# HG changeset patch
# User Patrick PIERRE
# Date 1389608341 -3600
# Node ID 02671b229bdc7f50cb290fda069a70c472699110
# Parent  68a36d5077164ac56986902e7c51ae6d32f81c8f
Correction pour xmllint

diff -r 68a36d507716 -r 02671b229bdc RelaxNG/publidoc.rnc
--- a/RelaxNG/publidoc.rnc	lun. janv. 13 01:37:03 2014 +0100
+++ b/RelaxNG/publidoc.rnc	lun. janv. 13 11:19:01 2014 +0100
@@ -721,8 +721,18 @@
  & warning*
 }
 
-inlines =
-   simple.inlines
+inlines = mixed {
+   sup*
+ & sub*
+ & var*
+ & number*
+ & math*
+ & date*
+ & name*
+ & acronym*
+ & term*
+ & warning*
+
  & literal*
  & foreign*
  & highlight*
@@ -738,6 +748,7 @@
  & link*
  & anchor*
  & index*
+}
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sub, sup, var ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff -r 68a36d507716 -r 02671b229bdc RelaxNG/publiquiz.rnc
--- a/RelaxNG/publiquiz.rnc	lun. janv. 13 01:37:03 2014 +0100
+++ b/RelaxNG/publiquiz.rnc	lun. janv. 13 11:19:01 2014 +0100
@@ -465,8 +465,18 @@
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ inlines ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-blanks.inlines =
-   simple.inlines
+blanks.inlines = mixed {
+   sup*
+ & sub*
+ & var*
+ & number*
+ & math*
+ & date*
+ & name*
+ & acronym*
+ & term*
+ & warning*
+
  & literal*
  & foreign*
  & highlight*
@@ -482,10 +492,22 @@
  & link*
  & anchor*
  & index*
+
  & blank*
+}
 
-point.inlines =
-   simple.inlines
+point.inlines = mixed {
+   sup*
+ & sub*
+ & var*
+ & number*
+ & math*
+ & date*
+ & name*
+ & acronym*
+ & term*
+ & warning*
+
  & literal*
  & foreign*
  & highlight*
@@ -501,9 +523,11 @@
  & link*
  & anchor*
  & index*
+
  & blank*
  & point.right*
  & point.wrong*
+}
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blank ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff -r 68a36d507716 -r 02671b229bdc RelaxNG/publiset.rnc
--- a/RelaxNG/publiset.rnc	lun. janv. 13 01:37:03 2014 +0100
+++ b/RelaxNG/publiset.rnc	lun. janv. 13 11:19:01 2014 +0100
@@ -336,11 +336,16 @@
  & name*
 }
 
-inlines =
-   simple.inlines
+inlines = mixed {
+   sup*
+ & sub*
+ & date*
+ & name*
+
  & highlight*
  & emphasis*
  & link*
+}
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sub, sup ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~