From ad968343b10553bbf9d34e14e00a756576d5758e Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Mon, 29 Aug 2016 23:52:21 +0200 Subject: 2016-08-29 22:58:00 --- tex/context/base/context-version.pdf | Bin 4260 -> 4258 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/math-ali.mkiv | 12 ++--- tex/context/base/mkiv/status-files.pdf | Bin 9246 -> 9247 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368146 -> 368146 bytes tex/context/base/mkiv/strc-mat.mkiv | 2 +- tex/context/base/mkiv/tabl-ntb.mkiv | 58 +++++++++++++++------ tex/context/interface/mkiv/i-context.pdf | Bin 774728 -> 774731 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60792 -> 60793 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- tex/generic/context/luatex/luatex-swiglib-test.lua | 3 +- 12 files changed, 50 insertions(+), 31 deletions(-) diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 6cafd4a4b..52d12f53d 100644 Binary files a/tex/context/base/context-version.pdf and b/tex/context/base/context-version.pdf differ diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 7384ff407..fe4f9be2a 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2016.08.29 11:16} +\newcontextversion{2016.08.29 22:53} %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 2b669be98..16de7726b 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.08.29 11:16} +\edef\contextversion{2016.08.29 22:53} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/math-ali.mkiv b/tex/context/base/mkiv/math-ali.mkiv index 497712818..404fddcc6 100644 --- a/tex/context/base/mkiv/math-ali.mkiv +++ b/tex/context/base/mkiv/math-ali.mkiv @@ -156,8 +156,8 @@ \tabskip\centering \aligntab \span - \rlap{\math_text_in_eqalign{\alignmark\alignmark}}% - % \math_text_in_eqalign{\alignmark\alignmark}% + % \rlap{\math_text_in_eqalign{\alignmark\alignmark}}% + \math_text_in_eqalign{\alignmark\alignmark}% \tabskip\zeropoint}% \fi\fi \global\mathnumberstatus\zerocount @@ -218,14 +218,8 @@ \the\mathdisplayaligntweaks \tabskip\centering} - \def\math_halign_checked - {\halign - \ifnum\c_strc_formulas_mode=\plustwo - % currently there is no need for width juggling - \else - \ifcase\eqalignmode \or to \checkeddisplaywidth \fi - \fi} + {\halign \ifcase\eqalignmode \or to \checkeddisplaywidth \fi} \def\math_both_eqalign_no_normal#1#2% {\ifmmode diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index fda2e5c5f..d9d58d670 100644 Binary files a/tex/context/base/mkiv/status-files.pdf and b/tex/context/base/mkiv/status-files.pdf differ diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf index a4b5cbf32..cda7a8d2e 100644 Binary files a/tex/context/base/mkiv/status-lua.pdf and b/tex/context/base/mkiv/status-lua.pdf differ diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv index cac96d2c4..b0e37f987 100644 --- a/tex/context/base/mkiv/strc-mat.mkiv +++ b/tex/context/base/mkiv/strc-mat.mkiv @@ -547,7 +547,7 @@ \newdimen\d_strc_formulas_display_pre_threshold \newdimen\d_strc_formulas_display_width -\newconstant\c_strc_formulas_mode +\newconstant\c_strc_formulas_mode % this will go away \newconstant\c_strc_formulas_space_model \c_strc_formulas_mode \plustwo % 0=native 1=simple (old) 2=align (new) diff --git a/tex/context/base/mkiv/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv index 8dad83b29..aeef22326 100644 --- a/tex/context/base/mkiv/tabl-ntb.mkiv +++ b/tex/context/base/mkiv/tabl-ntb.mkiv @@ -1187,7 +1187,7 @@ \global\let\m_tabl_ntb_same_page \empty} \def\tabl_ntb_prelocate_error - {\writestatus\m!system{fatal error: use \string\prelocateTBLrows\space to increase table memory (now: \the\c_tabl_prelocated_rows)}} + {\writestatus\m!TABLE{fatal error: use \string\prelocateTBLrows\space to increase table memory (now: \the\c_tabl_prelocated_rows)}} % \prelocateTBLrows{1000} % may speed up large tables @@ -1479,6 +1479,20 @@ \let\tabl_ntb_preroll\relax +\def\tabl_ntb_table_get_max_width#1#2% + {#1\wd#2\relax} + +% first needs testing (in projects): +% +% \def\tabl_ntb_table_get_max_width#1#2% +% {#1\zeropoint +% \dorecurse\c_tabl_ntb_maximum_col +% {\advance#1\tabl_ntb_get_wid\recurselevel +% \advance#1\tabl_ntb_get_dis\recurselevel}% +% \ifdim#1<\wd#2\relax +% #1\wd#2\relax +% \fi} + \def\tabl_ntb_table_stop {\forgetall % new, here see narrower-004.tex %\setbox\scratchbox\hbox @@ -1501,11 +1515,12 @@ \dorecurse\c_tabl_ntb_maximum_row {\tabl_ntb_let_hei\recurselevel\maxdimen}% \tabl_ntb_let_gal\zerocount -\tabl_ntb_preroll\relax + \tabl_ntb_preroll\relax \c_tabl_tbl_pass\plusone \let\tabl_ntb_pass\tabl_ntb_pass_one \let\tabl_ntb_cell_process\tabl_ntb_cell_process_a \setbox\scratchbox\vbox{\settrialtypesetting \tabl_ntb_flush_content}% + \writestatus\m!TABLE{!!\the\wd\scratchbox}% \ifcase\tabl_ntb_get_gal\or % \c_tabl_tbl_pass\plusone % \let\tabl_ntb_pass\tabl_ntb_pass_one @@ -1513,6 +1528,9 @@ \setbox\scratchbox\vbox{\settrialtypesetting \tabl_ntb_flush_content}% \fi \tabl_ntb_let_dis\c_tabl_ntb_maximum_col\zeropoint + % + \tabl_ntb_table_get_max_width\scratchdimen\scratchbox + % \ifautoTBLspread % experimental, stretch non fixed cells to \hsize \tabl_ntb_check_widths_one % trial run @@ -1520,7 +1538,8 @@ \tabl_ntb_stretch_widths \let\tabl_ntb_cell_process\tabl_ntb_cell_process_b \setbox\scratchbox\vbox{\settrialtypesetting \tabl_ntb_flush_content}% - \else\ifdim\wd\scratchbox>\hsize + % \else\ifdim\wd\scratchbox>\hsize + \else\ifdim\scratchdimen>\hsize \ifautoTBLhsize \tabl_ntb_check_widths_one % trial run \tabl_ntb_check_widths_two % real run @@ -1534,7 +1553,8 @@ \writestatus\m!TABLE{missing\space\number\numexpr\c_tabl_ntb_maximum_col-\c_tabl_ntb_encountered_max\relax\space column(s), guessing widths}% \fi \edef\savedhsize{\the\hsize}% - \hsize\wd\scratchbox\relax % new per 17/04/2006 + % \hsize\wd\scratchbox\relax % new per 17/04/2006 + \hsize\scratchdimen\relax % new per 17/04/2006 \tabl_ntb_check_widths_one % trial run \tabl_ntb_check_widths_two % real run \hsize\savedhsize @@ -1593,11 +1613,12 @@ % \hbox{\registerparoptions\box\b_tabl_ntb_final}% (*) better here % better : \ifinsidefloat - % nothing, else we get a \hsized box + % no \dontleavehmode else too wide, otherwise we get a \hsized box \else \registerparoptions % (*) better here (also does a \dontleavehmode) + \ifhmode\else\dontleavehmode\fi \fi - \dontleavehmode\box\b_tabl_ntb_final + \box\b_tabl_ntb_final \afterTABLEbox} \def\tabl_tbl_split_yes @@ -1652,11 +1673,11 @@ \let\beforeTABLEbox \relax \let\afterTABLEbox \relax -\def\tabl_ntb_check_widths_one{\tabl_ntb_check_widths_indeed0} % 0 = trial run -\def\tabl_ntb_check_widths_two{\tabl_ntb_check_widths_indeed1} % 1 = real run +\def\tabl_ntb_check_widths_one{\tabl_ntb_check_widths_indeed\zerocount} % 0 = trial run +\def\tabl_ntb_check_widths_two{\tabl_ntb_check_widths_indeed\plusone } % 1 = real run \def\tabl_ntb_check_widths_indeed#1% - {\iftraceTABLE\tabl_ntb_show_widths{B#1}\fi + {\iftraceTABLE\tabl_ntb_show_widths B#1\fi \!!counta\zerocount \!!dimena\dimexpr \hsize @@ -1689,6 +1710,7 @@ \fi \fi \fi}% + \iftraceTABLE\tabl_ntb_show_widths M#1\fi \ifcase\!!counta \else \divide\!!dimena \!!counta \fi \dorecurse\c_tabl_ntb_maximum_col {\scratchdimen\tabl_ntb_get_wid\recurselevel\relax @@ -1701,7 +1723,7 @@ \tabl_ntb_set_wid\recurselevel{\the\!!dimena}% \fi \fi}% - \iftraceTABLE\tabl_ntb_show_widths{E#1}\fi} + \iftraceTABLE\tabl_ntb_show_widths E#1\fi} \def\tabl_ntb_check_heights_one_indeed {\!!countb\tabl_ntb_get_row\c_tabl_ntb_current_row_three\c_tabl_ntb_current_col_three\relax @@ -1774,13 +1796,15 @@ \def\tabl_ntb_check_heights_two {} -\def\tabl_ntb_show_widths#1% - {\vbox - {\forgetall - \tttf[#1]% - \dorecurse\c_tabl_ntb_maximum_col - {\scratchdimen\tabl_ntb_get_wid\recurselevel\relax - [\recurselevel:\the\scratchdimen]}}} +\def\tabl_ntb_show_widths#1#2% + {\begingroup + \scratchdimen\zeropoint + \dorecurse\c_tabl_ntb_maximum_col + {\advance\scratchdimen\tabl_ntb_get_wid\recurselevel\relax}% + \writestatus\m!TABLE{#1 \ifcase#2trial\else real\fi: hsize: \the\hsize, total: \the\scratchdimen}% + \dorecurse\c_tabl_ntb_maximum_col + {\writestatus\m!TABLE{\space\space\recurselevel: \the\dimexpr\tabl_ntb_get_wid\recurselevel}}% + \endgroup} % \def\tabl_ntb_char_align % {\doifelse{\naturaltablelocalparameter\c!aligncharacter}\v!yes diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 5f7088b13..bd9315e2b 100644 Binary files a/tex/context/interface/mkiv/i-context.pdf and b/tex/context/interface/mkiv/i-context.pdf differ diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index ed7937f2e..be0a3f632 100644 Binary files a/tex/context/interface/mkiv/i-readme.pdf and b/tex/context/interface/mkiv/i-readme.pdf differ diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index c680531d6..06990de3c 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 08/29/16 11:16:30 +-- merge date : 08/29/16 22:53:15 do -- begin closure to overcome local limits and interference diff --git a/tex/generic/context/luatex/luatex-swiglib-test.lua b/tex/generic/context/luatex/luatex-swiglib-test.lua index db6a72909..0bca2a818 100644 --- a/tex/generic/context/luatex/luatex-swiglib-test.lua +++ b/tex/generic/context/luatex/luatex-swiglib-test.lua @@ -1,4 +1,5 @@ -local gm = swiglib("gmwand.core") +local gm = require("swiglib.gmwand.core") +-- local gm = swiglib("gmwand.core") gm.InitializeMagick(".") -- cgit v1.2.3