--- gnue-forms.dtd.~1.2.~	Wed Jul  4 21:40:53 2001
+++ gnue-forms.dtd	Mon May 20 16:50:15 2002
@@ -26,9 +26,9 @@
 <!ENTITY gt "&#62;">
 <!ENTITY amp "&#38;#38;">
 
-<!-- +---------------------------------------------------+ --> 
+<!-- +- - - - - - - - - - - - - - - - - - - - - - - - - -+ --> 
 <!-- | Datatype entities to make DTD more human readable | -->
-<!-- +---------------------------------------------------+ -->
+<!-- +- - - - - - - - - - - - - - - - - - - - - - - - - -+ -->
 
 <!ENTITY % text "CDATA">
 
@@ -43,21 +43,21 @@
 
 
 
-<!-- +-------------------+ -->
+<!-- +- - - - - - - - - -+ -->
 <!-- | Top level element | -->
-<!-- +-------------------+ -->
+<!-- +- - - - - - - - - -+ -->
 <!ELEMENT form (database*, datasource*, import*, import-datasource*, 
                 import-page*, import-trigger*, options?, page+, trigger*)>
-<!ATTLIST form height %whole; #DEFAULT "12">
+<!ATTLIST form height %whole; "12">
 <!ATTLIST form readonly %boolean;>
 <!ATTLIST form tabbed (bottom | left | right | top) #IMPLIED>
-<!ATTLIST form title %text; #DEFAULT "Untitled Form">
-<!ATTLIST form width %whole; #DEFAULT "40">
+<!ATTLIST form title %text; "Untitled Form">
+<!ATTLIST form width %whole; "40">
 
 
-<!-- +------------------------+ -->
+<!-- +- - - - - - - - - - - - + -->
 <!-- | Child elements of form | -->
-<!-- +------------------------+ -->
+<!-- +- - - - - - - - - - - - + -->
 <!-- DEPRECATED: Use of the database element has been deprecated -->
 <!ELEMENT database EMPTY>
 <!ATTLIST database name ID #REQUIRED>
@@ -75,13 +75,13 @@
 <!ATTLIST datasource order_by %text; #IMPLIED>
 <!ATTLIST datasource prequery %boolean;>
 <!ATTLIST datasource table %name; #IMPLIED>
-<!ATTLIST datasource type %name; #DEFAULT "object">
+<!ATTLIST datasource type %name; "object">
 
 <!ELEMENT import EMPTY>
 <!ATTLIST import library %name; #REQUIRED>
-<!ATTLIST import datasources %name; #DEFAULT "">
-<!ATTLIST import pages %name; #DEFAULT "">
-<!ATTLIST import triggers %name; #DEFAULT "">
+<!ATTLIST import datasources %name; "">
+<!ATTLIST import pages %name; "">
+<!ATTLIST import triggers %name; "">
 
 <!ELEMENT import-datasource EMPTY>
 <!ATTLIST import-datasource name ID #REQUIRED>
@@ -94,7 +94,7 @@
 <!ATTLIST import-datasource order_by %text; #IMPLIED>
 <!ATTLIST import-datasource prequery %boolean;>
 <!ATTLIST import-datasource table %name; #IMPLIED>
-<!ATTLIST import-datasource type %name; #DEFAULT "object">
+<!ATTLIST import-datasource type %name; "object">
 
 <!ELEMENT import-page EMPTY>
 <!ATTLIST import-page library %name; #REQUIRED>
@@ -125,9 +125,9 @@
 <!ATTLIST trigger type %name; #IMPLIED>
 
 
-<!-- +---------------------------+ -->
+<!-- +- - - - - - - - - - - - - -+ -->
 <!-- | Child elements of options | -->
-<!-- +---------------------------+ -->
+<!-- +- - - - - - - - - - - - - -+ -->
 <!ELEMENT author EMPTY>
 <!ATTLIST author name %name; #FIXED "author">
 <!ATTLIST author value %text; #IMPLIED>
