diff options
author | Hans Hagen <pragma@wxs.nl> | 2023-06-04 19:46:50 +0200 |
---|---|---|
committer | Context Git Mirror Bot <phg@phi-gamma.net> | 2023-06-04 19:46:50 +0200 |
commit | e9ccab5308d2b6fec79e36c355c03aad4e1e5dec (patch) | |
tree | 42a003cdebc84d23b9cc424ba47f11515b196385 /tex/context/base/mkiv | |
parent | e2ffa186c8e622ce9235533b91bb2399dd051672 (diff) | |
download | context-beta.tar.gz |
Diffstat (limited to 'tex/context/base/mkiv')
-rw-r--r-- | tex/context/base/mkiv/cont-new.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/context.mkiv | 2 | ||||
-rw-r--r-- | tex/context/base/mkiv/mult-def.lua | 6 | ||||
-rw-r--r-- | tex/context/base/mkiv/status-files.pdf | bin | 24568 -> 24581 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/status-lua.pdf | bin | 270890 -> 270902 bytes | |||
-rw-r--r-- | tex/context/base/mkiv/util-str.lua | 5 |
6 files changed, 13 insertions, 2 deletions
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index a74ceb409..6a3c5d0af 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{2023.06.01 09:35} +\newcontextversion{2023.06.04 18:54} %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 29963c6b7..10885f6d3 100644 --- a/tex/context/base/mkiv/context.mkiv +++ b/tex/context/base/mkiv/context.mkiv @@ -49,7 +49,7 @@ %D {YYYY.MM.DD HH:MM} format. \edef\contextformat {\jobname} -\edef\contextversion{2023.06.01 09:35} +\edef\contextversion{2023.06.04 18:54} %D Kind of special: diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua index b0aba96d6..7e07324ad 100644 --- a/tex/context/base/mkiv/mult-def.lua +++ b/tex/context/base/mkiv/mult-def.lua @@ -8536,6 +8536,9 @@ return { ["en"]="displaythreshold", ["fr"]="seuilaffichage", }, + ["displayfactor"]={ + ["en"]="displayfactor", + }, ["distance"]={ ["cs"]="vzdalenost", ["de"]="abstand", @@ -9450,6 +9453,9 @@ return { ["en"]="inlinethreshold", ["fr"]="seuilenligne", }, + ["inlinefactor"]={ + ["en"]="inlinefactor", + }, ["inner"]={ ["cs"]="vnitrni", ["de"]="innen", diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf Binary files differindex e5cc011e5..2cc535a25 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 617922f2d..7cbf4e9bc 100644 --- a/tex/context/base/mkiv/status-lua.pdf +++ b/tex/context/base/mkiv/status-lua.pdf diff --git a/tex/context/base/mkiv/util-str.lua b/tex/context/base/mkiv/util-str.lua index b5c721a41..a9150b886 100644 --- a/tex/context/base/mkiv/util-str.lua +++ b/tex/context/base/mkiv/util-str.lua @@ -269,6 +269,7 @@ local p_prune_intospace = Cs ( noleading * ( notrailing + intospace + 1 local p_retain_normal = Cs ( ( normalline + normalempty )^0 ) local p_retain_collapse = Cs ( ( normalline + doubleempty )^0 ) local p_retain_noempty = Cs ( ( normalline + singleempty )^0 ) +local p_collapse_all = Cs ( stripstart * ( stripend + ((whitespace+newline)^1/" ") + 1)^0 ) -- function striplines(str,prune,collapse,noempty) -- if prune then @@ -298,6 +299,7 @@ local striplinepatterns = { ["retain"] = p_retain_normal, ["retain and collapse"] = p_retain_collapse, ["retain and no empty"] = p_retain_noempty, + ["collapse all"] = p_collapse_all, ["collapse"] = patterns.collapser, } @@ -313,6 +315,9 @@ function strings.collapse(str) -- maybe also in strings return str and lpegmatch(p_prune_intospace,str) or str end +-- local s = "\naa\n\naa\na a\n\n" +-- print("["..strings.striplines(s,"collapse all").."]") + -- also see: string.collapsespaces strings.striplong = strings.striplines -- for old times sake |