diff options
Diffstat (limited to 'tex')
24 files changed, 181 insertions, 111 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 9fdbddad2..473c0782c 100644 --- a/tex/context/base/mkii/cont-new.mkii +++ b/tex/context/base/mkii/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2021.06.11 17:55} +\newcontextversion{2021.06.13 19:18} %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/mkii/context.mkii b/tex/context/base/mkii/context.mkii index 23852307b..a1679d905 100644 --- a/tex/context/base/mkii/context.mkii +++ b/tex/context/base/mkii/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2021.06.11 17:55} +\edef\contextversion{2021.06.13 19:18} %D For those who want to use this: diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index c633a8582..7f44775d5 100644 --- a/tex/context/base/mkiv/cont-new.mkiv +++ b/tex/context/base/mkiv/cont-new.mkiv @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2021.06.11 17:55} +\newcontextversion{2021.06.13 19:18} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 296d63924..72383f353 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -45,7 +45,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2021.06.11 17:55} +\edef\contextversion{2021.06.13 19:18} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua index 364243963..6338bff40 100644 --- a/tex/context/base/mkiv/mult-prm.lua +++ b/tex/context/base/mkiv/mult-prm.lua @@ -142,6 +142,9 @@ return { "Umathlimitbelowbgap", "Umathlimitbelowkern", "Umathlimitbelowvgap", + "Umathlimits", + "Umathnoaxis", + "Umathnolimits", "Umathnolimitsubfactor", "Umathnolimitsupfactor", "Umathnumeratorvariant", @@ -155,6 +158,8 @@ return { "Umathopenordspacing", "Umathopenpunctspacing", "Umathopenrelspacing", + "Umathopenupdepth", + "Umathopenupheight", "Umathoperatorsize", "Umathopinnerspacing", "Umathopopenspacing", @@ -178,6 +183,7 @@ return { "Umathoverdelimitervgap", "Umathoverlayaccentvariant", "Umathoverlinevariant", + "Umathphantom", "Umathpunctbinspacing", "Umathpunctclosespacing", "Umathpunctinnerspacing", @@ -231,6 +237,7 @@ return { "Umathunderdelimitervgap", "Umathunderlinevariant", "Umathvextensiblevariant", + "Umathvoid", "Umiddle", "Unosubprescript", "Unosubscript", diff --git a/tex/context/base/mkiv/scrp-cjk.lua b/tex/context/base/mkiv/scrp-cjk.lua index 579c9971c..f9df7ed45 100644 --- a/tex/context/base/mkiv/scrp-cjk.lua +++ b/tex/context/base/mkiv/scrp-cjk.lua @@ -515,7 +515,7 @@ end scripts.installmethod { name = "hangul", injector = process, - datasets = { -- todo: metatables + datasets = { -- todo: metatables and maybe some stretch and shrink factor default = { inter_char_shrink_factor = 0.50, -- of quad inter_char_stretch_factor = 0.50, -- of quad @@ -525,6 +525,15 @@ scripts.installmethod { inter_char_quarter_stretch_factor = 0.50, -- of quad inter_char_hangul_penalty = 50, }, + tight = { + inter_char_shrink_factor = 0.10, -- of quad + inter_char_stretch_factor = 0.10, -- of quad + inter_char_half_shrink_factor = 0.10, -- of quad + inter_char_half_stretch_factor = 0.10, -- of quad + inter_char_quarter_shrink_factor = 0.10, -- of quad + inter_char_quarter_stretch_factor = 0.10, -- of quad + inter_char_hangul_penalty = 50, + }, }, } diff --git a/tex/context/base/mkiv/scrp-ini.mkiv b/tex/context/base/mkiv/scrp-ini.mkiv index 4eb3f29e3..f677eceef 100644 --- a/tex/context/base/mkiv/scrp-ini.mkiv +++ b/tex/context/base/mkiv/scrp-ini.mkiv @@ -61,6 +61,8 @@ % \setuevalue\currentscript{\setscript[\currentscript]}% % \to \everydefinescript +% \ctxlua{inspect(scripts.handlers.hangul.datasets)} + \unexpanded\def\scripts_basics_set {\clf_setscript{\currentscript}{\scriptparameter\c!method}{\scriptparameter\c!preset}} diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex 592ac1160..8916a3b56 100644 --- a/tex/context/base/mkiv/status-files.pdf +++ b/tex/context/base/mkiv/status-files.pdf diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf Binary files differindex 9ee55e834..5c91aa4fe 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl index e20c03d1b..afcb20d11 100644 --- a/tex/context/base/mkxl/cont-new.mkxl +++ b/tex/context/base/mkxl/cont-new.mkxl @@ -13,7 +13,7 @@ % \normalend % uncomment this to get the real base runtime -\newcontextversion{2021.06.11 17:55} +\newcontextversion{2021.06.13 19:18} %D This file is loaded at runtime, thereby providing an excellent place for hacks, %D patches, extensions and new features. There can be local overloads in cont-loc diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl index cb9fcb0d2..ba4dc20e1 100644 --- a/tex/context/base/mkxl/context.mkxl +++ b/tex/context/base/mkxl/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \immutable\edef\contextformat {\jobname} -\immutable\edef\contextversion{2021.06.11 17:55} +\immutable\edef\contextversion{2021.06.13 19:18} %overloadmode 1 % check frozen / warning %overloadmode 2 % check frozen / error diff --git a/tex/context/base/mkxl/page-ffl.mkxl b/tex/context/base/mkxl/page-ffl.mkxl index 77018004f..7c0c5af9d 100644 --- a/tex/context/base/mkxl/page-ffl.mkxl +++ b/tex/context/base/mkxl/page-ffl.mkxl @@ -71,10 +71,10 @@ \setupfacingfloat [\c!spaceinbetween=\v!big, \c!inbetween={\blank[\v!big]}, - \c!width=\v!fit, + %\c!page=\v!left, % not used %\c!style, %\c!color, - \c!page=\v!left] + \c!width=\v!fit] \appendtoks \ifempty\currentfacingfloatparent @@ -91,45 +91,89 @@ \let\m_strc_floats_state\relax -\permanent\protected\def\strc_floats_facing_flush +% \permanent\protected\def\strc_floats_facing_flush +% {\ifnum\c_strc_floats_facing_flushed<\c_strc_floats_facing_saved +% \ifodd\c_strc_floats_facing_flushed +% \ifodd\realpageno +% \strc_floats_facing_flush_indeed +% \doifelsependingpagecontent\relax{\kern\zeropoint\page}% +% \fi +% \else +% \ifodd\realpageno\else +% \strc_floats_facing_flush_indeed +% \doifelsependingpagecontent\relax{\kern\zeropoint\page}% +% \fi +% \fi +% \fi} +% +% \permanent\protected\def\strc_floats_facing_flush_indeed +% {\global\advance\c_strc_floats_facing_flushed\plusone +% \floatingpenalty\zerocount +% \page_inserts_inject\namedinsertionnumber\s!topfloat\bgroup +% \forgetall +% \ifconditional\c_page_one_top_of_insert +% \ifconditional\c_page_one_correct_top_insert +% \topskipcorrection % [xx] new: see icare topbleed +% \kern-\lineskip +% \par +% \prevdepth\maxdimen +% \fi +% \fi +% \directboxfromcache{\currentfacingfloat}{\number\c_strc_floats_facing_flushed}% +% \vkern\s_page_one_between_top_insert +% \egroup +% \ifnum\c_strc_floats_facing_saved=\c_strc_floats_facing_flushed +% \global\c_strc_floats_facing_saved \zerocount +% \global\c_strc_floats_facing_flushed\zerocount +% \resetboxesincache{\currentfacingfloat}% +% \fi} +% +% \aliased\let\flushfacingfloats\strc_floats_facing_flush + + +% \let\page_check_weird_page\relax + +\def\page_check_weird_page_indeed % for now only when facing floats + {\ifdim\vsize>\zeropoint\else + %\showmessage\m!layouts9{}% + \writestatus\m!layouts{forcing zero height page}% + \emptyhbox\page + \fi} + +\permanent\protected\def\flushfacingfloats {\ifnum\c_strc_floats_facing_flushed<\c_strc_floats_facing_saved - \ifodd\c_strc_floats_facing_flushed - \ifodd\realpageno - \strc_floats_facing_flush_indeed - \doifelsependingpagecontent\relax{\kern\zeropoint\page}% - \fi - \else - \ifodd\realpageno\else - \strc_floats_facing_flush_indeed - \doifelsependingpagecontent\relax{\kern\zeropoint\page}% - \fi - \fi + \strc_floats_facing_flush_indeed \fi} \permanent\protected\def\strc_floats_facing_flush_indeed - {\global\advance\c_strc_floats_facing_flushed\plusone - \floatingpenalty\zerocount - \page_inserts_inject\namedinsertionnumber\s!topfloat\bgroup - \forgetall - \ifconditional\c_page_one_top_of_insert - \ifconditional\c_page_one_correct_top_insert - \topskipcorrection % [xx] new: see icare topbleed - \kern-\lineskip - \par - \prevdepth\maxdimen - \fi - \fi + {\begingroup + \glet\page_check_weird_page\page_check_weird_page_indeed % for now only when facing floats + \dorecurse\c_strc_floats_facing_saved + {\scratchdimen\getboxhtfromcache{\currentfacingfloat}{\recurselevel}\relax + \advance\scratchdimen\lineheight % this will become configurable, maybe some criterium + \normalexpanded{\adaptlayout[\the\numexpr\realpageno+\recurselevel\relax][\c!top=\the\scratchdimen]}}% + \glet\page_otr_flush_top_content\page_otr_flush_top_content_waiting % not at current page + \endgroup} + +\let\page_otr_flush_top_content\relax + +\def\page_otr_flush_top_content_waiting + {\glet\page_otr_flush_top_content\page_otr_flush_top_content_inject} % but in next page + +\def\page_otr_flush_top_content_inject + {\ifnum\c_strc_floats_facing_flushed<\c_strc_floats_facing_saved + \global\advance\c_strc_floats_facing_flushed\plusone \directboxfromcache{\currentfacingfloat}{\number\c_strc_floats_facing_flushed}% - \vkern\s_page_one_between_top_insert - \egroup - \ifnum\c_strc_floats_facing_saved=\c_strc_floats_facing_flushed - \global\c_strc_floats_facing_saved \zerocount - \global\c_strc_floats_facing_flushed\zerocount - \resetboxesincache{\currentfacingfloat}% + \ifnum\c_strc_floats_facing_saved=\c_strc_floats_facing_flushed + \global\c_strc_floats_facing_saved \zerocount + \global\c_strc_floats_facing_flushed\zerocount + \resetboxesincache{\currentfacingfloat}% + \glet\page_otr_flush_top_content\relax % till we're done + \fi + \nointerlineskip + \par \fi} -\aliased\let\flushfacingfloats\strc_floats_facing_flush - \protected\def\strc_floats_facing_setup {\edef\currentfacingfloat{\currentfacingfloat:\m_strc_floats_state}% \usefacingfloatstyleandcolor\c!style\v!color} @@ -178,12 +222,6 @@ \permanent\protected\def\startfacingfloat[#1]% {\begingroup - % todo: \usepageparameter -% \edef\p_page{\facingfloatparameter\c!page}% -% \ifempty\p_page\else -% \page[\p_page]% -% \fi - % \edef\currentfacingfloat{#1}% \edef\p_width{\facingfloatparameter\c!width}% \letfacingfloatparameter\c!width\v!fit diff --git a/tex/context/base/mkxl/page-ini.mkxl b/tex/context/base/mkxl/page-ini.mkxl index 3fa94cd5b..69ff59cdb 100644 --- a/tex/context/base/mkxl/page-ini.mkxl +++ b/tex/context/base/mkxl/page-ini.mkxl @@ -148,6 +148,8 @@ % % \stoptext +\ifdefined\page_check_weird_page \else \let\page_check_weird_page\relax \fi + \def\page_otr_construct_and_shipout#1#2#3% {\forgetall \page_boxes_shipout{\page_boxes_constructed_page#1#2}% \hbox removed @@ -162,7 +164,6 @@ \strc_pagenumbers_increment_counters % should hook into an every \page_adapts_synchronize \page_otr_check_for_pending_inserts - \page_otr_command_flush_facing_floats \page_floats_flush_page_floats % before postponed blocks \page_spread_flush % defined later \ifnum#3=\plusone @@ -174,7 +175,8 @@ \fi \else \page_postponed_blocks_flush - \fi} + \fi + \page_check_weird_page} % Can't we get rid of this hackery? It's used in some widgets % stuff so probably not. diff --git a/tex/context/base/mkxl/page-lay.mkxl b/tex/context/base/mkxl/page-lay.mkxl index 21cb48f20..b4bccd85b 100644 --- a/tex/context/base/mkxl/page-lay.mkxl +++ b/tex/context/base/mkxl/page-lay.mkxl @@ -989,11 +989,13 @@ \installsetuponlycommandhandler \??adaptlayout {adaptlayout} -\newdimen\d_page_adepts_pushed_text_height -\newdimen\d_page_adepts_pushed_footer_height -\newdimen\d_page_adepts_height +\newdimen\d_page_adapts_pushed_text_height +\newdimen\d_page_adapts_pushed_footer_height +\newdimen\d_page_adapts_height \newdimen\d_page_adapts_delta +\appendtoks \global\d_page_adapts_delta\zeropoint \to \everyshipout + \permanent\protected\tolerant\def\adaptlayout[#1]#*[#2]% {\ifparameter#2\or \processcommalist[#1]{\page_adapts_layout_register{#2}}% @@ -1008,34 +1010,37 @@ \let\p_adapts_height\zeropoint \let\p_adapts_lines \zerocount -\def\page_adapts_layout_indeed#1% - {\setupcurrentadaptlayout[\c!height=\zeropoint,\c!lines=\zerocount,#1]% - \page_adepts_push +\def\page_adapts_layout_indeed#1% called often + {\setupcurrentadaptlayout[\c!height=\zeropoint,\c!lines=\zerocount,\c!top=\zeropoint,#1]% + \page_adapts_push \edef\p_adapts_height{\adaptlayoutparameter\c!height}% \edef\p_adapts_lines {\adaptlayoutparameter\c!lines}% \ifx\p_adapts_height\v!max - \global\d_page_adepts_height\footerheight + \global\d_page_adapts_height\footerheight \else - \global\d_page_adepts_height\dimexpr + \global\d_page_adapts_height\dimexpr \ifnum\p_adapts_lines=\zerocount \p_adapts_height \else \p_adapts_lines\openlineheight \fi \relax - \ifdim\d_page_adepts_height>\footerheight - \global\d_page_adepts_height\footerheight + \ifdim\d_page_adapts_height>\footerheight + \global\d_page_adapts_height\footerheight \fi \fi - \global\advance\textheight \d_page_adepts_height - \global\advance\footerheight-\d_page_adepts_height - \showmessage\m!layouts1{\the\d_page_adepts_height,\the\realpageno}% +% + \global\d_page_adapts_delta-\dimexpr\adaptlayoutparameter\c!top\relax +% + \global\advance\textheight \d_page_adapts_height + \global\advance\footerheight-\d_page_adapts_height + \showmessage\m!layouts1{\the\dimexpr\d_page_adapts_height,\the\realpageno}% % this will become a better one (do we need insert correction?) \page_otr_command_set_vsize % \page_backgrounds_recalculate - \glet\page_adepts_push\relax - \glet\page_adepts_pop\page_adepts_pop_indeed} + \glet\page_adapts_push\relax + \glet\page_adapts_pop\page_adapts_pop_indeed} % \def\page_adapts_check % {\csname\??pageadaptations\the\ifcsname\??pageadaptations\the\realpageno\endcsname\realpageno\else\zerocount\fi\endcsname} @@ -1053,30 +1058,30 @@ \gletcsname\??pageadaptations\the\realpageno\endcsname\relax \fi} -\def\page_adepts_push_indeed - {\global\d_page_adepts_pushed_text_height \textheight - \global\d_page_adepts_pushed_footer_height\footerheight} +\def\page_adapts_push_indeed + {\global\d_page_adapts_pushed_text_height \textheight + \global\d_page_adapts_pushed_footer_height\footerheight} -\def\page_adepts_pop_indeed - {\global\textheight \d_page_adepts_pushed_text_height - \global\footerheight\d_page_adepts_pushed_footer_height +\def\page_adapts_pop_indeed + {\global\textheight \d_page_adapts_pushed_text_height + \global\footerheight\d_page_adapts_pushed_footer_height \page_layouts_synchronize - \glet\page_adepts_push\page_adepts_push_indeed - \glet\page_adepts_pop\relax} + \glet\page_adapts_push\page_adapts_push_indeed + \glet\page_adapts_pop\relax} \appendtoks \page_adapts_check \to \everystarttext \appendtoks \page_adapts_reset \to \everyshipout -\let\page_adepts_pop \relax -\let\page_adepts_push\page_adepts_push_indeed +\let\page_adapts_pop \relax +\let\page_adapts_push\page_adapts_push_indeed \protected\def\page_adapts_synchronize % used elsewhere - {\page_adepts_pop + {\page_adapts_pop \page_adapts_check} \def\page_adapts_status_info % used elsewhere - {\ifrelax\page_adepts_pop \else - \space(adept: \the\d_page_adepts_height)\space + {\ifrelax\page_adapts_pop \else + \space(adept: \the\d_page_adapts_height)\space \fi \the\realpageno} diff --git a/tex/context/base/mkxl/page-one.mkxl b/tex/context/base/mkxl/page-one.mkxl index f332b0d8e..4a4ce6014 100644 --- a/tex/context/base/mkxl/page-one.mkxl +++ b/tex/context/base/mkxl/page-one.mkxl @@ -778,9 +778,6 @@ \endgroup \fi} -\protected\def\page_one_command_flush_facing_floats - {\strc_floats_facing_flush} - \defineoutputroutine [\s!singlecolumn] [\s!page_otr_command_routine =\page_one_command_routine, @@ -805,7 +802,6 @@ \s!page_otr_command_flush_all_floats =\page_one_command_flush_all_floats, \s!page_otr_command_flush_margin_blocks =\page_one_command_flush_margin_blocks, \s!page_otr_command_test_column =\page_one_command_test_page, - \s!page_otr_command_flush_facing_floats =\page_one_command_flush_facing_floats ] % \setupoutputroutine diff --git a/tex/context/base/mkxl/page-otr.mklx b/tex/context/base/mkxl/page-otr.mklx index f2a341d4b..b24fa62e3 100644 --- a/tex/context/base/mkxl/page-otr.mklx +++ b/tex/context/base/mkxl/page-otr.mklx @@ -294,7 +294,6 @@ \definesystemconstant{page_otr_command_flush_all_floats} \definesystemconstant{page_otr_command_flush_margin_blocks} \definesystemconstant{page_otr_command_test_column} -\definesystemconstant{page_otr_command_flush_facing_floats} \definesystemconstant{singlecolumn} \definesystemconstant{multicolumn} % will move @@ -323,8 +322,7 @@ \s!page_otr_command_flush_saved_floats, \s!page_otr_command_flush_all_floats, \s!page_otr_command_flush_margin_blocks, - \s!page_otr_command_test_column, - \s!page_otr_command_flush_facing_floats] + \s!page_otr_command_test_column] \appendtoks \setupoutputroutine[\s!singlecolumn]% diff --git a/tex/context/base/mkxl/page-spr.mkxl b/tex/context/base/mkxl/page-spr.mkxl index 49285c96f..3d83126ce 100644 --- a/tex/context/base/mkxl/page-spr.mkxl +++ b/tex/context/base/mkxl/page-spr.mkxl @@ -29,6 +29,7 @@ \freezetextwidth \hsize\textwidth % local variant of \sethsize \boxmaxdepth\maxdepth + \page_otr_flush_top_content \noindent % content can be < \hsize \page_otr_command_package_contents#2#3}}% \dp#1\zeropoint diff --git a/tex/context/base/mkxl/page-txt.mklx b/tex/context/base/mkxl/page-txt.mklx index ed7fbbd80..3b46d42f9 100644 --- a/tex/context/base/mkxl/page-txt.mklx +++ b/tex/context/base/mkxl/page-txt.mklx @@ -937,6 +937,8 @@ %D overload the the stored version .. eventually i will clear up the experimental %D mess. +\ifdefined\page_otr_flush_top_content\else \let\page_otr_flush_top_content\relax \fi + \protected\def\settextpagecontent#1#2#3% #2 and #3 will disappear / is overloaded {\setbox#1\hpack to \makeupwidth {\hss % so don't change this @@ -946,6 +948,7 @@ \freezetextwidth \hsize\textwidth % local variant of \sethsize <<< in columns? \boxmaxdepth\maxdepth + \page_otr_flush_top_content \noindent % content can be < \hsize \page_otr_command_package_contents#2#3}% this will vbox \hss}% diff --git a/tex/context/base/mkxl/scrp-ini.lmt b/tex/context/base/mkxl/scrp-ini.lmt index 138251172..b71a530a2 100644 --- a/tex/context/base/mkxl/scrp-ini.lmt +++ b/tex/context/base/mkxl/scrp-ini.lmt @@ -92,14 +92,14 @@ local insertnodebefore, insertnodeafter do local setattributelist = nuts.setattributelist insertnodebefore = function (head,current,what) -- todo : lmtx - head, current = insertbefore(head,current,what) setattributelist(what,current) + head, current = insertbefore(head,current,what) return head, current end insertnodeafter = function(head,current,what) -- todo : lmtx - head, current = insertafter(head,current,what) setattributelist(what,current) + head, current = insertafter(head,current,what) return head, current end diff --git a/tex/context/base/mkxl/strc-ren.mkxl b/tex/context/base/mkxl/strc-ren.mkxl index 774f6f640..f7a1ec686 100644 --- a/tex/context/base/mkxl/strc-ren.mkxl +++ b/tex/context/base/mkxl/strc-ren.mkxl @@ -272,16 +272,27 @@ \installcorenamespace{headplacementcheckhang} -\setvalue{\??headplacementcheckhang\v!line }{\strc_rendering_check_hang - \n_strc_rendering_hang_lines\zerocount} -\setvalue{\??headplacementcheckhang\v!broad }{\strc_rendering_check_hang - \getnoflines\d_strc_rendering_hang_height} -\setvalue{\??headplacementcheckhang\v!fit }{\strc_rendering_check_hang - \getrawnoflines\d_strc_rendering_hang_height} -\setvalue{\??headplacementcheckhang\v!none }{\n_strc_rendering_hang_lines\zerocount} -\setvalue{\??headplacementcheckhang }{\n_strc_rendering_hang_lines\zerocount} -\setvalue{\??headplacementcheckhang\s!unknown}{\strc_rendering_check_hang - \n_strc_rendering_hang_lines\numexpr\headparameter\c!hang-\plusone\relax} +\defcsname\??headplacementcheckhang\v!line\endcsname + {\strc_rendering_check_hang + \n_strc_rendering_hang_lines\zerocount} + +\defcsname\??headplacementcheckhang\v!broad\endcsname + {\strc_rendering_check_hang + \getnoflines\d_strc_rendering_hang_height} + +\defcsname\??headplacementcheckhang\v!fit\endcsname + {\strc_rendering_check_hang + \getrawnoflines\d_strc_rendering_hang_height} + +\defcsname\??headplacementcheckhang\v!none\endcsname + {\n_strc_rendering_hang_lines\zerocount} + +\defcsname\??headplacementcheckhang\endcsname + {\n_strc_rendering_hang_lines\zerocount} + +\defcsname\??headplacementcheckhang\s!unknown\endcsname + {\strc_rendering_check_hang + \n_strc_rendering_hang_lines\numexpr\headparameter\c!hang-\plusone\relax} \def\strc_rendering_initialize_line_hang {\ifconditional\headisdisplay @@ -433,11 +444,11 @@ \def\strc_rendering_define_placement_yes[#1][#2]% {\defineheadalternative[#1][\c!alternative=#2,\c!renderingsetup=\??headrenderings:\v!command]% - \setuvalue{\??headplacementalternative#1}##1##2} + \protected\defcsname\??headplacementalternative#1\endcsname##1##2} \def\strc_rendering_define_placement_nop[#1][#2]% {\defineheadalternative[#1][\c!alternative=#2,\c!renderingsetup=\??headrenderings:\v!command]% - \setuvalue{\??headplacementalternative#1}} + \protected\defcsname\??headplacementalternative#1\endcsname} % these can be used in setups: % @@ -536,8 +547,7 @@ % {\hbox to \zeropoint{\let\getheadnumber\fakedheadnumber\headnumbercontent}} \permanent\protected\def\fakeheadnumbercontent - {\edef\p_hidenumber{\headparameter\c!hidenumber}% - \ifx\p_hidenumber\v!yes\else + {\ifcstok{\headparameter\c!hidenumber}\v!yes\else \hbox to \zeropoint{\let\getheadnumber\fakedheadnumber\headnumbercontent}% \fi} diff --git a/tex/context/base/mkxl/strc-sec.mkxl b/tex/context/base/mkxl/strc-sec.mkxl index a5b3cde6e..19eeb262e 100644 --- a/tex/context/base/mkxl/strc-sec.mkxl +++ b/tex/context/base/mkxl/strc-sec.mkxl @@ -981,14 +981,12 @@ \setfalse\c_strc_sectioning_ignore_page % ignorespaces prevents spaces creeping in when after=\dontleavehmode \dostarttagged\t!sectioncontent\empty - \ifempty\currentstructureplaceholder - \ifconditional\headisdisplay - \doubleexpandafter\ignorespaces - \else - \doubleexpandafter\ignorepars - \fi + \unless\ifempty\currentstructureplaceholder + \expandafter\strc_sectioning_placeholder + \orelse\ifconditional\headisdisplay + \expandafter\ignorespaces \else - \expandafter\strc_sectioning_placeholder + \expandafter\ignorepars \fi} %D \starttyping diff --git a/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv b/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv index 05c0bb342..b16d01d3a 100644 --- a/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv +++ b/tex/context/fonts/mkiv/type-imp-newcomputermodern.mkiv @@ -43,7 +43,7 @@ \setups[\s!font:\s!fallback:\s!mono] \definefontsynonym [\s!Mono] [\s!file:newcmmono10-regular.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] - \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-oblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] + \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-italic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-boldoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] \stoptypescript @@ -73,7 +73,7 @@ \setups[\s!font:\s!fallback:\s!mono] \definefontsynonym [\s!Mono] [\s!file:newcmmono10-book.otf] [\s!features=\s!none,\s!fallbacks=\s!Mono] \definefontsynonym [\s!MonoBold] [\s!file:newcmmono10-bold.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBold] - \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-bookoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] + \definefontsynonym [\s!MonoItalic] [\s!file:newcmmono10-bookitalic.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoItalic] \definefontsynonym [\s!MonoBoldItalic] [\s!file:newcmmono10-boldoblique.otf] [\s!features=\s!none,\s!fallbacks=\s!MonoBoldItalic] \stoptypescript diff --git a/tex/context/modules/mkiv/s-math-repertoire.mkiv b/tex/context/modules/mkiv/s-math-repertoire.mkiv index fb4780834..826c13fb0 100644 --- a/tex/context/modules/mkiv/s-math-repertoire.mkiv +++ b/tex/context/modules/mkiv/s-math-repertoire.mkiv @@ -461,7 +461,8 @@ % \showmathcharacterssetbodyfonts{lucidaot,cambria,xits,stixtwo,modern,pagella,termes,bonum,schola,dejavu} % \showmathcharacterssetbodyfonts{newcomputermodern-book,lucidaot,cambria,stixtwo,modern,pagella,termes,bonum,schola,dejavu} -\showmathcharacterssetbodyfonts{newcomputermodern-book,stixtwo,modern,pagella,termes,bonum,schola,dejavu} +% \showmathcharacterssetbodyfonts{newcomputermodern-book,stixtwo,modern,pagella,termes,bonum,schola,dejavu} +\showmathcharacterssetbodyfonts{newcomputermodern-book,lucidaot,cambria,stixtwo,modern,pagella,termes,schola,dejavu} \starttext diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 06039f3b7..629a00c6d 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 : 2021-06-11 17:55 +-- merge date : 2021-06-13 19:18 do -- begin closure to overcome local limits and interference |