summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2013-03-20 11:40:14 +0200
committerMarius <mariausol@gmail.com>2013-03-20 11:40:14 +0200
commitec45850390b27ff82a3ef2ab406a801393fdf603 (patch)
treeaf86d8f869ebd338a9b9d6dccc8cffd6c67d3ee7 /tex
parentc1dea81cbfff1644796ad5b4e00965250529b5b4 (diff)
downloadcontext-ec45850390b27ff82a3ef2ab406a801393fdf603.tar.gz
beta 2013.03.20 10:34
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/colo-ini.mkiv28
-rw-r--r--tex/context/base/cont-new.mkii2
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4132 -> 4137 bytes
-rw-r--r--tex/context/base/context-version.pngbin40500 -> 40482 bytes
-rw-r--r--tex/context/base/context.mkii2
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/font-tra.mkiv2
-rw-r--r--tex/context/base/page-mul.mkiv11
-rw-r--r--tex/context/base/status-files.pdfbin24788 -> 24801 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin211443 -> 211429 bytes
-rw-r--r--tex/context/base/strc-ren.mkiv3
-rw-r--r--tex/context/base/tabl-tbl.mkiv44
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
14 files changed, 77 insertions, 21 deletions
diff --git a/tex/context/base/colo-ini.mkiv b/tex/context/base/colo-ini.mkiv
index ed550987f..6b82f592d 100644
--- a/tex/context/base/colo-ini.mkiv
+++ b/tex/context/base/colo-ini.mkiv
@@ -587,6 +587,34 @@
\letvalue{\??colorsetter-}\empty % used?
\letvalue{\??transparencysetter-}\empty % used?
+% new: expandable (see tbl)
+
+\def\colo_helpers_fast_activate
+ {\ifx\currentcolorprefix\empty
+ \expandafter\colo_helpers_fast_activate_nop
+ \else
+ \expandafter\colo_helpers_fast_activate_yes
+ \fi}
+
+\def\colo_helpers_fast_activate_yes#1%
+ {\ifcsname\??colorsetter\currentcolorprefix#1\endcsname
+ \csname\??colorsetter\currentcolorprefix#1\endcsname
+ \csname\??transparencysetter\currentcolorprefix#1\endcsname
+ \else\ifcsname\??colorsetter#1\endcsname
+ \csname\??colorsetter#1\endcsname
+ \csname\??transparencysetter#1\endcsname
+ \fi\fi}
+
+\def\colo_helpers_fast_activate_nop#1%
+ {\ifcsname\??colorsetter#1\endcsname
+ \csname\??colorsetter#1\endcsname
+ \csname\??transparencysetter#1\endcsname
+ \fi}
+
+\let\dofastcoloractivation\colo_helpers_fast_activate
+
+% so far
+
\def\colo_helpers_activate % two-step is not that much faster but less tracing
{\ifx\currentcolorprefix\empty
\expandafter\colo_helpers_activate_nop
diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii
index b2cd286ae..4fceea3cb 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{2013.03.19 16:34}
+\newcontextversion{2013.03.20 10:34}
%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 55950cb0f..43c591c41 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{2013.03.19 16:34}
+\newcontextversion{2013.03.20 10:34}
%D This file is loaded at runtime, thereby providing an excellent place for
%D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 5c3d53e2e..172657701 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index 90a866ce2..029e973d8 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii
index cbd731f50..5158dbd76 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{2013.03.19 16:34}
+\edef\contextversion{2013.03.20 10:34}
%D For those who want to use this:
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 96fa9f535..a2f2280fa 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{2013.03.19 16:34}
+\edef\contextversion{2013.03.20 10:34}
%D For those who want to use this:
diff --git a/tex/context/base/font-tra.mkiv b/tex/context/base/font-tra.mkiv
index d1778c15d..1877c4904 100644
--- a/tex/context/base/font-tra.mkiv
+++ b/tex/context/base/font-tra.mkiv
@@ -271,7 +271,7 @@
{\begingroup
\forgetparindent
\forgeteverypar
- \setupcolors[\c!state=\v!start]%
+ % \setupcolors[\c!state=\v!start]%
\setupalign[\v!verytolerant,\v!flushleft]%
\startotfsample
\global\setbox\otfcompositionbox\hbox{\definedfont[#1]\relax\getvalue{\??otfcompositiondir#2}\relax#3}%
diff --git a/tex/context/base/page-mul.mkiv b/tex/context/base/page-mul.mkiv
index c5c9f73df..7478c997f 100644
--- a/tex/context/base/page-mul.mkiv
+++ b/tex/context/base/page-mul.mkiv
@@ -1633,10 +1633,15 @@
\installcolumnbreakmethod \s!multicolumn \v!preference
{\goodbreak}
+% \installcolumnbreakmethod \s!multicolumn \v!yes
+% {\vskip\textheight
+% \penalty-200 % we can mark and intercept this
+% \vskip-\textheight}
+
\installcolumnbreakmethod \s!multicolumn \v!yes
- {\vskip\textheight
- \penalty-200 % we can mark and intercept this
- \vskip-\textheight}
+ {\vskip .5\pagegoal
+ \penalty-200 % we can mark and intercept this
+ \vskip-.5\pagegoal}
%D Next we initialize the lot:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 8b9695149..aa7450545 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index b6bdfe561..44d672007 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/strc-ren.mkiv b/tex/context/base/strc-ren.mkiv
index d9cebc17f..d0a3e2e23 100644
--- a/tex/context/base/strc-ren.mkiv
+++ b/tex/context/base/strc-ren.mkiv
@@ -462,6 +462,9 @@
\unexpanded\def\strc_rendering_initialize_alternatives
{\edef\currentheadalternative {\headparameter \c!alternative}%
+ \ifcsname\??headplacementalternative\currentheadalternative\endcsname \else
+ \let\currentheadalternative\v!normal % cf. mkii
+ \fi
\edef\currentheadrenderingsetup {\headalternativeparameter\c!renderingsetup}%
\edef\currentheadrenderingalternative{\headalternativeparameter\c!alternative}%
\ifx\currentheadrenderingalternative\empty
diff --git a/tex/context/base/tabl-tbl.mkiv b/tex/context/base/tabl-tbl.mkiv
index b5c3b0064..2fa8c4805 100644
--- a/tex/context/base/tabl-tbl.mkiv
+++ b/tex/context/base/tabl-tbl.mkiv
@@ -63,7 +63,7 @@
% k i<n> skip around column
% d digits (~)
%
-% C [C\L\M\R] {color}
+% C [LMRT] {color} % T is text color
%
% | {color,n}
%
@@ -456,7 +456,7 @@
\bgroup
\tabl_tabulate_bbskip
\bgroup % we cannot combine the if because a cell may have only one ##
-\tabl_tabulate_hook_b
+ \tabl_tabulate_hook_b
\c_tabl_tabulate_align\constantnumber\c_tabl_tabulate_align % needed in tag passing
\noexpand\dostarttagged\noexpand\t!tabulatecell\noexpand\empty
\noexpand\dotagtabulatecell
@@ -470,6 +470,11 @@
\the\t_tabl_tabulate_font
\the\t_tabl_tabulate_settings
\the\t_tabl_tabulate_before
+ \ifx\m_tabl_tabulate_text_color\empty
+ \expandafter\gobbleoneargument
+ \else
+ \expandafter\dofastcoloractivation
+ \fi\m_tabl_tabulate_text_color
\noexpand\fi
% grouping needs to be outside macros (or expandable), nice test
% example \NC \string \aligntab \NC which will fail otherwise (mk)
@@ -486,7 +491,7 @@
\tabl_tabulate_shaped_par_end
\fi
\noexpand#2%
-\tabl_tabulate_hook_e
+ \tabl_tabulate_hook_e
\egroup
\egroup
\aligntab
@@ -529,7 +534,8 @@
\tabl_tabulate_set_preamble}
\installtabulatepreambleoption{R}{\t_tabl_tabulate_font{\rm}%
\tabl_tabulate_set_preamble}
-\installtabulatepreambleoption{m}{\t_tabl_tabulate_bmath{$}\t_tabl_tabulate_emath{$}%
+\installtabulatepreambleoption{m}{\t_tabl_tabulate_bmath{$}%
+ \t_tabl_tabulate_emath{$}%
\tabl_tabulate_set_preamble}
\installtabulatepreambleoption{M}{\t_tabl_tabulate_bmath{$\displaystyle}\t_tabl_tabulate_emath{$}%
\tabl_tabulate_set_preamble}
@@ -705,9 +711,20 @@
\def\tabl_tabulate_set_width_simple
{\tabl_tabulate_set_preamble_step\tabl_tabulate_xbskip\tabl_tabulate_xeskip}
+% \def\tabl_tabulate_set_color_span#1#2%
+% {\xdef\m_tabl_tabulate_color{#2}%
+% \global\c_tabl_tabulate_colorspan\if#1L\plusone\else\if#1M\plustwo\else\if#1R\plusthree\else\zerocount\fi\fi\fi\relax
+% \tabl_tabulate_set_preamble}
+
+\installcorenamespace{tabulatecolorspec}
+
+\setvalue{\??tabulatecolorspec L}#1{\xdef\m_tabl_tabulate_color {#1}\global\c_tabl_tabulate_colorspan\plusone }
+\setvalue{\??tabulatecolorspec M}#1{\xdef\m_tabl_tabulate_color {#1}\global\c_tabl_tabulate_colorspan\plustwo }
+\setvalue{\??tabulatecolorspec R}#1{\xdef\m_tabl_tabulate_color {#1}\global\c_tabl_tabulate_colorspan\plusthree}
+\setvalue{\??tabulatecolorspec T}#1{\xdef\m_tabl_tabulate_text_color{#1}}
+
\def\tabl_tabulate_set_color_span#1#2%
- {\xdef\m_tabl_tabulate_color{#2}%
- \global\c_tabl_tabulate_colorspan\if#1L\plusone\else\if#1M\plustwo\else\if#1R\plusthree\else\zerocount\fi\fi\fi\relax
+ {\csname\??tabulatecolorspec#1\endcsname{#2}%
\tabl_tabulate_set_preamble}
\def\tabl_tabulate_set_vrule_command#1%
@@ -727,6 +744,7 @@
\t_tabl_tabulate_font\emptytoks
\t_tabl_tabulate_settings\emptytoks
\global\let\m_tabl_tabulate_color\empty
+ \global\let\m_tabl_tabulate_text_color\empty
\global\let\m_tabl_tabulate_vrule_color\empty
\global\c_tabl_tabulate_colorspan\zerocount
\global\advance\c_tabl_tabulate_columns\plusone
@@ -1211,6 +1229,7 @@
\let\m_tabl_tabulate_color_previous \empty
\let\m_tabl_tabulate_color \empty
+\let\m_tabl_tabulate_text_color \empty
\let\m_tabl_tabulate_color_local \empty
\let\m_tabl_tabulate_vrule_color \empty
\let\m_tabl_tabulate_vrule_color_local \empty
@@ -1218,12 +1237,13 @@
\let\m_tabl_tabulate_hrule_color_default\empty % used local
\appendtoks
- \glet\m_tabl_tabulate_color_previous \empty
- \glet\m_tabl_tabulate_color \empty
- \glet\m_tabl_tabulate_color_local \empty
- \glet\m_tabl_tabulate_vrule_color \empty
- \glet\m_tabl_tabulate_vrule_color_local\empty
- \global\d_tabl_tabulate_vrulethickness_local\zeropoint
+ \global\let\m_tabl_tabulate_color_previous \empty
+ \global\let\m_tabl_tabulate_color \empty
+ \global\let\m_tabl_tabulate_text_color \empty
+ \global\let\m_tabl_tabulate_color_local \empty
+ \global\let\m_tabl_tabulate_vrule_color \empty
+ \global\let\m_tabl_tabulate_vrule_color_local \empty
+ \global \d_tabl_tabulate_vrulethickness_local\zeropoint
\to \t_tabl_tabulate_every_row
\unexpanded\def\tabl_tabulate_color_side_right_second
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index d7d76dd7c..e2a6781ed 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 : 03/19/13 16:34:04
+-- merge date : 03/20/13 10:34:56
do -- begin closure to overcome local limits and interference