From 73b98c1460debac19577c07301220a0d7944fbd7 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 5 Oct 2017 23:05:54 +0200 Subject: 2017-10-05 22:46:00 --- tex/context/base/mkii/cont-new.mkii | 2 +- tex/context/base/mkii/context.mkii | 2 +- tex/context/base/mkiv/buff-ver.lua | 30 ++++++++++----------- tex/context/base/mkiv/buff-ver.mkiv | 8 +++--- tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 25743 -> 25745 bytes tex/context/base/mkiv/status-lua.pdf | Bin 426111 -> 426112 bytes tex/context/interface/mkiv/context-en.xml | 2 +- tex/context/interface/mkiv/i-boxes.xml | 4 +-- tex/context/interface/mkiv/i-context.pdf | Bin 818629 -> 818633 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60766 -> 60765 bytes tex/context/modules/mkiv/x-setups-basics.mkiv | 11 ++++++-- tex/generic/context/luatex/luatex-fonts-merged.lua | 2 +- 14 files changed, 36 insertions(+), 29 deletions(-) (limited to 'tex') diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii index f4d801b6d..3342dd419 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{2017.10.05 16:25} +\newcontextversion{2017.10.05 22:40} %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 c9dfd1494..643685639 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{2017.10.05 16:25} +\edef\contextversion{2017.10.05 22:40} %D For those who want to use this: diff --git a/tex/context/base/mkiv/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua index bf2859435..a39e90bda 100644 --- a/tex/context/base/mkiv/buff-ver.lua +++ b/tex/context/base/mkiv/buff-ver.lua @@ -46,8 +46,8 @@ local v_yes = variables.yes local v_last = variables.last local v_all = variables.all local v_absolute = variables.absolute -local v_inline = variables.inline -local v_display = variables.display +----- v_inline = variables.inline -- not ! +----- v_display = variables.display -- not ! -- beware, all macros have an argument: @@ -70,7 +70,7 @@ local ctx_verbatimspace = context.doverbatimspace local CargOne = Carg(1) local function f_emptyline(s,settings) - if settings and settings.nature == v_inline then + if settings and settings.nature == "inline" then ctx_inlineverbatimemptyline() else ctx_displayverbatimemptyline() @@ -78,7 +78,7 @@ local function f_emptyline(s,settings) end local function f_beginline(s,settings) - if settings and settings.nature == v_inline then + if settings and settings.nature == "inline" then ctx_inlineverbatimbeginline() else ctx_displayverbatimbeginline() @@ -86,7 +86,7 @@ local function f_beginline(s,settings) end local function f_newline(s,settings) - if settings and settings.nature == v_inline then + if settings and settings.nature == "inline" then ctx_inlineverbatimnewline() else ctx_displayverbatimnewline() @@ -94,7 +94,7 @@ local function f_newline(s,settings) end local function f_start(s,settings) - if settings and settings.nature == v_inline then + if settings and settings.nature == "inline" then ctx_inlineverbatimstart() else ctx_displayverbatimstart() @@ -102,7 +102,7 @@ local function f_start(s,settings) end local function f_stop(s,settings) - if settings and settings.nature == v_inline then + if settings and settings.nature == "inline" then ctx_inlineverbatimstop() else ctx_displayverbatimstop() @@ -507,7 +507,7 @@ local function visualize(content,settings) -- maybe also method in settings else m = specifications[method] or specifications.default end - local nature = settings.nature or v_display + local nature = settings.nature or "display" local n = m and m[nature] if n then if trace_visualize then @@ -541,15 +541,15 @@ local function checkedsettings(settings,nature) end function visualizers.visualizestring(content,settings) - visualize(content,checkedsettings(settings,v_inline)) + visualize(content,checkedsettings(settings,"inline")) end function visualizers.visualizefile(name,settings) - visualize(resolvers.loadtexfile(name),checkedsettings(settings,v_display)) + visualize(resolvers.loadtexfile(name),checkedsettings(settings,"display")) end function visualizers.visualizebuffer(name,settings) - visualize(buffers.getcontent(name),checkedsettings(settings,v_display)) + visualize(buffers.getcontent(name),checkedsettings(settings,"display")) end -- -- @@ -746,7 +746,7 @@ local function filter(lines,settings) -- todo: inline or display in settings first, last = getstrip(lines,first,last) end -- \r is \endlinechar but \n would is more generic so this choice is debatable - local content = concat(lines,(settings.nature == v_inline and " ") or "\n",first,last) + local content = concat(lines,(settings.nature == "inline" and " ") or "\n",first,last) return content, m end @@ -762,7 +762,7 @@ local function typebuffer(settings) if content and content ~= "" then -- content = decodecomment(content) content = dotabs(content,settings) - visualize(content,checkedsettings(settings,v_display)) + visualize(content,checkedsettings(settings,"display")) end end end @@ -811,7 +811,7 @@ local function typestring(settings) end -- content = decodecomment(content) -- content = dotabs(content,settings) - visualize(content,checkedsettings(settings,v_inline)) + visualize(content,checkedsettings(settings,"inline")) end end @@ -831,7 +831,7 @@ local function typefile(settings) local content, m = filter(lines,settings) if content and content ~= "" then content = dotabs(content,settings) - visualize(content,checkedsettings(settings,v_display)) + visualize(content,checkedsettings(settings,"display")) end end end diff --git a/tex/context/base/mkiv/buff-ver.mkiv b/tex/context/base/mkiv/buff-ver.mkiv index 44fa72932..30527da12 100644 --- a/tex/context/base/mkiv/buff-ver.mkiv +++ b/tex/context/base/mkiv/buff-ver.mkiv @@ -342,7 +342,7 @@ method {\p_buff_option}% compact {\typeparameter\c!compact}% % none | all | last (all needed in tabulate etc for manuals) escape {\typeparameter\c!escape}% % new but rather useless imo (escaping in general is not used much) - % nature {\v!inline}% is default + % nature {inline}% is default \relax \dostoptagged \buff_verbatim_right_of_type @@ -356,7 +356,7 @@ tab {\typeparameter\c!tab}% method {\p_buff_option}% % extra visualizer (maybe: nested,\typeparameter\c!option) escape {\typeparameter\c!escape}% % new but rather useless imo (escaping in general is not used much) - % nature {\v!inline}% is default + % nature {inline}% is default method {nested}% \relax \dostoptagged @@ -844,7 +844,7 @@ tab {\typingparameter\c!tab}% method {\p_buff_option}% escape {\typingparameter\c!escape}% - % nature {display}% + nature {display}% \relax \dostoptagged \endofverbatimlines @@ -869,7 +869,7 @@ strip {\v!yes}% regime {\currentregime}% method {\p_buff_option}% - nature {\v!inline}% + nature {inline}% is default anyway \relax \dostoptagged} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 9441154c3..34dc68343 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{2017.10.05 16:25} +\newcontextversion{2017.10.05 22:40} %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 5a6eabb3f..6e1911cca 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -41,7 +41,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2017.10.05 16:25} +\edef\contextversion{2017.10.05 22:40} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 02750e284..66c7dc56d 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 e9d4ff0e2..d1e17ab58 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/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml index a0d1d38e7..0dbc9f4e4 100644 --- a/tex/context/interface/mkiv/context-en.xml +++ b/tex/context/interface/mkiv/context-en.xml @@ -1720,7 +1720,7 @@ - + diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml index faac4ddf9..f78cba953 100644 --- a/tex/context/interface/mkiv/i-boxes.xml +++ b/tex/context/interface/mkiv/i-boxes.xml @@ -162,7 +162,7 @@ - + @@ -444,7 +444,7 @@ - + diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 802270a96..f48fd5d5b 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 c9cc4fc32..0a1a477db 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/context/modules/mkiv/x-setups-basics.mkiv b/tex/context/modules/mkiv/x-setups-basics.mkiv index 35314bc9c..87dd7241d 100644 --- a/tex/context/modules/mkiv/x-setups-basics.mkiv +++ b/tex/context/modules/mkiv/x-setups-basics.mkiv @@ -466,10 +466,17 @@ {%(#1)(#2)(#3)\par \edef\m_cmd_instance{\secondoftwoarguments#3}% \c_cmd_kind\plustwo - \xmlsetup{\firstoftwoarguments#3}{xml:setups:typeset} + \xmlsetup{\firstoftwoarguments#3}{xml:setups:typeset}% \let\m_cmd_instance\empty \par} +\unexpanded\def\showsetupnameonly#1#2#3% + {\edef\m_cmd_instance{\secondoftwoarguments#3}% + \c_cmd_kind\plustwo + \xmlsetup{\firstoftwoarguments#3}{xml:setups:assemblename}% + \let\m_cmd_instance\empty + \texescape\currentSETUPfullname} + \installtextracker {cmd.showsetup} {\settrue\c_cmd_show_setup} @@ -1078,7 +1085,7 @@ } } \blank[\v!big,\v!samepage] - \starttabulate[|l|p|] + \starttabulate[|l|pl|] % no /interface here \xmlall {#1} diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index f84adbf43..671d3c83f 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 : 10/05/17 16:25:14 +-- merge date : 10/05/17 22:40:23 do -- begin closure to overcome local limits and interference -- cgit v1.2.3