summaryrefslogtreecommitdiff
path: root/tex
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-03-16 22:44:00 +0100
committerHans Hagen <pragma@wxs.nl>2013-03-16 22:44:00 +0100
commit2bc833c2f33d4bf2eb523c4bff7eb662874e111f (patch)
tree507306a9a5cc03bbc876bfcf250e30178be9906c /tex
parent2d21ae4e13ec8a167e3a9a1576b583dcf26ecdd0 (diff)
downloadcontext-2bc833c2f33d4bf2eb523c4bff7eb662874e111f.tar.gz
beta 2013.03.16 22:44
Diffstat (limited to 'tex')
-rw-r--r--tex/context/base/context-version.pdfbin4137 -> 4136 bytes
-rw-r--r--tex/context/base/context-version.pngbin40485 -> 40527 bytes
-rw-r--r--tex/context/base/font-otd.lua4
-rw-r--r--tex/context/base/lang-ini.mkiv12
-rw-r--r--tex/context/base/status-files.pdfbin24769 -> 24766 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin210835 -> 210759 bytes
6 files changed, 8 insertions, 8 deletions
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 6efa6fe61..b5354d291 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
Binary files differ
diff --git a/tex/context/base/context-version.png b/tex/context/base/context-version.png
index d2e38cf8a..6d0337de0 100644
--- a/tex/context/base/context-version.png
+++ b/tex/context/base/context-version.png
Binary files differ
diff --git a/tex/context/base/font-otd.lua b/tex/context/base/font-otd.lua
index 9a654fb6b..fceb0cf01 100644
--- a/tex/context/base/font-otd.lua
+++ b/tex/context/base/font-otd.lua
@@ -50,10 +50,10 @@ function otf.setdynamics(font,attribute)
local dynamics = fontdynamics[font]
dynamic = contextmerged[attribute] or 0
local script, language
- if dynamic == 2 then
+ if dynamic == 2 then -- merge
language = features.language or fontproperties[font].language or "dflt"
script = features.script or fontproperties[font].script or "dflt"
- else
+ else -- if dynamic == 1 then -- replace
language = features.language or "dflt"
script = features.script or "dflt"
end
diff --git a/tex/context/base/lang-ini.mkiv b/tex/context/base/lang-ini.mkiv
index c6e9af394..3226c1255 100644
--- a/tex/context/base/lang-ini.mkiv
+++ b/tex/context/base/lang-ini.mkiv
@@ -387,12 +387,12 @@
\let\dohyphens\relax
\unexpanded\def\lang_basics_synchronize_min_max
- { % these values are stored along with glyph nodes
- \lefthyphenmin \numexpr0\languageparameter\s!lefthyphenmin +\hyphenminoffset\relax
- \righthyphenmin\numexpr0\languageparameter\s!righthyphenmin+\hyphenminoffset\relax
- % these values are stored with the language (global!)
- \prehyphenchar \languageparameter\s!righthyphenchar\relax
- \posthyphenchar\languageparameter\s!lefthyphenchar \relax}
+ {% these values are stored along with glyph nodes
+ \lefthyphenmin \numexpr0\languageparameter\s!lefthyphenmin +\hyphenminoffset\relax
+ \righthyphenmin\numexpr0\languageparameter\s!righthyphenmin+\hyphenminoffset\relax
+ % these values are stored with the language (global!)
+ \prehyphenchar \languageparameter\s!righthyphenchar\relax
+ \posthyphenchar\languageparameter\s!lefthyphenchar \relax}
\appendtoks
\lang_basics_synchronize_min_max
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2fab5f861..204a6f2ba 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
Binary files differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 307a4c0fc..1f12a5f7d 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