diff options
22 files changed, 501 insertions, 340 deletions
diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 106931707..f975b5302 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -456,7 +456,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lpeg"] = package.loaded["l-lpeg"] or true --- original size: 38157, stripped down to: 20990 +-- original size: 38185, stripped down to: 20990 if not modules then modules={} end modules ['l-lpeg']={ version=1.001, @@ -493,7 +493,7 @@ local uppercase=R("AZ") local underscore=P("_") local hexdigit=digit+lowercase+uppercase local cr,lf,crlf=P("\r"),P("\n"),P("\r\n") -local newline=P("\r")*(P("\n")+P(true))+P("\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') @@ -18360,8 +18360,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-fil.lua util-sac.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 : 782314 --- stripped bytes : 283426 +-- original bytes : 782342 +-- stripped bytes : 283454 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 106931707..f975b5302 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -456,7 +456,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lpeg"] = package.loaded["l-lpeg"] or true --- original size: 38157, stripped down to: 20990 +-- original size: 38185, stripped down to: 20990 if not modules then modules={} end modules ['l-lpeg']={ version=1.001, @@ -493,7 +493,7 @@ local uppercase=R("AZ") local underscore=P("_") local hexdigit=digit+lowercase+uppercase local cr,lf,crlf=P("\r"),P("\n"),P("\r\n") -local newline=P("\r")*(P("\n")+P(true))+P("\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') @@ -18360,8 +18360,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-fil.lua util-sac.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 : 782314 --- stripped bytes : 283426 +-- original bytes : 782342 +-- stripped bytes : 283454 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 106931707..f975b5302 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -456,7 +456,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lpeg"] = package.loaded["l-lpeg"] or true --- original size: 38157, stripped down to: 20990 +-- original size: 38185, stripped down to: 20990 if not modules then modules={} end modules ['l-lpeg']={ version=1.001, @@ -493,7 +493,7 @@ local uppercase=R("AZ") local underscore=P("_") local hexdigit=digit+lowercase+uppercase local cr,lf,crlf=P("\r"),P("\n"),P("\r\n") -local newline=P("\r")*(P("\n")+P(true))+P("\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') @@ -18360,8 +18360,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-fil.lua util-sac.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 : 782314 --- stripped bytes : 283426 +-- original bytes : 782342 +-- stripped bytes : 283454 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index 106931707..f975b5302 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -456,7 +456,7 @@ do -- create closure to overcome 200 locals limit package.loaded["l-lpeg"] = package.loaded["l-lpeg"] or true --- original size: 38157, stripped down to: 20990 +-- original size: 38185, stripped down to: 20990 if not modules then modules={} end modules ['l-lpeg']={ version=1.001, @@ -493,7 +493,7 @@ local uppercase=R("AZ") local underscore=P("_") local hexdigit=digit+lowercase+uppercase local cr,lf,crlf=P("\r"),P("\n"),P("\r\n") -local newline=P("\r")*(P("\n")+P(true))+P("\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') @@ -18360,8 +18360,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-fil.lua util-sac.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 : 782314 --- stripped bytes : 283426 +-- original bytes : 782342 +-- stripped bytes : 283454 -- end library merge diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index fbf54053f..9bfe09d64 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{2016.01.05 19:20} +\newcontextversion{2016.01.06 17:29} %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 e4d9946fe..3cc58dc20 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 7e26fd898..45b39c573 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -39,7 +39,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2016.01.05 19:20} +\edef\contextversion{2016.01.06 17:29} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/file-mod.mkvi b/tex/context/base/file-mod.mkvi index 8c46ddac0..8025da6ea 100644 --- a/tex/context/base/file-mod.mkvi +++ b/tex/context/base/file-mod.mkvi @@ -20,16 +20,14 @@ %D \macros %D {usemodule} %D -%D Most of \CONTEXT is preloaded in the format file. Some very -%D domain specific typesetting topics are however dealt with in -%D separate modules, e.g. typesetting of chemical structure -%D formulas. These modules are loaded by: +%D Most of \CONTEXT is preloaded in the format file. Some very domain specific +%D typesetting topics are however dealt with in separate modules, e.g. typesetting +%D of chemical structure formulas. These modules are loaded by: %D %D \showsetup{usemodule} %D -%D More information on the specific modules can be found in -%D their dedicated manuals. We use \type {\next} so that we -%D can \type {\end} in modules. +%D More information on the specific modules can be found in their dedicated manuals. +%D We use \type {\next} so that we can \type {\end} in modules. \unexpanded\def\usemodules {\dotripleempty\strc_modules_use} @@ -64,7 +62,11 @@ \popmacro\currentmodule} \def\strc_modules_use_indeed#category#name% - {\clf_usemodules{#category}{#name}} + {\ifx\currentmoduleparameters\empty\else + \scratchtoks\expandafter{\currentmoduleparameters}% + \normalexpanded{\getparameters[\??module#name:][\the\scratchtoks]}% + \fi + \clf_usemodules{#category}{#name}} \installcorenamespace{module} @@ -91,15 +93,34 @@ \unexpanded\def\setupmodule {\dodoubleempty\syst_modules_setup} -\def\syst_modules_setup[#name][#parameters]% +\def\syst_modules_setup_indeed + {\ifx\currentmoduleparameters\empty + \expandafter\syst_modules_setup_indeed_nop + \else + \expandafter\syst_modules_setup_indeed_yes + \fi} + +\def\syst_modules_setup_indeed_nop[#name][#parameters]% + {\ifsecondargument + \getparameters[\??module#name:][#parameters]% internal (defaults) + \else\iffirstargument + \doifassignmentelse{#name}{\getparameters[\??module\currentmodule:][#name]}\donothing + \fi\fi + \the\everysetupmodule} + +\def\syst_modules_setup_indeed_yes[#name][#parameters]% {\scratchtoks\expandafter{\currentmoduleparameters}% \ifsecondargument \getparameters[\??module#name:][#parameters]% internal (defaults) \normalexpanded{\getparameters[\??module#name:][\the\scratchtoks]}% loadtime (user) + \else\iffirstargument + \doifassignmentelse{#name} + {\getparameters[\??module\currentmodule:][#name]% internal (defaults) + \normalexpanded{\getparameters[\??module\currentmodule:][\the\scratchtoks]}}% loadtime (user) + {\normalexpanded{\getparameters[\??module#1:][\the\scratchtoks]}}% loadtime (user) \else - \getparameters[\??module\currentmodule:][#name]% internal (defaults) - \normalexpanded{\getparameters[\??module\currentmodule:][\the\scratchtoks]}% loadtime (user) - \fi + \normalexpanded{\getparameters[\??module\currentmodule:][\the\scratchtoks]}% + \fi\fi \let\currentmoduleparameters\empty \the\everysetupmodule} @@ -115,11 +136,6 @@ % \fi % \let\currentmoduleparameters\empty} -% \def\moduleparameter#name#parameter% should have been \namedmoduleparameter -% {\csname\??module -% \ifcsname\??module#name:#parameter\endcsname#name:#parameter\fi -% \endcsname} - \def\moduleparameter#name#parameter% should have been \namedmoduleparameter {\begincsname\??module#name:#parameter\endcsname} diff --git a/tex/context/base/l-lpeg.lua b/tex/context/base/l-lpeg.lua index 5be12468b..959ca553e 100644 --- a/tex/context/base/l-lpeg.lua +++ b/tex/context/base/l-lpeg.lua @@ -110,7 +110,7 @@ local underscore = P("_") local hexdigit = digit + lowercase + uppercase local cr, lf, crlf = P("\r"), P("\n"), P("\r\n") ----- newline = crlf + S("\r\n") -- cr + lf -local newline = P("\r") * (P("\n") + P(true)) + P("\n") +local newline = P("\r") * (P("\n") + P(true)) + P("\n") -- P("\r")^-1 * P("\n")^-1 local escaped = P("\\") * anything local squote = P("'") local dquote = P('"') diff --git a/tex/context/base/m-sql.mkiv b/tex/context/base/m-sql.mkiv index 60cbdd1be..f1df2833a 100644 --- a/tex/context/base/m-sql.mkiv +++ b/tex/context/base/m-sql.mkiv @@ -11,7 +11,19 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +\startmodule[sql] + \registerctxluafile{util-tpl}{} \registerctxluafile{util-sql}{} -\endinput +\setupmodule + +\doifsomething {\currentmoduleparameter{method}}{ + \ctxlua{utilities.sql.setmethod("\currentmoduleparameter{method}")} +} + +\doifsomething {\currentmoduleparameter{server}} { + \ctxlua{utilities.sql.setserver("\currentmoduleparameter{server}")} +} + +\stopmodule diff --git a/tex/context/base/s-sql-tables.mkiv b/tex/context/base/s-sql-tables.mkiv index 122570874..4c8bcddac 100644 --- a/tex/context/base/s-sql-tables.mkiv +++ b/tex/context/base/s-sql-tables.mkiv @@ -11,12 +11,18 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -% for the moment no helpers - \startmodule[sql-tables] \registerctxluafile{s-sql-tables}{} +\doifsomething {\currentmoduleparameter{method}}{ + \ctxlua{utilities.sql.setmethod("\currentmoduleparameter{method}")} +} + +\doifsomething {\currentmoduleparameter{server}} { + \ctxlua{utilities.sql.setserver("\currentmoduleparameter{server}")} +} + \installmodulecommandluasingle \showdefinedsqltables {moduledata.sql.tables.showdefined} \stopmodule diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex 1b3b4a129..d08186367 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 d14d446b2..b28c97183 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/context/base/trac-vis.mkiv b/tex/context/base/trac-vis.mkiv index bcf5f210d..a503981f5 100644 --- a/tex/context/base/trac-vis.mkiv +++ b/tex/context/base/trac-vis.mkiv @@ -141,20 +141,13 @@ % \definecolor[f:y:t][a=1,t=.25,y=1] % \definecolor[f:k:t][a=1,t=.25,s=0] -% \def\node_backgrounds_boxes_add#1[#2]% -% {\node_backgrounds_boxes_initialize -% #1\backgroundcolorattr{#2}} - -\def\syst_visualizers_filled_hbox#1% - {\node_backgrounds_boxes_initialize\hbox\backgroundcolorattr{#1}} - -\unexpanded\def\filledhboxr{\syst_visualizers_filled_hbox{f:r:t}} -\unexpanded\def\filledhboxg{\syst_visualizers_filled_hbox{f:g:t}} -\unexpanded\def\filledhboxb{\syst_visualizers_filled_hbox{f:b:t}} -\unexpanded\def\filledhboxc{\syst_visualizers_filled_hbox{f:c:t}} -\unexpanded\def\filledhboxm{\syst_visualizers_filled_hbox{f:m:t}} -\unexpanded\def\filledhboxy{\syst_visualizers_filled_hbox{f:y:t}} -\unexpanded\def\filledhboxk{\syst_visualizers_filled_hbox{f:k:t}} +\unexpanded\def\filledhboxr{\node_backgrounds_boxes_add\hbox[f:r:t]} +\unexpanded\def\filledhboxg{\node_backgrounds_boxes_add\hbox[f:g:t]} +\unexpanded\def\filledhboxb{\node_backgrounds_boxes_add\hbox[f:b:t]} +\unexpanded\def\filledhboxc{\node_backgrounds_boxes_add\hbox[f:c:t]} +\unexpanded\def\filledhboxm{\node_backgrounds_boxes_add\hbox[f:m:t]} +\unexpanded\def\filledhboxy{\node_backgrounds_boxes_add\hbox[f:y:t]} +\unexpanded\def\filledhboxk{\node_backgrounds_boxes_add\hbox[f:k:t]} %D Overload: diff --git a/tex/context/base/type-imp-gentium.mkiv b/tex/context/base/type-imp-gentium.mkiv new file mode 100644 index 000000000..b2ad35a96 --- /dev/null +++ b/tex/context/base/type-imp-gentium.mkiv @@ -0,0 +1,34 @@ +%D \module +%D [ file=type-gentium, +%D version=2013.05.02, +%D title=\CONTEXT\ Typescript Macros, +%D subtitle=Typescript file for Gentium, +%D author={Thomas A. Schmitz and Mojca Miklavec}, +%D date=\currentdate, +%D copyright={Mojca and Thomas}] + +\starttypescript [serif] [gentium] + \definefontsynonym [Gentium-Roman] [file:GentiumPlus-R] [features=default] + \definefontsynonym [Gentium-Italic] [file:GentiumPlus-I] [features=default] + \definefontsynonym [Gentium-Bold] [file:GenBasB] [features=default] + \definefontsynonym [Gentium-BoldItalic] [file:GenBasBI] [features=default] + \definefontsynonym [Gentium-Slanted] [Gentium-Italic] + \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic] + \definefontsynonym [Gentium-RomanCaps] [file:GentiumPlus-R] [features=smallcaps] +\stoptypescript + +\starttypescript [serif] [gentium] [name] + \definefontsynonym [Serif] [Gentium-Roman] + \definefontsynonym [SerifItalic] [Gentium-Italic] + \definefontsynonym [SerifBold] [Gentium-Bold] + \definefontsynonym [SerifBoldItalic] [Gentium-BoldItalic] + \definefontsynonym [SerifSlanted] [Gentium-Slanted] + \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted] + \definefontsynonym [SerifCaps] [Serif] + \definefontsynonym [OldStyle] [Serif] + \definefontsynonym [SerifCaps] [Gentium-RomanCaps] +\stoptypescript + +\starttypescript [gentium] + \definetypeface [gentium] [rm] [serif] [gentium] [default] [features=default] +\stoptypescript diff --git a/tex/context/base/type-ini.mkvi b/tex/context/base/type-ini.mkvi index 22fe5ad4d..e4cd0b0b1 100644 --- a/tex/context/base/type-ini.mkvi +++ b/tex/context/base/type-ini.mkvi @@ -554,7 +554,7 @@ \def\font_typefaces_setup[#class][#settings]% {\setcurrentfontclass{#class}% \let\globalfontclass\fontclass - \iffourthargument + \ifsecondargument \setupbodyfont[#settings]% \else\ifx\fontclass\empty \setupbodyfont[\s!rm]% @@ -569,7 +569,7 @@ \def\font_typefaces_switch[#class][#settings]% {\setcurrentfontclass{#class}% \let\globalfontclass\globalfontclass - \iffourthargument + \ifsecondargument \switchtobodyfont[#settings]% \else\ifx\fontclass\empty \switchtobodyfont[\s!rm]% diff --git a/tex/context/base/type-one.mkii b/tex/context/base/type-one.mkii index e98f6864a..4f6e43745 100644 --- a/tex/context/base/type-one.mkii +++ b/tex/context/base/type-one.mkii @@ -188,66 +188,66 @@ %D {NNN}, i.e.\ four digit numbers). \starttypescript [serif] [computer-modern] [cyr] - \definefontsynonym [cmb10] [wcmb10] [encoding=t2a] - \definefontsynonym [cmbsy10] [wcmbsy10] [encoding=t2a] - \definefontsynonym [cmbx10] [wcmbx10] [encoding=t2a] - \definefontsynonym [cmbx12] [wcmbx12] [encoding=t2a] - \definefontsynonym [cmbx5] [wcmbx5] [encoding=t2a] - \definefontsynonym [cmbx6] [wcmbx6] [encoding=t2a] - \definefontsynonym [cmbx7] [wcmbx7] [encoding=t2a] - \definefontsynonym [cmbx8] [wcmbx8] [encoding=t2a] - \definefontsynonym [cmbx9] [wcmbx9] [encoding=t2a] - \definefontsynonym [cmbxsl10] [wcmbxsl10] [encoding=t2a] - \definefontsynonym [cmbxti10] [wcmbxti10] [encoding=t2a] - \definefontsynonym [cmcsc10] [wcmcsc10] [encoding=t2a] - %definefontsynonym [cmdunh10] [wcmdunh10] [encoding=t2a] - \definefontsynonym [cminch] [wcminch] [encoding=t2a] - \definefontsynonym [cmr10] [wcmr10] [encoding=t2a] - \definefontsynonym [cmr12] [wcmr12] [encoding=t2a] - \definefontsynonym [cmr17] [wcmr17] [encoding=t2a] - \definefontsynonym [cmr5] [wcmr5] [encoding=t2a] - \definefontsynonym [cmr6] [wcmr6] [encoding=t2a] - \definefontsynonym [cmr7] [wcmr7] [encoding=t2a] - \definefontsynonym [cmr8] [wcmr8] [encoding=t2a] - \definefontsynonym [cmr9] [wcmr9] [encoding=t2a] - \definefontsynonym [cmsl10] [wcmsl10] [encoding=t2a] - \definefontsynonym [cmsl12] [wcmsl12] [encoding=t2a] - \definefontsynonym [cmsl8] [wcmsl8] [encoding=t2a] - \definefontsynonym [cmsl9] [wcmsl9] [encoding=t2a] - \definefontsynonym [cmti10] [wcmti10] [encoding=t2a] - \definefontsynonym [cmti12] [wcmti12] [encoding=t2a] - \definefontsynonym [cmti7] [wcmti7] [encoding=t2a] - \definefontsynonym [cmti8] [wcmti8] [encoding=t2a] - \definefontsynonym [cmti9] [wcmti9] [encoding=t2a] - \definefontsynonym [cmu10] [wcmu10] [encoding=t2a] + \definefontsynonym [cmb10] [wcmb10] [encoding=t2a] + \definefontsynonym [cmbsy10] [wcmbsy10] [encoding=t2a] + \definefontsynonym [cmbx10] [wcmbx10] [encoding=t2a] + \definefontsynonym [cmbx12] [wcmbx12] [encoding=t2a] + \definefontsynonym [cmbx5] [wcmbx5] [encoding=t2a] + \definefontsynonym [cmbx6] [wcmbx6] [encoding=t2a] + \definefontsynonym [cmbx7] [wcmbx7] [encoding=t2a] + \definefontsynonym [cmbx8] [wcmbx8] [encoding=t2a] + \definefontsynonym [cmbx9] [wcmbx9] [encoding=t2a] + \definefontsynonym [cmbxsl10] [wcmbxsl10] [encoding=t2a] + \definefontsynonym [cmbxti10] [wcmbxti10] [encoding=t2a] + \definefontsynonym [cmcsc10] [wcmcsc10] [encoding=t2a] + %definefontsynonym [cmdunh10] [wcmdunh10] [encoding=t2a] + \definefontsynonym [cminch] [wcminch] [encoding=t2a] + \definefontsynonym [cmr10] [wcmr10] [encoding=t2a] + \definefontsynonym [cmr12] [wcmr12] [encoding=t2a] + \definefontsynonym [cmr17] [wcmr17] [encoding=t2a] + \definefontsynonym [cmr5] [wcmr5] [encoding=t2a] + \definefontsynonym [cmr6] [wcmr6] [encoding=t2a] + \definefontsynonym [cmr7] [wcmr7] [encoding=t2a] + \definefontsynonym [cmr8] [wcmr8] [encoding=t2a] + \definefontsynonym [cmr9] [wcmr9] [encoding=t2a] + \definefontsynonym [cmsl10] [wcmsl10] [encoding=t2a] + \definefontsynonym [cmsl12] [wcmsl12] [encoding=t2a] + \definefontsynonym [cmsl8] [wcmsl8] [encoding=t2a] + \definefontsynonym [cmsl9] [wcmsl9] [encoding=t2a] + \definefontsynonym [cmti10] [wcmti10] [encoding=t2a] + \definefontsynonym [cmti12] [wcmti12] [encoding=t2a] + \definefontsynonym [cmti7] [wcmti7] [encoding=t2a] + \definefontsynonym [cmti8] [wcmti8] [encoding=t2a] + \definefontsynonym [cmti9] [wcmti9] [encoding=t2a] + \definefontsynonym [cmu10] [wcmu10] [encoding=t2a] \stoptypescript \starttypescript [sans] [computer-modern] [cyr] - \definefontsynonym [cmss10] [wcmss10] [encoding=t2a] - \definefontsynonym [cmss12] [wcmss12] [encoding=t2a] - \definefontsynonym [cmss17] [wcmss17] [encoding=t2a] - \definefontsynonym [cmss8] [wcmss8] [encoding=t2a] - \definefontsynonym [cmss9] [wcmss9] [encoding=t2a] - %definefontsynonym [cmssbi10] [wcmssbi10] [encoding=t2a] - \definefontsynonym [cmssbx10] [wcmssbx10] [encoding=t2a] - \definefontsynonym [cmssdc10] [wcmssdc10] [encoding=t2a] - \definefontsynonym [cmssi10] [wcmssi10] [encoding=t2a] - \definefontsynonym [cmssi12] [wcmssi12] [encoding=t2a] - \definefontsynonym [cmssi17] [wcmssi17] [encoding=t2a] - \definefontsynonym [cmssi8] [wcmssi8] [encoding=t2a] - \definefontsynonym [cmssi9] [wcmssi9] [encoding=t2a] - \definefontsynonym [cmssq8] [wcmssq8] [encoding=t2a] - \definefontsynonym [cmssqi8] [wcmssqi8] [encoding=t2a] + \definefontsynonym [cmss10] [wcmss10] [encoding=t2a] + \definefontsynonym [cmss12] [wcmss12] [encoding=t2a] + \definefontsynonym [cmss17] [wcmss17] [encoding=t2a] + \definefontsynonym [cmss8] [wcmss8] [encoding=t2a] + \definefontsynonym [cmss9] [wcmss9] [encoding=t2a] + %definefontsynonym [cmssbi10] [wcmssbi10] [encoding=t2a] + \definefontsynonym [cmssbx10] [wcmssbx10] [encoding=t2a] + \definefontsynonym [cmssdc10] [wcmssdc10] [encoding=t2a] + \definefontsynonym [cmssi10] [wcmssi10] [encoding=t2a] + \definefontsynonym [cmssi12] [wcmssi12] [encoding=t2a] + \definefontsynonym [cmssi17] [wcmssi17] [encoding=t2a] + \definefontsynonym [cmssi8] [wcmssi8] [encoding=t2a] + \definefontsynonym [cmssi9] [wcmssi9] [encoding=t2a] + \definefontsynonym [cmssq8] [wcmssq8] [encoding=t2a] + \definefontsynonym [cmssqi8] [wcmssqi8] [encoding=t2a] \stoptypescript \starttypescript [mono] [computer-modern] [cyr] - \definefontsynonym [cmitt10] [wcmitt10] [encoding=t2a] - \definefontsynonym [cmsltt10] [wcmsltt10] [encoding=t2a] - \definefontsynonym [cmtt10] [wcmtt10] [encoding=t2a] - \definefontsynonym [cmtt12] [wcmtt12] [encoding=t2a] - \definefontsynonym [cmtt8] [wcmtt8] [encoding=t2a] - \definefontsynonym [cmtt9] [wcmtt9] [encoding=t2a] - %definefontsynonym [cmvtt10] [wcmvtt10] [encoding=t2a] + \definefontsynonym [cmitt10] [wcmitt10] [encoding=t2a] + \definefontsynonym [cmsltt10] [wcmsltt10] [encoding=t2a] + \definefontsynonym [cmtt10] [wcmtt10] [encoding=t2a] + \definefontsynonym [cmtt12] [wcmtt12] [encoding=t2a] + \definefontsynonym [cmtt8] [wcmtt8] [encoding=t2a] + \definefontsynonym [cmtt9] [wcmtt9] [encoding=t2a] + %definefontsynonym [cmvtt10] [wcmvtt10] [encoding=t2a] \stoptypescript \definetypescriptprefix [c:t2a] [la] @@ -262,155 +262,155 @@ \stoptypescript \starttypescript [serif] [computer-modern] [t2a,t2b,t2c,x2] - \definefontsynonym [cmb10] [\typescriptprefix{c:\typescriptthree}rb1000] [encoding=\typescriptthree] - \definefontsynonym [cmbx10] [\typescriptprefix{c:\typescriptthree}bx1000] [encoding=\typescriptthree] - \definefontsynonym [cmbx12] [\typescriptprefix{c:\typescriptthree}bx1200] [encoding=\typescriptthree] - \definefontsynonym [cmbx5] [\typescriptprefix{c:\typescriptthree}bx0500] [encoding=\typescriptthree] - \definefontsynonym [cmbx6] [\typescriptprefix{c:\typescriptthree}bx0600] [encoding=\typescriptthree] - \definefontsynonym [cmbx7] [\typescriptprefix{c:\typescriptthree}bx0700] [encoding=\typescriptthree] - \definefontsynonym [cmbx8] [\typescriptprefix{c:\typescriptthree}bx0800] [encoding=\typescriptthree] - \definefontsynonym [cmbx9] [\typescriptprefix{c:\typescriptthree}bx0900] [encoding=\typescriptthree] - \definefontsynonym [cmbxsl10] [\typescriptprefix{c:\typescriptthree}bl1000] [encoding=\typescriptthree] - \definefontsynonym [cmbxti10] [\typescriptprefix{c:\typescriptthree}bi1000] [encoding=\typescriptthree] - \definefontsynonym [cmcsc10] [\typescriptprefix{c:\typescriptthree}cc1000] [encoding=\typescriptthree] - \definefontsynonym [cmdunh10] [\typescriptprefix{c:\typescriptthree}dh1000] [encoding=\typescriptthree] - \definefontsynonym [cmff10] [\typescriptprefix{c:\typescriptthree}ff1000] [encoding=\typescriptthree] - \definefontsynonym [cmfi10] [\typescriptprefix{c:\typescriptthree}fi1000] [encoding=\typescriptthree] - \definefontsynonym [cmfib8] [\typescriptprefix{c:\typescriptthree}fb0800] [encoding=\typescriptthree] - %\definefontsynonym [cminch] [\typescriptprefix{c:\typescriptthree}inch00] [encoding=\typescriptthree] - \definefontsynonym [cmr10] [\typescriptprefix{c:\typescriptthree}rm1000] [encoding=\typescriptthree] - \definefontsynonym [cmr12] [\typescriptprefix{c:\typescriptthree}rm1200] [encoding=\typescriptthree] - \definefontsynonym [cmr17] [\typescriptprefix{c:\typescriptthree}rm1700] [encoding=\typescriptthree] - \definefontsynonym [cmr5] [\typescriptprefix{c:\typescriptthree}rm0500] [encoding=\typescriptthree] - \definefontsynonym [cmr6] [\typescriptprefix{c:\typescriptthree}rm0600] [encoding=\typescriptthree] - \definefontsynonym [cmr7] [\typescriptprefix{c:\typescriptthree}rm0700] [encoding=\typescriptthree] - \definefontsynonym [cmr8] [\typescriptprefix{c:\typescriptthree}rm0800] [encoding=\typescriptthree] - \definefontsynonym [cmr9] [\typescriptprefix{c:\typescriptthree}rm0900] [encoding=\typescriptthree] - \definefontsynonym [cmsl10] [\typescriptprefix{c:\typescriptthree}sl1000] [encoding=\typescriptthree] - \definefontsynonym [cmsl12] [\typescriptprefix{c:\typescriptthree}sl1200] [encoding=\typescriptthree] - \definefontsynonym [cmsl8] [\typescriptprefix{c:\typescriptthree}sl0800] [encoding=\typescriptthree] - \definefontsynonym [cmsl9] [\typescriptprefix{c:\typescriptthree}sl0900] [encoding=\typescriptthree] - \definefontsynonym [cmtcsc10] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree] - \definefontsynonym [cmti10] [\typescriptprefix{c:\typescriptthree}ti1000] [encoding=\typescriptthree] - \definefontsynonym [cmti12] [\typescriptprefix{c:\typescriptthree}ti1200] [encoding=\typescriptthree] - \definefontsynonym [cmti7] [\typescriptprefix{c:\typescriptthree}ti0700] [encoding=\typescriptthree] - \definefontsynonym [cmti8] [\typescriptprefix{c:\typescriptthree}ti0800] [encoding=\typescriptthree] - \definefontsynonym [cmti9] [\typescriptprefix{c:\typescriptthree}ti0900] [encoding=\typescriptthree] - \definefontsynonym [cmu10] [\typescriptprefix{c:\typescriptthree}ui1000] [encoding=\typescriptthree] + \definefontsynonym [cmb10] [\typescriptprefix{c:\typescriptthree}rb1000] [encoding=\typescriptthree] + \definefontsynonym [cmbx10] [\typescriptprefix{c:\typescriptthree}bx1000] [encoding=\typescriptthree] + \definefontsynonym [cmbx12] [\typescriptprefix{c:\typescriptthree}bx1200] [encoding=\typescriptthree] + \definefontsynonym [cmbx5] [\typescriptprefix{c:\typescriptthree}bx0500] [encoding=\typescriptthree] + \definefontsynonym [cmbx6] [\typescriptprefix{c:\typescriptthree}bx0600] [encoding=\typescriptthree] + \definefontsynonym [cmbx7] [\typescriptprefix{c:\typescriptthree}bx0700] [encoding=\typescriptthree] + \definefontsynonym [cmbx8] [\typescriptprefix{c:\typescriptthree}bx0800] [encoding=\typescriptthree] + \definefontsynonym [cmbx9] [\typescriptprefix{c:\typescriptthree}bx0900] [encoding=\typescriptthree] + \definefontsynonym [cmbxsl10] [\typescriptprefix{c:\typescriptthree}bl1000] [encoding=\typescriptthree] + \definefontsynonym [cmbxti10] [\typescriptprefix{c:\typescriptthree}bi1000] [encoding=\typescriptthree] + \definefontsynonym [cmcsc10] [\typescriptprefix{c:\typescriptthree}cc1000] [encoding=\typescriptthree] + \definefontsynonym [cmdunh10] [\typescriptprefix{c:\typescriptthree}dh1000] [encoding=\typescriptthree] + \definefontsynonym [cmff10] [\typescriptprefix{c:\typescriptthree}ff1000] [encoding=\typescriptthree] + \definefontsynonym [cmfi10] [\typescriptprefix{c:\typescriptthree}fi1000] [encoding=\typescriptthree] + \definefontsynonym [cmfib8] [\typescriptprefix{c:\typescriptthree}fb0800] [encoding=\typescriptthree] + %\definefontsynonym [cminch] [\typescriptprefix{c:\typescriptthree}inch00] [encoding=\typescriptthree] + \definefontsynonym [cmr10] [\typescriptprefix{c:\typescriptthree}rm1000] [encoding=\typescriptthree] + \definefontsynonym [cmr12] [\typescriptprefix{c:\typescriptthree}rm1200] [encoding=\typescriptthree] + \definefontsynonym [cmr17] [\typescriptprefix{c:\typescriptthree}rm1700] [encoding=\typescriptthree] + \definefontsynonym [cmr5] [\typescriptprefix{c:\typescriptthree}rm0500] [encoding=\typescriptthree] + \definefontsynonym [cmr6] [\typescriptprefix{c:\typescriptthree}rm0600] [encoding=\typescriptthree] + \definefontsynonym [cmr7] [\typescriptprefix{c:\typescriptthree}rm0700] [encoding=\typescriptthree] + \definefontsynonym [cmr8] [\typescriptprefix{c:\typescriptthree}rm0800] [encoding=\typescriptthree] + \definefontsynonym [cmr9] [\typescriptprefix{c:\typescriptthree}rm0900] [encoding=\typescriptthree] + \definefontsynonym [cmsl10] [\typescriptprefix{c:\typescriptthree}sl1000] [encoding=\typescriptthree] + \definefontsynonym [cmsl12] [\typescriptprefix{c:\typescriptthree}sl1200] [encoding=\typescriptthree] + \definefontsynonym [cmsl8] [\typescriptprefix{c:\typescriptthree}sl0800] [encoding=\typescriptthree] + \definefontsynonym [cmsl9] [\typescriptprefix{c:\typescriptthree}sl0900] [encoding=\typescriptthree] + \definefontsynonym [cmtcsc10] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree] + \definefontsynonym [cmti10] [\typescriptprefix{c:\typescriptthree}ti1000] [encoding=\typescriptthree] + \definefontsynonym [cmti12] [\typescriptprefix{c:\typescriptthree}ti1200] [encoding=\typescriptthree] + \definefontsynonym [cmti7] [\typescriptprefix{c:\typescriptthree}ti0700] [encoding=\typescriptthree] + \definefontsynonym [cmti8] [\typescriptprefix{c:\typescriptthree}ti0800] [encoding=\typescriptthree] + \definefontsynonym [cmti9] [\typescriptprefix{c:\typescriptthree}ti0900] [encoding=\typescriptthree] + \definefontsynonym [cmu10] [\typescriptprefix{c:\typescriptthree}ui1000] [encoding=\typescriptthree] \stoptypescript \starttypescript [sans] [computer-modern] [t2a,t2b,t2c,x2] - \definefontsynonym [cmss10] [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree] - \definefontsynonym [cmss12] [\typescriptprefix{c:\typescriptthree}ss1200] [encoding=\typescriptthree] - \definefontsynonym [cmss17] [\typescriptprefix{c:\typescriptthree}ss1700] [encoding=\typescriptthree] - \definefontsynonym [cmss8] [\typescriptprefix{c:\typescriptthree}ss0800] [encoding=\typescriptthree] - \definefontsynonym [cmss9] [\typescriptprefix{c:\typescriptthree}ss0900] [encoding=\typescriptthree] - \definefontsynonym [cmssbx10] [\typescriptprefix{c:\typescriptthree}sx1000] [encoding=\typescriptthree] - %\definefontsynonym [cmssdc10] [\typescriptprefix{c:\typescriptthree}ssdc1000] [encoding=\typescriptthree] - \definefontsynonym [cmssi10] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] - \definefontsynonym [cmssi12] [\typescriptprefix{c:\typescriptthree}si1200] [encoding=\typescriptthree] - \definefontsynonym [cmssi17] [\typescriptprefix{c:\typescriptthree}si1700] [encoding=\typescriptthree] - \definefontsynonym [cmssi8] [\typescriptprefix{c:\typescriptthree}si0800] [encoding=\typescriptthree] - \definefontsynonym [cmssi9] [\typescriptprefix{c:\typescriptthree}si0900] [encoding=\typescriptthree] - \definefontsynonym [cmssq8] [\typescriptprefix{c:\typescriptthree}ss0800] [encoding=\typescriptthree] - \definefontsynonym [cmssqi8] [\typescriptprefix{c:\typescriptthree}si0800] [encoding=\typescriptthree] + \definefontsynonym [cmss10] [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree] + \definefontsynonym [cmss12] [\typescriptprefix{c:\typescriptthree}ss1200] [encoding=\typescriptthree] + \definefontsynonym [cmss17] [\typescriptprefix{c:\typescriptthree}ss1700] [encoding=\typescriptthree] + \definefontsynonym [cmss8] [\typescriptprefix{c:\typescriptthree}ss0800] [encoding=\typescriptthree] + \definefontsynonym [cmss9] [\typescriptprefix{c:\typescriptthree}ss0900] [encoding=\typescriptthree] + \definefontsynonym [cmssbx10] [\typescriptprefix{c:\typescriptthree}sx1000] [encoding=\typescriptthree] + %\definefontsynonym [cmssdc10] [\typescriptprefix{c:\typescriptthree}ssdc1000] [encoding=\typescriptthree] + \definefontsynonym [cmssi10] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] + \definefontsynonym [cmssi12] [\typescriptprefix{c:\typescriptthree}si1200] [encoding=\typescriptthree] + \definefontsynonym [cmssi17] [\typescriptprefix{c:\typescriptthree}si1700] [encoding=\typescriptthree] + \definefontsynonym [cmssi8] [\typescriptprefix{c:\typescriptthree}si0800] [encoding=\typescriptthree] + \definefontsynonym [cmssi9] [\typescriptprefix{c:\typescriptthree}si0900] [encoding=\typescriptthree] + \definefontsynonym [cmssq8] [\typescriptprefix{c:\typescriptthree}ss0800] [encoding=\typescriptthree] + \definefontsynonym [cmssqi8] [\typescriptprefix{c:\typescriptthree}si0800] [encoding=\typescriptthree] \stoptypescript \starttypescript [mono] [computer-modern] [t2a,t2b,t2c,x2] - \definefontsynonym [cmitt10] [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree] - \definefontsynonym [cmsltt10] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree] - \definefontsynonym [cmtt10] [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree] - \definefontsynonym [cmtt12] [\typescriptprefix{c:\typescriptthree}tt1200] [encoding=\typescriptthree] - \definefontsynonym [cmtt8] [\typescriptprefix{c:\typescriptthree}tt0800] [encoding=\typescriptthree] - \definefontsynonym [cmtt9] [\typescriptprefix{c:\typescriptthree}tt0900] [encoding=\typescriptthree] - \definefontsynonym [cmvtt10] [\typescriptprefix{c:\typescriptthree}vt1000] [encoding=\typescriptthree] + \definefontsynonym [cmitt10] [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree] + \definefontsynonym [cmsltt10] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree] + \definefontsynonym [cmtt10] [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree] + \definefontsynonym [cmtt12] [\typescriptprefix{c:\typescriptthree}tt1200] [encoding=\typescriptthree] + \definefontsynonym [cmtt8] [\typescriptprefix{c:\typescriptthree}tt0800] [encoding=\typescriptthree] + \definefontsynonym [cmtt9] [\typescriptprefix{c:\typescriptthree}tt0900] [encoding=\typescriptthree] + \definefontsynonym [cmvtt10] [\typescriptprefix{c:\typescriptthree}vt1000] [encoding=\typescriptthree] \stoptypescript \starttypescript [serif] [computer-modern] [lcy] - \definefontsynonym [cmb10] [lhb10] [encoding=lcy] - \definefontsynonym [cmbx10] [lhbx10] [encoding=lcy] - \definefontsynonym [cmbx12] [lhbx12] [encoding=lcy] - \definefontsynonym [cmbx5] [lhbx5] [encoding=lcy] - \definefontsynonym [cmbx6] [lhbx6] [encoding=lcy] - \definefontsynonym [cmbx7] [lhbx7] [encoding=lcy] - \definefontsynonym [cmbx8] [lhbx8] [encoding=lcy] - \definefontsynonym [cmbx9] [lhbx9] [encoding=lcy] - \definefontsynonym [cmbxsl10] [lhbxsl10] [encoding=lcy] - \definefontsynonym [cmbxti10] [lhbxti10] [encoding=lcy] - \definefontsynonym [cmcsc10] [lhcsc10] [encoding=lcy] - \definefontsynonym [cmdunh10] [lhdunh10] [encoding=lcy] - \definefontsynonym [cmff10] [lhff10] [encoding=lcy] - \definefontsynonym [cmfi10] [lhfi10] [encoding=lcy] - \definefontsynonym [cmfib8] [lhfib8] [encoding=lcy] - \definefontsynonym [cminch] [lhinch] [encoding=lcy] - \definefontsynonym [cmr10] [lhr10] [encoding=lcy] - \definefontsynonym [cmr12] [lhr12] [encoding=lcy] - \definefontsynonym [cmr17] [lhr17] [encoding=lcy] - \definefontsynonym [cmr5] [lhr5] [encoding=lcy] - \definefontsynonym [cmr6] [lhr6] [encoding=lcy] - \definefontsynonym [cmr7] [lhr7] [encoding=lcy] - \definefontsynonym [cmr8] [lhr8] [encoding=lcy] - \definefontsynonym [cmr9] [lhr9] [encoding=lcy] - \definefontsynonym [cmsl10] [lhsl10] [encoding=lcy] - \definefontsynonym [cmsl12] [lhsl12] [encoding=lcy] - \definefontsynonym [cmsl8] [lhsl8] [encoding=lcy] - \definefontsynonym [cmsl9] [lhsl9] [encoding=lcy] - \definefontsynonym [cmtcsc10] [lhtcsc10] [encoding=lcy] - \definefontsynonym [cmtex10] [lhtex10] [encoding=lcy] - \definefontsynonym [cmtex8] [lhtex8] [encoding=lcy] - \definefontsynonym [cmtex9] [lhtex9] [encoding=lcy] - \definefontsynonym [cmti10] [lhti10] [encoding=lcy] - \definefontsynonym [cmti12] [lhti12] [encoding=lcy] - \definefontsynonym [cmti7] [lhti7] [encoding=lcy] - \definefontsynonym [cmti8] [lhti8] [encoding=lcy] - \definefontsynonym [cmti9] [lhti9] [encoding=lcy] - \definefontsynonym [cmu10] [lhu10] [encoding=lcy] + \definefontsynonym [cmb10] [lhb10] [encoding=lcy] + \definefontsynonym [cmbx10] [lhbx10] [encoding=lcy] + \definefontsynonym [cmbx12] [lhbx12] [encoding=lcy] + \definefontsynonym [cmbx5] [lhbx5] [encoding=lcy] + \definefontsynonym [cmbx6] [lhbx6] [encoding=lcy] + \definefontsynonym [cmbx7] [lhbx7] [encoding=lcy] + \definefontsynonym [cmbx8] [lhbx8] [encoding=lcy] + \definefontsynonym [cmbx9] [lhbx9] [encoding=lcy] + \definefontsynonym [cmbxsl10] [lhbxsl10] [encoding=lcy] + \definefontsynonym [cmbxti10] [lhbxti10] [encoding=lcy] + \definefontsynonym [cmcsc10] [lhcsc10] [encoding=lcy] + \definefontsynonym [cmdunh10] [lhdunh10] [encoding=lcy] + \definefontsynonym [cmff10] [lhff10] [encoding=lcy] + \definefontsynonym [cmfi10] [lhfi10] [encoding=lcy] + \definefontsynonym [cmfib8] [lhfib8] [encoding=lcy] + \definefontsynonym [cminch] [lhinch] [encoding=lcy] + \definefontsynonym [cmr10] [lhr10] [encoding=lcy] + \definefontsynonym [cmr12] [lhr12] [encoding=lcy] + \definefontsynonym [cmr17] [lhr17] [encoding=lcy] + \definefontsynonym [cmr5] [lhr5] [encoding=lcy] + \definefontsynonym [cmr6] [lhr6] [encoding=lcy] + \definefontsynonym [cmr7] [lhr7] [encoding=lcy] + \definefontsynonym [cmr8] [lhr8] [encoding=lcy] + \definefontsynonym [cmr9] [lhr9] [encoding=lcy] + \definefontsynonym [cmsl10] [lhsl10] [encoding=lcy] + \definefontsynonym [cmsl12] [lhsl12] [encoding=lcy] + \definefontsynonym [cmsl8] [lhsl8] [encoding=lcy] + \definefontsynonym [cmsl9] [lhsl9] [encoding=lcy] + \definefontsynonym [cmtcsc10] [lhtcsc10] [encoding=lcy] + \definefontsynonym [cmtex10] [lhtex10] [encoding=lcy] + \definefontsynonym [cmtex8] [lhtex8] [encoding=lcy] + \definefontsynonym [cmtex9] [lhtex9] [encoding=lcy] + \definefontsynonym [cmti10] [lhti10] [encoding=lcy] + \definefontsynonym [cmti12] [lhti12] [encoding=lcy] + \definefontsynonym [cmti7] [lhti7] [encoding=lcy] + \definefontsynonym [cmti8] [lhti8] [encoding=lcy] + \definefontsynonym [cmti9] [lhti9] [encoding=lcy] + \definefontsynonym [cmu10] [lhu10] [encoding=lcy] \stoptypescript \starttypescript [sans] [computer-modern] [lcy] - \definefontsynonym [cmss10] [lhss10] [encoding=lcy] - \definefontsynonym [cmss12] [lhss12] [encoding=lcy] - \definefontsynonym [cmss17] [lhss17] [encoding=lcy] - \definefontsynonym [cmss8] [lhss8] [encoding=lcy] - \definefontsynonym [cmss9] [lhss9] [encoding=lcy] - \definefontsynonym [cmssbi10] [lhssbi10] [encoding=lcy] - \definefontsynonym [cmssbx10] [lhssbx10] [encoding=lcy] - \definefontsynonym [cmssdc10] [lhssdc10] [encoding=lcy] - \definefontsynonym [cmssi10] [lhssi10] [encoding=lcy] - \definefontsynonym [cmssi12] [lhssi12] [encoding=lcy] - \definefontsynonym [cmssi17] [lhssi17] [encoding=lcy] - \definefontsynonym [cmssi8] [lhssi8] [encoding=lcy] - \definefontsynonym [cmssi9] [lhssi9] [encoding=lcy] - \definefontsynonym [cmssq8] [lhssq8] [encoding=lcy] - \definefontsynonym [cmssqi8] [lhssqi8] [encoding=lcy] + \definefontsynonym [cmss10] [lhss10] [encoding=lcy] + \definefontsynonym [cmss12] [lhss12] [encoding=lcy] + \definefontsynonym [cmss17] [lhss17] [encoding=lcy] + \definefontsynonym [cmss8] [lhss8] [encoding=lcy] + \definefontsynonym [cmss9] [lhss9] [encoding=lcy] + \definefontsynonym [cmssbi10] [lhssbi10] [encoding=lcy] + \definefontsynonym [cmssbx10] [lhssbx10] [encoding=lcy] + \definefontsynonym [cmssdc10] [lhssdc10] [encoding=lcy] + \definefontsynonym [cmssi10] [lhssi10] [encoding=lcy] + \definefontsynonym [cmssi12] [lhssi12] [encoding=lcy] + \definefontsynonym [cmssi17] [lhssi17] [encoding=lcy] + \definefontsynonym [cmssi8] [lhssi8] [encoding=lcy] + \definefontsynonym [cmssi9] [lhssi9] [encoding=lcy] + \definefontsynonym [cmssq8] [lhssq8] [encoding=lcy] + \definefontsynonym [cmssqi8] [lhssqi8] [encoding=lcy] \stoptypescript \starttypescript [mono] [computer-modern] [lcy] - \definefontsynonym [cmitt10] [lhitt10] [encoding=lcy] - \definefontsynonym [cmsltt10] [lhsltt10] [encoding=lcy] - \definefontsynonym [cmtt10] [lhtt10] [encoding=lcy] - \definefontsynonym [cmtt12] [lhtt12] [encoding=lcy] - \definefontsynonym [cmtt8] [lhtt8] [encoding=lcy] - \definefontsynonym [cmtt9] [lhtt9] [encoding=lcy] - \definefontsynonym [cmvtt10] [lhvtt10] [encoding=lcy] + \definefontsynonym [cmitt10] [lhitt10] [encoding=lcy] + \definefontsynonym [cmsltt10] [lhsltt10] [encoding=lcy] + \definefontsynonym [cmtt10] [lhtt10] [encoding=lcy] + \definefontsynonym [cmtt12] [lhtt12] [encoding=lcy] + \definefontsynonym [cmtt8] [lhtt8] [encoding=lcy] + \definefontsynonym [cmtt9] [lhtt9] [encoding=lcy] + \definefontsynonym [cmvtt10] [lhvtt10] [encoding=lcy] \stoptypescript % \starttypescript [math] [modern,computer-modern,latin-modern] % [default] - % watch the space, it prevents remapping - \definefontsynonym [ComputerModernMath-Roman] [rm-lmr10]% [lmr10 ] - \definefontsynonym [ComputerModernMath-Extension] [lmex10] - \definefontsynonym [ComputerModernMath-Italic] [lmmi10] - \definefontsynonym [ComputerModernMath-Symbol] [lmsy10] + % watch the space, it prevents remapping + \definefontsynonym [ComputerModernMath-Roman] [rm-lmr10]% [lmr10 ] + \definefontsynonym [ComputerModernMath-Extension] [lmex10] + \definefontsynonym [ComputerModernMath-Italic] [lmmi10] + \definefontsynonym [ComputerModernMath-Symbol] [lmsy10] \stoptypescript \starttypescript [boldmath,bfmath] [modern,computer-modern,latin-modern] % [default] - % watch the space, it prevents remapping - \definefontsynonym [ComputerModernMath-Roman-Bold] [rm-lmb10] % [lmb10 ] - \definefontsynonym [ComputerModernMath-Extension] [lmex10] - \definefontsynonym [ComputerModernMath-Italic-Bold] [lmmib10] - \definefontsynonym [ComputerModernMath-Symbol-Bold] [lmbsy10] + % watch the space, it prevents remapping + \definefontsynonym [ComputerModernMath-Roman-Bold] [rm-lmb10] % [lmb10 ] + \definefontsynonym [ComputerModernMath-Extension] [lmex10] + \definefontsynonym [ComputerModernMath-Italic-Bold] [lmmib10] + \definefontsynonym [ComputerModernMath-Symbol-Bold] [lmbsy10] \stoptypescript % Till we have cyrilic in lm: @@ -419,48 +419,48 @@ % \setupbodyfont[modern,10pt] \starttypescript [serif] [computer-modern] [t2a,t2b,t2c,x2] - \definefontsynonym [Serif] [\typescriptprefix{c:\typescriptthree}rm1000] [encoding=\typescriptthree] - \definefontsynonym [SerifItalic] [\typescriptprefix{c:\typescriptthree}ti1000] [encoding=\typescriptthree] - \definefontsynonym [SerifSlanted] [\typescriptprefix{c:\typescriptthree}sl1000] [encoding=\typescriptthree] - \definefontsynonym [SerifBold] [\typescriptprefix{c:\typescriptthree}bx1000] [encoding=\typescriptthree] - \definefontsynonym [SerifBoldItalic] [\typescriptprefix{c:\typescriptthree}bi1000] [encoding=\typescriptthree] - \definefontsynonym [SerifBoldSlanted] [\typescriptprefix{c:\typescriptthree}bl1000] [encoding=\typescriptthree] - \definefontsynonym [SerifCaps] [\typescriptprefix{c:\typescriptthree}cc1000] [encoding=\typescriptthree] - \definefontsynonym [SerifCapsSlanted] [\typescriptprefix{c:\typescriptthree}sc1000] [encoding=\typescriptthree] + \definefontsynonym [Serif] [\typescriptprefix{c:\typescriptthree}rm1000] [encoding=\typescriptthree] + \definefontsynonym [SerifItalic] [\typescriptprefix{c:\typescriptthree}ti1000] [encoding=\typescriptthree] + \definefontsynonym [SerifSlanted] [\typescriptprefix{c:\typescriptthree}sl1000] [encoding=\typescriptthree] + \definefontsynonym [SerifBold] [\typescriptprefix{c:\typescriptthree}bx1000] [encoding=\typescriptthree] + \definefontsynonym [SerifBoldItalic] [\typescriptprefix{c:\typescriptthree}bi1000] [encoding=\typescriptthree] + \definefontsynonym [SerifBoldSlanted] [\typescriptprefix{c:\typescriptthree}bl1000] [encoding=\typescriptthree] + \definefontsynonym [SerifCaps] [\typescriptprefix{c:\typescriptthree}cc1000] [encoding=\typescriptthree] + \definefontsynonym [SerifCapsSlanted] [\typescriptprefix{c:\typescriptthree}sc1000] [encoding=\typescriptthree] \stoptypescript \starttypescript [sans] [computer-modern] [t2a,t2b,t2c,x2] - \definefontsynonym [Sans] [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree] - \definefontsynonym [SansItalic] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] - \definefontsynonym [SansSlanted] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] - \definefontsynonym [SansBold] [\typescriptprefix{c:\typescriptthree}sx1000] [encoding=\typescriptthree] - \definefontsynonym [SansBoldItalic] [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree] - \definefontsynonym [SansBoldSlanted] [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree] - \definefontsynonym [SansCaps] [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree] - \definefontsynonym [SansCapsSlanted] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] + \definefontsynonym [Sans] [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree] + \definefontsynonym [SansItalic] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] + \definefontsynonym [SansSlanted] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] + \definefontsynonym [SansBold] [\typescriptprefix{c:\typescriptthree}sx1000] [encoding=\typescriptthree] + \definefontsynonym [SansBoldItalic] [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree] + \definefontsynonym [SansBoldSlanted] [\typescriptprefix{c:\typescriptthree}so1000] [encoding=\typescriptthree] + \definefontsynonym [SansCaps] [\typescriptprefix{c:\typescriptthree}ss1000] [encoding=\typescriptthree] + \definefontsynonym [SansCapsSlanted] [\typescriptprefix{c:\typescriptthree}si1000] [encoding=\typescriptthree] \stoptypescript \starttypescript [mono] [computer-modern] [t2a,t2b,t2c,x2] - \definefontsynonym [Mono] [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree] - \definefontsynonym [MonoItalic] [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree] - \definefontsynonym [MonoSlanted] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree] - \definefontsynonym [MonoBold] [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree] - \definefontsynonym [MonoBoldItalic] [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree] - \definefontsynonym [MonoBoldSlanted] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree] - \definefontsynonym [MonoCaps] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree] - \definefontsynonym [MonoCapsSlanted] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree] + \definefontsynonym [Mono] [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree] + \definefontsynonym [MonoItalic] [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree] + \definefontsynonym [MonoSlanted] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree] + \definefontsynonym [MonoBold] [\typescriptprefix{c:\typescriptthree}tt1000] [encoding=\typescriptthree] + \definefontsynonym [MonoBoldItalic] [\typescriptprefix{c:\typescriptthree}it1000] [encoding=\typescriptthree] + \definefontsynonym [MonoBoldSlanted] [\typescriptprefix{c:\typescriptthree}st1000] [encoding=\typescriptthree] + \definefontsynonym [MonoCaps] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree] + \definefontsynonym [MonoCapsSlanted] [\typescriptprefix{c:\typescriptthree}tc1000] [encoding=\typescriptthree] \stoptypescript % Computer Concrete (AMS) \starttypescript [serif] [concrete] [default] - \definefontsynonym [ComputerConcrete] [ccr10] - \definefontsynonym [ComputerConcrete-Italic] [ccti10] - \definefontsynonym [ComputerConcrete-Slanted] [ccsl10] - \definefontsynonym [ComputerConcrete-Bold] [ComputerConcrete] - \definefontsynonym [ComputerConcrete-BoldItalic] [ComputerConcrete-Italic] - \definefontsynonym [ComputerConcrete-BoldSlanted] [ComputerConcrete-Slanted] - \definefontsynonym [ComputerConcrete-Caps] [cccsc10] + \definefontsynonym [ComputerConcrete] [ccr10] + \definefontsynonym [ComputerConcrete-Italic] [ccti10] + \definefontsynonym [ComputerConcrete-Slanted] [ccsl10] + \definefontsynonym [ComputerConcrete-Bold] [ComputerConcrete] + \definefontsynonym [ComputerConcrete-BoldItalic] [ComputerConcrete-Italic] + \definefontsynonym [ComputerConcrete-BoldSlanted] [ComputerConcrete-Slanted] + \definefontsynonym [ComputerConcrete-Caps] [cccsc10] \stoptypescript \starttypescript [serif] [modern,computer-modern,latin-modern] [name] @@ -2553,13 +2553,13 @@ % so we keep using that as default % \starttypescript [mono] [lucida] [name] - % \definefontsynonym [Mono] [LucidaTypewriter] - % \definefontsynonym [MonoBold] [LucidaTypewriterBold] - % \definefontsynonym [MonoItalic] [LucidaTypewriterOblique] - % \definefontsynonym [MonoBoldItalic] [LucidaTypewriterBoldOblique] - % \definefontsynonym [MonoSlanted] [LucidaTypewriterOblique] - % \definefontsynonym [MonoBoldSlanted] [LucidaTypewriterBoldOblique] - % \definefontsynonym [MonoCaps] [LucidaTypewriter] + % \definefontsynonym [Mono] [LucidaTypewriter] + % \definefontsynonym [MonoBold] [LucidaTypewriterBold] + % \definefontsynonym [MonoItalic] [LucidaTypewriterOblique] + % \definefontsynonym [MonoBoldItalic] [LucidaTypewriterBoldOblique] + % \definefontsynonym [MonoSlanted] [LucidaTypewriterOblique] + % \definefontsynonym [MonoBoldSlanted] [LucidaTypewriterBoldOblique] + % \definefontsynonym [MonoCaps] [LucidaTypewriter] % \stoptypescript % Lucida Bright Sans Typewriter @@ -2790,14 +2790,14 @@ \loadmapfile[dejavu-truetype.map] \stoptypescript - \starttypescript [mono] [dejavu,dejavu-condensed] [ec,qx,t2a] - \definefontsynonym [DejaVuSansMono] [DejaVuSansMono-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] - \definefontsynonym [DejaVuSansMono-Italic] [DejaVuSansMono-Italic-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] - \definefontsynonym [DejaVuSansMono-Bold] [DejaVuSansMono-Bold-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] - \definefontsynonym [DejaVuSansMono-BoldItalic] [DejaVuSansMono-BoldItalic-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] + \starttypescript [mono] [dejavu,dejavu-condensed] [ec,qx,t2a] + \definefontsynonym [DejaVuSansMono] [DejaVuSansMono-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] + \definefontsynonym [DejaVuSansMono-Italic] [DejaVuSansMono-Italic-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] + \definefontsynonym [DejaVuSansMono-Bold] [DejaVuSansMono-Bold-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] + \definefontsynonym [DejaVuSansMono-BoldItalic] [DejaVuSansMono-BoldItalic-tlf-\typescriptprefix{e:\typescriptthree}] [encoding=\typescriptthree] - \loadmapfile[dejavu-truetype.map] - \stoptypescript + \loadmapfile[dejavu-truetype.map] + \stoptypescript \starttypescript [serif] [dejavu] [name] \definefontsynonym [Serif] [DejaVuSerif] @@ -2843,16 +2843,16 @@ \definefontsynonym [SansCaps] [Sans] \stoptypescript - \starttypescript [mono] [dejavu,dejavu-condensed] [name] - \definefontsynonym [Mono] [DejaVuSansMono] - \definefontsynonym [MonoItalic] [DejaVuSansMono-Italic] - \definefontsynonym [MonoBold] [DejaVuSansMono-Bold] - \definefontsynonym [MonoBoldItalic] [DejaVuSansMono-BoldItalic] + \starttypescript [mono] [dejavu,dejavu-condensed] [name] + \definefontsynonym [Mono] [DejaVuSansMono] + \definefontsynonym [MonoItalic] [DejaVuSansMono-Italic] + \definefontsynonym [MonoBold] [DejaVuSansMono-Bold] + \definefontsynonym [MonoBoldItalic] [DejaVuSansMono-BoldItalic] - \definefontsynonym [MonoSlanted] [MonoItalic] - \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic] - \definefontsynonym [MonoCaps] [Mono] - \stoptypescript + \definefontsynonym [MonoSlanted] [MonoItalic] + \definefontsynonym [MonoBoldSlanted] [MonoBoldItalic] + \definefontsynonym [MonoCaps] [Mono] + \stoptypescript \starttypescript [dejavu] [ec,qx,t2a] \definetypeface [dejavu] [rm] [serif] [dejavu] [default] [encoding=\typescripttwo] @@ -2872,4 +2872,46 @@ \stoptypescriptcollection +\starttypescriptcollection[gentium] + + \starttypescript [serif] [gentium] [ec,texnansi,qx,t5,l7x] + \definefontsynonym [Gentium-Roman] [\typescriptthree-gentiumplus-regular] [encoding=\typescriptthree] + \definefontsynonym [Gentium-Italic] [\typescriptthree-gentiumplus-italic] [encoding=\typescriptthree] + \definefontsynonym [Gentium-Bold] [\typescriptthree-gentiumbasic-bold] [encoding=\typescriptthree] + \definefontsynonym [Gentium-BoldItalic] [\typescriptthree-gentiumbasic-bolditalic] [encoding=\typescriptthree] + \definefontsynonym [Gentium-RomanCaps] [\typescriptthree-gentiumplus-regular-sc] [encoding=\typescriptthree] + \definefontsynonym [Gentium-Slanted] [Gentium-Italic] + \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic] + \loadmapfile[gentium-\typescriptthree.map] + \stoptypescript + + \starttypescript [serif] [gentium] [agr,t2a] + \definefontsynonym [Gentium-Roman] [\typescriptthree-gentiumplus-regular] [encoding=\typescriptthree] + \definefontsynonym [Gentium-Italic] [\typescriptthree-gentiumplus-italic] [encoding=\typescriptthree] + \definefontsynonym [Gentium-RomanCaps] [\typescriptthree-gentiumplus-regular-sc] [encoding=\typescriptthree] + \definefontsynonym [Gentium-Bold] [Gentium-Roman] + \definefontsynonym [Gentium-BoldItalic] [Gentium-Italic] + \definefontsynonym [Gentium-Slanted] [Gentium-Italic] + \definefontsynonym [Gentium-BoldSlanted] [Gentium-Italic] + \loadmapfile[gentium-\typescriptthree.map] + \stoptypescript + + \starttypescript [serif] [gentium] [name] + \usetypescript[serif][fallback] + \definefontsynonym [Serif] [Gentium-Roman] + \definefontsynonym [SerifItalic] [Gentium-Italic] + \definefontsynonym [SerifBold] [Gentium-Bold] + \definefontsynonym [SerifBoldItalic] [Gentium-BoldItalic] + \definefontsynonym [SerifSlanted] [Gentium-Slanted] + \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted] + \definefontsynonym [SerifCaps] [Gentium-RomanCaps] + \definefontsynonym [OldStyle] [Serif] + \stoptypescript + + \starttypescript [gentium] [ec,texnansi,qx,t5,t2a,agr,l7x] + \definetypeface [gentium] [rm] [serif] [gentium] [default] [encoding=\typescripttwo] + \stoptypescript + +\stoptypescriptcollection + \endinput diff --git a/tex/context/base/type-xtx.mkii b/tex/context/base/type-xtx.mkii index d8b5f9c2a..3c5b06d9e 100644 --- a/tex/context/base/type-xtx.mkii +++ b/tex/context/base/type-xtx.mkii @@ -3,14 +3,17 @@ %D version=2004.11.15, % prereleased earlier %D title=\CONTEXT\ Typescript Macros, %D subtitle=\XETEX's font treasures, -%D author=Adam T. Lindsay, +%D author=Adam T. Lindsay etc, %D date=\currentdate, -%D copyright={Adam Lindsay \& Hans Hagen}] +%D copyright={Adam Lindsay \& Hans Hagen \& ...}] %C %C This module is part of the \CONTEXT\ macro||package and is %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +%D Note HH: this file probably needs to be adapted to the current names and +%D so but as I don't use \XETEX\ myself others have to provide information. + %D Here are some fonts definitions that can get you started with %D \XETEX\ (for more details see Adam's MyWay documents). %D @@ -363,7 +366,7 @@ \starttypescript[serif,handwriting][zapfino][uc] -\definefontsynonym[ZapfinoOne] [name:Zapfino\xetexcolon mapping=tex-text] [encoding=uc] +\definefontsynonym[ZapfinoOne] [name:Zapfino\xetexcolon mapping=tex-text] [encoding=uc] \definefontsynonym[ZapfinoTwo] [name:Zapfino\xetexcolon mapping=tex-text;% Stylistic Variants=First variant glyph set] [encoding=uc] \definefontsynonym[ZapfinoThree][name:Zapfino\xetexcolon mapping=tex-text;% @@ -430,8 +433,7 @@ \stoptypescript -% MS Office 2004 for Mac has impressive Unicode coverage in -% many of its fonts. +% MS Office 2004 for Mac has impressive Unicode coverage in many of its fonts. \starttypescript[serif][timesnewroman][uc] @@ -475,9 +477,8 @@ \stoptypescript -%D MS Office comes with an installation of the Lucida family in -%D TrueType form. It's nice, except\dots\ no math, no slanted, no caps -%D and some other auxiliary fonts. +%D MS Office comes with an installation of the Lucida family in TrueType form. It's nice, +%D except\dots\ no math, no slanted, no caps and some other auxiliary fonts. \starttypescript [serif] [lucida] [uc] @@ -535,27 +536,33 @@ \stoptypescript -%D Gentium is from SIL, the fine makers of \XETEX, and it's not only -%D very complete with Roman and Italic Unicode support, but very -%D attractive. - -\starttypescript[serif][gentium][uc] - -\definefontsynonym[Gentium] [name:Gentium] [features=default] -\definefontsynonym[GentiumItalic][name:Gentium Italic][features=default] +%D Gentium is from SIL, the fine makers of \XETEX, and it's not only very complete with +%D Roman and Italic Unicode support, but very attractive. +\starttypescript [serif] [gentium] + \definefontsynonym [Gentium-Roman] [file:GentiumPlus-R] [features=default] + \definefontsynonym [Gentium-Italic] [file:GentiumPlus-I] [features=default] + \definefontsynonym [Gentium-Bold] [file:GenBasB] [features=default] + \definefontsynonym [Gentium-BoldItalic] [file:GenBasBI] [features=default] + \definefontsynonym [Gentium-Slanted] [Gentium-Italic] + \definefontsynonym [Gentium-BoldSlanted] [Gentium-BoldItalic] + \definefontsynonym [Gentium-RomanCaps] [file:GentiumPlus-R] [features=smallcaps] \stoptypescript -\starttypescript[serif][gentium][name] - -\definefontsynonym[Serif] [Gentium] -\definefontsynonym[SerifBold] [Gentium] -\definefontsynonym[SerifItalic] [GentiumItalic] -\definefontsynonym[SerifBoldItalic] [GentiumItalic] -\definefontsynonym[SerifSlanted] [GentiumItalic] -\definefontsynonym[SerifBoldSlanted][GentiumItalic] -\definefontsynonym[SerifCaps] [Gentium] +\starttypescript [serif] [gentium] [name] + \definefontsynonym [Serif] [Gentium-Roman] + \definefontsynonym [SerifItalic] [Gentium-Italic] + \definefontsynonym [SerifBold] [Gentium-Bold] + \definefontsynonym [SerifBoldItalic] [Gentium-BoldItalic] + \definefontsynonym [SerifSlanted] [Gentium-Slanted] + \definefontsynonym [SerifBoldSlanted] [Gentium-BoldSlanted] + \definefontsynonym [SerifCaps] [Serif] + \definefontsynonym [OldStyle] [Serif] + \definefontsynonym [SerifCaps] [Gentium-RomanCaps] +\stoptypescript +\starttypescript [gentium] + \definetypeface [gentium] [rm] [serif] [gentium] [default] [features=default] \stoptypescript \stoptypescriptcollection diff --git a/tex/context/base/util-sql-imp-client.lua b/tex/context/base/util-sql-imp-client.lua index a5add61c7..9a0fbc299 100644 --- a/tex/context/base/util-sql-imp-client.lua +++ b/tex/context/base/util-sql-imp-client.lua @@ -24,6 +24,7 @@ local splitdata = helpers.splitdata local replacetemplate = utilities.templates.replace local serialize = sql.serialize local deserialize = sql.deserialize +local getserver = sql.getserver -- Experiments with an p/action demonstrated that there is not much gain. We could do a runtime -- capture but creating all the small tables is not faster and it doesn't work well anyway. @@ -43,7 +44,7 @@ local entry = Cs((unescaped + (1-separator-newline))^0) -- C 10% faster t local getfirst = Ct( entry * (separator * (entry+empty))^0) + newline local skipfirst = (1-newline)^1 * newline -local skipdashes = P("-")^1 * newline +local skipdashes = (P("-")+separator)^1 * newline local getfirstline = C((1-newline)^0) local cache = { } @@ -106,7 +107,11 @@ local function splitdata(data) -- todo: hash on first line ... maybe move to cli end end p = Cf(Ct("") * p,rawset) * newline^1 - p = skipfirst * (skipdashes^-1) * Ct(p^0) -- mssql has a dashed line between the header and data +if getserver() == "mssql" then + p = skipfirst * skipdashes * Ct(p^0) +else + p = skipfirst * Ct(p^0) +end cache[first] = { parser = p, keys = keys } local entries = lpegmatch(p,data) return entries or { }, keys @@ -122,11 +127,29 @@ end helpers.splitdata = splitdata helpers.getdata = getdata +local t_runner = { + mysql = [[mysql --batch --user="%username%" --password="%password%" --host="%host%" --port=%port% --database="%database%" --default-character-set=utf8 < "%queryfile%" > "%resultfile%"]], + mssql = [[sqlcmd -S %host% %?U: -U "%username%" ?% %?P: -P "%password%" ?% -I -W -w 65535 -s"]] .. "\t" .. [[" -m 1 -i "%queryfile%" -o "%resultfile%"]], +} + +local t_preamble = { + mysql = [[ +SET GLOBAL SQL_MODE=ANSI_QUOTES; + ]], + mssql = [[ +:setvar SQLCMDERRORLEVEL 1 +SET QUOTED_IDENTIFIER ON; +SET NOCOUNT ON; +%?database: USE %database%; ?% + ]], +} + local function dataprepared(specification,client) local query = preparetemplate(specification) if query then - local preamble = client.preamble + local preamble = t_preamble[getserver()] or t_preamble.mysql if preamble then + preamble = replacetemplate(preamble,specification.variables,'sql') query = preamble .. "\n" .. query end io.savedata(specification.queryfile,query) @@ -143,7 +166,7 @@ local function dataprepared(specification,client) end local function datafetched(specification,client) - local runner = client.runner + local runner = t_runner[getserver()] or t_runner.mysql local command = replacetemplate(runner,specification) if trace_sql then local t = osclock() @@ -254,8 +277,6 @@ end local celltemplate = "cells[%s]" methods.client = { - runner = [[mysql --batch --user="%username%" --password="%password%" --host="%host%" --port=%port% --database="%database%" --default-character-set=utf8 < "%queryfile%" > "%resultfile%"]], - preamble = "", execute = execute, usesfiles = true, wraptemplate = wraptemplate, diff --git a/tex/context/base/util-sql-tracers.lua b/tex/context/base/util-sql-tracers.lua index 1bd133acb..c210755f1 100644 --- a/tex/context/base/util-sql-tracers.lua +++ b/tex/context/base/util-sql-tracers.lua @@ -12,35 +12,51 @@ sql.tracers = tracers sql.setmethod("swiglib") +local t_names = { + mysql = [[SHOW TABLES FROM `%database%`]], + mssql = [[SELECT table_name FROM %database%.information_schema.tables;]], + mssql = [[SELECT "name" FROM "%database%"."sys"."databases" ORDER BY "name";]], + mssql = [[SELECT name FROM "%database%"."sys"."objects" WHERE "type" IN ('P', 'U', 'V', 'TR', 'FN', 'TF');]], +} + +local t_fields = { + mysql = [[SHOW FIELDS FROM `%database%`.`%table%` ]], + mssql = [[SELECT column_name "field", data_type "type", column_default "default", is_nullable "null" FROM %database%.information_schema.columns WHERE table_name='%table%']], +} + function sql.tracers.gettables(presets) + local servertype = sql.getserver() + local results, keys = sql.execute { presets = presets, - template = "SHOW TABLES FROM `%database%`", + template = t_names[servertype], variables = { database = presets.database, }, } - local key = keys[1] + local key = keys and keys[1] local tables = { } - for i=1,#results do - local name = results[i][key] - local results, keys = sql.execute { - presets = presets, - template = "SHOW FIELDS FROM `%database%`.`%table%` ", - variables = { - database = presets.database, - table = name - }, - } - if #results > 0 then - for i=1,#results do - results[i] = table.loweredkeys(results[i]) + if keys then + for i=1,#results do + local name = results[i][key] + local results, keys = sql.execute { + presets = presets, + template = t_fields[servertype], + variables = { + database = presets.database, + table = name + }, + } + if #results > 0 then + for i=1,#results do + results[i] = table.loweredkeys(results[i]) + end + tables[name] = results + else + -- a view end - tables[name] = results - else - -- a view end end diff --git a/tex/context/base/util-sql.lua b/tex/context/base/util-sql.lua index 1c1766edf..84cbb1692 100644 --- a/tex/context/base/util-sql.lua +++ b/tex/context/base/util-sql.lua @@ -283,6 +283,7 @@ helpers.preparetemplate = preparetemplate -- -- -- we delay setting this -- -- -- local currentmethod +local currentserver local function firstexecute(...) local execute = methods[currentmethod].execute @@ -295,7 +296,20 @@ function sql.setmethod(method) sql.execute = firstexecute end +function sql.setserver(server) + currentserver = server +end + +function sql.getmethod() + return currentmethod +end + +function sql.getserver() + return currentserver +end + sql.setmethod("library") +sql.setserver("mysql") -- helper: diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index cbf3cd358..dbe1b6713 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua -- parent file : c:/data/develop/context/sources/luatex-fonts.lua --- merge date : 01/05/16 19:20:37 +-- merge date : 01/06/16 17:29:42 do -- begin closure to overcome local limits and interference @@ -144,7 +144,7 @@ local uppercase=R("AZ") local underscore=P("_") local hexdigit=digit+lowercase+uppercase local cr,lf,crlf=P("\r"),P("\n"),P("\r\n") -local newline=P("\r")*(P("\n")+P(true))+P("\n") +local newline=P("\r")*(P("\n")+P(true))+P("\n") local escaped=P("\\")*anything local squote=P("'") local dquote=P('"') |