summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Hagen <pragma@wxs.nl>2013-10-15 11:52:00 +0200
committerHans Hagen <pragma@wxs.nl>2013-10-15 11:52:00 +0200
commit103a839f3e920a1c91e3a7931a6d08c5262eeb2a (patch)
tree5d7eb47b722b746099733016f4d4fc8e301e381e
parent3225b47605e9ddf74e0ce762b46fa64b16214863 (diff)
downloadcontext-103a839f3e920a1c91e3a7931a6d08c5262eeb2a.tar.gz
beta 2013.10.15 11:52
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4106 -> 4112 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/page-mrk.mkiv1
-rw-r--r--tex/context/base/status-files.pdfbin24536 -> 24546 bytes
-rw-r--r--tex/context/base/status-lua.pdfbin224878 -> 224928 bytes
-rw-r--r--tex/context/base/type-imp-euler.mkiv8
-rw-r--r--tex/context/fonts/euler-math.lfg20
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
9 files changed, 21 insertions, 14 deletions
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index d655f011c..7ada1c1df 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.10.15 10:11}
+\newcontextversion{2013.10.15 11:52}
%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
index c686d4e2f..6fa574c8e 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.mkiv b/tex/context/base/context.mkiv
index 43930574a..9fdcc2a4f 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.10.15 10:11}
+\edef\contextversion{2013.10.15 11:52}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/page-mrk.mkiv b/tex/context/base/page-mrk.mkiv
index 5f8d332c5..6d0a5af94 100644
--- a/tex/context/base/page-mrk.mkiv
+++ b/tex/context/base/page-mrk.mkiv
@@ -173,6 +173,7 @@
\settrue\c_page_marks_add_more_number}
\appendtoks
+ \setfalse\c_page_marks_add_page_lines
\setfalse\c_page_marks_add_more_color
\setfalse\c_page_marks_add_more_marking
\setfalse\c_page_marks_add_more_lines
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 51957e4b7..80f5ff012 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 07a5a0aaa..09a9f9dcf 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
Binary files differ
diff --git a/tex/context/base/type-imp-euler.mkiv b/tex/context/base/type-imp-euler.mkiv
index 26d18ca31..d3b552b56 100644
--- a/tex/context/base/type-imp-euler.mkiv
+++ b/tex/context/base/type-imp-euler.mkiv
@@ -19,11 +19,17 @@
\resetfontfallback [euleroverpagella]
\resetfontfallback [pagellaovereuler]
+% 0x1D455 : italic h
+
\definefontfallback [euleroverpagella] [\s!file:euler.otf] [0x02100-0x02BFF] [\s!check=yes,\c!force=yes]
\definefontfallback [euleroverpagella] [\s!file:euler.otf] [0x1D400-0x1D7FF] [\s!check=yes,\c!force=yes]
+\definefontfallback [euleroverpagella] [texgyrepagella-math] [0x0210E] [\s!check=yes,\c!force=\v!yes]
%definefontfallback [euleroverpagella] [\s!file:euler.otf] [0x1D538-0x1D550] [\s!check=yes,\c!force=yes]
+
\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x02100-0x02BFF] [\s!check=yes]
\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D400-0x1D7FF] [\s!check=yes]
+\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D400-0x1D7FF] [\s!check=yes]
+\definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x0210E] [\s!check=yes,\c!force=\v!yes]
%definefontfallback [pagellaovereuler] [texgyrepagella-math] [0x1D538-0x1D550] [\s!check=yes]
% example for aditya:
@@ -43,7 +49,7 @@
\starttypescript [\s!math] [eulernova] [\s!name]
\loadfontgoodies[euler-math]
- \definefontsynonym [MathRoman] [eulermath@euler-nova] [\s!features=\s!math\mathsizesuffix]
+ \definefontsynonym [MathRoman] [\s!file:euler.otf] [\s!features=\s!math\mathsizesuffix]
\stoptypescript
\starttypescript [pagella-eulernova]
diff --git a/tex/context/fonts/euler-math.lfg b/tex/context/fonts/euler-math.lfg
index 4f11a0822..da7647c53 100644
--- a/tex/context/fonts/euler-math.lfg
+++ b/tex/context/fonts/euler-math.lfg
@@ -7,16 +7,16 @@ return {
author = "Hans Hagen",
copyright = "ConTeXt development team",
mathematics = {
- virtuals = {
- ["euler-nova"] = {
- { name = "texgyrepagella-math.otf", main = true, parameters = true },
- { name = "euler.otf", overlay = true }, -- first = 0x1234, last = 0x1256
-
- -- { name = "euler.otf", main = true, parameters = true },
- -- { name = "texgyrepagella-math.otf", overlay = true },
-
- },
- }
+ -- virtuals = {
+ -- ["euler-nova"] = {
+ -- { name = "texgyrepagella-math.otf", main = true, parameters = true },
+ -- { name = "euler.otf", overlay = true }, -- first = 0x1234, last = 0x1256
+ --
+ -- -- { name = "euler.otf", main = true, parameters = true },
+ -- -- { name = "texgyrepagella-math.otf", overlay = true },
+ --
+ -- },
+ -- }
}
}
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 012878063..23fbad0e3 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 : 10/15/13 10:11:32
+-- merge date : 10/15/13 11:52:32
do -- begin closure to overcome local limits and interference