diff options
Diffstat (limited to 'tex')
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4127 -> 4128 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/font-ctx.lua | 6 | ||||
| -rw-r--r-- | tex/context/base/l-pdfview.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/s-fonts-features.lua | 14 | ||||
| -rw-r--r-- | tex/context/base/s-fonts-shapes.lua | 16 | ||||
| -rw-r--r-- | tex/context/base/s-fonts-shapes.mkiv | 22 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24754 -> 24752 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 211738 -> 211900 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
11 files changed, 34 insertions, 32 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 192764258..d60f0f3a6 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.05.18 00:46} +\newcontextversion{2013.05.18 02:06} %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 d70b95eb5..6b9266881 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 5e2602f1d..1b06d3e4c 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.05.18 00:46} +\edef\contextversion{2013.05.18 02:06} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/font-ctx.lua b/tex/context/base/font-ctx.lua index 8ae74435f..2583c6520 100644 --- a/tex/context/base/font-ctx.lua +++ b/tex/context/base/font-ctx.lua @@ -1080,7 +1080,7 @@ end local n = 0 -function definers.internal(specification) +function definers.internal(specification,cs) specification = specification or { } local name = specification.name local size = specification.size and number.todimen(specification.size) or texdimen.bodyfontsize @@ -1089,11 +1089,13 @@ function definers.internal(specification) if number then id = number elseif name and name ~= "" then - local cs = specification.cs + local cs = cs or specification.cs if not cs then n = n + 1 -- beware ... there can be many and they are often used once -- cs = formatters["internal font %s"](n) cs = "internal font " .. n + else + specification.cs = cs end id = definers.define { name = name, diff --git a/tex/context/base/l-pdfview.lua b/tex/context/base/l-pdfview.lua index 49c6a8c48..80033900f 100644 --- a/tex/context/base/l-pdfview.lua +++ b/tex/context/base/l-pdfview.lua @@ -28,7 +28,7 @@ if os.type == "windows" then ['okular'] = 'start "test" "c:/data/system/kde/bin/okular.exe" --unique', -- todo! ['sumatra'] = 'start "test" "c:/data/system/sumatrapdf/sumatrapdf.exe" -reuse-instance', ['okular'] = 'start "test" "okular.exe" --unique', - ['sumatra'] = 'start "test" "sumatrapdf.exe" -reuse-instance', + ['sumatra'] = 'start "test" "sumatrapdf.exe" -reuse-instance -bg-color 0xCCCCCC', } closecalls= { ['default'] = "pdfclose --file", diff --git a/tex/context/base/s-fonts-features.lua b/tex/context/base/s-fonts-features.lua index 3f4d95096..0a7cf8b13 100644 --- a/tex/context/base/s-fonts-features.lua +++ b/tex/context/base/s-fonts-features.lua @@ -115,8 +115,9 @@ local showkernpair = context.showkernpair function moduledata.fonts.features.showbasekerns(specification) -- assumes that the font is loaded in base mode - local id = tonumber(specification.number) - local tfmdata = fonts.hashes.identifiers[id or font.current()] + specification = interfaces.checkedspecification(specification) + local id, cs = fonts.definers.internal(specification,"<module:fonts:features:font>") + local tfmdata = fonts.hashes.identifiers[id] local done = false for unicode, character in sortedhash(tfmdata.characters) do local kerns = character.kerns @@ -136,10 +137,11 @@ function moduledata.fonts.features.showbasekerns(specification) end function moduledata.fonts.features.showallkerns(specification) - local id = tonumber(specification.number) - local tfmdata = fonts.hashes.identifiers[id or font.current()] - local allkerns = collectkerns(tfmdata) - local characters = tfmdata.characters + specification = interfaces.checkedspecification(specification) + local id, cs = fonts.definers.internal(specification,"<module:fonts:features:font>") + local tfmdata = fonts.hashes.identifiers[id] + local allkerns = collectkerns(tfmdata) + local characters = tfmdata.characters if next(allkerns) then for first, pairs in sortedhash(allkerns) do context.par() diff --git a/tex/context/base/s-fonts-shapes.lua b/tex/context/base/s-fonts-shapes.lua index 0fddfa01a..b387c11dd 100644 --- a/tex/context/base/s-fonts-shapes.lua +++ b/tex/context/base/s-fonts-shapes.lua @@ -11,13 +11,14 @@ moduledata.fonts.shapes = moduledata.fonts.shapes or { } local fontdata = fonts.hashes.identifiers +local context = context local NC, NR = context.NC, context.NR -local space, dontleavehmode, glyph = context.space, context.dontleavehmode, context.glyph +local space, dontleavehmode, glyph, getvalue = context.space, context.dontleavehmode, context.glyph, context.getvalue local formatters = string.formatters function moduledata.fonts.shapes.showlist(specification) -- todo: ranges specification = interfaces.checkedspecification(specification) - local id = tonumber(specification.number) or font.current() + local id, cs = fonts.definers.internal(specification,"<module:fonts:shapes:font>") local chrs = fontdata[id].characters function char(k) dontleavehmode() @@ -49,7 +50,7 @@ function moduledata.fonts.shapes.showlist(specification) -- todo: ranges for k, v in next, characters.data do if chrs[k] then NC() context("0x%05X",k) - NC() char(k) + NC() char(k) -- getvalue(cs) context.char(k) NC() char(v.shcode) NC() char(v.lccode or k) NC() char(v.uccode or k) @@ -64,7 +65,7 @@ end function moduledata.fonts.shapes.showlist(specification) -- todo: ranges specification = interfaces.checkedspecification(specification) - local id = tonumber(specification.number) or font.current() + local id, cs = fonts.definers.internal(specification,"<module:fonts:shapes:font>") local chrs = fontdata[id].characters function char(k) dontleavehmode() @@ -114,14 +115,12 @@ local characters = nil local function showglyphshape(specification) specification = interfaces.checkedspecification(specification) - specification.cs = "showglyphshape:font" - local id, cs = fonts.definers.internal(specification) + local id, cs = fonts.definers.internal(specification,"<module:fonts:shapes:font>") local tfmdata = fontdata[id] local charnum = tonumber(specification.character) if not charnum then charnum = fonts.helpers.nametoslot(n) end --- print(id,cs,charnum) context.start() context.dontleavehmode() context.obeyMPboxdepth() @@ -306,8 +305,7 @@ moduledata.fonts.shapes.showglyphshape = showglyphshape function moduledata.fonts.shapes.showallglypshapes(specification) specification = interfaces.checkedspecification(specification) - specification.cs = "showglyphshape:font" - local id, cs = fonts.definers.internal(specification) + local id, cs = fonts.definers.internal(specification,"<module:fonts:shapes:font>") local descriptions = fontdata[id].descriptions for unicode, description in fonts.iterators.descriptions(tfmdata) do context.modulefontsstartshowglyphshape(unicode,description.name) diff --git a/tex/context/base/s-fonts-shapes.mkiv b/tex/context/base/s-fonts-shapes.mkiv index 5651bdad9..56e3d80a7 100644 --- a/tex/context/base/s-fonts-shapes.mkiv +++ b/tex/context/base/s-fonts-shapes.mkiv @@ -95,21 +95,21 @@ % \startTEXpage \ShowGlyphShape{simplenaskhi}{100bp}{0xF0299} \stopTEXpage % \startTEXpage \ShowGlyphShape{simplenaskhi}{100bp}{NameMe.1190} \stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math} {40bp}{0x00066}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math} {40bp}{0x1D453}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math} {40bp}{0x1D43F}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x1D444}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x1D447}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x02112}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x1D432}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x1D43D}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x1D44A}\stopTEXpage - \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{100bp}{0x1D45D}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{20bp}{0x00066}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{20bp}{0x1D453}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{20bp}{0x1D43F}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x1D444}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x1D447}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x02112}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x1D432}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x1D43D}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x1D44A}\stopTEXpage + \startTEXpage[offset=0pt]\ShowGlyphShape{name:cambria-math}{50bp}{0x1D45D}\stopTEXpage \page % \showallglyphshapes[name=name:cambria-math,size=100bp] - \showallglyphshapes[name=name:dejavuserif,size=100bp] + % \showallglyphshapes[name=name:dejavuserif,size=100bp] \stoptext diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 02e1255d8..524f2c005 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 3f9c1b392..559e5cd33 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 9b7f60406..82ea91f77 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 : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 05/18/13 00:46:06 +-- merge date : 05/18/13 02:06:59 do -- begin closure to overcome local limits and interference |