summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/strc-lst.mkvi
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-08 00:43:40 +0000
committerKarl Berry <karl@freefriends.org>2013-04-08 00:43:40 +0000
commit824f7b0903de8ad7f6ee3d7656005e4c59155e06 (patch)
treeabfc8673ef9916f3ab7074e811207384c301492b /Master/texmf-dist/tex/context/base/strc-lst.mkvi
parent689aefb0727676ed3cddf331337b4be226495e72 (diff)
context import for TL13, from www.pragma-ade.com/context/beta/cont-tmf.zip
git-svn-id: svn://tug.org/texlive/trunk@29731 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/context/base/strc-lst.mkvi')
-rw-r--r--Master/texmf-dist/tex/context/base/strc-lst.mkvi42
1 files changed, 27 insertions, 15 deletions
diff --git a/Master/texmf-dist/tex/context/base/strc-lst.mkvi b/Master/texmf-dist/tex/context/base/strc-lst.mkvi
index 16544f8662b..15a499c8b15 100644
--- a/Master/texmf-dist/tex/context/base/strc-lst.mkvi
+++ b/Master/texmf-dist/tex/context/base/strc-lst.mkvi
@@ -28,12 +28,6 @@
\unprotect
-% To be added to mult-def.lua:
-
-\ifdefined\c!renderingsetup \else \def\c!renderingsetup{renderingsetup} \fi % maybe not interfaced
-\ifdefined\c!filler \else \def\c!filler {filler} \fi
-\ifdefined\v!interactive \else \def\v!interactive {interactive} \fi
-
%D Lists are mostly used for tables of contents but are in fact a rather generic
%D feature of \CONTEXT. We seperate between storage and rendering and the current
%D implementation is a reworked version of all that was added in steps. As lists
@@ -247,7 +241,7 @@
\setupcurrentlist[#settings]%
\the\everystructurelist
% \doif{\listparameter\c!coupling}\v!on{\startlistreferences{#tag}}%
- \doplacestructurelist % maybe inline
+ \strc_lists_place_current % maybe inline
{#list}%
{\listparameter\c!criterium}%
{\listparameter\c!number}%
@@ -364,9 +358,15 @@
\ctxcommand{listuserdata("\currentlist",\currentlistindex,"#name")}%
\dostoptagged}
+\def\rawstructurelistuservariable#name%
+ {\ctxcommand{listuserdata("\currentlist",\currentlistindex,"#name")}}
+
\unexpanded\def\structurelistfirst {\structurelistuservariable\s!first } % s!
\unexpanded\def\structurelistsecond{\structurelistuservariable\s!second} % s!
+\def\rawstructurelistfirst {\rawstructurelistuservariable\s!first } % s! % was \unexpanded
+\def\rawstructurelistsecond{\rawstructurelistuservariable\s!second} % s! % was \unexpanded
+
\unexpanded\def\doifstructurelisthaspageelse
{\ctxcommand{doiflisthaspageelse("\currentlist",\currentlistindex)}}
@@ -401,22 +401,22 @@
% TODO: pass extra tag name (contents, figures, bibliography ...)
-\unexpanded\def\doplacestructurelist#list#criterium#number#extras#order% beware, not a user command
+\unexpanded\def\strc_lists_place_current#list#criterium#number#extras#order% beware, not a user command
{\dostarttagged\t!list\empty
\ctxcommand{processlist{
names = "#list",
criterium = "#criterium",
- number = "\number#number",
+ number = "#number",
extras = "#extras",
order = "#order"
}}%
\dostoptagged}
-\unexpanded\def\doanalyzestructurelist#list#criterium#number%
+\unexpanded\def\strc_lists_analyze#list#criterium#number%
{\ctxcommand{analyzelist{
names = "#list",
criterium = "#criterium",
- number = "\number#number"
+ number = "#number"
}}}
\def\firststructureelementinlist#list%
@@ -1020,9 +1020,6 @@
% \chapter{Chapter three} \chapter{Chapter four} \chapter{Chapter five}
% \stoptext
-% overrulen interactie kan sneller, bv door hulpconstanten
-% te gebruiken en die te letten
-
\startsetups[\??listrenderings:d]
\ifvmode
\advance\leftskip\listparameter\c!margin
@@ -1182,6 +1179,10 @@
\letvalue{\??listinteractions\v!all }\v!all
\letvalue{\??listinteractions\v!yes }\v!all
+\def\listboxproperties {\strc_lists_get_reference_attribute}
+\def\listrenderingsetup {\the\t_lists_every_renderingtext}
+\def\listrenderingsynchronize{\the\t_lists_every_renderingsynchronize}
+
\unexpanded\def\strc_lists_interaction_check
{\iflocation
\strc_lists_interaction_check_yes
@@ -1271,6 +1272,17 @@
\listparameter\c!textcommand{\limitatetext{#text}\p_maxwidth{\splitsymbol{\listparameter\c!limittext}}}%
\fi}
+% public helpers
+
+\unexpanded\def\startcurrentlistentrywrapper
+ {\hbox \strc_lists_get_reference_attribute\v!all \strc_lists_get_destination_attribute\bgroup}
+
+\let\stopcurrentlistentrywrapper\egroup
+
+\let\currentlistentryreferenceattribute \strc_lists_get_reference_attribute
+\let\currentlistentrydestinationattribute\strc_lists_get_destination_attribute
+\let\currentlistentrylimitedtext \strc_lists_limitated_text
+
% todo:
\def\utilitylistlength{\listlength} % old name ... uses in styles
@@ -1288,7 +1300,7 @@
\let\listlength\!!zerocount
\else
\setupcurrentlist[#settings]%
- \doanalyzestructurelist{#list}{\listparameter\c!criterium}{\listparameter\c!number}%
+ \strc_lists_analyze{#list}{\listparameter\c!criterium}{\listparameter\c!number}%
\normalexpanded{\endgroup\noexpand\edef\noexpand\listlength{\structurelistsize}}%
\fi
\strc_lists_set_mode}