diff options
Diffstat (limited to 'tex/context/base')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4134 -> 4127 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 40309 -> 40464 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/font-def.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/font-otn.lua | 4 | ||||
| -rw-r--r-- | tex/context/base/mult-low.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/node-inj.lua | 27 | ||||
| -rw-r--r-- | tex/context/base/page-lay.mkiv | 5 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24733 -> 24744 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 211433 -> 211486 bytes | |||
| -rw-r--r-- | tex/context/base/syst-aux.mkiv | 7 |
12 files changed, 18 insertions, 33 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 2628ed729..c3d3b77ea 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2013.04.26 15:13} +\newcontextversion{2013.04.27 22:36} %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/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex cbfbbd551..920764a0a 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png Binary files differindex a1b580233..77244b17f 100644 --- a/tex/context/base/context-version.png +++ b/tex/context/base/context-version.png diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index b35c8d445..05de832ce 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -25,7 +25,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2013.04.26 15:13} +\edef\contextversion{2013.04.27 22:36} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/font-def.lua b/tex/context/base/font-def.lua index cb056ff1b..bee02e8dc 100644 --- a/tex/context/base/font-def.lua +++ b/tex/context/base/font-def.lua @@ -174,7 +174,7 @@ function resolvers.file(specification) specification.forced = suffix specification.name = file.removesuffix(name) else - specification.name = name -- cna be resolved + specification.name = name -- can be resolved end end diff --git a/tex/context/base/font-otn.lua b/tex/context/base/font-otn.lua index 36b5c4001..46d64c783 100644 --- a/tex/context/base/font-otn.lua +++ b/tex/context/base/font-otn.lua @@ -1896,7 +1896,6 @@ local function normal_handle_contextchain(head,start,kind,chainname,contexts,seq end else -- is valid - -- logprocess("%s: multiple subchains for %s are not yet supported",cref(kind,chainname,chainlookupname),chainlookup and chainlookup.type or "?") i = i + 1 end if start then @@ -2277,6 +2276,9 @@ for s=1,#datasets do if ok then success = true break + elseif not start then + -- don't ask why ... shouldn't happen + break end end else diff --git a/tex/context/base/mult-low.lua b/tex/context/base/mult-low.lua index d5848e5c7..de2c69da2 100644 --- a/tex/context/base/mult-low.lua +++ b/tex/context/base/mult-low.lua @@ -232,7 +232,7 @@ return { -- "wait", "writestatus", "define", "defineexpandable", "redefine", -- - "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", + "setmeasure", "setemeasure", "setgmeasure", "setxmeasure", "definemeasure", "freezemeasure", "measure", "measured", -- "installcorenamespace", -- diff --git a/tex/context/base/node-inj.lua b/tex/context/base/node-inj.lua index 91c5d1414..697370cfb 100644 --- a/tex/context/base/node-inj.lua +++ b/tex/context/base/node-inj.lua @@ -356,29 +356,6 @@ function injections.handler(head,where,keep) if d then local rlmode = d[3] -- - -- local k = wx[p] - -- if rlmode and rlmode >= 0 then - -- -- new per 2010-10-06, width adapted per 2010-02-03 - -- -- we used to negate the width of marks because in tfm - -- -- that makes sense but we no longer do that so as a - -- -- consequence the sign of p.width was changed - -- -- this is a real mess ... somewhat 'first font that gets - -- -- tested gets treated best' - -- if k then - -- -- brill roman: A\char"0300 (but ugly anyway) - -- n.xoffset = p.xoffset - p.width + d[1] - k[2] -- was + p.width - -- else - -- -- lucida: U\char"032F (default+mark) - -- n.xoffset = p.xoffset - p.width + d[1] -- 01-05-2011 - -- end - -- else - -- if k then -- k[4] ? - -- n.xoffset = p.xoffset - d[1] - k[2] - -- else - -- n.xoffset = p.xoffset - d[1] - -- end - -- end - -- local k = wx[p] if k then local x = k[2] @@ -393,10 +370,11 @@ function injections.handler(head,where,keep) end else if rlmode and rlmode >= 0 then + -- okay for husayni n.xoffset = p.xoffset - p.width + d[1] else -- needs checking: is x ok here? - n.xoffset = p.xoffset - d[1] - x -- x: todo ? + n.xoffset = p.xoffset - d[1] - x end end else @@ -412,6 +390,7 @@ function injections.handler(head,where,keep) else n.yoffset = n.yoffset + p.yoffset + d[2] end + -- if nofmarks == 1 then break else diff --git a/tex/context/base/page-lay.mkiv b/tex/context/base/page-lay.mkiv index bbe60eec5..c0d897522 100644 --- a/tex/context/base/page-lay.mkiv +++ b/tex/context/base/page-lay.mkiv @@ -1417,8 +1417,9 @@ \definepapersize [S5] [\c!width=500pt,\c!height=375pt] \definepapersize [S6] [\c!width=600pt,\c!height=450pt] \definepapersize [S8] [\c!width=800pt,\c!height=600pt] -\definepapersize [SW] [\c!width=800pt,\c!height=450pt] -\definepapersize [SM] [\c!width=720pt,\c!height=450pt] +\definepapersize [SL] [\c!width=640pt,\c!height=400pt] % low +\definepapersize [SM] [\c!width=720pt,\c!height=450pt] % medium +\definepapersize [SW] [\c!width=800pt,\c!height=450pt] % wide \definepapersize [HD] [\c!width=1920pt,\c!height=1080pt] \definepapersize [HD+] [\c!width=1920pt,\c!height=1200pt] diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 045dc3eb1..db3a68053 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 3839f0116..5c908c9c1 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/syst-aux.mkiv b/tex/context/base/syst-aux.mkiv index 3e0b1629b..6ed0b4fee 100644 --- a/tex/context/base/syst-aux.mkiv +++ b/tex/context/base/syst-aux.mkiv @@ -6292,8 +6292,11 @@ \unexpanded\def\setemeasure#1#2{\expandafter\edef\csname\??measure#1\endcsname{\the\dimexpr#2}} % quick way \unexpanded\def\setxmeasure#1#2{\expandafter\xdef\csname\??measure#1\endcsname{\the\dimexpr#2}} % quick way -\def\measure#1% - {\the\dimexpr\ifcsname\??measure#1\endcsname\csname\??measure#1\endcsname\else\zeropoint\fi\relax} +\def\measure + {\the\measured} + +\def\measured#1% + {\dimexpr\ifcsname\??measure#1\endcsname\csname\??measure#1\endcsname\else\zeropoint\fi\relax} % #2 could be omitted, but we want to support spaces % |
