# HG changeset patch # User Patrick PIERRE # Date 1350639119 -7200 # Node ID 4c01e659284aecddef9796e846876abd21fdb273 # Parent 053afd50e85dd57c1634e34ef35a5d08a94932b5 Ajout de diff -r 053afd50e85d -r 4c01e659284a RelaxNG/Examples/Documents/torture_test.xml --- a/RelaxNG/Examples/Documents/torture_test.xml lun. oct. 01 19:12:55 2012 +0200 +++ b/RelaxNG/Examples/Documents/torture_test.xml ven. oct. 19 11:31:59 2012 +0200 @@ -639,13 +639,18 @@ en Europe.

+ +

Le mot table n'a qu'une syllabe.

+
+

Un hydrate est un composé chimique contenant de l'eau.

- -

Le mot table n'a qu'une syllabe.

+ +

<html> est l'ancêtre de tous les + éléments.

diff -r 053afd50e85d -r 4c01e659284a RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc lun. oct. 01 19:12:55 2012 +0200 +++ b/RelaxNG/publidoc.rnc ven. oct. 19 11:31:59 2012 +0200 @@ -560,10 +560,11 @@ & note* & foreign* & highlight* - & mentioned* & quote* & acronym* + & mentioned* & term* + & literal* & link* & anchor* & initial* @@ -658,12 +659,6 @@ highlight.content = inlines -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mentioned ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -mentioned = element mentioned { mentioned.content } - -mentioned.content = inlines - # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ quote ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ quote = element quote { quote.content } @@ -681,12 +676,24 @@ acronym.content = inlines +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ mentioned ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +mentioned = element mentioned { mentioned.content } + +mentioned.content = inlines + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ term ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ term = element term { term.content } term.content = inlines +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ literal ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +literal = element literal { literal.content } + +literal.content = text + # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ link = element link { link.attributes, link.content }