# HG changeset patch # User Patrick PIERRE <patrick.pierre@prismallia.fr> # Date 1322840274 -3600 # Node ID c099d1e7e57e5dcad4939c65d90f4c2ae145f689 # Parent 9a3492dd5ffe3beecba3731da8c1a2133bfda34d Correction ordre de définition de la section diff -r 9a3492dd5ffe -r c099d1e7e57e RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc ven. déc. 02 14:51:43 2011 +0100 +++ b/RelaxNG/publidoc.rnc ven. déc. 02 16:37:54 2011 +0100 @@ -283,16 +283,16 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -section = element section { section.content, section.attributes } +section = element section { section.attributes, section.content } + +section.attributes = + section.type.attribute? +section.type.attribute = attribute type { xsd:NCName } section.content = section.head?, (section+ | block+) -section.attributes = - section.type.attribute? -section.type.attribute = attribute type { xsd:NCName } - # ============================================================================= # BLOCK LEVEL diff -r 9a3492dd5ffe -r c099d1e7e57e RelaxNG/publidoc.rng --- a/RelaxNG/publidoc.rng ven. déc. 02 14:51:43 2011 +0100 +++ b/RelaxNG/publidoc.rng ven. déc. 02 16:37:54 2011 +0100 @@ -583,10 +583,20 @@ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ section ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --> <define name="section"> <element name="section"> + <ref name="section.attributes"/> <ref name="section.content"/> - <ref name="section.attributes"/> </element> </define> + <define name="section.attributes"> + <optional> + <ref name="section.type.attribute"/> + </optional> + </define> + <define name="section.type.attribute"> + <attribute name="type"> + <data type="NCName"/> + </attribute> + </define> <define name="section.content"> <optional> <ref name="section.head"/> @@ -600,16 +610,6 @@ </oneOrMore> </choice> </define> - <define name="section.attributes"> - <optional> - <ref name="section.type.attribute"/> - </optional> - </define> - <define name="section.type.attribute"> - <attribute name="type"> - <data type="NCName"/> - </attribute> - </define> <!-- ============================================================================= BLOCK LEVEL