From 0bc04866afcb280678aec47daed0716a2a4d17c7 Mon Sep 17 00:00:00 2001 From: Context Git Mirror Bot Date: Tue, 19 Apr 2016 17:28:27 +0200 Subject: 2016-04-19 17:20:00 --- tex/context/base/context-version.pdf | Bin 4243 -> 4248 bytes tex/context/base/mkiv/cont-new.mkiv | 2 +- tex/context/base/mkiv/context-help.lmx | 41 +++++++++++++++++---- tex/context/base/mkiv/context.mkiv | 2 +- tex/context/base/mkiv/font-map.lua | 4 +- tex/context/base/mkiv/page-mak.mkvi | 1 - tex/context/base/mkiv/status-files.pdf | Bin 9254 -> 9243 bytes tex/context/base/mkiv/status-lua.pdf | Bin 267894 -> 267891 bytes tex/context/interface/mkiv/i-context.pdf | Bin 797040 -> 797157 bytes tex/context/interface/mkiv/i-readme.pdf | Bin 60792 -> 60792 bytes tex/generic/context/luatex/luatex-fonts-merged.lua | 5 ++- 11 files changed, 41 insertions(+), 14 deletions(-) (limited to 'tex') diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf index 46eeebc0a..fcb81e92d 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/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv index 62c2e3cd2..124e4fd6d 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.04.18 22:12} +\newcontextversion{2016.04.19 17:16} %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-help.lmx b/tex/context/base/mkiv/context-help.lmx index 7d54fca4d..962cd3c32 100644 --- a/tex/context/base/mkiv/context-help.lmx +++ b/tex/context/base/mkiv/context-help.lmx @@ -65,9 +65,29 @@ background-color: #C0C0C0 ; color: black; } + a.setupmenuurl { + color: #FFFFFF ; + text-decoration: none ; + font-weight: bold ; + } + a.setupmenucmd { + color: #FFFFFF ; + text-decoration: none ; + font-weight: bold ; + font-style: italic ; + } a.setuplisturl { color: #000000 ; - text-decoration: underline ; + text-decoration: none ; + font-weight: bold ; + } + .setupmenugroup { + text-decoration: none ; + } + .setupmenucategory { + font-weight: bold ; + font-size: 2.5ex ; + margin-bottom: 1ex ; }

- +

- + +

- +

diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv index 2d0bb2aeb..4fe3b2c66 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.04.18 22:12} +\edef\contextversion{2016.04.19 17:16} \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 db501f0b6..509e75107 100644 --- a/tex/context/base/mkiv/font-map.lua +++ b/tex/context/base/mkiv/font-map.lua @@ -19,6 +19,8 @@ local trace_mapping = false trackers.register("fonts.mapping", function(v) trac local report_fonts = logs.reporter("fonts","loading") -- not otf only +local force_ligatures = false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures = v end) + local fonts = fonts or { } local mappings = fonts.mappings or { } fonts.mappings = mappings @@ -443,7 +445,7 @@ function mappings.addtounicode(data,filename,checklookups) local collected = false local unicoded = 0 for unicode, glyph in next, descriptions do - if not glyph.unicode and glyph.class == "ligature" then + if glyph.class == "ligature" and (force_ligatures or not glyph.unicode) then if not collected then collected = fonts.handlers.otf.readers.getcomponents(data) if not collected then diff --git a/tex/context/base/mkiv/page-mak.mkvi b/tex/context/base/mkiv/page-mak.mkvi index 04df90d08..bbb7cc148 100644 --- a/tex/context/base/mkiv/page-mak.mkvi +++ b/tex/context/base/mkiv/page-mak.mkvi @@ -258,7 +258,6 @@ \definemakeup [\v!page] - [] \definemakeup [\v!middle] diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf index 3068ebbb9..7198a0b1e 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 5fae860b8..b0a5f7392 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/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf index 42fb600bf..da9192469 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-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf index 5927d6f3a..f83cee161 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 e784738f4..fdfcadd43 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 : 04/18/16 22:12:36 +-- merge date : 04/19/16 17:16:02 do -- begin closure to overcome local limits and interference @@ -6408,6 +6408,7 @@ local formatters=string.formatters 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_unimapping=v end) local report_fonts=logs.reporter("fonts","loading") +local force_ligatures=false directives.register("fonts.mapping.forceligatures",function(v) force_ligatures=v end) local fonts=fonts or {} local mappings=fonts.mappings or {} fonts.mappings=mappings @@ -6676,7 +6677,7 @@ function mappings.addtounicode(data,filename,checklookups) local collected=false local unicoded=0 for unicode,glyph in next,descriptions do - if not glyph.unicode and glyph.class=="ligature" then + if glyph.class=="ligature" and (force_ligatures or not glyph.unicode) then if not collected then collected=fonts.handlers.otf.readers.getcomponents(data) if not collected then -- cgit v1.2.3