[glom] Document DTD: adapt to the format we actually use.

[Murray Cumming <murrayc src gnome org>]

commit 199616ae8452b1065642b6615d7c3087b1118ea3
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Dec 4 22:14:31 2011 +0100

    Document DTD: adapt to the format we actually use.
    
    * examples/example_film_manager.glom: Resave this.
    * glom/glom_document.dtd: Change the sequence of child nodes for
    tables and print_layouts to match what we really write.
    We do not really care about this but the DTD format forces us to
    use a sequence.

 ChangeLog                          |   10 ++++++++++
 examples/example_film_manager.glom |   10 +++++-----
 glom/glom_document.dtd             |   12 +++++++++---
 3 files changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2611f5b..1588ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-12-04  Murray Cumming  <murrayc murray com>
+
+	Document DTD: adapt to the format we actually use.
+
+	* examples/example_film_manager.glom: Resave this.
+	* glom/glom_document.dtd: Change the sequence of child nodes for 
+	tables and print_layouts to match what we really write.
+	We do not really care about this but the DTD format forces us to 
+	use a sequence.
+
 2011-12-03  Murray Cumming  <murrayc murrayc com>
 
 	test_document_load: Check reports too.
diff --git a/examples/example_film_manager.glom b/examples/example_film_manager.glom
index 3cc9366..f06b59a 100644
--- a/examples/example_film_manager.glom
+++ b/examples/example_film_manager.glom
@@ -519,8 +519,8 @@
                 <title_custom use_custom="true" title="Actor's Name">
                   <trans_set>
                     <trans loc="de_DE" val="Schauspieler Name"/>
-                </trans_set>
-              </title_custom>
+                  </trans_set>
+                </title_custom>
                 <formatting/>
               </data_layout_item>
             </data_layout_group>
@@ -1437,9 +1437,6 @@
     </reports>
     <print_layouts>
       <print_layout name="contact_details" show_table_title="true" show_grid="true" show_rules="true" show_outlines="true" page_count="2" title="Contact Details">
-        <trans_set>
-          <trans loc="de_DE" val="Kontakt Details"/>
-        </trans_set>
         <page_setup>
 [Page Setup]
 PPDName=Letter
@@ -1753,6 +1750,9 @@ Orientation=portrait
             </data_layout_item>
           </data_layout_group>
         </data_layout_groups>
+        <trans_set>
+          <trans loc="de_DE" val="Kontakt Details"/>
+        </trans_set>
       </print_layout>
     </print_layouts>
   </table>
diff --git a/glom/glom_document.dtd b/glom/glom_document.dtd
index 1a8db58..e035376 100644
--- a/glom/glom_document.dtd
+++ b/glom/glom_document.dtd
@@ -3,7 +3,6 @@
 DTD for glom documents.
 TODO: Make sure that all the comments list all the attributes and their meaning.
 TODO: Should we specify the presence of child text nodes in the ELEMENT somehow?
-TODO: Add 'title_singular' element.
 -->
 
 
@@ -92,7 +91,7 @@ TODO: Add 'title_singular' element.
   default: can specify that the table should be opened when the file is opened. Only one table should have default=true.
   example_rows: deprecated in 1.6 (and support removed in 1.10) - use the child node instead.
 -->
-    <!ELEMENT table (title_singular?, example_rows?, trans_set?, fields+, relationships?, data_layouts+, reports?, print_layouts?)>
+    <!ELEMENT table (example_rows?, trans_set?, title_singular?, fields+, relationships?, data_layouts+, reports?, print_layouts?)>
     <!ATTLIST table
         name CDATA #REQUIRED
         title CDATA #IMPLIED
@@ -347,6 +346,13 @@ TODO: Add 'title_singular' element.
         title CDATA #IMPLIED
         use_custom (true|false) "true">
 
+<!-- A title_singular is used for the singular form where the standard title would be the plural form. -->
+
+    <!ELEMENT title_singular (trans_set?)>
+    <!ATTLIST title_singular
+        title CDATA #IMPLIED>
+
+
 <!-- A data_layout_portal shows related records -->
 
     <!ELEMENT data_layout_portal (position?, portal_navigation_relationship?, data_layout_item*) >
@@ -417,7 +423,7 @@ TODO: Add 'title_singular' element.
 <!-- print layouts are for perfectly-positioned printing of single record details. -->
     <!ELEMENT print_layouts (print_layout*)>
 
-    <!ELEMENT print_layout (trans_set?, page_setup?, data_layout_groups, horizontal_rule?, vertical_rule?)>
+    <!ELEMENT print_layout (page_setup?, data_layout_groups, horizontal_rule?, vertical_rule?, trans_set?)>
     <!ATTLIST print_layout
         name CDATA #REQUIRED
         title CDATA #IMPLIED