summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/x-set-11.tex
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2008-06-12 10:42:53 +0000
committerTaco Hoekwater <taco@elvenkind.com>2008-06-12 10:42:53 +0000
commit0d01365d53c456d246da0ca1f0b3cd9868f02b35 (patch)
tree01a655c8028e17cfb371456b299c1848fe08c05b /Master/texmf-dist/tex/context/base/x-set-11.tex
parent44f3714442da07fdfc36a7f2a8dcd5d4294c5d26 (diff)
ConTeXt release 2008.05.21
git-svn-id: svn://tug.org/texlive/trunk@8691 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/x-set-11.tex')
-rw-r--r--Master/texmf-dist/tex/context/base/x-set-11.tex68
1 files changed, 31 insertions, 37 deletions
diff --git a/Master/texmf-dist/tex/context/base/x-set-11.tex b/Master/texmf-dist/tex/context/base/x-set-11.tex
index f3ce754209a..19ce18a75a5 100644
--- a/Master/texmf-dist/tex/context/base/x-set-11.tex
+++ b/Master/texmf-dist/tex/context/base/x-set-11.tex
@@ -20,6 +20,13 @@
\usemodule[set-02]
+\loadmarkfile{x-set-11}
+
+\ifx\mkloadsetups\undefined \let\mkloadsetups \gobbleoneargument \fi
+\ifx\mkshowsetup \undefined \let\mkshowsetup \gobbleoneargument \fi
+\ifx\mkusedsetups\undefined \let\mkusedsetups \gobbleoneargument \fi
+\ifx\mkallsetups \undefined \let\mkallsetups \gobbleoneargument \fi
+
\unprotect
% general
@@ -303,11 +310,11 @@
\stopmessages
\def\c!setup!internal!#1%
- {{\dogetmessage{setup}{#1}%
+ {{\setmessagetext{setup}{#1}%
\expanded{\setupintfont{\currentmessagetext}}}}
\def\c!setup!text!#1%
- {{\dogetmessage{setup}{#1}%
+ {{\setmessagetext{setup}{#1}%
\setupvarfont{\currentmessagetext}}}
\def\c!setup!command!#1%
@@ -350,8 +357,19 @@
\newif\ifshortsetup
-\def\setup {\shortsetupfalse\dosetup}
-\def\shortsetup{\shortsetuptrue \dosetup}
+\def\doshowsetup
+ {\dosingleempty\dodoshowsetup}
+
+\def\dodoshowsetup[#1]%
+ {\iffirstargument
+ \mkshowsetup{#1}%
+ \else
+ \expandafter\mkshowsetup
+ \fi}
+
+\def\setup {\shortsetupfalse\doshowsetup}
+\def\showsetup {\shortsetupfalse\doshowsetup}
+\def\shortsetup{\shortsetuptrue \doshowsetup}
\def\setupsetup{\dodoubleargument\getparameters[\??stp]}
\setupsetup
@@ -370,18 +388,20 @@
\def\placesetup
{\bgroup
- \getvalue{\e!place\e!listof texcommands}
+ \mkshowusedsetups
\egroup}
-\def\placeeverysetup % for fun purposes only
+\def\placeallsetups
{\bgroup
\setupsetup[\c!reference=2]%
\setupreferencing[\c!state=\v!stop]%
- \getvalue{\e!place\e!listof alltexcommands}%
+ \mkshowallsetups
\egroup}
+\let\placeeverysetup\placeallsetups
+
\let\plaatssetup \placesetup
-\let\plaatselkesetup\placeeverysetup
+\let\plaatselkesetup\placeallsetups
% we use :1 as fallback
%
@@ -389,22 +409,6 @@
% \setup{setupinterlinespace:1}
% \setup{setupinterlinespace:2}
-\bgroup \catcode`\<=\active
-
-\gdef\dosetup#1%
- {\bgroup
- \def<<##1>>{##1}%
- \edef\ascii{#1}%
- \enableXML
- \doifelseXMLelement{stp:\ascii}
- {\expanded{\flushXMLelement{stp:\ascii}}}
- {\doifelseXMLelement{stp:\ascii:1}
- {\expanded{\flushXMLelement{stp:\ascii:1}}}
- {\convertargument#1\to\ascii
- \em unknown setup \quote{\ascii}}}
- \egroup}
-
-\egroup
\defineXMLenvironment [cd:command] [name=,type=,generated=,interactive=,variant=]
{}
@@ -419,7 +423,7 @@
\doglobal\newcounter\currentSETUPargument
\global\let\maximumSETUPargument\currentSETUPargument
\bgroup
- \doifXMLop{generated}{yes}{\ttsl}%
+ \doif{\XMLpar{cd:command}{generated}{}}{yes}{\ttsl}%
\doifelseXMLop{type}{environment}
{\tex{\e!start}}{\tex{}}\ignorespaces
\XMLflush{cd:sequence}\ignorespaces
@@ -433,6 +437,7 @@
\ignorespaces\XMLflush{cd:arguments}%
\doif{\XMLpar{cd:command}{type}{}}{environment}
{\hskip.5em\unknown\hskip.5em
+ \doif{\XMLpar{cd:command}{generated}{}}{yes}{\ttsl}%
\tex{\e!stop}\ignorespaces\XMLflush{cd:sequence}}%
\endgraf
\egroup
@@ -546,13 +551,6 @@
\def\previousSETUPargument{\currentSETUPargument}
-\defineXMLenvironmentsave [cd:define] [name=]
- {}
- {\setevalue{cd:def:\XMLop{name}}{\XMLflush{cd:define}}}
-
-\defineXMLsingular [cd:resolve] [name=]
- {\getvalue{cd:def:\XMLop{name}}}
-
\defineXMLenvironmentsave [cd:assignments]
{}
{\xdef\currentSETUPwidth{0pt}%
@@ -812,11 +810,7 @@
{\complexloadsetups[cont-en.xml]}}
\def\complexloadsetups[#1]%
- {\doifnotmode{no-setup-all}
- {\doifsomething{#1}
- {\startXMLmapping[zero]
- \expanded{\processXMLfilegrouped{#1}}%
- \stopXMLmapping}}}
+ {\doifsomething{#1}{\mkloadsetups{#1}}}
\defineXMLsingular [cd:include] [file=]
{\complexloadsetups[\XMLop{file}]}