From 80ec8a2141d8eb9c7c21e62cdd2874192be11bd7 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Thu, 22 Jan 2015 19:15:04 +0100 Subject: 2015-01-22 18:20:00 --- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context-version.pdf | Bin 4388 -> 4388 bytes tex/context/base/context.mkiv | 2 +- tex/context/base/math-frc.mkiv | 16 ++++++++++ tex/context/base/math-ini.mkiv | 4 ++- tex/context/base/status-files.pdf | Bin 24943 -> 24932 bytes tex/context/base/status-lua.pdf | Bin 333215 -> 333215 bytes tex/context/base/tabl-ntb.mkiv | 34 ++++++++++++--------- tex/context/base/tabl-xtb.mkvi | 7 +++-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 10 files changed, 45 insertions(+), 22 deletions(-) diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 8307ce650..49176ff44 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{2015.01.22 13:26} +\newcontextversion{2015.01.22 18:18} %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 6502c4965..9f1ea93ab 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/context.mkiv b/tex/context/base/context.mkiv index 5d5d5a8a2..9e0a1f78b 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2015.01.22 13:26} +\edef\contextversion{2015.01.22 18:18} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/math-frc.mkiv b/tex/context/base/math-frc.mkiv index c466760ac..932053f8f 100644 --- a/tex/context/base/math-frc.mkiv +++ b/tex/context/base/math-frc.mkiv @@ -405,6 +405,22 @@ \definemathfraction[d:sfrac][\c!alternative=\v!both ,\c!mathstyle={\s!cramped,\s!scriptscript}] \definemathfraction[d:dfrac][\c!alternative=\v!inner,\c!mathstyle=\s!display] +%D \unexpanded\def\ShowMathFractions#1#2% +%D {\dontleavehmode +%D \begingroup +%D \showmathstruts +%D \mathematics{x+\tfrac{#1}{#2}+1+\frac{#1}{#2}+2+\sfrac{#1}{#2}+g}% +%D \endgroup} +%D +%D The default \type {tfrac}, \type {frac} and \type \sfrac} look like this: +%D +%D \blank +%D \ShowMathFractions{a}{a}\par +%D \ShowMathFractions{1}{x}\par +%D \ShowMathFractions{a}{b}\par +%D \ShowMathFractions{1}{b}\par +%D \blank + \unexpanded\def\frac {\csname\inlineordisplaymath id:frac\endcsname} \unexpanded\def\tfrac{\csname\inlineordisplaymath id:tfrac\endcsname} \unexpanded\def\sfrac{\csname\inlineordisplaymath id:sfrac\endcsname} diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv index d7587a5c4..7cee9fb31 100644 --- a/tex/context/base/math-ini.mkiv +++ b/tex/context/base/math-ini.mkiv @@ -19,7 +19,9 @@ % p = cur_chr; % get_token(); % if (cur_cmd != math_style_cmd) { - +% +% plus two new math styles: larger/smaller +% % \unexpanded\def\Umathshow#1% % {\hbox{\infofont(\string#1:\the#1\textstyle,\the#1\scriptstyle,\the#1\scriptscriptstyle)}} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index c8be76f91..a5b42628e 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf index 1a4f54428..c21faf601 100644 Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv index ddb18018f..b0fc71627 100644 --- a/tex/context/base/tabl-ntb.mkiv +++ b/tex/context/base/tabl-ntb.mkiv @@ -1117,7 +1117,8 @@ \fi} \def\tabl_ntb_row_stop_boxed - {\normalexpanded + {\noindent % \dontleavehmode + \normalexpanded {\t_tabl_ntb {\the\t_tabl_ntb % no need for init @@ -1460,7 +1461,8 @@ \fi} \def\tabl_ntb_table_stop - {\setbox\scratchbox\hbox + {\forgetall % new, here see narrower-004.tex + \setbox\scratchbox\hbox {\letnaturaltablelocalparameter\c!frame\v!off \letnaturaltablelocalparameter\c!background\empty \letnaturaltablelocalparameter\c!align\v!no @@ -1483,12 +1485,12 @@ \c_tabl_tbl_pass\plusone \let\tabl_ntb_pass\tabl_ntb_pass_one \let\tabl_ntb_cell_process\tabl_ntb_cell_process_a - \setbox0\vbox{\settrialtypesetting \tabl_ntb_flush_content}% + \setbox\scratchbox\vbox{\settrialtypesetting \tabl_ntb_flush_content}% \ifcase\tabl_ntb_get_gal\or % \c_tabl_tbl_pass\plusone % \let\tabl_ntb_pass\tabl_ntb_pass_one \let\tabl_ntb_cell_process\tabl_ntb_cell_process_a_extra - \setbox0\vbox{\settrialtypesetting \tabl_ntb_flush_content}% + \setbox\scratchbox\vbox{\settrialtypesetting \tabl_ntb_flush_content}% \fi \tabl_ntb_let_dis\c_tabl_ntb_maximum_col\zeropoint \ifautoTBLspread @@ -1498,7 +1500,7 @@ \tabl_ntb_stretch_widths \let\tabl_ntb_cell_process\tabl_ntb_cell_process_b \setbox\scratchbox\vbox{\settrialtypesetting \tabl_ntb_flush_content}% - \else\ifdim\wd0>\hsize + \else\ifdim\wd\scratchbox>\hsize \ifautoTBLhsize \tabl_ntb_check_widths_one % trial run \tabl_ntb_check_widths_two % real run @@ -1512,7 +1514,7 @@ \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\wd0\relax % new per 17/04/2006 + \hsize\wd\scratchbox\relax % new per 17/04/2006 \tabl_ntb_check_widths_one % trial run \tabl_ntb_check_widths_two % real run \hsize\savedhsize @@ -1746,7 +1748,9 @@ \def\tabl_ntb_show_widths#1% {\vbox - {\forgetall\tttf[#1]\dorecurse\c_tabl_ntb_maximum_col + {\forgetall + \tttf[#1]% + \dorecurse\c_tabl_ntb_maximum_col {\scratchdimen\tabl_ntb_get_wid\recurselevel\relax [\recurselevel:\the\scratchdimen]}}} @@ -1798,15 +1802,15 @@ \unexpanded\def\tabl_ntb_cell_process_a#1#2[#3]#4% grouping added ! ! ! {\bgroup -\letnaturaltablelocalparameter\c!option\empty + \letnaturaltablelocalparameter\c!option\empty \tabl_ntb_setup_cell{#1}{#2}% -\setupcurrentnaturaltablelocal[#3]% -\letnaturaltablelocalparameter\c!background\empty -\letnaturaltablelocalparameter\c!frame\v!off -\scratchcounter\tabl_ntb_get_col{#1}{#2}\relax -\ifnum\scratchcounter>\plusone - \letnaturaltablelocalparameter\c!width\v!fit % compatible with extreme tables -\fi + \setupcurrentnaturaltablelocal[#3]% + \letnaturaltablelocalparameter\c!background\empty + \letnaturaltablelocalparameter\c!frame\v!off + \scratchcounter\tabl_ntb_get_col{#1}{#2}\relax + \ifnum\scratchcounter>\plusone + \letnaturaltablelocalparameter\c!width\v!fit % compatible with extreme tables + \fi \setbox\scratchbox\hbox {\scratchdimen\naturaltablelocalparameter\c!distance\relax \ifdim\scratchdimen>\tabl_ntb_get_dis{#2}\relax diff --git a/tex/context/base/tabl-xtb.mkvi b/tex/context/base/tabl-xtb.mkvi index 35ae79e82..56e52794f 100644 --- a/tex/context/base/tabl-xtb.mkvi +++ b/tex/context/base/tabl-xtb.mkvi @@ -221,7 +221,7 @@ \setupcurrentxtable[#settings]% \fi \tabl_x_check_textwidth - \forgetall + %\forgetall % else whitespace mess \edef\tabl_x_current_buffer{\tabl_x_default_buffer}% \normalexpanded{\buff_pickup{\tabl_x_current_buffer}{\e!start\currentxtable}{\e!stop\currentxtable}\relax\tabl_x_process\zerocount}} @@ -245,7 +245,7 @@ \tabl_x_set_checked{#settings}% \fi \tabl_x_check_textwidth - \forgetall} + }% else whitespace mess \def\tabl_x_get_buffer {\ctxcommand{gettexbuffer("\tabl_x_current_buffer")}} @@ -259,6 +259,7 @@ \unexpanded\def\tabl_x_process {\begingroup % * + \forgetall % moved here \dontcomplain % for the moment here till we figure out where we get the overflow \doifsomething{\xtableparameter\c!bodyfont} {\setupbodyfont[\xtableparameter\c!bodyfont]}% @@ -342,7 +343,7 @@ % in text flow: headers and footers only once \setvalue{\??xtableflushsplit\v!no}% - {\dontleavehmode % else no leftskip etc + {\noindent % \dontleavehmode % else no leftskip etc \ctxcommand{x_table_flush{ method = "\v!normal" }}% \removeunwantedspaces} diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 26d9f3d41..ae12c52b3 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 : 01/22/15 13:26:19 +-- merge date : 01/22/15 18:18:07 do -- begin closure to overcome local limits and interference -- cgit v1.2.3