diff options
author | Marius <mariausol@gmail.com> | 2012-07-10 00:20:16 +0300 |
---|---|---|
committer | Marius <mariausol@gmail.com> | 2012-07-10 00:20:16 +0300 |
commit | f7f5e6779a6e1db630c21151d30858a2c8c97cbd (patch) | |
tree | ea60319922993e56f34c6ea6934c63177940ba7e | |
parent | 550d418660a6918df3b81698f264a6f0bdd000ce (diff) | |
download | context-f7f5e6779a6e1db630c21151d30858a2c8c97cbd.tar.gz |
beta 2012.07.09 23:06
-rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
-rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/context-version.pdf | bin | 4141 -> 4140 bytes | |||
-rw-r--r-- | tex/context/base/context-version.png | bin | 106426 -> 105441 bytes | |||
-rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
-rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/status-files.pdf | bin | 24462 -> 24481 bytes | |||
-rw-r--r-- | tex/context/base/status-lua.pdf | bin | 179532 -> 179530 bytes | |||
-rw-r--r-- | tex/context/base/status-mkiv.lua | 2 | ||||
-rw-r--r-- | tex/context/base/strc-sec.mkiv | 15 | ||||
-rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 12 insertions, 15 deletions
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index c4d52b313..b589b1eb6 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.07.09 22:35} +\newcontextversion{2012.07.09 23:06} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index b07d17585..3895ea717 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2012.07.09 22:35} +\newcontextversion{2012.07.09 23:06} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex eaef9c1e7..a36bc4c60 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex 164b0508b..4b3cf9635 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index af6e0d1df..c186c4a71 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2012.07.09 22:35} +\edef\contextversion{2012.07.09 23:06} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 1bd5703f3..962bb4314 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2012.07.09 22:35} +\edef\contextversion{2012.07.09 23:06} %D For those who want to use this: diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex e734d8a6c..98c3cd6e6 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex b27731a99..6b21762f5 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/status-mkiv.lua b/tex/context/base/status-mkiv.lua index 327df0214..18b4a78e5 100644 --- a/tex/context/base/status-mkiv.lua +++ b/tex/context/base/status-mkiv.lua @@ -536,7 +536,7 @@ return { { filename = "strc-sec", marktype = "mkiv", - status = "okay", + status = "todo", comment = "some of the local current and synchronization macros will be renamed", }, { diff --git a/tex/context/base/strc-sec.mkiv b/tex/context/base/strc-sec.mkiv index ea087185c..29f3c07ea 100644 --- a/tex/context/base/strc-sec.mkiv +++ b/tex/context/base/strc-sec.mkiv @@ -451,10 +451,6 @@ \newcount\maxstructuredepth -\def\setnextsectionlevel#1% - {\global\advance\maxstructuredepth\plusone - \setevalue{\??headlevel#1}{\the\maxstructuredepth}} - \def\sectionlevel#1% {\csname\??headlevel\ifcsname\??headlevel#1\endcsname#1\else\v!none\fi\endcsname} @@ -468,14 +464,15 @@ {\ifcsname\??headlevel#1\endcsname \else \edef\currentsection{#1}% not used, will go \edef\currenthead{#1}% - \setnextsectionlevel{#1}% + \global\advance\maxstructuredepth\plusone + \setevalue{\??headlevel#1}{\the\maxstructuredepth}% \setstructurelevel{#1}{\sectionlevel{#1}}% \normalexpanded{\setheadparameter{\s!parent}{\??head\lastsectionname}}% TO BE CHECKED, WE HAVE A HELPER \the\everydefinesection % so far for these default inheritances \definemarking[#1]% \ifnum\maxstructuredepth>\plusone - \normalexpanded{\noexpand\relatemarking[#1][\lastsectionname]}% so, the parent will reset the child + \normalexpanded{\relatemarking[#1][\lastsectionname]}% so, the parent will reset the child \fi \xdef\lastsectionname{#1}% \ifx\firstsectionname\empty @@ -900,15 +897,15 @@ \expandcheckedcsname\??headmarkyes{\headparameter\c!marking}\s!unknown \edef\p_header{\headparameter\c!header}% \ifx\p_header\empty \else - \doifelselayouttextline\v!header{\normalexpanded{\setuplayouttext[\v!header][\c!state=\p_header]}}% + \doifelselayouttextline\v!header{\normalexpanded{\setuplayouttext[\v!header][\c!state=\p_header]}}\donothing \fi \edef\p_text{\headparameter\c!text}% \ifx\p_text\empty \else - \doifelselayouttextline\v!text {\normalexpanded{\setuplayouttext[\v!text ][\c!state=\p_text ]}}% + \doifelselayouttextline\v!text {\normalexpanded{\setuplayouttext[\v!text ][\c!state=\p_text ]}}\donothing \fi \edef\p_header{\headparameter\c!footer}% \ifx\p_header\empty \else - \doifelselayouttextline\v!footer{\normalexpanded{\setuplayouttext[\v!footer][\c!state=\p_footer]}}% + \doifelselayouttextline\v!footer{\normalexpanded{\setuplayouttext[\v!footer][\c!state=\p_footer]}}\donothing \fi} \newcount \c_strc_sectioniong_preceding_level \c_strc_sectioniong_preceding_level\plusone diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 046b1404b..5e7472c00 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 07/09/12 22:35:28 +-- merge date : 07/09/12 23:06:25 do -- begin closure to overcome local limits and interference |