summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--scripts/context/lua/mtxrun.lua6
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua6
-rwxr-xr-xscripts/context/stubs/unix/mtxrun6
-rw-r--r--tex/context/base/cont-new.mkiv2
-rw-r--r--tex/context/base/context-version.pdfbin4106 -> 4109 bytes
-rw-r--r--tex/context/base/context.mkiv2
-rw-r--r--tex/context/base/math-act.lua23
-rw-r--r--tex/context/base/math-ini.mkiv17
-rw-r--r--tex/context/base/status-files.pdfbin24719 -> 24764 bytes
-rw-r--r--tex/context/base/status-lua.log2
-rw-r--r--tex/context/base/trac-log.lua21
-rw-r--r--tex/context/base/type-imp-mathdigits.mkiv53
-rw-r--r--tex/generic/context/luatex/luatex-fonts-merged.lua2
13 files changed, 124 insertions, 16 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua
index 585985fa9..36a737017 100644
--- a/scripts/context/lua/mtxrun.lua
+++ b/scripts/context/lua/mtxrun.lua
@@ -6686,7 +6686,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 24638, stripped down to: 16561
+-- original size: 25391, stripped down to: 16561
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -16323,8 +16323,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 665783
--- stripped bytes : 233490
+-- original bytes : 666536
+-- stripped bytes : 234243
-- end library merge
diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 585985fa9..36a737017 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -6686,7 +6686,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 24638, stripped down to: 16561
+-- original size: 25391, stripped down to: 16561
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -16323,8 +16323,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 665783
--- stripped bytes : 233490
+-- original bytes : 666536
+-- stripped bytes : 234243
-- end library merge
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 585985fa9..36a737017 100755
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -6686,7 +6686,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["trac-log"] = package.loaded["trac-log"] or true
--- original size: 24638, stripped down to: 16561
+-- original size: 25391, stripped down to: 16561
if not modules then modules={} end modules ['trac-log']={
version=1.001,
@@ -16323,8 +16323,8 @@ end -- of closure
-- used libraries : l-lua.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-mrg.lua util-tpl.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 665783
--- stripped bytes : 233490
+-- original bytes : 666536
+-- stripped bytes : 234243
-- end library merge
diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index 5fb029493..b8b3bc37d 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.08.15 13:53}
+\newcontextversion{2013.08.15 23:58}
%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 c845bb444..a5627df43 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 4acc44762..077b8f318 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.08.15 13:53}
+\edef\contextversion{2013.08.15 23:58}
\edef\contextkind {beta}
%D For those who want to use this:
diff --git a/tex/context/base/math-act.lua b/tex/context/base/math-act.lua
index bb6226a23..abb96bb52 100644
--- a/tex/context/base/math-act.lua
+++ b/tex/context/base/math-act.lua
@@ -559,7 +559,7 @@ blocks["lowercasegreekbolditalic"] = { first = 0x1D736, last = 0x1D74
blocks["lowercasegreeksansserifbold"] = { first = 0x1D770, last = 0x1D789 }
blocks["lowercasegreeksansserifbolditalic"] = { first = 0x1D7AA, last = 0x1D7C3 }
-blocks["digitsnormal"] = { first = 0x00030, last = 0x0003A }
+blocks["digitsnormal"] = { first = 0x00030, last = 0x00039 }
blocks["digitsbold"] = { first = 0x1D7CE, last = 0x1D7D8 }
blocks["digitsdoublestruck"] = { first = 0x1D7D8, last = 0x1D7E2 }
blocks["digitssansserifnormal"] = { first = 0x1D7E2, last = 0x1D7EC }
@@ -576,6 +576,27 @@ blocks["geometricshapes"] = { first = 0x025A0, last = 0x025F
blocks["miscellaneoussymbolsandarrows"] = { first = 0x02B30, last = 0x02B4C }
blocks["mathematicalalphanumericsymbols"] = { first = 0x00400, last = 0x1D7FF }
+blocks["digitslatin"] = { first = 0x00030, last = 0x00039 }
+blocks["digitsarabicindic"] = { first = 0x00660, last = 0x00669 }
+blocks["digitsextendedarabicindic"] = { first = 0x006F0, last = 0x006F9 }
+------["digitsdevanagari"] = { first = 0x00966, last = 0x0096F }
+------["digitsbengali"] = { first = 0x009E6, last = 0x009EF }
+------["digitsgurmukhi"] = { first = 0x00A66, last = 0x00A6F }
+------["digitsgujarati"] = { first = 0x00AE6, last = 0x00AEF }
+------["digitsoriya"] = { first = 0x00B66, last = 0x00B6F }
+------["digitstamil"] = { first = 0x00030, last = 0x00039 } -- no zero
+------["digitstelugu"] = { first = 0x00C66, last = 0x00C6F }
+------["digitskannada"] = { first = 0x00CE6, last = 0x00CEF }
+------["digitsmalayalam"] = { first = 0x00D66, last = 0x00D6F }
+------["digitsthai"] = { first = 0x00E50, last = 0x00E59 }
+------["digitslao"] = { first = 0x00ED0, last = 0x00ED9 }
+------["digitstibetan"] = { first = 0x00F20, last = 0x00F29 }
+------["digitsmyanmar"] = { first = 0x01040, last = 0x01049 }
+------["digitsethiopic"] = { first = 0x01369, last = 0x01371 }
+------["digitskhmer"] = { first = 0x017E0, last = 0x017E9 }
+------["digitsmongolian"] = { first = 0x01810, last = 0x01809 }
+
+
-- operators : 0x02200
-- symbolsa : 0x02701
-- symbolsb : 0x02901
diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv
index c2438f384..f386cdd30 100644
--- a/tex/context/base/math-ini.mkiv
+++ b/tex/context/base/math-ini.mkiv
@@ -1730,3 +1730,20 @@
\def\mathhorizontalcode#1#2{\ctxcommand{horizontalcode(\number#1,\number#2)}}
\protect \endinput
+
+% % not used (yet)
+%
+% \newtoks \everystartimath
+% \newtoks \everystopimath
+%
+% \unexpanded\def\startimath{\Ustartmath\the\everystartimath}
+% \unexpanded\def\stopimath {\the\everystopimath\Ustopmath}
+%
+% \unexpanded\def\m%
+% {\relax
+% \ifmmode\expandafter\math_m_stay\else\expandafter\math_m_math\fi}
+%
+% \unexpanded\def\math_m_math#1%
+% {\startimath#1\stopimath}
+%
+% \let\math_m_stay\firstofoneargument
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index bc6dfe1a9..5c7d35361 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.log b/tex/context/base/status-lua.log
index f0ed24bc8..5fe45ee09 100644
--- a/tex/context/base/status-lua.log
+++ b/tex/context/base/status-lua.log
@@ -1,6 +1,6 @@
(cont-yes.mkiv
-ConTeXt ver: 2013.08.15 13:53 MKIV beta fmt: 2013.8.15 int: english/english
+ConTeXt ver: 2013.08.15 23:58 MKIV beta fmt: 2013.8.15 int: english/english
system > 'cont-new.mkiv' loaded
(cont-new.mkiv)
diff --git a/tex/context/base/trac-log.lua b/tex/context/base/trac-log.lua
index b3204358f..0d0b66260 100644
--- a/tex/context/base/trac-log.lua
+++ b/tex/context/base/trac-log.lua
@@ -98,13 +98,13 @@ wiki : http://contextgarden.net
-- function utilities.strings.chruni(s) return utfchar(s) .. " (U+" .. format("%05X",s) .. ")" end
--
-- utilities.strings.formatters.add (
--- string.formatters, "uni",
+-- string.formatters, "unichr",
-- [[unichr(%s)]],
-- [[local unichr = utilities.strings.unichr]]
-- )
--
-- utilities.strings.formatters.add (
--- string.formatters, "chr",
+-- string.formatters, "chruni",
-- [[chruni(%s)]],
-- [[local chruni = utilities.strings.chruni]]
-- )
@@ -119,8 +119,25 @@ utilities.strings.formatters.add (
[[utfchar(%s) .. " (U+" .. format("%%05X",%s) .. ")"]]
)
+-- function utilities.strings.unichk(s) return s <= 0xFFFF and ("U+" .. format("%05X",s) .. " (" .. utfchar(s) .. ")") or ("U+" .. format("%05X",s)) end
+-- function utilities.strings.chkuni(s) return s <= 0xFFFF and (utfchar(s) .. " (U+" .. format("%05X",s) .. ")") or ("U+" .. format("%05X",s)) end
+--
+-- utilities.strings.formatters.add (
+-- string.formatters, "unichk",
+-- [[unichk(%s)]],
+-- [[local unichk = utilities.strings.unichk]]
+-- )
+--
+-- utilities.strings.formatters.add (
+-- string.formatters, "chkuni",
+-- [[chkuni(%s)]],
+-- [[local chkuni = utilities.strings.chkuni]]
+-- )
+--
-- print(formatters["Missing character %!chruni! in font."](234))
-- print(formatters["Missing character %!unichr! in font."](234))
+-- print(formatters["Missing character %!chkuni! in font."](234))
+-- print(formatters["Missing character %!unichk! in font."](234))
-- basic loggers
diff --git a/tex/context/base/type-imp-mathdigits.mkiv b/tex/context/base/type-imp-mathdigits.mkiv
new file mode 100644
index 000000000..7a7e6b764
--- /dev/null
+++ b/tex/context/base/type-imp-mathdigits.mkiv
@@ -0,0 +1,53 @@
+%D \module
+%D [ file=type-imp-hvmath,
+%D version=2007.07.30,
+%D title=\CONTEXT\ Typescript Macros,
+%D subtitle=Xits,
+%D author=Khaled Hosny \& Hans Hagen,
+%D date=\currentdate,
+%D copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+% \starttypescript [math] [xits] [name]
+% \definefontsynonym[MathRoman][file:xits-math.otf][features=math\mathsizesuffix,goodies=xits-math,fallbacks=mathdigits]
+% \stoptypescript
+%
+% \usetypescript [mathdigits][dejavu][arabicindic]
+
+% \definefontsynonym [MathRomanDigitsXitsDejavu] [file:xits-math.otf] [features=math\mathsizesuffix,goodies=xits-math,fallbacks=mathdigits]
+%
+% \starttypescript [math] [xits] [name]
+% \definefontsynonym [MathRoman] [MathRomanDigitsXitsDejavu]
+% \stoptypescript
+%
+% \usetypescript [mathdigits][dejavu][arabicindic]
+
+\starttypescriptcollection[mathdigits]
+
+ \starttypescript [mathdigits] [dejavu] [arabicindic,extendedarabicindic]
+ \resetfontfallback [mathdigits]
+ \definefontfallback [mathdigits] [dejavusansmono] [digits\typescriptthree] [check=yes,force=yes,offset=digitsnormal]
+ \definefontfallback [mathdigits] [dejavusansmonobold] [digits\typescriptthree] [check=yes,force=yes,offset=digitsbold]
+ \stoptypescript
+
+ \starttypescript [mathdigits] [xits-dejavu] [arabicindic,extendedarabicindic]
+ \usetypescript [mathdigits] [dejavu] [\typescriptthree]
+ \definefontsynonym[MathRoman][file:xits-math.otf][features=math\mathsizesuffix,goodies=xits-math,fallbacks=mathdigits]
+ \stoptypescript
+
+\stoptypescriptcollection
+
+\continueifinputfile{type-imp-mathdigits.mkiv}
+
+% \usetypescriptfile[mathdigits]
+
+\usetypescript [mathdigits] [xits-dejavu] [arabicindic]
+
+\setupbodyfont[dejavu]
+
+\starttext
+ $3+2=5 \quad \bf 3+2=5$
+\stoptext
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index fbe7fc16f..a742805a3 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 : 08/15/13 13:53:53
+-- merge date : 08/15/13 23:58:05
do -- begin closure to overcome local limits and interference
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 16:52:46 +0000