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 -> 4137 bytes | |||
| -rw-r--r-- | tex/context/base/context-version.png | bin | 40464 -> 40421 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/data-con.lua | 3 | ||||
| -rw-r--r-- | tex/context/base/font-pre.mkiv | 7 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24744 -> 24732 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 211486 -> 211422 bytes | |||
| -rw-r--r-- | tex/context/base/typo-cap.mkiv | 4 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 4 |
10 files changed, 13 insertions, 9 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index c3d3b77ea..a127ceefd 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.27 22:36} +\newcontextversion{2013.04.28 18:31} %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 920764a0a..63096df22 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 77244b17f..559bcba87 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 05de832ce..f5130a2f6 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.27 22:36} +\edef\contextversion{2013.04.28 18:31} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/data-con.lua b/tex/context/base/data-con.lua index 354c6807d..ef1635714 100644 --- a/tex/context/base/data-con.lua +++ b/tex/context/base/data-con.lua @@ -133,5 +133,6 @@ function containers.content(container,name) end function containers.cleanname(name) - return (gsub(lower(name),"[^%w%d]+","-")) + -- return (gsub(lower(name),"[^%w]+","-")) + return (gsub(lower(name),"[^%w\128-\255]+","-")) -- more utf friendly end diff --git a/tex/context/base/font-pre.mkiv b/tex/context/base/font-pre.mkiv index 74c39722f..bbb06dce1 100644 --- a/tex/context/base/font-pre.mkiv +++ b/tex/context/base/font-pre.mkiv @@ -501,8 +501,11 @@ \definefontfeature[f:smallcaps][smcp=yes] \definefontfeature[f:oldstyle] [onum=yes] -\definealternativestyle [\v!smallcaps] [\doaddfeature{f:smallcaps}] [\doaddfeature{f:smallcaps}] -\definealternativestyle [\v!oldstyle] [\doaddfeature{f:oldstyle}] [\doaddfeature{f:oldstyle}] +\definealternativestyle [\v!smallcaps] [\setsmallcaps] [\setsmallcaps] +\definealternativestyle [\v!oldstyle] [\setoldstyle ] [\setoldstyle ] + +\unexpanded\def\setsmallcaps{\doaddfeature{f:smallcaps}} +\unexpanded\def\setoldstyle {\doaddfeature{f:oldstyle}} %D \macros %D {tinyfont} diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex db3a68053..0ca67ef87 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 5c908c9c1..f43f97a10 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/typo-cap.mkiv b/tex/context/base/typo-cap.mkiv index 25a0ff9ee..d2f1dc0e0 100644 --- a/tex/context/base/typo-cap.mkiv +++ b/tex/context/base/typo-cap.mkiv @@ -211,9 +211,9 @@ \appendtoks \doifelse{\directcapitalsparameter\c!title}\v!yes {\definealternativestyle[\v!capital ][\font_style_normalsmallcapped][\font_style_normalsmallcapped]% - \definealternativestyle[\v!smallcaps][\sc][\sc]} + \definealternativestyle[\v!smallcaps][\setsmallcaps][\setsmallcaps]} {\definealternativestyle[\v!capital ][\font_style_normalsmallcapped][\font_style_normalWORD]% - \definealternativestyle[\v!smallcaps][\sc][\font_style_normalWORD]}% + \definealternativestyle[\v!smallcaps][\setsmallcaps][\font_style_normalWORD]}% \doifelse{\directcapitalsparameter\s!sc}\v!yes \userealcaps \usepseudocaps diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index 63f1381ae..1d37c791d 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 : 04/27/13 22:36:05 +-- merge date : 04/28/13 18:31:01 do -- begin closure to overcome local limits and interference @@ -3217,7 +3217,7 @@ function containers.content(container,name) return container.storage[name] end function containers.cleanname(name) - return (gsub(lower(name),"[^%w%d]+","-")) + return (gsub(lower(name),"[^%w\128-\255]+","-")) end end -- closure |
