# HG changeset patch # User Patrick PIERRE # Date 1387194842 -3600 # Node ID 70ae719226b1490ed2f07cb1ef0adbe736500455 # Parent 1b4a22675865aed37b0071cc606678f305c04004 Modification de la gestion des mathématiques diff -r 1b4a22675865 -r 70ae719226b1 RelaxNG/publidoc.rnc --- a/RelaxNG/publidoc.rnc lun. déc. 16 00:19:39 2013 +0100 +++ b/RelaxNG/publidoc.rnc lun. déc. 16 12:54:02 2013 +0100 @@ -736,24 +736,26 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ math ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -math = element math { - ( attribute notation {"latex"}, math.latex.attributes, math.latex.content ) - | ( math.attributes, math.content ) -} +# ~~~~~~ math +math = element math { math.attributes, math.content } math.attributes = - math.mode.attribute? -math.latex.attributes = - math.latex.mode.attribute? -math.mode.attribute = attribute mode { + math.display.attribute? +math.display.attribute = attribute display { "wide" | "numbered" | "box" | "numbered-box" } -math.latex.mode.attribute = attribute mode { - "wide" | "numbered" | "box" | "numbered-box" - | "plain" | "plain-wide" | "numbered-plain" | "plain-box" - | "numbered-plain-box" } -math.content = mixed { sup* & sub* & var* & warning* } -math.latex.content = text +math.content = + mixed { sup* & sub* & var* & warning* } + | latex + +# ~~~~~~ latex +latex = element latex { latex.attributes, latex.content } + +latex.attributes = + plain.attritute? +plain.attritute = attribute plain { xsd:boolean } + +latex.content = text # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ date ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~