Réorganisation
authorPatrick PIERRE
jeu., 20 nov. 2014 17:54:56 +0100
changeset 351 715ab7002268
parent 350 58bbf6bb79e2
child 352 29514b276117
Réorganisation
RelaxNG/publidoc.rnc
RelaxNG/publiquiz.rnc
--- a/RelaxNG/publidoc.rnc	jeu. nov. 20 17:37:00 2014 +0100
+++ b/RelaxNG/publidoc.rnc	jeu. nov. 20 17:54:56 2014 +0100
@@ -742,15 +742,15 @@
  & foreign*
  & date*
  & math*
+ & quote*
  & initial*
- & quote*
- & image*
- & audio*
- & smil*
  & note*
  & link*
  & anchor*
  & index*
+ & image*
+ & audio*
+ & smil*
 }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sub, sup, var ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -874,17 +874,6 @@
 
 latex.content = text
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ initial ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-initial = element initial { initial.content }
-
-initial.content =
-   initial.c,
-   initial.w?
-
-initial.c = element c { text }
-initial.w = element w { inlines }
-
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ quote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 quote = element quote { quote.content }
@@ -896,19 +885,16 @@
 
 phrase.content = inlines
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ smil ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ initial ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-smil = element smil { smil.attributes, smil.content }
+initial = element initial { initial.content }
 
-smil.attributes =
-   audio.attribute?
- & begin.attribute?
- & end.attribute?
-audio.attribute = attribute audio { xsd:anyURI }
-begin.attribute = attribute begin { xsd:decimal }
-end.attribute = attribute end { xsd:decimal }
+initial.content =
+   initial.c,
+   initial.w?
 
-smil.content = inlines
+initial.c = element c { text }
+initial.w = element w { inlines }
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ note ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -945,6 +931,20 @@
 
 anchor.content = simple.inlines
 
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ smil ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+smil = element smil { smil.attributes, smil.content }
+
+smil.attributes =
+   audio.attribute?
+ & begin.attribute?
+ & end.attribute?
+audio.attribute = attribute audio { xsd:anyURI }
+begin.attribute = attribute begin { xsd:decimal }
+end.attribute = attribute end { xsd:decimal }
+
+smil.content = inlines
+
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ warning ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 warning = element warning { warning.attributes, warning.content }
--- a/RelaxNG/publiquiz.rnc	jeu. nov. 20 17:37:00 2014 +0100
+++ b/RelaxNG/publiquiz.rnc	jeu. nov. 20 17:54:56 2014 +0100
@@ -582,15 +582,15 @@
  & foreign*
  & date*
  & math*
+ & quote*
  & initial*
- & quote*
- & image*
- & audio*
- & smil*
  & note*
  & link*
  & anchor*
  & index*
+ & image*
+ & audio*
+ & smil*
 
  & blank*
 }
@@ -613,15 +613,15 @@
  & foreign*
  & date*
  & math*
+ & quote*
  & initial*
- & quote*
- & image*
- & audio*
- & smil*
  & note*
  & link*
  & anchor*
  & index*
+ & image*
+ & audio*
+ & smil*
 
  & point*
 }