diff options
Diffstat (limited to 'tex/context/interface/mkiv/i-note.xml')
| -rw-r--r-- | tex/context/interface/mkiv/i-note.xml | 236 |
1 files changed, 132 insertions, 104 deletions
diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml index be74ca3a6..a7ecb5401 100644 --- a/tex/context/interface/mkiv/i-note.xml +++ b/tex/context/interface/mkiv/i-note.xml @@ -156,6 +156,9 @@ <cd:constant type="no" default="yes"/> <cd:constant type="xml"/> </cd:parameter> + <cd:parameter name="referenceprefix"> + <cd:resolve name="value-referenceprefix"/> + </cd:parameter> <cd:parameter name="sample"> <cd:constant type="cd:text"/> </cd:parameter> @@ -180,54 +183,62 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupnotations" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupnotation"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupnotations" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupnotation"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="generated:1" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance:assignment" file="strc-not.mkvi"> <cd:sequence> - <cd:variable value="note"/> + <cd:instance value="note"/> </cd:sequence> <cd:arguments> <cd:resolve name="assignment-constructiondata-list-optional"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-note"/> + </cd:instances> </cd:command> - <cd:command name="note" type="environment" generated="yes" variant="generated:2" file="strc-not.mkvi"> + <cd:command name="note" type="environment" generated="yes" variant="instance" file="strc-not.mkvi"> <cd:sequence> - <cd:variable value="note"/> + <cd:instance value="note"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-note"/> + </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="generated:1" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance" file="strc-not.mkvi"> <cd:sequence> - <cd:variable value="note"/> + <cd:instance value="note"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-note"/> + </cd:instances> </cd:command> - <cd:command name="note" generated="yes" variant="generated:2" file="strc-not.mkvi"> + <cd:command name="note" generated="yes" variant="instance:assignment" file="strc-not.mkvi"> <cd:sequence> - <cd:variable value="note"/> + <cd:instance value="note"/> </cd:sequence> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-note"/> + </cd:instances> </cd:command> <cd:command name="definenote" file="strc-not.mkvi"> @@ -330,7 +341,7 @@ <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="after"> - <cd:constant type="cd.command"/> + <cd:constant type="cd:command"/> </cd:parameter> <cd:parameter name="inbetween"> <cd:constant type="cd:command"/> @@ -375,20 +386,16 @@ </cd:arguments> </cd:command> - <!-- - - <cd:command name="setupnotes" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-name-list-optional"/> - <cd:assignments list="yes"> - <cd:inherit name="setupnote"/> - </cd:assignments> - </cd:arguments> - </cd:command> - - --> + <cd:command name="setupnotes" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-name-list-optional"/> + <cd:assignments list="yes"> + <cd:inherit name="setupnote"/> + </cd:assignments> + </cd:arguments> + </cd:command> - <cd:command name="setnote" variant="1" file="strc-not.mkvi"> + <cd:command name="setnote" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -396,14 +403,14 @@ </cd:arguments> </cd:command> - <cd:command name="setnote" variant="2" file="strc-not.mkvi"> + <cd:command name="setnote" variant="assignment" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> </cd:command> - <cd:command name="setnotetext" variant="1" file="strc-not.mkvi"> + <cd:command name="setnotetext" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="keyword-reference-list-optional"/> @@ -411,7 +418,7 @@ </cd:arguments> </cd:command> - <cd:command name="setnotetext" variant="2" file="strc-not.mkvi"> + <cd:command name="setnotetext" variant="assignment" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-name"/> <cd:resolve name="assignment-constructiondata-list"/> @@ -483,39 +490,43 @@ </cd:arguments> </cd:command> - <cd:command name="footnote" type="environment" variant="1" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list-optional"/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="footnote" type="environment" variant="2" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="footnote" type="environment" variant="assignment" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="assignment-constructiondata-list-optional"/> + </cd:arguments> + </cd:command> - <cd:command name="footnote" variant="1" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="footnote" type="environment" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-reference-list-optional"/> + </cd:arguments> + </cd:command> - <cd:command name="footnote" variant="2" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list"/> - </cd:arguments> - </cd:command> + <cd:command name="footnote" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="footnote" variant="assignment" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="assignment-constructiondata-list"/> + </cd:arguments> + </cd:command> + + --> - <cd:command name="footnotetext" variant="1" file="strc-not.mkvi"> + <cd:command name="footnotetext" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="keyword-reference-list-optional"/> <cd:resolve name="argument-text"/> </cd:arguments> </cd:command> - <cd:command name="footnotetext" variant="2" file="strc-not.mkvi"> + <cd:command name="footnotetext" variant="assignment" file="strc-not.mkvi"> <cd:arguments> <cd:resolve name="assignment-constructiondata-list"/> </cd:arguments> @@ -539,30 +550,34 @@ </cd:arguments> </cd:command> - <cd:command name="endnote" type="environment" variant="1" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list-optional"/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="endnote" type="environment" variant="2" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - </cd:arguments> - </cd:command> + <cd:command name="endnote" type="environment" variant="assignment" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="assignment-constructiondata-list-optional"/> + </cd:arguments> + </cd:command> - <cd:command name="endnote" variant="1" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference-list-optional"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="endnote" type="environment" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-reference-list-optional"/> + </cd:arguments> + </cd:command> - <cd:command name="endnote" variant="2" file="strc-not.mkvi"> - <cd:arguments> - <cd:resolve name="assignment-constructiondata-list"/> - </cd:arguments> - </cd:command> + <cd:command name="endnote" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-reference-list-optional"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="endnote" variant="assignment" file="strc-not.mkvi"> + <cd:arguments> + <cd:resolve name="assignment-constructiondata-list"/> + </cd:arguments> + </cd:command> + + --> <cd:command name="definelinenote" file="strc-lnt.mkvi"> <cd:arguments> @@ -598,34 +613,43 @@ </cd:arguments> </cd:command> - <cd:command name="linenote" generated="yes" variant="generated" file="strc-lnt.mkvi"> + <cd:command name="linenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> <cd:sequence> - <cd:variable value="linenote"/> + <cd:instance value="linenote"/> </cd:sequence> <cd:arguments> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-linenote"/> + </cd:instances> </cd:command> - <cd:command name="startlinenote" generated="yes" variant="generated" file="strc-lnt.mkvi"> + <cd:command name="startlinenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="start"/> - <cd:variable value="linenote"/> + <cd:instance value="linenote"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference"/> <cd:resolve name="argument-text"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-linenote"/> + </cd:instances> </cd:command> - <cd:command name="stoplinenote" generated="yes" variant="generated" file="strc-lnt.mkvi"> + <cd:command name="stoplinenote" generated="yes" variant="instance" file="strc-lnt.mkvi"> <cd:sequence> <cd:string value="stop"/> - <cd:variable value="linenote"/> + <cd:instance value="linenote"/> </cd:sequence> <cd:arguments> <cd:resolve name="keyword-reference"/> </cd:arguments> + <cd:instances> + <cd:resolve name="instance-linenote"/> + </cd:instances> </cd:command> <cd:command name="fromlinenote" file="strc-lnt.mkvi"> @@ -641,23 +665,27 @@ </cd:arguments> </cd:command> - <cd:command name="linenote" file="strc-lnt.mkvi"> - <cd:arguments> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <!-- - <cd:command name="startlinenote" file="strc-lnt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference"/> - <cd:resolve name="argument-text"/> - </cd:arguments> - </cd:command> + <cd:command name="linenote" file="strc-lnt.mkvi"> + <cd:arguments> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> - <cd:command name="stoplinenote" file="strc-lnt.mkvi"> - <cd:arguments> - <cd:resolve name="keyword-reference"/> - </cd:arguments> - </cd:command> + <cd:command name="startlinenote" file="strc-lnt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-reference"/> + <cd:resolve name="argument-text"/> + </cd:arguments> + </cd:command> + + <cd:command name="stoplinenote" file="strc-lnt.mkvi"> + <cd:arguments> + <cd:resolve name="keyword-reference"/> + </cd:arguments> + </cd:command> + + --> -</cd:interface>
\ No newline at end of file +</cd:interface> |