From e8fa8688344d3a2b73b38e736781701dc657c343 Mon Sep 17 00:00:00 2001
From: peterdd <ddpm@liscovius.de>
Date: Wed, 8 Jan 2020 20:31:35 +0100
Subject: Fix invalid xmlschema03.dtd

Trying to make schema valid following https://www.w3.org/TR/xml11/, so
it can be used for validation of xmlschema03 xml files.

* remove xml declaration and doctype wrapper from dtd file
* add XL|I1|I2|I4|I8 as allowed field types to the field attribute list
* fix the sql attribute list
* format ATTLIST with more then on attribute on separate lines

See also ticket in the old abandoned adodb-xmlschema project
https://sourceforge.net/p/adodb-xmlschema/bugs/20/
(probably xmlschema 02 there)

Fixes #595
---
 xmlschema03.dtd | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/xmlschema03.dtd b/xmlschema03.dtd
index 97850bc7..10c6fef0 100644
--- a/xmlschema03.dtd
+++ b/xmlschema03.dtd
@@ -1,11 +1,16 @@
-<?xml version="1.0"?>
-<!DOCTYPE adodb_schema [
 <!ELEMENT schema (table*, sql*)>
 <!ATTLIST schema version CDATA #REQUIRED>
 <!ELEMENT table (descr?, (field+|DROP), constraint*, opt*, index*, data*)>
-<!ATTLIST table name CDATA #REQUIRED platform CDATA #IMPLIED version CDATA #IMPLIED>
+<!ATTLIST table
+	name CDATA #REQUIRED
+	platform CDATA #IMPLIED
+	version CDATA #IMPLIED>
 <!ELEMENT field (descr?, (NOTNULL|KEY|PRIMARY)?, (AUTO|AUTOINCREMENT)?, (DEFAULT|DEFDATE|DEFTIMESTAMP)?, NOQUOTE?, UNSIGNED?, constraint*, opt*)>
-<!ATTLIST field name CDATA #REQUIRED type (C|C2|X|X2|B|D|T|L|I|F|N) #REQUIRED size CDATA #IMPLIED opts CDATA #IMPLIED>
+<!ATTLIST
+	field name CDATA #REQUIRED
+	type (C|C2|X|X2|XL|B|D|T|L|I|I1|I2|I4|I8|F|N) #REQUIRED
+	size CDATA #IMPLIED
+	opts CDATA #IMPLIED>
 <!ELEMENT data (descr?, row+)>
 <!ATTLIST data platform CDATA #IMPLIED>
 <!ELEMENT row (f+)>
@@ -29,7 +34,9 @@
 <!ELEMENT opt (#CDATA)>
 <!ATTLIST opt platform CDATA #IMPLIED>
 <!ELEMENT index ((col+|DROP), CLUSTERED?, BITMAP?, UNIQUE?, FULLTEXT?, HASH?, descr?)>
-<!ATTLIST index name CDATA #REQUIRED platform CDATA #IMPLIED>
+<!ATTLIST index
+	name CDATA #REQUIRED
+	platform CDATA #IMPLIED>
 <!ELEMENT col (#CDATA)>
 <!ELEMENT CLUSTERED EMPTY>
 <!ELEMENT BITMAP EMPTY>
@@ -37,7 +44,10 @@
 <!ELEMENT FULLTEXT EMPTY>
 <!ELEMENT HASH EMPTY>
 <!ELEMENT sql (query+, descr?)>
-<!ATTLIST sql name CDATA #IMPLIED platform CDATA #IMPLIED, key CDATA, prefixmethod (AUTO|MANUAL|NONE)>
+<!ATTLIST sql
+	name CDATA #IMPLIED
+	platform CDATA #IMPLIED
+	key CDATA #IMPLIED
+	prefixmethod (AUTO|MANUAL|NONE) #IMPLIED>
 <!ELEMENT query (#CDATA)>
 <!ATTLIST query platform CDATA #IMPLIED>
-]>
\ No newline at end of file
-- 
cgit v1.3