summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/context/base/strc-def.mkiv
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/context/base/strc-def.mkiv')
-rw-r--r--Master/texmf-dist/tex/context/base/strc-def.mkiv158
1 files changed, 65 insertions, 93 deletions
diff --git a/Master/texmf-dist/tex/context/base/strc-def.mkiv b/Master/texmf-dist/tex/context/base/strc-def.mkiv
index e386902e02c..7917b7d83c0 100644
--- a/Master/texmf-dist/tex/context/base/strc-def.mkiv
+++ b/Master/texmf-dist/tex/context/base/strc-def.mkiv
@@ -4,7 +4,7 @@
%D subtitle=Definitions,
%D author=Hans Hagen,
%D date=\currentdate,
-%D copyright=PRAGMA-ADE / Hans Hagen]
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
%C
%C This module is part of the \CONTEXT\ macro||package and is
%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
@@ -16,39 +16,7 @@
\unprotect
-% \def\installparameterhandler#1#2#3#4#5#6#7#8#9{%
-% \def#3##1{\csname#5{#1#2}##1\endcsname}%
-% \def#4##1{#6{#1#2}##1}%
-% %
-% \def#5##1##2{\ifcsname##1##2\endcsname##1##2\else\expandafter#7\csname##1\s!parent\endcsname##2\fi}%
-% \def#6##1##2{\ifcsname##1##2\endcsname ##1\else\expandafter#8\csname##1\s!parent\endcsname##2\fi}%
-% %
-% \def#7##1##2{\ifx##1\relax\s!empty\else#5##1##2\fi}%
-% \def#8##1##2{\ifx##1\relax \else#6##1##2\fi}%
-% %
-% \def#9##1##2% style color
-% {\edef\fontattributehash {#4##1}%
-% \edef\colorattributehash{#4##2}%
-% \ifx\fontattributehash \empty\else\dosetfontattribute \fontattributehash ##1\fi
-% \ifx\colorattributehash\empty\else\dosetcolorattribute\colorattributehash##2\fi}%
-% %
-% }
-
-% \installparameterhandler
-% \empty
-% \@@framed
-% \framedparameter
-% \framedparameterhash
-% \doframedparameter
-% \doframedparameterhash
-% \doframedparentparameter
-% \doframedparentparameterhash
-% \dosetframedattributes
-
-
-% \setupheads
-
-\setupstructureheads[%
+\setupheads[%
%\c!after=,
%\c!align=,
%\c!aligntitle=,
@@ -71,14 +39,14 @@
\c!incrementnumber=\v!yes,
\c!indentnext=\v!no,
%\c!label=,
- \c!limittext=\v!yes,
+ %\c!limittext=\languageparameter\c!limittext,
\c!margin=\zeropoint,
%\c!margintext=,
\c!number=\v!yes,
- \c!numbercolor=\structureheadparameter\c!color,
- \c!textcolor=\structureheadparameter\c!color,
- \c!numberstyle=\structureheadparameter\c!style,
- \c!textstyle=\structureheadparameter\c!style,
+ \c!numbercolor=\headparameter\c!color,
+ \c!textcolor=\headparameter\c!color,
+ \c!numberstyle=\headparameter\c!style,
+ \c!textstyle=\headparameter\c!style,
%\c!numbercommand=,
%\c!textcommand=,
\c!ownnumber=\v!no,
@@ -95,13 +63,16 @@
%\c!strut=,
%\c!style=,
%\c!text=,
- %\c!tolerance=
+ %\c!tolerance=,
+ %\c!beforesection=\directsetup{document:\currenthead:start}, % these might become defaults i.e. acpect document: namespace
+ %\c!insidesection=\directsetup{document:\currenthead:inside}, % these might become defaults i.e. acpect document: namespace
+ %\c!aftersection=\directsetup{document:\currenthead:stop}, % these might become defaults i.e. acpect document: namespace
]
-% \setupstructureblock[appendix][sectionconversionset=appendix]
-% \setupstructurehead[chapter][sectionconversionset=\structureblockparameter\c!sectionconversionset] % \structureblockparameter]
+% \setupsectionblock[appendix][sectionconversionset=appendix]
+% \setuphead[chapter][sectionconversionset=\sectionblockparameter\c!sectionconversionset] % \sectionblockparameter]
-% \definestructureresetset[default][0,1,1,0][1] % this will not reset parts and subsections
+% \defineresetset[default][0,1,1,0][1] % this will not reset parts and subsections
% \setuphead[part][sectionresetset=default]
% \starttext
% \placelist[chapter,section,subsection][criterium=all,width=3cm]
@@ -109,150 +80,151 @@
% \part{second} \chapter{gamma} \section{a} \section{b} \subsection{x} \subsection{y} \chapter{delta}
% \stoptext
-\definestructureseparatorset [\s!default] [] [.]
-\definestructureconversionset [\s!default] [] [numbers]
-\definestructureresetset [\s!default] [] [1] % each level
-\definestructureprefixset [\s!default] [section-1,section-2,section-3] []
+\defineseparatorset [\s!default] [] [.]
+\defineconversionset [\s!default] [] [numbers]
+\defineresetset [\s!default] [] [1] % each level
+\defineprefixset [\s!default] [section-1,section-2,section-3] []
-\definestructureconversionset [\v!pagenumber] [] [numbers]
+\defineconversionset [\v!pagenumber] [] [numbers]
-\definestructureprefixset [\v!all] [section-1,section-2,section-3,section-4,section-5,section-6,section-7,section-8] []
-\definestructureprefixset [\v!none] [] []
+\defineprefixset [\v!all] [section-1,section-2,section-3,section-4,section-5,section-6,section-7,section-8] []
+\defineprefixset [\v!none] [] []
-\definestructureprefixset [\v!part] [section-1] []
-\definestructureprefixset [\v!chapter] [section-2] []
+\defineprefixset [\v!part] [section-1] []
+\defineprefixset [\v!chapter] [section-2] []
-\definestructureseparatorset [\v!appendix:\s!default] [] [.]
-\definestructureconversionset [\v!appendix:\s!default] [Romannumerals,Characters] [numbers]
-\definestructureresetset [\v!appendix:\s!default] [] [1] % why was this 0
+\defineseparatorset [\v!appendix:\s!default] [] [.]
+\defineconversionset [\v!appendix:\s!default] [Romannumerals,Characters] [numbers]
+\defineresetset [\v!appendix:\s!default] [] [1] % why was this 0
-\setupuserpagenumber [\c!numberconversionset=\v!pagenumber]
+\setupuserpagenumber
+ [\c!numberconversionset=\v!pagenumber]
% \startsetups defaults:frontpart:pagenumbers:roman
-% \definestructureconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
+% \defineconversionset[\c!frontpart:\c!pagenumber][][romannumerals]
% \setupuserpagenumber[\c!way=\v!byblock]
% \stopsetups
% \definesectionblock
-\definestructureblock [\v!frontpart] [\v!frontmatter] [\c!number=\v!no]
-\definestructureblock [\v!bodypart] [\v!bodymatter] [\c!number=\v!yes]
-\definestructureblock [\v!appendix] [\v!appendices] [\c!number=\v!yes]
-\definestructureblock [\v!backpart] [\v!backmatter] [\c!number=\v!no]
+\definesectionblock [\v!frontpart] [\v!frontmatter] [\c!number=\v!no]
+\definesectionblock [\v!bodypart] [\v!bodymatter] [\c!number=\v!yes]
+\definesectionblock [\v!appendix] [\v!appendices] [\c!number=\v!yes]
+\definesectionblock [\v!backpart] [\v!backmatter] [\c!number=\v!no]
-\setstructureblock [\v!bodypart] % default
+\setsectionblock [\v!bodypart] % default
\appendtoks
- \setstructureblock [\v!bodypart]% default
+ \setsectionblock [\v!bodypart]% default
\to \everyjob
-% \definesection
+% \definesection (could become \definehead with one parameter)
-\definestructuresection[\s!section-1] % part
-\definestructuresection[\s!section-2] % chapter
-\definestructuresection[\s!section-3] % section
-\definestructuresection[\s!section-4] % subsection
-\definestructuresection[\s!section-5] % subsubsection
-\definestructuresection[\s!section-6] % subsubsubsection
-\definestructuresection[\s!section-7] % subsubsubsubsection
+\definesection[\s!section-1] % part
+\definesection[\s!section-2] % chapter
+\definesection[\s!section-3] % section
+\definesection[\s!section-4] % subsection
+\definesection[\s!section-5] % subsubsection
+\definesection[\s!section-6] % subsubsubsection
+\definesection[\s!section-7] % subsubsubsubsection
% \definehead
-\definestructurehead
+\definehead
[\v!part]
[\c!section=\s!section-1]
-\definestructurehead
+\definehead
[\v!chapter]
[\c!section=\s!section-2]
-\definestructurehead
+\definehead
[\v!section]
[\c!section=\s!section-3]
-\definestructurehead
+\definehead
[\v!subsection]
[\c!section=\s!section-4,
\c!default=\v!section]
-\definestructurehead
+\definehead
[\v!subsubsection]
[\c!section=\s!section-5,
\c!default=\v!subsection]
-\definestructurehead
+\definehead
[\v!subsubsubsection]
[\c!section=\s!section-6,
\c!default=\v!subsubsection]
-\definestructurehead
+\definehead
[\v!subsubsubsubsection]
[\c!section=\s!section-7,
\c!default=\v!subsubsubsection]
-\definestructurehead
+\definehead
[\v!title]
[\c!coupling=\v!chapter,
\c!default=\v!chapter,
\c!incrementnumber=\v!no]
-\definestructurehead
+\definehead
[\v!subject]
[\c!coupling=\v!section,
\c!default=\v!section,
\c!incrementnumber=\v!no]
-\definestructurehead
+\definehead
[\v!subsubject]
[\c!coupling=\v!subsection,
\c!default=\v!subsection,
\c!incrementnumber=\v!no]
-\definestructurehead
+\definehead
[\v!subsubsubject]
[\c!coupling=\v!subsubsection,
\c!default=\v!subsubsection,
\c!incrementnumber=\v!no]
-\definestructurehead
+\definehead
[\v!subsubsubsubject]
[\c!coupling=\v!subsubsubsection,
\c!default=\v!subsubsubsection,
\c!incrementnumber=\v!no]
-\definestructurehead
+\definehead
[\v!subsubsubsubsubject]
[\c!coupling=\v!subsubsubsubsection,
\c!default=\v!subsubsubsubsection,
\c!incrementnumber=\v!no]
-\setupstructurehead
+\setuphead
[\v!part]
[\c!placehead=\v!no]
-\setupstructurehead
+\setuphead
[\v!chapter]
[\v!appendix\c!label=\v!appendix,
\v!bodypart\c!label=\v!chapter] % bijlageconversie=\Character
-\setupstructurehead
+\setuphead
[\v!section]
[\v!appendix\c!label=\v!section,
\v!bodypart\c!label=\v!section] % bijlageconversie=\Character
-\setupstructurehead
+\setuphead
[\v!subsection]
[\v!appendix\c!label=\v!subsection,
\v!bodypart\c!label=\v!subsection] % bijlageconversie=\Character
-\setupstructurehead
+\setuphead
[\v!subsubsection]
[\v!appendix\c!label=\v!subsubsection,
\v!bodypart\c!label=\v!subsubsection] % bijlageconversie=\Character
% \setuphead
-\setupstructurehead
+\setuphead
[\v!part,\v!chapter]
[%\c!align=,
%\c!indentnext=\v!no,
@@ -265,7 +237,7 @@
\c!before={\blank[2*\v!big]},
\c!after={\blank[2*\v!big]}]
-\setupstructurehead
+\setuphead
[\v!section]
[%\c!align=,
%\c!indentnext=\v!no,
@@ -274,13 +246,13 @@
\c!before={\blank[2*\v!big]},
\c!after=\blank]
-\setupstructurehead % nieuw
+\setuphead % nieuw
[\v!subsection]
[\c!page=]
% brrr
-% \definestructurecounter[\v!page][\c!start=1] % todo: setup
+% \definecounter[\v!page][\c!start=1] % todo: setup
% lists