diff options
| -rw-r--r-- | tex/context/base/char-def.lua | 3 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkii | 2 | ||||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/grph-inc.lua | 14 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 23498 -> 23514 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 154239 -> 154243 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex-fonts-merged.lua | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/tex/context/base/char-def.lua b/tex/context/base/char-def.lua index dec5581cc..79ced56c3 100644 --- a/tex/context/base/char-def.lua +++ b/tex/context/base/char-def.lua @@ -107427,7 +107427,8 @@ characters.data={ [0xFE18]={ category="pe", cjkwd="w", - description="PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRAKCET", + comment="corrected description: brakcet", + description="PRESENTATION FORM FOR VERTICAL RIGHT WHITE LENTICULAR BRACKET", direction="on", linebreak="cl", specials={ "vertical", 0x3017 }, diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index cb83a8c07..23470a909 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.04.27 21:50} +\newcontextversion{2011.04.30 17:02} %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/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 733169e35..4a8e1d614 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{2011.04.27 21:50} +\newcontextversion{2011.04.30 17:02} %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/context.mkii b/tex/context/base/context.mkii index 49b66c8ba..3a5066cbc 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.04.27 21:50} +\edef\contextversion{2011.04.30 17:02} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 3dece400b..84f86a243 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.04.27 21:50} +\edef\contextversion{2011.04.30 17:02} %D For those who want to use this: diff --git a/tex/context/base/grph-inc.lua b/tex/context/base/grph-inc.lua index eb85bbb19..b37fe0766 100644 --- a/tex/context/base/grph-inc.lua +++ b/tex/context/base/grph-inc.lua @@ -255,7 +255,7 @@ end -- interfacing to tex -local figuredata = { } +local figuredata = nil -- will be topofstack or last so no { } (else problems with getfiguredimensions) local callstack = { } local function new() -- we could use metatables status -> used -> request but it needs testing @@ -293,6 +293,8 @@ local function new() -- we could use metatables status -> used -> request but it fullname = false, format = false, } + -- this needs checking because we might check for nil, the test case + -- is getfiguredimensions which then should return ~= 0 -- setmetatableindex(status, used) -- setmetatableindex(used, request) return { @@ -338,7 +340,7 @@ function figures.current() end function figures.get(category,tag,default) - local value = figuredata[category] + local value = figuredata and figuredata[category] value = value and value[tag] if not value or value == "" or value == true then return default or "" @@ -755,14 +757,12 @@ end function figures.check(data) data = data or figures.current() - local dr, du, ds = data.request, data.used, data.status - return (checkers[ds.format] or checkers.generic)(data) + return (checkers[data.status.format] or checkers.generic)(data) end function figures.include(data) data = data or figures.current() - local dr, du, ds = data.request, data.used, data.status - return (includers[ds.format] or includers.generic)(data) + return (includers[data.status.format] or includers.generic)(data) end function figures.scale(data) -- will become lua code @@ -787,7 +787,7 @@ end function figures.dummy(data) data = data or figures.current() - local dr, du, ds, nr = data.request, data.used, data.status, figures.boxnumber + local dr, du, nr = data.request, data.used, figures.boxnumber local box = node.hpack(node.new("hlist")) -- we need to set the dir (luatex 0.60 buglet) du.width = du.width or figures.defaultwidth du.height = du.height or figures.defaultheight diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 3e1f57f4c..366bf950d 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 7c5c7fce4..3868be7a2 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index a85817e47..bd8caf716 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 04/27/11 21:50:04 +-- merge date : 04/30/11 17:02:19 do -- begin closure to overcome local limits and interference |