# HG changeset patch
# User Patrick PIERRE
# Date 1432758545 -7200
# Node ID 2f3e64c8187149160a157b50f22d70da19924d08
# Parent  b4827053c3152f6b6e0ae348c9c46f25b1bd17fa
Ordre libre pour title, shorttitle et subtitle

diff -r b4827053c315 -r 2f3e64c81871 RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publidoc.rnc	mer. mai 27 22:29:05 2015 +0200
@@ -196,7 +196,7 @@
 top.head = element head { top.head.content }
 
 top.head.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & identifier*
  & copyright*
  & collection?
@@ -254,7 +254,7 @@
 division.head = element head { division.head.content }
 
 division.head.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & indexset?
  & abstract?
  & annotation?
@@ -289,7 +289,7 @@
 component.head = element head { component.head.content }
 
 component.head.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & contributors?
  & date?
  & place?
@@ -325,7 +325,7 @@
 section.head = element head { section.head.content }
 
 section.head.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & keywordset?
  & subjectset?
  & indexset?
@@ -380,7 +380,7 @@
 block.head = element head { block.head.content }
 
 block.head.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & indexset?
  & annotation?
 
diff -r b4827053c315 -r 2f3e64c81871 RelaxNG/publimeta.rnc
--- a/RelaxNG/publimeta.rnc	dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publimeta.rnc	mer. mai 27 22:29:05 2015 +0200
@@ -38,7 +38,7 @@
 lang.attribute = attribute xml:lang { xsd:language }
 
 metadata.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & identifier*
  & copyright*
  & collection?
diff -r b4827053c315 -r 2f3e64c81871 RelaxNG/publiquiz.rnc
--- a/RelaxNG/publiquiz.rnc	dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publiquiz.rnc	mer. mai 27 22:29:05 2015 +0200
@@ -245,9 +245,9 @@
 category.head = element head { category.head.content }
 
 category.head.content =
-   title,
-   shorttitle?,
-   subtitle*
+   title
+ & shorttitle?
+ & subtitle*
 
 # ~~~~~~ categories
 categories = element categories { categories.attributes, categories.content }
diff -r b4827053c315 -r 2f3e64c81871 RelaxNG/publiset.rnc
--- a/RelaxNG/publiset.rnc	dim. mai 24 19:12:25 2015 +0200
+++ b/RelaxNG/publiset.rnc	mer. mai 27 22:29:05 2015 +0200
@@ -237,7 +237,7 @@
    remap.attributes
 
 composition.head.content =
-   (title, shorttitle?, subtitle*)?
+   (title & shorttitle? & subtitle*)?
  & identifier*
  & copyright*
  & collection?