From 3f59c56887a9a6c4bda68ab8d99e67d2afc902f9 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Mon, 5 Sep 2016 11:09:19 +0200 Subject: 2016-09-05 10:33:00 --- tex/context/base/context-version.pdf | Bin 4255 -> 4255 bytes tex/context/base/mkii/mult-de.mkii | 1 + tex/context/base/mkii/mult-en.mkii | 1 + tex/context/base/mkii/mult-fr.mkii | 1 + tex/context/base/mkii/mult-it.mkii | 1 + tex/context/base/mkii/mult-nl.mkii | 1 + tex/context/base/mkii/mult-pe.mkii | 1 + tex/context/base/mkii/mult-ro.mkii | 1 + tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/font-map.lua | 3 +- tex/context/base/mkiv/lpdf-fld.lua | 11 ++-- tex/context/base/mkiv/lpdf-ini.lua | 51 --------------- tex/context/base/mkiv/lpdf-tag.lua | 9 ++- tex/context/base/mkiv/lpdf-wid.lua | 3 +- tex/context/base/mkiv/mlib-pps.lua | 2 +- tex/context/base/mkiv/mult-def.lua | 3 + tex/context/base/mkiv/node-met.lua | 2 +- tex/context/base/mkiv/node-nut.lua | 2 +- tex/context/base/mkiv/node-rul.mkiv | 20 +++++- tex/context/base/mkiv/spac-hor.mkiv | 6 ++ tex/context/base/mkiv/spac-ver.lua | 2 +- tex/context/base/mkiv/status-files.pdf | Bin 9264 -> 9292 bytes tex/context/base/mkiv/status-lua.pdf | Bin 368304 -> 368304 bytes tex/context/base/mkiv/tabl-ntb.mkiv | 1 - tex/context/base/mkiv/tabl-tbl.mkiv | 72 +++++++++++++++++++-- tex/context/interface/mkii/keys-cs.xml | 1 + tex/context/interface/mkii/keys-de.xml | 1 + tex/context/interface/mkii/keys-en.xml | 1 + tex/context/interface/mkii/keys-fr.xml | 1 + tex/context/interface/mkii/keys-it.xml | 1 + tex/context/interface/mkii/keys-nl.xml | 1 + tex/context/interface/mkii/keys-pe.xml | 1 + tex/context/interface/mkii/keys-ro.xml | 1 + tex/context/interface/mkiv/i-bar.xml | 16 +++++ tex/context/interface/mkiv/i-context.pdf | Bin 774839 -> 775248 bytes tex/context/interface/mkiv/i-hspace.xml | 8 ++- tex/context/interface/mkiv/i-readme.pdf | Bin 60793 -> 60792 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 5 +- 39 files changed, 154 insertions(+), 81 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 1e57311f4..ff56bbb53 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/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii index 9c06b873b..5fba2fd3c 100644 --- a/tex/context/base/mkii/mult-de.mkii +++ b/tex/context/base/mkii/mult-de.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{hier} \setinterfacevariable{hereafter}{nachher} \setinterfacevariable{hidden}{versteckt} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{verbergen} \setinterfacevariable{high}{hoch} \setinterfacevariable{horizontal}{horizontal} diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii index d927b0395..15d8637e0 100644 --- a/tex/context/base/mkii/mult-en.mkii +++ b/tex/context/base/mkii/mult-en.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{here} \setinterfacevariable{hereafter}{hereafter} \setinterfacevariable{hidden}{hidden} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{hiding} \setinterfacevariable{high}{high} \setinterfacevariable{horizontal}{horizontal} diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii index a2ecb7ce5..18ebdc3db 100644 --- a/tex/context/base/mkii/mult-fr.mkii +++ b/tex/context/base/mkii/mult-fr.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{ici} \setinterfacevariable{hereafter}{suivant} \setinterfacevariable{hidden}{cache} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{cache} \setinterfacevariable{high}{haut} \setinterfacevariable{horizontal}{horizontale} diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii index 22574156e..779d32256 100644 --- a/tex/context/base/mkii/mult-it.mkii +++ b/tex/context/base/mkii/mult-it.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{qui} \setinterfacevariable{hereafter}{seguente} \setinterfacevariable{hidden}{nascosto} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{nascondere} \setinterfacevariable{high}{alto} \setinterfacevariable{horizontal}{orizzontale} diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii index cb5e4a103..dabf77b27 100644 --- a/tex/context/base/mkii/mult-nl.mkii +++ b/tex/context/base/mkii/mult-nl.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{hier} \setinterfacevariable{hereafter}{hieronder} \setinterfacevariable{hidden}{verborgen} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{verbergen} \setinterfacevariable{high}{hoog} \setinterfacevariable{horizontal}{horizontaal} diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii index 199cfc5bf..f66194edf 100644 --- a/tex/context/base/mkii/mult-pe.mkii +++ b/tex/context/base/mkii/mult-pe.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{اینجا} \setinterfacevariable{hereafter}{ازاین‌به‌بعد} \setinterfacevariable{hidden}{پنهانی} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{پنهان‌کردن} \setinterfacevariable{high}{بلند} \setinterfacevariable{horizontal}{افقی} diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii index cd829c036..d6e6d8362 100644 --- a/tex/context/base/mkii/mult-ro.mkii +++ b/tex/context/base/mkii/mult-ro.mkii @@ -235,6 +235,7 @@ \setinterfacevariable{here}{aici} \setinterfacevariable{hereafter}{urmator} \setinterfacevariable{hidden}{ascuns} +\setinterfacevariable{hiddenbar}{hiddenbar} \setinterfacevariable{hiding}{ascundere} \setinterfacevariable{high}{inalt} \setinterfacevariable{horizontal}{orizontal} diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index f619cbcc4..0b90445f6 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.09.04 13:46} +\newcontextversion{2016.09.05 10:28} %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 37dc55cc6..cc9538cca 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.09.04 13:46} +\edef\contextversion{2016.09.05 10:28} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/mkiv/font-map.lua b/tex/context/base/mkiv/font-map.lua index 7f3b0f960..7ebb7349a 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -12,6 +12,7 @@ local match, format, find, concat, gsub, lower = string.match, string.format, st local P, R, S, C, Ct, Cc, lpegmatch = lpeg.P, lpeg.R, lpeg.S, lpeg.C, lpeg.Ct, lpeg.Cc, lpeg.match local floor = math.floor local formatters = string.formatters +local sortedhash = table.sortedhash local trace_loading = false trackers.register("fonts.loading", function(v) trace_loading = v end) local trace_mapping = false trackers.register("fonts.mapping", function(v) trace_mapping = v end) @@ -478,7 +479,7 @@ function mappings.addtounicode(data,filename,checklookups) report_fonts("%n ligature tounicode mappings deduced from gsub ligature features",unicoded) end if trace_mapping then - for unic, glyph in table.sortedhash(descriptions) do + for unic, glyph in sortedhash(descriptions) do local name = glyph.name or "-" local index = glyph.index or 0 local unicode = glyph.unicode diff --git a/tex/context/base/mkiv/lpdf-fld.lua b/tex/context/base/mkiv/lpdf-fld.lua index 04425fb46..b1401200f 100644 --- a/tex/context/base/mkiv/lpdf-fld.lua +++ b/tex/context/base/mkiv/lpdf-fld.lua @@ -59,7 +59,7 @@ local tostring, next = tostring, next local gmatch, lower, format, formatters = string.gmatch, string.lower, string.format, string.formatters local lpegmatch = lpeg.match local bpfactor, todimen = number.dimenfactors.bp, string.todimen - +local sortedhash = table.sortedhash local trace_fields = false trackers.register("backends.fields", function(v) trace_fields = v end) local report_fields = logs.reporter("backend","fields") @@ -365,7 +365,8 @@ local function registerfonts() checkpdfdocencoding() -- already done local d = pdfdictionary() local pdffonttype, pdffontsubtype = pdfconstant("Font"), pdfconstant("Type1") - for tag, name in next, usedfonts do + -- for tag, name in next, usedfonts do + for tag, name in sortedhash(usedfonts) do local f = pdfdictionary { Type = pdffonttype, Subtype = pdffontsubtype, @@ -653,7 +654,7 @@ local xfdftemplate = [[ function codeinjections.exportformdata(name) local result = { } - for k, v in table.sortedhash(fields) do + for k, v in sortedhash(fields) do result[#result+1] = formatters[" %s"](v.name or k,v.default or "") end local base = file.basename(tex.jobname) @@ -878,7 +879,7 @@ local forceencoding = false local function finishfields() local sometext = forceencoding - for name, field in next, fields do + for name, field in sortedhash(fields) do local kids = field.kids if kids then pdfflushobject(field.kidsnum,kids) @@ -892,7 +893,7 @@ local function finishfields() sometext = true end end - for name, field in next, radios do + for name, field in sortedhash(radios) do local kids = field.kids if kids then pdfflushobject(field.kidsnum,kids) diff --git a/tex/context/base/mkiv/lpdf-ini.lua b/tex/context/base/mkiv/lpdf-ini.lua index a0413dbcd..f395a32f9 100644 --- a/tex/context/base/mkiv/lpdf-ini.lua +++ b/tex/context/base/mkiv/lpdf-ini.lua @@ -312,59 +312,8 @@ local f_array = formatters["[ % t ]"] local f_key_number = formatters["/%s %F"] local f_tonumber = formatters["%F"] --- local f_key_value = formatters["/%s %s"] --- local f_key_dictionary = formatters["/%s <<% t>>"] --- local f_dictionary = formatters["<<% t>>"] --- local f_key_array = formatters["/%s [% t]"] --- local f_array = formatters["[% t]"] - local tostring_a, tostring_d --- tostring_d = function(t,contentonly,key) --- if next(t) then --- local r, rn = { }, 0 --- for k, v in next, t do --- -- for k, v in sortedhash(t) do -- can be an option --- rn = rn + 1 --- local tv = type(v) --- if tv == "string" then --- r[rn] = f_key_value(k,toeight(v)) --- elseif tv == "number" then --- r[rn] = f_key_number(k,v) --- -- elseif tv == "unicode" then -- can't happen --- -- r[rn] = f_key_value(k,tosixteen(v)) --- elseif tv == "table" then --- local mv = getmetatable(v) --- if mv and mv.__lpdftype then --- -- if v == t then --- -- report_objects("ignoring circular reference in dirctionary") --- -- r[rn] = f_key_null(k) --- -- else --- r[rn] = f_key_value(k,tostring(v)) --- -- end --- elseif v[1] then --- r[rn] = f_key_value(k,tostring_a(v)) --- else --- r[rn] = f_key_value(k,tostring_d(v)) --- end --- else --- r[rn] = f_key_value(k,tostring(v)) --- end --- end --- if contentonly then --- return concat(r," ") --- elseif key then --- return f_key_dictionary(key,r) --- else --- return f_dictionary(r) --- end --- elseif contentonly then --- return "" --- else --- return "<< >>" --- end --- end - tostring_d = function(t,contentonly,key) if next(t) then local r, n = { }, 0 diff --git a/tex/context/base/mkiv/lpdf-tag.lua b/tex/context/base/mkiv/lpdf-tag.lua index 0e5cea1bf..ee72181ba 100644 --- a/tex/context/base/mkiv/lpdf-tag.lua +++ b/tex/context/base/mkiv/lpdf-tag.lua @@ -10,6 +10,7 @@ local next = next local format, match, concat = string.format, string.match, table.concat local lpegmatch, P, S, C = lpeg.match, lpeg.P, lpeg.S, lpeg.C local settings_to_hash = utilities.parsers.settings_to_hash +local sortedhash = table.sortedhash local formatters = string.formatters local trace_tags = false trackers.register("structures.tags", function(v) trace_tags = v end) @@ -144,7 +145,7 @@ local function finishstructure() K = pdfreference(pdfflushobject(structure_kids)), ParentTree = pdfreference(pdfflushobject(parent_ref,parenttree)), IDTree = #names > 0 and pdfreference(pdfflushobject(idtree)) or nil, - RoleMap = rolemap, + RoleMap = rolemap, -- sorted ? } pdfflushobject(structure_ref,structuretree) addtocatalog("StructTreeRoot",pdfreference(structure_ref)) @@ -157,7 +158,8 @@ local function finishstructure() } addtocatalog("MarkInfo",pdfreference(pdfflushobject(markinfo))) -- - for fulltag, element in next, elements do + -- for fulltag, element in next, elements do + for fulltag, element in sortedhash(elements) do -- sorting is easier on comparing pdf pdfflushobject(element.knum,element.kids) end end @@ -190,7 +192,8 @@ local pdf_userproperties = pdfconstant("UserProperties") local function makeattribute(t) if t and next(t) then local properties = pdfarray() - for k, v in next, t do + -- for k, v in next, t do + for k, v in sortedhash(t) do -- easier on comparing pdf properties[#properties+1] = pdfdictionary { N = pdfunicode(k), V = pdfunicode(v), diff --git a/tex/context/base/mkiv/lpdf-wid.lua b/tex/context/base/mkiv/lpdf-wid.lua index f3c993316..6b0024a51 100644 --- a/tex/context/base/mkiv/lpdf-wid.lua +++ b/tex/context/base/mkiv/lpdf-wid.lua @@ -10,6 +10,7 @@ local gmatch, gsub, find, lower, format = string.gmatch, string.gsub, string.fin local stripstring = string.strip local settings_to_array = utilities.parsers.settings_to_array local settings_to_hash = utilities.parsers.settings_to_hash +local sortedhash = table.sortedhash local report_media = logs.reporter("backend","media") local report_attachment = logs.reporter("backend","attachment") @@ -200,7 +201,7 @@ job.register('job.fileobjreferences.collected', tobesavedobjrefs, initializer) local function flushembeddedfiles() if next(filestreams) then local e = pdfarray() - for tag, reference in next, filestreams do + for tag, reference in sortedhash(filestreams) do if not reference then report_attachment("unreferenced file, tag %a",tag) elseif referenced[tag] == "hidden" then diff --git a/tex/context/base/mkiv/mlib-pps.lua b/tex/context/base/mkiv/mlib-pps.lua index b6d22f1be..883e2d5fb 100644 --- a/tex/context/base/mkiv/mlib-pps.lua +++ b/tex/context/base/mkiv/mlib-pps.lua @@ -517,7 +517,7 @@ local parser = Cs(( + 1 )^0) -local checking_enabled = true directives.register("metapost.checktexts",function(v) checking_enabled = v end) +local checking_enabled = false directives.register("metapost.checktexts",function(v) checking_enabled = v end) local function checktexts(str) if checking_enabled then diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index b6a9c64ee..3a244fa4e 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -13820,6 +13820,9 @@ return { ["pe"]="پنهانی", ["ro"]="ascuns", }, + ["hiddenbar"]={ + ["en"]="hiddenbar", + }, ["hiding"]={ ["cs"]="skryt", ["de"]="verbergen", diff --git a/tex/context/base/mkiv/node-met.lua b/tex/context/base/mkiv/node-met.lua index efd748b12..ece7b5149 100644 --- a/tex/context/base/mkiv/node-met.lua +++ b/tex/context/base/mkiv/node-met.lua @@ -133,7 +133,7 @@ if not node.rangedimensions then -- LUATEXVERSION < 0.99 local dimensions = node.dimensions local getfield = node.getfield - local findtail = node.find_tail + local findtail = node.tail function node.rangedimensions(parent,first,last) return dimensions( diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua index e158b9325..3b73ce134 100644 --- a/tex/context/base/mkiv/node-nut.lua +++ b/tex/context/base/mkiv/node-nut.lua @@ -230,7 +230,7 @@ if not direct.rangedimensions then -- LUATEXVERSION < 0.99 local dimensions = direct.dimensions local getfield = direct.getfield - local findtail = direct.find_tail + local findtail = direct.tail function direct.rangedimensions(parent,first,last) return dimensions( diff --git a/tex/context/base/mkiv/node-rul.mkiv b/tex/context/base/mkiv/node-rul.mkiv index 91b013937..275d8e9f2 100644 --- a/tex/context/base/mkiv/node-rul.mkiv +++ b/tex/context/base/mkiv/node-rul.mkiv @@ -131,7 +131,9 @@ {\def\currentbar{#1}\node_rules_define} \unexpanded\def\node_rules_direct#1% - {\groupedcommand{\node_rules_set{#1}}\relax} + {\groupedcommand + {\node_rules_set{#1}\barparameter\c!left}% + {\relax\barparameter\c!right}} \unexpanded\def\node_rules_set#1% maybe reverse the 1000 (also maybe use more attributes instead of settings) {\edef\currentbar{#1}% @@ -151,15 +153,19 @@ {\attribute\ruledattribute\attributeunsetvalue} \unexpanded\def\nobar - {\groupedcommand\resetbar\relax} + {\groupedcommand + {\resetbar\barparameter\c!left}% + {\relax\barparameter\c!right}} \unexpanded\def\startbar[#1]% {\begingroup \node_rules_set{#1}% - \ignorespaces} + \ignorespaces + \barparameter\c!left} \unexpanded\def\stopbar {\removeunwantedspaces + \barparameter\c!right \endgroup} \unexpanded\def\setbar[#1]% @@ -219,6 +225,14 @@ \definebar[\v!overstrikes] [\v!overstrike] [\c!continue=\v!no] \definebar[\v!understrikes][\v!understrike][\c!continue=\v!no] +\definebar + [\v!hiddenbar] + [\v!underbar] + [\c!continue=\v!yes, + \c!empty=\v!yes, + \c!left=\zwj, + \c!right=\zwj] + % \setupbar[\v!overstrike][continue=all] % we want these always so ... diff --git a/tex/context/base/mkiv/spac-hor.mkiv b/tex/context/base/mkiv/spac-hor.mkiv index 89ade8cfd..111830fad 100644 --- a/tex/context/base/mkiv/spac-hor.mkiv +++ b/tex/context/base/mkiv/spac-hor.mkiv @@ -608,6 +608,12 @@ \unexpanded\def\charspace{ } % the unexpandable \space (as space can also be delimiter for numbers) +\unexpanded\def\quads + {\dosingleempty\spac_quads} + +\def\spac_quads[#1]% + {\zwj\dorecurse{\iffirstargument#1\else\plusthree\fi}{\hskip\emwidth\zwj}} + % Suggested by GB (not the name -): \def\rapfillskip{.5\hsize plus .092\hsize minus .5\hsize} % D.A.'s value diff --git a/tex/context/base/mkiv/spac-ver.lua b/tex/context/base/mkiv/spac-ver.lua index f8f29b483..8b362f903 100644 --- a/tex/context/base/mkiv/spac-ver.lua +++ b/tex/context/base/mkiv/spac-ver.lua @@ -1239,7 +1239,7 @@ end -- topskip -- splittopskip -local experiment = false directives.register("vspacing.experiment",function(v) experiment = v end) +local experiment = true directives.register("vspacing.experiment",function(v) experiment = v end) local function collapser(head,where,what,trace,snap,a_snapmethod) -- maybe also pass tail if trace then diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index ad2f3bea9..00e9651dd 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 273acc006..c822d48db 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/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv index eea743bfe..0d1c97f88 100644 --- a/tex/context/base/mkiv/tabl-ntb.mkiv +++ b/tex/context/base/mkiv/tabl-ntb.mkiv @@ -1520,7 +1520,6 @@ \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 diff --git a/tex/context/base/mkiv/tabl-tbl.mkiv b/tex/context/base/mkiv/tabl-tbl.mkiv index 9e3f00ccc..a9ba36087 100644 --- a/tex/context/base/mkiv/tabl-tbl.mkiv +++ b/tex/context/base/mkiv/tabl-tbl.mkiv @@ -1213,16 +1213,74 @@ % todo: spacing around tabulate when bodyfont is set -\let\tabl_tabulate_inside_before \relax -\let\tabl_tabulate_inside_after \relax -\let\tabl_tabulate_inside_inbetween\relax +% \let\tabl_tabulate_inside_before \relax +% \let\tabl_tabulate_inside_after \relax +% \let\tabl_tabulate_inside_inbetween\relax +% +% \def\tabl_tabulate_outside_before +% {\whitespace +% \tabulationparameter\c!before} +% +% \def\tabl_tabulate_outside_after +% {\tabulationparameter\c!after} + +% \showboxes +% +% \startcombination +% {\insidefloattrue \starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% {\insidefloattrue \starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% \stopcombination +% +% \startcombination +% {\vbox{\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate}} {} +% {\vbox{\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate}} {} +% \stopcombination +% +% \startcombination +% {\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% {\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% \stopcombination + +\let\tabl_tabulate_inside_after \relax +\let\tabl_tabulate_outside_after\relax + +\def\tabl_tabulate_inside_before + {\ifhmode\par\fi + \ifhmode + \ifinsidesplitfloat + \let\tabl_tabulate_inside_after\relax + \else + \vbox\bgroup + \let\tabl_tabulate_inside_after\egroup + \fi + \else + \let\tabl_tabulate_inside_after\relax + \fi} \def\tabl_tabulate_outside_before - {\whitespace - \tabulationparameter\c!before} + {\ifhmode\par\fi + \ifhmode + \vbox\bgroup + \let\tabl_tabulate_outside_after \egroup + \let\tabl_tabulate_outside_inbetween\relax + \else\ifinner + \let\tabl_tabulate_outside_after \relax + \let\tabl_tabulate_outside_inbetween\relax + \else + \whitespace + \tabulationparameter\c!before + \let\tabl_tabulate_outside_after \tabl_tabulate_outside_after_indeed + \let\tabl_tabulate_outside_inbetween\tabl_tabulate_outside_inbetween_indeed + \fi\fi} -\def\tabl_tabulate_outside_after - {\tabulationparameter\c!after} +\def\tabl_tabulate_outside_after_indeed + {\tabulationparameter\c!after}% + +\def\tabl_tabulate_outside_inbetween_indeed + {\doifempty{\tabulationparameter\c!after} + {\vskip\strutdp + \verticalstrut + \vskip-\struttotal}} \def\tabl_tabulate_outside_inbetween {\doifempty{\tabulationparameter\c!after} diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml index 7a04ae33f..93e998e58 100644 --- a/tex/context/interface/mkii/keys-cs.xml +++ b/tex/context/interface/mkii/keys-cs.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml index 5e56927f3..b45cc3442 100644 --- a/tex/context/interface/mkii/keys-de.xml +++ b/tex/context/interface/mkii/keys-de.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml index f4277da6f..483b8345f 100644 --- a/tex/context/interface/mkii/keys-en.xml +++ b/tex/context/interface/mkii/keys-en.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml index fd3625492..7a6f99a13 100644 --- a/tex/context/interface/mkii/keys-fr.xml +++ b/tex/context/interface/mkii/keys-fr.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml index c2e205b42..28b7649d1 100644 --- a/tex/context/interface/mkii/keys-it.xml +++ b/tex/context/interface/mkii/keys-it.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml index bbe0233e1..1016b7697 100644 --- a/tex/context/interface/mkii/keys-nl.xml +++ b/tex/context/interface/mkii/keys-nl.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml index fb32a8c14..8dcd35c3d 100644 --- a/tex/context/interface/mkii/keys-pe.xml +++ b/tex/context/interface/mkii/keys-pe.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml index 38a7b77cf..f4e833bb4 100644 --- a/tex/context/interface/mkii/keys-ro.xml +++ b/tex/context/interface/mkii/keys-ro.xml @@ -238,6 +238,7 @@ + diff --git a/tex/context/interface/mkiv/i-bar.xml b/tex/context/interface/mkiv/i-bar.xml index c04a00601..428c1eea4 100644 --- a/tex/context/interface/mkiv/i-bar.xml +++ b/tex/context/interface/mkiv/i-bar.xml @@ -26,6 +26,10 @@ + + + + @@ -68,6 +72,12 @@ + + + + + + @@ -130,6 +140,12 @@ + + + + + + diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index acd42b3c6..0d6937a5d 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-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml index 3c96fc247..9e683542e 100644 --- a/tex/context/interface/mkiv/i-hspace.xml +++ b/tex/context/interface/mkiv/i-hspace.xml @@ -156,4 +156,10 @@ - \ No newline at end of file + + + + + + + diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index f5d105ac8..69de19ffd 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 ef3528c76..861732578 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 : 09/04/16 13:46:35 +-- merge date : 09/05/16 10:28:36 do -- begin closure to overcome local limits and interference @@ -7166,6 +7166,7 @@ local match,format,find,concat,gsub,lower=string.match,string.format,string.find local P,R,S,C,Ct,Cc,lpegmatch=lpeg.P,lpeg.R,lpeg.S,lpeg.C,lpeg.Ct,lpeg.Cc,lpeg.match local floor=math.floor local formatters=string.formatters +local sortedhash=table.sortedhash local trace_loading=false trackers.register("fonts.loading",function(v) trace_loading=v end) local trace_mapping=false trackers.register("fonts.mapping",function(v) trace_mapping=v end) local report_fonts=logs.reporter("fonts","loading") @@ -7473,7 +7474,7 @@ function mappings.addtounicode(data,filename,checklookups) report_fonts("%n ligature tounicode mappings deduced from gsub ligature features",unicoded) end if trace_mapping then - for unic,glyph in table.sortedhash(descriptions) do + for unic,glyph in sortedhash(descriptions) do local name=glyph.name or "-" local index=glyph.index or 0 local unicode=glyph.unicode -- cgit v1.2.3