diff options
Diffstat (limited to 'tex')
29 files changed, 232 insertions, 35 deletions
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index 2ef972527..2ee1c8da4 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{2019.08.09 18:29} +\newcontextversion{2019.08.11 20:03} %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 9c89d78e7..7ee0869d6 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{2019.08.09 18:29} +\edef\contextversion{2019.08.11 20:03} %D For those who want to use this: diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index 1097d7e18..b85fcc245 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -637,6 +637,7 @@ \setinterfaceconstant{aligntitle}{alignementtitre} \setinterfaceconstant{alternative}{alternative} \setinterfaceconstant{anchor}{anchor} +\setinterfaceconstant{anchoring}{anchoring} \setinterfaceconstant{andtext}{andtext} \setinterfaceconstant{apa}{apa} \setinterfaceconstant{arguments}{arguments} @@ -866,6 +867,7 @@ \setinterfaceconstant{hfil}{hfil} \setinterfaceconstant{hidenumber}{hidenumber} \setinterfaceconstant{hoffset}{decalagehauteur} +\setinterfaceconstant{horizontal}{horizontale} \setinterfaceconstant{horoffset}{horoffset} \setinterfaceconstant{hyphen}{hyphen} \setinterfaceconstant{hyphens}{hyphens} @@ -966,9 +968,12 @@ \setinterfaceconstant{menu}{menu} \setinterfaceconstant{method}{methode} \setinterfaceconstant{middle}{milieu} +\setinterfaceconstant{middlecolor}{middlecolor} \setinterfaceconstant{middlecommand}{middlecommand} \setinterfaceconstant{middlespeech}{middlespeech} +\setinterfaceconstant{middlestyle}{middlestyle} \setinterfaceconstant{middletext}{textecentre} +\setinterfaceconstant{middlewidth}{middlewidth} \setinterfaceconstant{midsentence}{midsentence} \setinterfaceconstant{min}{min} \setinterfaceconstant{mindepth}{profondeurmin} @@ -1286,6 +1291,7 @@ \setinterfaceconstant{vcompact}{vcompact} \setinterfaceconstant{vector}{vector} \setinterfaceconstant{veroffset}{veroffset} +\setinterfaceconstant{vertical}{verticale} \setinterfaceconstant{vfactor}{vfactor} \setinterfaceconstant{vfil}{vfil} \setinterfaceconstant{viewerprefix}{viewerprefix} @@ -1296,6 +1302,7 @@ \setinterfaceconstant{white}{blanc} \setinterfaceconstant{width}{largeur} \setinterfaceconstant{words}{words} +\setinterfaceconstant{xanchor}{xanchor} \setinterfaceconstant{xfactor}{xfactor} \setinterfaceconstant{xhtml}{xhtml} \setinterfaceconstant{xmax}{xmax} @@ -1303,6 +1310,7 @@ \setinterfaceconstant{xoffset}{xoffset} \setinterfaceconstant{xscale}{xscale} \setinterfaceconstant{xstep}{xstep} +\setinterfaceconstant{yanchor}{yanchor} \setinterfaceconstant{yfactor}{yfactor} \setinterfaceconstant{ymax}{ymax} \setinterfaceconstant{yoffset}{yoffset} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 487aab5d7..11d81d603 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{2019.08.09 18:29} +\newcontextversion{2019.08.11 20:03} %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 4b0e9897e..bb8a89065 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{2019.08.09 18:29} +\edef\contextversion{2019.08.11 20:03} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl index e1fbe1e04..f7ea6ad6a 100644 --- a/tex/context/base/mkiv/context.mkxl +++ b/tex/context/base/mkiv/context.mkxl @@ -29,7 +29,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2019.08.09 18:29} +\edef\contextversion{2019.08.11 20:03} \edef\contextkind {beta} %D Kind of special: diff --git a/tex/context/base/mkiv/mlib-lua.lua b/tex/context/base/mkiv/mlib-lua.lua index a3e5e84cd..9d271de82 100644 --- a/tex/context/base/mkiv/mlib-lua.lua +++ b/tex/context/base/mkiv/mlib-lua.lua @@ -120,6 +120,12 @@ do return currentmpx end + local status = mplib.status + + function metapost.currentmpxstatus() + return status and status(currentmpx) or 0 + end + end do diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua index 62a6de16b..1457020ef 100644 --- a/tex/context/base/mkiv/mlib-pps.lua +++ b/tex/context/base/mkiv/mlib-pps.lua @@ -850,6 +850,8 @@ local tx_reset, tx_process do end end + local madetext = nil + function mp.mf_some_text(index,str) mp_target = index mp_index = index @@ -864,24 +866,46 @@ local tx_reset, tx_process do madetext = nil end - local madetext = nil - function mp.mf_made_text(index) mp.mf_some_text(index,madetext) end + -- This is a bit messy. In regular metapost it's a kind of immediate replacement + -- so embedded btex ... etex is not really working as one would expect. We now have + -- a mix: it's immediate when we are at the outer level (rawmadetext) and indirect + -- (with the danger of stuff that doesn't work well in strings) when we are for + -- instance in a macro definition (rawtextext (pass back string)) ... of course one + -- should use textext so this is just a catch. When not in lmtx it's never immediate. + + local reported = false + local awayswrap = CONTEXTLMTXMODE <= 1 + function metapost.maketext(s,mode) + if not reported then + reported = true + report_metapost("use 'textext(.....)' instead of 'btex ..... etex'") + end if mode and mode == 1 then if trace_btexetex then report_metapost("ignoring verbatimtex: [[%s]]",s) end + elseif alwayswrap then + if trace_btexetex then + report_metapost("rewrapping btex ... etex [[%s]]",s) + end + return 'rawtextext("' .. gsub(s,'"','"&ditto&"') .. '")' -- nullpicture + elseif metapost.currentmpxstatus() ~= 0 then + if trace_btexetex then + report_metapost("rewrapping btex ... etex at the outer level [[%s]]",s) + end + return 'rawtextext("' .. gsub(s,'"','"&ditto&"') .. '")' -- nullpicture else if trace_btexetex then report_metapost("handling btex ... etex: [[%s]]",s) end -- madetext = utilities.strings.collapse(s) madetext = s - return "rawmadetext" + return "rawmadetext" -- is assuming immediate processing end end diff --git a/tex/context/base/mkiv/mlib-scn.lua b/tex/context/base/mkiv/mlib-scn.lua index b1f93d5cc..6916f3f38 100644 --- a/tex/context/base/mkiv/mlib-scn.lua +++ b/tex/context/base/mkiv/mlib-scn.lua @@ -26,7 +26,7 @@ if not modules then modules = { } end modules ['mlib-scn'] = { -- endfor ; -- popparameters; -local type, next = type, next +local type, next, rawget, getmetatable = type, next, rawget, getmetatable local byte, gmatch = string.byte, string.gmatch local insert, remove = table.insert, table.remove @@ -370,6 +370,31 @@ local function getparameter() end end +local function hasparameter() + local list, n = collectnames() + local v = namespaces + for i=1,n do + local l = list[i] + local vl = rawget(v,l) + if vl == nil then + if type(l) == "number" then + vl = rawget(v,1) + if vl == nil then + return mpboolean(false) + end + else + return mpboolean(false) + end + end + v = vl + end + if v == nil then + return mpboolean(false) + else + return mpboolean(true) + end +end + local function getparameterdefault() local list, n = collectnames() local v = namespaces @@ -399,7 +424,33 @@ local function getparameterdefault() return get(list[n]) end else - return get(list[n]) + local last = list[n] + if last == "*" then + -- so, only when not pushed + local m = getmetatable(namespaces[list[1]]) + if n then + m = m.__index -- can also be a _m_ + end + if m then + local v = m + for i=2,n-1 do + local l = list[i] + local vl = v[l] + if vl == nil then + return mpnumeric(0) + end + v = vl + end + if v == nil then + return mpnumeric(0) + else + return get(v) + end + end + return mpnumeric(0) + else + return get(last) + end end end v = vl @@ -509,6 +560,7 @@ end metapost.registerscript("getparameters", getparameters) metapost.registerscript("applyparameters", applyparameters) metapost.registerscript("presetparameters", presetparameters) +metapost.registerscript("hasparameter", hasparameter) metapost.registerscript("getparameter", getparameter) metapost.registerscript("getparameterdefault", getparameterdefault) metapost.registerscript("getparametercount", getparametercount) diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua index bee0e76e8..bbaa30d53 100644 --- a/tex/context/base/mkiv/mult-low.lua +++ b/tex/context/base/mkiv/mult-low.lua @@ -246,7 +246,7 @@ return { -- "givenwidth", "givenheight", "givendepth", "scangivendimensions", -- - "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", + "scratchwidth", "scratchheight", "scratchdepth", "scratchoffset", "scratchdistance", "scratchtotal", "scratchhsize", "scratchvsize", "scratchxoffset", "scratchyoffset", "scratchhoffset", "scratchvoffset", "scratchxposition", "scratchyposition", @@ -377,6 +377,8 @@ return { "strut", "halfstrut", "quarterstrut", "depthstrut", "halflinestrut", "noheightstrut", "setstrut", "strutbox", "strutht", "strutdp", "strutwd", "struthtdp", "strutgap", "begstrut", "endstrut", "lineheight", "leftboundary", "rightboundary", "signalcharacter", -- + "shiftbox", "vpackbox", "hpackbox", "vpackedbox", "hpackedbox", + -- "ordordspacing", "ordopspacing", "ordbinspacing", "ordrelspacing", "ordopenspacing", "ordclosespacing", "ordpunctspacing", "ordinnerspacing", -- diff --git a/tex/context/base/mkiv/page-ini.mkiv b/tex/context/base/mkiv/page-ini.mkiv index 618ea9006..b1e3e7f8a 100644 --- a/tex/context/base/mkiv/page-ini.mkiv +++ b/tex/context/base/mkiv/page-ini.mkiv @@ -58,9 +58,27 @@ \newbox\pagebox -\ifdefined\page_postprocessors_column \else \let\page_postprocessors_column\gobbleoneargument \fi -\ifdefined\page_postprocessors_page \else \let\page_postprocessors_page \gobbleoneargument \fi -\ifdefined\page_postprocessors_box \else \let\page_postprocessors_box \gobbleoneargument \fi +% \ifdefined\page_postprocessors_column \else \let\page_postprocessors_column\gobbleoneargument \fi +% \ifdefined\page_postprocessors_page \else \let\page_postprocessors_page \gobbleoneargument \fi +% \ifdefined\page_postprocessors_box \else \let\page_postprocessors_box \gobbleoneargument \fi + +\newtoks\t_page_postprocessors_box +\newtoks\t_page_postprocessors_page +\newtoks\t_page_postprocessors_column + +\newconstant\b_page_postprocessor + +\def\page_apply_postprocessors_box#1% + {\b_page_postprocessor#1\relax + \the\t_page_postprocessors_box} + +\def\page_apply_postprocessors_page#1% + {\b_page_postprocessor#1\relax + \the\t_page_postprocessors_page} + +\def\page_apply_postprocessors_column#1% + {\b_page_postprocessor#1\relax + \the\t_page_postprocessors_column} %D Floats. diff --git a/tex/context/base/mkiv/page-lin.mkvi b/tex/context/base/mkiv/page-lin.mkvi index a27ba5736..51f808df8 100644 --- a/tex/context/base/mkiv/page-lin.mkvi +++ b/tex/context/base/mkiv/page-lin.mkvi @@ -255,6 +255,19 @@ \page_lines_start_followup} \newconditional\c_page_lines_auto_narrow +%\newconditional\c_page_lines_enabled + +\appendtoks + \ifconditional\page_postprocessors_needed_box + \page_postprocessors_linenumbers_page\b_page_postprocessor + \fi +\to \t_page_postprocessors_page + +\appendtoks + \ifconditional\page_postprocessors_needed_box + \page_postprocessors_linenumbers_column\b_page_postprocessor + \fi +\to \t_page_postprocessors_column \def\page_lines_start_followup {\numberinglinestrue @@ -279,8 +292,7 @@ \fi\fi\fi \fi \the\beforeeverylinenumbering - \glet\page_postprocessors_page \page_postprocessors_linenumbers_page - \glet\page_postprocessors_column\page_postprocessors_linenumbers_column + %\global\settrue\c_page_lines_enabled % \global\settrue\page_postprocessors_needed_box % see core-rul.mkiv \ifcase\c_page_lines_mode\relax \page_lines_start_update % continue diff --git a/tex/context/base/mkiv/page-mul.mkiv b/tex/context/base/mkiv/page-mul.mkiv index 957981703..69e8fcdaa 100644 --- a/tex/context/base/mkiv/page-mul.mkiv +++ b/tex/context/base/mkiv/page-mul.mkiv @@ -461,7 +461,7 @@ \setfalse\c_page_mul_preceding_present % will be set elsewhere \else \settrue\c_page_mul_preceding_present - \page_postprocessors_box\b_page_mul_preceding + \page_apply_postprocessors_box\b_page_mul_preceding \fi \forgetall \page_mul_initialize_variables @@ -612,18 +612,21 @@ %D This feature is implemented using the reshape macros presented %D in \type{supp-box}. -\ifdefined\page_postprocessors_column\else\let\page_postprocessors_column\relax\fi % operates on passed box +%ifdefined\page_postprocessors_column\else\let\page_postprocessors_column\relax\fi % operates on passed box \ifdefined\postprocesscolumnline \else\let\postprocesscolumnline \relax\fi % operates on passed box \ifdefined\postprocesscolumnbox \else\let\postprocesscolumnbox \relax\fi % operates on passed box \ifdefined\postprocesscolumnpagebox \else\let\postprocesscolumnpagebox \relax\fi % operates on passed box -\def\page_mul_postprocess_linenumbers{\ifx\page_postprocessors_column\relax\else\page_mul_postprocess_linenumbers_indeed\fi} +%def\page_mul_postprocess_linenumbers{\ifx\page_postprocessors_column\relax\else\page_mul_postprocess_linenumbers_indeed\fi} \def\page_mul_postprocess_lines {\ifx\postprocesscolumnline \relax\else\page_mul_postprocess_lines_indeed \fi} \def\page_mul_postprocess_columns {\ifx\postprocesscolumnbox \relax\else\page_mul_postprocess_columns_indeed \fi} \def\page_mul_postprocess_page {\ifx\postprocesscolumnpagebox \relax\else\page_mul_postprocess_page_indeed \fi} -\def\page_mul_postprocess_linenumbers_indeed - {\dohandleallcolumns{\page_postprocessors_column\currentcolumnbox}} +% \def\page_mul_postprocess_linenumbers_indeed +% {\dohandleallcolumns{\page_apply_postprocessors_column\currentcolumnbox}} + +\def\page_mul_postprocess_linenumbers + {\dohandleallcolumns{\page_apply_postprocessors_column\currentcolumnbox}} \def\page_mul_postprocess_lines_indeed {\dohandleallcolumnscs\page_mul_postprocess_lines_step} diff --git a/tex/context/base/mkiv/page-txt.mklx b/tex/context/base/mkiv/page-txt.mklx index 641e7dc19..10c051422 100644 --- a/tex/context/base/mkiv/page-txt.mklx +++ b/tex/context/base/mkiv/page-txt.mklx @@ -924,7 +924,7 @@ \kern\dimexpr\leftmarginwidth+\leftmargindistance\relax \fi \endgroup - \page_postprocessors_page{#2}% + \page_apply_postprocessors_page{#2}% \settextpagecontent\b_page_layouts_element{#1}{#2}% \page_backgrounds_add_to_text\b_page_layouts_element \page_grids_add_to_box\b_page_layouts_element diff --git a/tex/context/base/mkiv/page-txt.mkvi b/tex/context/base/mkiv/page-txt.mkvi index 4b3702ad7..8b021acca 100644 --- a/tex/context/base/mkiv/page-txt.mkvi +++ b/tex/context/base/mkiv/page-txt.mkvi @@ -852,7 +852,7 @@ \kern\dimexpr\leftmarginwidth+\leftmargindistance\relax \fi \endgroup - \page_postprocessors_page{#2}% + \page_apply_postprocessors_page{#2}% \settextpagecontent\b_page_layouts_element{#1}{#2}% \page_backgrounds_add_to_text\b_page_layouts_element \page_grids_add_to_box\b_page_layouts_element diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex c975f3bab..1cac838de 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 62daabe8a..cc2cf3f29 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/supp-box.lua b/tex/context/base/mkiv/supp-box.lua index 323274bea..d957376d0 100644 --- a/tex/context/base/mkiv/supp-box.lua +++ b/tex/context/base/mkiv/supp-box.lua @@ -68,6 +68,7 @@ local copy_list = nuts.copy_list local find_tail = nuts.tail local getdimensions = nuts.dimensions local hpack = nuts.hpack +local vpack = nuts.vpack local traverse_id = nuts.traverse_id local free = nuts.free local findtail = nuts.tail @@ -635,9 +636,17 @@ implement { implement { name = "shiftbox", arguments = { "integer", "dimension" }, - actions = function(n,d) setshift(getbox(n),d) end, + actions = function(n,d) + setshift(getbox(n),d) + end, } +implement { name = "vpackbox", arguments = "integer", actions = function(n) setbox(n,(vpack(takebox(n)))) end } +implement { name = "hpackbox", arguments = "integer", actions = function(n) setbox(n,(hpack(takebox(n)))) end } + +implement { name = "vpackedbox", arguments = "integer", actions = function(n) context(vpack(takebox(n))) end } +implement { name = "hpackedbox", arguments = "integer", actions = function(n) context(hpack(takebox(n))) end } + implement { name = "scangivendimensions", public = true, diff --git a/tex/context/base/mkiv/supp-box.mkiv b/tex/context/base/mkiv/supp-box.mkiv index 4ceade033..6b6d3f790 100644 --- a/tex/context/base/mkiv/supp-box.mkiv +++ b/tex/context/base/mkiv/supp-box.mkiv @@ -2940,7 +2940,11 @@ %D This one keeps dimensions and sets the shift field (and so it's more for testing %D than for real usage): -\unexpanded\def\shiftbox{\clf_shiftbox} +\unexpanded\def\shiftbox {\clf_shiftbox} +\unexpanded\def\vpackbox {\clf_vpackbox} +\unexpanded\def\hpackbox {\clf_hpackbox} +\unexpanded\def\vpackedbox{\clf_vpackedbox} +\unexpanded\def\hpackedbox{\clf_hpackedbox} %D This one has been moved from a 2 decade old file. It makes something boxed %D sit on the baseline. diff --git a/tex/context/base/mkiv/supp-box.mkxl b/tex/context/base/mkiv/supp-box.mkxl index 26b04d77c..ed0c5f3a3 100644 --- a/tex/context/base/mkiv/supp-box.mkxl +++ b/tex/context/base/mkiv/supp-box.mkxl @@ -2874,7 +2874,11 @@ %D This one keeps dimensions and sets the shift field (and so it's more for testing %D than for real usage): -\unexpanded\def\shiftbox{\clf_shiftbox} +\unexpanded\def\shiftbox {\clf_shiftbox} +\unexpanded\def\vpackbox {\clf_vpackbox} +\unexpanded\def\hpackbox {\clf_hpackbox} +\unexpanded\def\vpackedbox{\clf_vpackedbox} +\unexpanded\def\hpackedbox{\clf_hpackedbox} %D This one has been moved from a 2 decade old file. It makes something boxed %D sit on the baseline. diff --git a/tex/context/base/mkiv/syst-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv index 529dc70a7..eaea7e4cc 100644 --- a/tex/context/base/mkiv/syst-ini.mkiv +++ b/tex/context/base/mkiv/syst-ini.mkiv @@ -370,6 +370,7 @@ \newdimen\scratchwidth \newdimen\scratchheight \newdimen\scratchdepth +\newdimen\scratchtotal \newdimen\scratchoffset \newdimen\scratchleftoffset diff --git a/tex/context/base/mkiv/trac-deb.lua b/tex/context/base/mkiv/trac-deb.lua index b83e43ca7..5101119d7 100644 --- a/tex/context/base/mkiv/trac-deb.lua +++ b/tex/context/base/mkiv/trac-deb.lua @@ -181,8 +181,8 @@ local function processerror(offset) -- print("[[ last context : " .. tostring(status.lasterrorcontext or "<unset>") .. " ]]") local inputstack = resolvers.inputstack - local filename = inputstack[#inputstack-1] or status.filename -- weird, why -1 - ----- filename = status.filename -- weird, why -1 +-- local filename = inputstack[#inputstack-1] or status.filename -- weird, why -1, something is wrong + local filename = status.filename local linenumber = tonumber(status.linenumber) or 0 local lastcontext = status.lasterrorcontext local lasttexerror = status.lasterrorstring or "?" diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index 3fab361da..3e0e890d6 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -643,6 +643,7 @@ <cd:constant name='aligntitle' value='alignementtitre'/> <cd:constant name='alternative' value='alternative'/> <cd:constant name='anchor' value='anchor'/> + <cd:constant name='anchoring' value='anchoring'/> <cd:constant name='andtext' value='andtext'/> <cd:constant name='apa' value='apa'/> <cd:constant name='arguments' value='arguments'/> @@ -872,6 +873,7 @@ <cd:constant name='hfil' value='hfil'/> <cd:constant name='hidenumber' value='hidenumber'/> <cd:constant name='hoffset' value='decalagehauteur'/> + <cd:constant name='horizontal' value='horizontale'/> <cd:constant name='horoffset' value='horoffset'/> <cd:constant name='hyphen' value='hyphen'/> <cd:constant name='hyphens' value='hyphens'/> @@ -972,9 +974,12 @@ <cd:constant name='menu' value='menu'/> <cd:constant name='method' value='methode'/> <cd:constant name='middle' value='milieu'/> + <cd:constant name='middlecolor' value='middlecolor'/> <cd:constant name='middlecommand' value='middlecommand'/> <cd:constant name='middlespeech' value='middlespeech'/> + <cd:constant name='middlestyle' value='middlestyle'/> <cd:constant name='middletext' value='textecentre'/> + <cd:constant name='middlewidth' value='middlewidth'/> <cd:constant name='midsentence' value='midsentence'/> <cd:constant name='min' value='min'/> <cd:constant name='mindepth' value='profondeurmin'/> @@ -1292,6 +1297,7 @@ <cd:constant name='vcompact' value='vcompact'/> <cd:constant name='vector' value='vector'/> <cd:constant name='veroffset' value='veroffset'/> + <cd:constant name='vertical' value='verticale'/> <cd:constant name='vfactor' value='vfactor'/> <cd:constant name='vfil' value='vfil'/> <cd:constant name='viewerprefix' value='viewerprefix'/> @@ -1302,6 +1308,7 @@ <cd:constant name='white' value='blanc'/> <cd:constant name='width' value='largeur'/> <cd:constant name='words' value='words'/> + <cd:constant name='xanchor' value='xanchor'/> <cd:constant name='xfactor' value='xfactor'/> <cd:constant name='xhtml' value='xhtml'/> <cd:constant name='xmax' value='xmax'/> @@ -1309,6 +1316,7 @@ <cd:constant name='xoffset' value='xoffset'/> <cd:constant name='xscale' value='xscale'/> <cd:constant name='xstep' value='xstep'/> + <cd:constant name='yanchor' value='yanchor'/> <cd:constant name='yfactor' value='yfactor'/> <cd:constant name='ymax' value='ymax'/> <cd:constant name='yoffset' value='yoffset'/> diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index e90ec342e..8ca94179f 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -1936,6 +1936,26 @@ <cd:content/> </cd:arguments> </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="hpackbox"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="vpackbox"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="hpackedbox"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + <cd:command file="supp-box.mkiv" level="system" name="vpackedbox"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> <cd:command file="supp-box.mkiv" level="system" name="inlinedbox"> <cd:arguments> <cd:content/> diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index 39034e32b..8c6c6c74a 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/tex/context/interface/mkiv/i-boxes.xml @@ -259,6 +259,30 @@ </cd:arguments> </cd:command> + <cd:command name="hpackbox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + + <cd:command name="vpackbox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + + <cd:command name="hpackedbox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + + <cd:command name="vpackedbox" level="system" file="supp-box.mkiv"> + <cd:arguments> + <cd:dimension/> + </cd:arguments> + </cd:command> + <cd:command name="inlinedbox" level="system" file="supp-box.mkiv"> <cd:arguments> <cd:content/> diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf Binary files differindex 746358a5f..0060c1245 100644 --- a/tex/context/interface/mkiv/i-context.pdf +++ b/tex/context/interface/mkiv/i-context.pdf diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf Binary files differindex bdf620c1a..bac5181ea 100644 --- a/tex/context/interface/mkiv/i-readme.pdf +++ b/tex/context/interface/mkiv/i-readme.pdf diff --git a/tex/context/modules/mkiv/s-magazine-basic.mkiv b/tex/context/modules/mkiv/s-magazine-basic.mkiv index 267bf50d8..d45fe6f60 100644 --- a/tex/context/modules/mkiv/s-magazine-basic.mkiv +++ b/tex/context/modules/mkiv/s-magazine-basic.mkiv @@ -24,6 +24,8 @@ %D will produce unwanted side effects. So, if some feature or settings is needed, %D let me know. +%D By now (2019) it's an old style that needs an overhaul ... + % These are reserved for PRAGMA-ADE, don't use them yourself! % \setupdocument[main=Tricky] @@ -67,21 +69,21 @@ \startreusableMPgraphic{middlepaper} fill OverlayBox withshademethod "circular" - withshadecenter center (0.5,0.5) + withshadecenter center (0,0.5) withshadecolors ("InnerColor","OuterColor") ; \stopreusableMPgraphic -\startreusableMPgraphic{rightpaper} +\startreusableMPgraphic{leftpaper} fill OverlayBox withshademethod "circular" - withshadecenter center (0,0.5) + withshadecenter center (-0.5,0.5) withshadecolors ("InnerColor","OuterColor") ; \stopreusableMPgraphic -\startreusableMPgraphic{leftpaper} +\startreusableMPgraphic{rightpaper} fill OverlayBox withshademethod "circular" - withshadecenter center (1,0.5) + withshadecenter center (0.5,0.5) withshadecolors ("InnerColor","OuterColor") ; \stopreusableMPgraphic @@ -472,7 +474,7 @@ before={\setups[titlepage,title]}, after={\setups[cleanup,listing,lastpage]}] -\continueifinputfile {s-mag-01.mkiv} +\continueifinputfile {s-magazine-basic.mkiv} \startbuffer[abstract] This is the zero issue of a semi periodical. The associated style can be used diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f3409eb5d..3120f4513 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/09/19 18:29:14 +-- merge date : 08/11/19 20:03:46 do -- begin closure to overcome local limits and interference |