From 309f96c3e16645c17bb880ab4b9e19a095cce10c Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Tue, 14 Jan 2014 22:36:00 +0100
Subject: beta 2014.01.14 22:36
---
tex/context/base/context-version.pdf | Bin 4087 -> 4084 bytes
tex/context/base/mult-low.lua | 2 ++
tex/context/base/status-files.pdf | Bin 24758 -> 24763 bytes
tex/context/base/status-lua.pdf | Bin 229084 -> 229018 bytes
tex/context/base/strc-mat.mkiv | 8 ++++----
tex/context/base/supp-mat.mkiv | 34 ++++++++++++++++++++++++++++++++--
tex/context/base/type-ini.lua | 4 +++-
7 files changed, 41 insertions(+), 7 deletions(-)
(limited to 'tex')
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 77c107dae..2a760c903 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/mult-low.lua b/tex/context/base/mult-low.lua
index f82be039c..1e4fef212 100644
--- a/tex/context/base/mult-low.lua
+++ b/tex/context/base/mult-low.lua
@@ -365,5 +365,7 @@ return {
--
"lesshyphens", "morehyphens", "nohyphens", "dohyphens",
--
+ "Ucheckedstartdisplaymath", "Ucheckedstopdisplaymath",
+ --
}
}
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index 2c53b885d..201784050 100644
Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 641701700..9ddb19bc0 100644
Binary files a/tex/context/base/status-lua.pdf and b/tex/context/base/status-lua.pdf differ
diff --git a/tex/context/base/strc-mat.mkiv b/tex/context/base/strc-mat.mkiv
index b9263cdb0..18cb005cb 100644
--- a/tex/context/base/strc-mat.mkiv
+++ b/tex/context/base/strc-mat.mkiv
@@ -630,13 +630,13 @@
% \prevdepth-\maxdimen % texbook pagina 79-80
% \fi
% \noindent % else funny hlist with funny baselineskip
-% $$% \Ustartdisplaymath
+% $$% \Ucheckedstartdisplaymath
% \setdisplaydimensions
% \startinnermath}
%
% \unexpanded\def\stopdisplaymath
% {\stopinnermath
-% $$% \Ustopdisplaymath
+% $$% \Ucheckedstopdisplaymath
% \par
% \afterdisplayspace
% \par
@@ -663,13 +663,13 @@
\fi
\fi
\noindent % else funny hlist with funny baselineskip
- $$% \Ustartdisplaymath
+ \Ucheckedstartdisplaymath
\setdisplaydimensions
\startinnermath}
\unexpanded\def\stopdisplaymath
{\stopinnermath
- $$% \Ustopdisplaymath
+ \Ucheckedstopdisplaymath
\par
\ifvmode
\ifcase\c_strc_formulas_space_model
diff --git a/tex/context/base/supp-mat.mkiv b/tex/context/base/supp-mat.mkiv
index f77ee3454..925f25cc4 100644
--- a/tex/context/base/supp-mat.mkiv
+++ b/tex/context/base/supp-mat.mkiv
@@ -53,6 +53,36 @@
\let\normalstartdmath \Ustartdisplaymath
\let\normalstopdmath \Ustopdisplaymath
+% \unexpanded\def\Ustartdisplaymath
+% {\ifinner
+% \ifhmode
+% \normalUstartmath
+% \let\Ustopdisplaymath\normalUstopmath
+% \else
+% \normalUstartdisplaymath
+% \let\Ustopdisplaymath\normalUstopdisplaymath
+% \fi
+% \else
+% \normalUstartdisplaymath
+% \let\Ustopdisplaymath\normalUstopdisplaymath
+% \fi}
+
+\unexpanded\def\Ucheckedstartdisplaymath
+ {\ifinner
+ \ifhmode
+ \normalUstartmath
+ \let\Ucheckedstopdisplaymath\normalUstopmath
+ \else
+ \normalUstartdisplaymath
+ \let\Ucheckedstopdisplaymath\normalUstopdisplaymath
+ \fi
+ \else
+ \normalUstartdisplaymath
+ \let\Ucheckedstopdisplaymath\normalUstopdisplaymath
+ \fi}
+
+\let\Ucheckedstopdisplaymath\relax
+
\def\normalmathaligntab{&} % \let\normalmathaligntab\aligntab does to work well in a let to & (a def works ok)
\let\normalsuper \Usuperscript % obsolete
@@ -60,8 +90,8 @@
\let\startimath \Ustartmath
\let\stopimath \Ustopmath
-\let\startdmath \Ustartdisplaymath
-\let\stopdmath \Ustopmath
+\let\startdmath \Ustartdisplaymath % \Ucheckedstartdisplaymath
+\let\stopdmath \Ustopdisplaymath % \Ucheckedstopdisplaymath
\unexpanded\def\mathematics#1{\relax \ifmmode#1\else\normalstartimath#1\normalstopimath\fi}
\unexpanded\def\displaymath#1{\noindent \ifmmode#1\else\normalstartdmath#1\normalstopdmath\fi}
diff --git a/tex/context/base/type-ini.lua b/tex/context/base/type-ini.lua
index 9ee97acae..4f53fbf40 100644
--- a/tex/context/base/type-ini.lua
+++ b/tex/context/base/type-ini.lua
@@ -35,7 +35,9 @@ end
local function failure_one(name)
name_two = gsub(name,"%-.*$","")
- if name_two == name then
+ if name == "loc" then
+ -- ignore
+ elseif name_two == name then
report_typescripts("unknown library %a",name_one)
else
commands.uselibrary {
--
cgit v1.2.3