[glom] Partly fix the DTD validation test.

[Murray Cumming <murrayc src gnome org>]

commit d2e05599394dd449f8e9bcab6ee1c0e5ffcbf591
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Nov 17 11:08:12 2009 +0100

    Partly fix the DTD validation test.
    
    * glom/glom_document.dtd: table: Correct the syntax for the child
    elements, to use ?, instead of | because they are all optional, instead
    of being alternatives for each other.
    Add the print_layouts element.
    * Makefile_tests.am: Change the order so the sometimes-hanging import
    tests are at the end, to make the tests more useful.

 ChangeLog              |   11 +++++++++++
 Makefile_tests.am      |   12 ++++++------
 glom/glom_document.dtd |   20 +++++++++++++++-----
 3 files changed, 32 insertions(+), 11 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d0ad585..3186223 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-17  Murray Cumming  <murrayc murrayc com>
+
+	Partly fix the DTD validation test.
+
+	* glom/glom_document.dtd: table: Correct the syntax for the child 
+	elements, to use ?, instead of | because they are all optional, instead 
+	of being alternatives for each other.
+	Add the print_layouts element.
+	* Makefile_tests.am: Change the order so the sometimes-hanging import 
+	tests are at the end, to make the tests more useful.
+
 2009-11-13  David King  <davidk openismus com>
 
 	* configure.ac: Fix check for SQLite and libgettextpo.
diff --git a/Makefile_tests.am b/Makefile_tests.am
index ffc2d0a..bbc0d66 100644
--- a/Makefile_tests.am
+++ b/Makefile_tests.am
@@ -30,12 +30,12 @@ check_PROGRAMS =						\
 	tests/import/test_signals
 
 TESTS =	tests/test_parsing_time	\
-	tests/test_signal_reemit	\
-	tests/test_load_python_library\
-	tests/test_python_module\
-	tests/import/test_parsing\
-	tests/import/test_signals\
-        tests/dtd/test_example_sqlite
+	tests/test_signal_reemit \
+        tests/dtd/test_example_sqlite \
+	tests/test_load_python_library \
+	tests/test_python_module \
+	tests/import/test_parsing \
+	tests/import/test_signals
 
 #TESTS_ENVIRONMENT=which valgrind && valgrind --tool=memcheck --leak-check=full --leak-resolution=high --trace-children=yes --num-callers=30
 
diff --git a/glom/glom_document.dtd b/glom/glom_document.dtd
index 31d17d3..bf0305e 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 'print_layouts' element.
 TODO: Add 'title_singular' element.
 -->
 
@@ -89,7 +88,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 | fields | relationships | data_layouts | reports | trans_set)*>
+    <!ELEMENT table (title_singular?, example_rows?, fields+, relationships?, data_layouts+, reports?, print_layouts?, trans_set?)>
     <!ATTLIST table
         name CDATA #REQUIRED
         title CDATA #IMPLIED
@@ -365,9 +364,9 @@ TODO: Add 'title_singular' element.
 
     <!ELEMENT portal_navigation_relationship ANY>
     <!ATTLIST portal_navigation_relationship
-        navigation_type CDATA #REQUIRED
-        relationship CDATA #REQUIRED
-        related_relationship CDATA #REQUIRED>
+        navigation_type CDATA #IMPLIED
+        relationship CDATA #IMPLIED
+        related_relationship CDATA #IMPLIED>
 
 <!-- reports and data reports make short sheets of important information that
   distill a larger database. data_report(s) is the old interface; use reports if you are
@@ -389,6 +388,17 @@ TODO: Add 'title_singular' element.
         title CDATA #IMPLIED
         show_table_title (true|false) "false">
 
+<!-- print layouts are for perfectly-positioned printing of single record details. -->
+    <!ELEMENT print_layouts (print_layout*)>
+    <!ELEMENT print_layout (print_layout_groups)>
+    <!ATTLIST print_layout
+        name CDATA #REQUIRED
+        parent_table CDATA #IMPLIED>
+
+    <!ELEMENT print_layout_groups (print_layout_group)*>
+    <!ATTLIST print_layout_groups>
+
+
 <!-- The library_modules node contains python code that may be used in scripts and 
      calculations via the python import keyword. -->