@@ -163,9 +163,9 @@
 <!ATTLIST width value %text; #IMPLIED>
 
 
-<!-- +------------------------+ -->
+<!-- +- - - - - - - - - - - - + -->
 <!-- | Child elements of page | -->
-<!-- +------------------------+ -->
+<!-- +- - - - - - - - - - - - + -->
 <!ELEMENT block (box*, button*, entry*, import-button*, import-entry*, label*, 
                  scrollbar*)>
 <!ATTLIST block name ID #REQUIRED>
@@ -173,7 +173,7 @@
 <!ATTLIST block detail IDREF #IMPLIED>
 <!ATTLIST block master IDREF #IMPLIED>
 <!ATTLIST block rowSpacer %whole; #IMPLIED>
-<!ATTLIST block rows %whole; #DEFAULT "1">
+<!ATTLIST block rows %whole; "1">
 <!ATTLIST block transparentBlock %boolean;>
 
 <!ELEMENT box EMPTY>
@@ -200,7 +200,7 @@
 <!ATTLIST import-block detail IDREF #IMPLIED>
 <!ATTLIST import-block master IDREF #IMPLIED>
 <!ATTLIST import-block rowSpacer %whole; #IMPLIED>
-<!ATTLIST import-block rows %whole; #DEFAULT "1">
+<!ATTLIST import-block rows %whole; "1">
 <!ATTLIST import-block transparentBlock %boolean;>
 
 <!ELEMENT import-button EMPTY>
@@ -228,9 +228,9 @@
 <!ATTLIST scrollbar y %whole; #REQUIRED>
 
 
-<!-- +-------------------------+ -->
+<!-- +- - - - - - - - - - - - -+ -->
 <!-- | Child elements of block | -->
-<!-- +-------------------------+ -->
+<!-- +- - - - - - - - - - - - -+ -->
 <!ELEMENT entry EMPTY>
 <!ATTLIST entry name ID #REQUIRED>
 <!ATTLIST entry x %whole; #REQUIRED>
@@ -239,7 +239,7 @@
 <!ATTLIST entry field %name; #IMPLIED>
 <!ATTLIST entry foreign_key %name; #IMPLIED>
 <!ATTLIST entry foreign_key_description %text; #IMPLIED>
-<!ATTLIST entry height %whole; #DEFAULT "1">
+<!ATTLIST entry height %whole; "1">
 <!ATTLIST entry hidden %boolean;>
 <!ATTLIST entry lowercase %boolean;>
 <!ATTLIST entry max_length %whole; #IMPLIED>
@@ -251,7 +251,7 @@
 <!ATTLIST entry uppercase %boolean;>
 <!ATTLIST entry value %text; #IMPLIED>
 <!-- DEPRECATED: The visibleCount attribute of entry has been deprecated -->
-<!ATTLIST entry visibleCount %whole; #DEFAULT "1">
+<!ATTLIST entry visibleCount %whole; "1">
 <!ATTLIST entry width %whole; #IMPLIED>
 
 <!ELEMENT import-entry EMPTY>
@@ -263,7 +263,7 @@
 <!ATTLIST import-entry field %name; #IMPLIED>
 <!ATTLIST import-entry foreign_key %name; #IMPLIED>
 <!ATTLIST import-entry foreign_key_description %text; #IMPLIED>
-<!ATTLIST import-entry height %whole; #DEFAULT "1">
+<!ATTLIST import-entry height %whole; "1">
 <!ATTLIST import-entry hidden %boolean;>
 <!ATTLIST import-entry lowercase %boolean;>
 <!ATTLIST import-entry max_length %whole; #IMPLIED>
@@ -276,7 +276,7 @@
 <!ATTLIST import-entry value %text; #IMPLIED>
 <!-- DEPRECATED: The visibleCount attribute of import-entry has been 
                  deprecated -->
-<!ATTLIST import-entry visibleCount %whole; #DEFAULT "1">
+<!ATTLIST import-entry visibleCount %whole; "1">
 <!ATTLIST import-entry width %whole; #IMPLIED>