diff options
Diffstat (limited to 'Master/texmf-dist/tex/context/base')
30 files changed, 1238 insertions, 472 deletions
diff --git a/Master/texmf-dist/tex/context/base/cont-new.tex b/Master/texmf-dist/tex/context/base/cont-new.tex index bf3aabfa31c..1328a507382 100644 --- a/Master/texmf-dist/tex/context/base/cont-new.tex +++ b/Master/texmf-dist/tex/context/base/cont-new.tex @@ -13,7 +13,7 @@ % it's about time to clean up this file ... -\newcontextversion{2006.12.27 11:34} +\newcontextversion{2007.01.12 01:02} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/Master/texmf-dist/tex/context/base/context.tex b/Master/texmf-dist/tex/context/base/context.tex index 76e3c7a54e8..ea34f3fec40 100644 --- a/Master/texmf-dist/tex/context/base/context.tex +++ b/Master/texmf-dist/tex/context/base/context.tex @@ -42,7 +42,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2006.12.27 11:34} +\edef\contextversion{2007.01.12 01:02} %D For those who want to use this: @@ -66,23 +66,44 @@ \ifx\normalinput\undefined \let\normalinput\input \fi -\edef\mksuffix {mk\ifx\directlua\undefined ii\else iv\fi} +% trick: + +\ifx\directlua\undefined + \chardef\contextmarkmode = 2 +\else + \chardef\contextmarkmode = \directlua 0 { do + if arg then + local mkii = 4 + for k,v in pairs(arg) do + if v == "--mkii" then mkii = 2 break end + end + tex.sprint(mkii) + else + tex.sprint(2) + end + end } + % \ifnum\contextmarkmode=2 + % \immediate\write16{} + % \immediate\write16{>> Quitting LuaTeX, test mode only! <<} + % \immediate\write16{} + % \def\next{\errorstopmode \dump \endinput} + % \expandafter \expandafter \expandafter \next + % \fi +\fi \def\loadcorefile#1{\normalinput#1\relax} \def\loadmarkfile#1{\normalinput#1.\mksuffix\relax} -\ifx\directlua\undefined - \def\loadmarkivfile#1{} \let\loadmarkiifile\loadcorefile +\ifnum\contextmarkmode=4 + \def\loadmarkiifile#1{} \let\loadmarkivfile\loadcorefile \edef\mksuffix {mkiv} \edef\contextmark{MKIV} \else - \def\loadmarkiifile#1{} \let\loadmarkivfile\loadcorefile + \def\loadmarkivfile#1{} \let\loadmarkiifile\loadcorefile \edef\mksuffix {mkii} \edef\contextmark{MKII} \fi \let\loadmkiifile\loadmarkiifile \let\loadmkivfile\loadmarkivfile \let\loadmkfile \loadmarkfile -\edef\contextmark{MK \ifx\directlua\undefined II\else IV\fi} - %D Welcome to the main module. When this module is ran through %D \type{initex} or \type {tex -i} or \type {whatevertex} using %D \type{whatever switch}, the \CONTEXT\ format file is @@ -383,12 +404,16 @@ %D content. Here we also redefine \type{\it} as {\it italic} %D instead of italian. +\loadmkivfile{font-set.tex} + \loadcorefile{font-ini.tex} \loadcorefile{font-uni.tex} \loadcorefile{font-bfm.tex} \loadcorefile{enco-pfr.tex} +%loadmkiifile{pdfr-def.tex} -- dvi/pdf bugged, must be done runtime anyway + \loadcorefile{type-ini.tex} \loadcorefile{type-def.tex} diff --git a/Master/texmf-dist/tex/context/base/core-ctx.tex b/Master/texmf-dist/tex/context/base/core-ctx.tex index 88659122f7b..9cd3de2b9c2 100644 --- a/Master/texmf-dist/tex/context/base/core-ctx.tex +++ b/Master/texmf-dist/tex/context/base/core-ctx.tex @@ -21,6 +21,7 @@ \chardef\preprocessmethod 2 % 0=no check 1=present_check 2=log_check \chardef\preprocessstate 0 % 1=found 2=not_present (skip) +\chardef\preprocesslocal 0 % 0=no 1=yes \def \preprocesssuffix {.prep} \def\loadctxpreplist @@ -33,13 +34,21 @@ \or \doiffileexistselse{./\jobname.ctl} {\bgroup - \defineXMLenvironment[ctx:preplist] - {\writestatus\m!systems{loading ctx log file}} - {}% + \defineXMLenvironment[ctx:preplist][local=no] + {\doifelse{\XMLop{local}}{yes} + {\global\chardef\preprocesslocal\plusone + \writestatus\m!systems{loading ctx log file (local)}}% + {\writestatus\m!systems{loading ctx log file (specified)}}} + \donothing \defineXMLenvironmentsave[ctx:prepfile][done=no] - {} - {\writestatus\m!systems{registering \XMLflush{ctx:prepfile} -> \XMLop{done}}% - \setxvalue{fp..\XMLflush{ctx:prepfile}}{\XMLop{done}}}% + \donothing + {\edef\readfilename{\XMLflush{ctx:prepfile}}% + \ifcase\preprocesslocal\else + \splitfilename\readfilename + \let\readfilename\splitoffbase + \fi + \writestatus\m!systems{registering \readfilename\space -> \XMLop{done}}% + \setxvalue{fp..\readfilename}{\XMLop{done}}}% \processXMLfile{./\jobname.ctl}% \egroup}% {\global\chardef\preprocessmode\plusone}% @@ -67,21 +76,29 @@ % saveguard and speed up \iftracefiles\writestatus\m!systems{preprocessing - no suffix}\fi \egroup - \else + \else\ifcase\preprocesslocal \iftracefiles\writestatus\m!systems{preprocessing - check presence of \readfilename\preprocesssuffix}\fi \doifdefinedelse{fp..\readfilename} {\egroup \doiffileexistselse{\readfilename\preprocesssuffix} {\chardef\preprocessstate\plusone} {\chardef\preprocessstate\plustwo}}% - {\doifdefinedelse{fp..\splitoffname.\splitofftype} + {\doifdefinedelse{fp..\splitoffbase}% {\egroup \doiffileexistselse{\readfilename\preprocesssuffix} {\chardef\preprocessstate\plusone} {\chardef\preprocessstate\plustwo}}% {\egroup}}% + \else + \iftracefiles\writestatus\m!systems{preprocessing - check local presence of \readfilename\preprocesssuffix}\fi + \doifdefinedelse{fp..\readfilename} + {\egroup + \doiffileexistselse{\readfilename\preprocesssuffix} + {\chardef\preprocessstate\plusone} + {\chardef\preprocessstate\plustwo}}% + {\egroup}% \fi - \fi} + \fi\fi} % beware, \readfilename keeps the original one, but we load and store the % suffixed with .prep file (if present) @@ -125,7 +142,7 @@ \fi \fi \else - \edef\readfilename{\getvalue{fn..\readfilename}}% + \edef\readfilename{\getvalue{fn..\readfilename}}% ??? is done ! \iftracefiles\writestatus\m!systems{already located \readfilename}\fi \def\next{#3\dodoreadfile}% \fi @@ -148,7 +165,11 @@ \def\next{#3}% \fi}% \or - \edef\readfilename{#1}% + \ifcase\preprocesslocal + \edef\readfilename{#1}% nor found + \else + % no path prepending + \fi \iftracefiles\writestatus\m!systems{#1\preprocesssuffix\space located}\fi \def\next{#2\dodoreadfile}% \or diff --git a/Master/texmf-dist/tex/context/base/core-fig.tex b/Master/texmf-dist/tex/context/base/core-fig.tex index 2719d5677e6..ed893fa429a 100644 --- a/Master/texmf-dist/tex/context/base/core-fig.tex +++ b/Master/texmf-dist/tex/context/base/core-fig.tex @@ -1076,6 +1076,7 @@ \definegraphictypesynonym[epdf] [pdf] \definegraphictypesynonym[jpeg] [jpg] +\definegraphictypesynonym[jp2] [jpg] \definegraphictypesynonym[jbig] [jb2] \definegraphictypesynonym[jbig2][jb2] \definegraphictypesynonym[jbg] [jb2] diff --git a/Master/texmf-dist/tex/context/base/core-mat.tex b/Master/texmf-dist/tex/context/base/core-mat.tex index b4ee9173033..e9319068c47 100644 --- a/Master/texmf-dist/tex/context/base/core-mat.tex +++ b/Master/texmf-dist/tex/context/base/core-mat.tex @@ -261,7 +261,7 @@ {\doifnot{\formulaparameter\c!spacebefore}\v!none{\blank[\formulaparameter\c!spacebefore]}} \def\afterdisplayspace - {\doifnot{\formulaparameter\c!spaceafter }\v!none{\blank[\formulaparameter\c!spaceafter ]}} + {\doifnot{\formulaparameter\c!spaceafter }\v!none{\blank[\formulaparameter\c!spaceafter ]}} \def\setpredisplaysize#1% {\predisplaysize#1\relax @@ -746,10 +746,31 @@ {\let\normalleqno\relax \let\leqno\relax \let\normalreqno\relax \let\eqno \relax \let\doplaceformulanumber\empty} + +%D The next code is derived from plain \TEX. + +\newif\ifdt@p + +\def\displ@y + {\global\dt@ptrue + \openup\displayopenupvalue % was \openup\jot + \everycr + {\noalign + {\ifdt@p + \global\dt@pfalse + \ifdim\prevdepth>-1000\p@ + \vskip-\lineskiplimit + \vskip\normallineskiplimit + \fi + \else + \penalty\interdisplaylinepenalty + \fi}}} \let\normaldispl@y\displ@y \def\displ@y{\resetdisplaymatheq\normaldispl@y} + +\def\m@th{\mathsurround\z@} %D Here we implement a basic math alignment mechanism. Numbers %D are also handled. The macros \type {\startinnermath} and diff --git a/Master/texmf-dist/tex/context/base/core-not.tex b/Master/texmf-dist/tex/context/base/core-not.tex index 1d764e412b7..c013dba40bb 100644 --- a/Master/texmf-dist/tex/context/base/core-not.tex +++ b/Master/texmf-dist/tex/context/base/core-not.tex @@ -673,6 +673,13 @@ \newconditional\processingnote +\def\footnotereferencefrom + {\rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}} + +\def\footnotereferenceto + {\global\advance\crossreferencenumber\minusone\relax % else problem, needs further testing + \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}} + \def\dostartnote% nog gobble als in pagebody {\bgroup \settrue\processingnote @@ -711,9 +718,9 @@ \fi \doifelse{\noteparameter\c!interaction}\v!no {\ifconditional\pagewisenotes - \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}% + \footnotereferenceto \fi}% - {\rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}}}% + {\footnotereferenceto}}% \bgroup \postponenotes \aftergroup\dostopnote @@ -737,12 +744,12 @@ \doifelse{\noteparameter\c!interaction}\v!no {\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}% \ifconditional\pagewisenotes - \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}% + \footnotereferencefrom \fi} {\gotobox {\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}}% [\s!fnt:t:\internalfootreference]% - \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}}% + \footnotereferencefrom}% \globallet\lastnotesymbol\relax} \let\lastnotesymbol\relax diff --git a/Master/texmf-dist/tex/context/base/core-ntb.tex b/Master/texmf-dist/tex/context/base/core-ntb.tex index 9e6eadb9af7..78156264470 100644 --- a/Master/texmf-dist/tex/context/base/core-ntb.tex +++ b/Master/texmf-dist/tex/context/base/core-ntb.tex @@ -81,6 +81,7 @@ %D \bTABLE[left={(},right={)},top=\startnarrower,bottom=\stopnarrower] %D \bTR \bTD something \eTD \eTR %D \eTABLE +%D \stopbuffer %D %D \typebuffer \getbuffer diff --git a/Master/texmf-dist/tex/context/base/core-var.tex b/Master/texmf-dist/tex/context/base/core-var.tex index 6b019d65803..2317d7bf75a 100644 --- a/Master/texmf-dist/tex/context/base/core-var.tex +++ b/Master/texmf-dist/tex/context/base/core-var.tex @@ -626,9 +626,6 @@ % \def\blabelgroup {\begingroup} % why no \let ? % \let\elabelgroup \endgroup - - - %D Concepts: \chardef\conceptmode\zerocount diff --git a/Master/texmf-dist/tex/context/base/enco-pfr.mkii b/Master/texmf-dist/tex/context/base/enco-pfr.mkii new file mode 100644 index 00000000000..aec926e226b --- /dev/null +++ b/Master/texmf-dist/tex/context/base/enco-pfr.mkii @@ -0,0 +1,20 @@ +%D \module +%D [ file=enco-pfr, +%D version=2000.12.10, % adapted 2005.08.14 to more delayed loading +%D title=\CONTEXT\ Encoding Macros, +%D subtitle=PDF Font Resource Inclusion, +%D author=Hans Hagen, +%D date=\currentdate, +%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] +%C +%C This module is part of the \CONTEXT\ macro||package and is +%C therefore copyrighted by \PRAGMA. See mreadme.pdf for +%C details. + +\ifx\pdfglyphtounicode\undefined \else + \appendtoks + \doif\jobsuffix{pdf}{\readfile{pdfr-def.tex}\donothing\donothing}% + \to \everystarttext +\fi + +\endinput diff --git a/Master/texmf-dist/tex/context/base/enco-pfr.tex b/Master/texmf-dist/tex/context/base/enco-pfr.tex index 199d48fd3a8..24044e4d009 100644 --- a/Master/texmf-dist/tex/context/base/enco-pfr.tex +++ b/Master/texmf-dist/tex/context/base/enco-pfr.tex @@ -11,6 +11,10 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. +\beginXETEX + \endinput +\endXETEX + \ifx\pdffontresource\undefined\else\endinput\fi \writestatus{loading}{Context Encoding Macros (pdf)} @@ -45,8 +49,6 @@ %D of the fonts and either flush the information at shipout %D time, or at the end of the document. -\unprotect - %D \macros %D {ifincludepdffontresources} %D @@ -54,6 +56,24 @@ \newif\ifincludepdffontresources \includepdffontresourcestrue +\ifx\pdfglyphtounicode\undefined \else \loadmarkfile{enco-pfr} \fi + +% somehow we cannot preload this beast; also, it's mk dependent +% +% \appendtoks +% \doifelse{\jobsuffix}{pdf}{\loadmkiifile{pdfr-def.tex}}% +% \to \everystarttext + +% ugly, this should go to the driver spec-tpd + +\ifx\pdfgentounicode\undefined \else + \ifcase\pdfgentounicode \else + \expandafter \expandafter \expandafter \endinput + \fi +\fi + +\unprotect + % a problem is that there is always an ec vector added even when % we switch to texnansi early; this has to do with the fact that % we need to setup fonts at startup; this a pain when we have @@ -195,16 +215,20 @@ % \fi} \def\includepdffontresource - {\ifincludepdffontresources - \expandafter\ifx\the\font\nullfont \else - \ifx\pdffontattr\undefined - % we're not using (a recent version of) pdftex - \else\ifcase\pdfoutput - % we're not in pdf mode - \else - \doincludepdffontresource - \fi\fi + {\ifcase\pdfgentounicode + \ifincludepdffontresources + \expandafter\ifx\the\font\nullfont \else + \ifx\pdffontattr\undefined + % we're not using (a recent version of) pdftex + \else\ifcase\pdfoutput + % we're not in pdf mode + \else + \doincludepdffontresource + \fi\fi + \fi \fi + \or + \global\let\includepdffontresource\relax % automatic, built in \fi} \def\dododoincludepdffontresource#1% encoding diff --git a/Master/texmf-dist/tex/context/base/enco-xtx.tex b/Master/texmf-dist/tex/context/base/enco-utf.tex index 26fd97dfbb3..b41490bebcc 100644 --- a/Master/texmf-dist/tex/context/base/enco-xtx.tex +++ b/Master/texmf-dist/tex/context/base/enco-utf.tex @@ -1,4 +1,4 @@ -% filename : enco-xtx.tex +% filename : enco-utf.tex % comment : poor man's alternative for a proper enco file % author : Hans Hagen, PRAGMA-ADE, Hasselt NL % copyright: PRAGMA ADE / ConTeXt Development Team @@ -7,8 +7,8 @@ \ifx\setcclcuc\undefined \def\setcclcuc #1 #2 #3 % - {\global\catcode"#1=11 - \global\lccode "#1="#2 + {\global\catcode"#1=11 + \global\lccode "#1="#2 \global\uccode "#1="#3 } \fi diff --git a/Master/texmf-dist/tex/context/base/lang-all.xml b/Master/texmf-dist/tex/context/base/lang-all.xml index 486ef5d0885..bb4790b4910 100644 --- a/Master/texmf-dist/tex/context/base/lang-all.xml +++ b/Master/texmf-dist/tex/context/base/lang-all.xml @@ -236,10 +236,34 @@ </copyright> </description> +<!-- Watch the next one: what a naming mess. What user can keep track of +such an inconsistent name scheme (well, no name scheme). Please warn me +when yet another name shows up --> + <description language='no'> <sourcefile>nohyph.tex</sourcefile> <title>TeX hyphenation patterns for the Norwegian language</title> <copyright> + <year>2005</year> + <owner>Rune Kleveland with patches from Ole Michael Selberg</owner> + <comment>nohyphbx.tex</comment> + </copyright> + <copyright> + <year>200+</year> + <owner>Rune Kleveland</owner> + <comment>nohyphb.tex</comment> + </copyright> + <copyright> + <year>199+</year> + <owner>Dag Langmyhr and student</owner> + <comment>nohyph2.tex</comment> + </copyright> + <copyright> + <year>199+</year> + <owner>Ivar Aavatsmark and others</owner> + <comment>nohyph.tex sometimes named nohyph1.tex</comment> + </copyright> + <copyright> <year>1992,1993</year> <owner>Ivar Aavatsmark</owner> <comment>nohyphen.tex based on danhyph.tex</comment> diff --git a/Master/texmf-dist/tex/context/base/lang-ini.tex b/Master/texmf-dist/tex/context/base/lang-ini.tex index d9f79b6fc16..85243f3de31 100644 --- a/Master/texmf-dist/tex/context/base/lang-ini.tex +++ b/Master/texmf-dist/tex/context/base/lang-ini.tex @@ -350,6 +350,10 @@ \def\setuphyppatencoding{\pathypsettings} \endXETEX +\beginMETATEX + \def\setuphyppatencoding{\pathypsettings} +\endMETATEX + \def\dodoloadpatterns#1#2#3#4% beware, loaded language also incr {\normallanguage\loadedlanguage % when not really needed \bgroup diff --git a/Master/texmf-dist/tex/context/base/math-pln.tex b/Master/texmf-dist/tex/context/base/math-pln.tex index d9dfd3445e4..f0b4f440e41 100644 --- a/Master/texmf-dist/tex/context/base/math-pln.tex +++ b/Master/texmf-dist/tex/context/base/math-pln.tex @@ -16,7 +16,8 @@ \unprotect -\def\m@th{\mathsurround\z@} +\ifx\displ@y\unefined \let\displ@y\relax\fi +\ifx\m@th \unefined \let\m@th \relax\fi \newbox\rootbox @@ -47,16 +48,11 @@ {\lineskiplimit-\maxdimen \oalign} -{\catcode`p=12 \catcode`t=12 \gdef\\#1pt{#1}} \let\getf@ctor=\\ - \def\sh@ft#1% kern by #1 times the current slant {\dimen@#1% - \kern\expandafter\getf@ctor\the\slantperpoint + \kern\expandafter\withoutpt\the\slantperpoint \dimen@} -% \def\copyright % will be overloaded -% {{\ooalign{\hfil\raise.07ex\hbox{c}\hfil\crcr\Orb}}} - \def\dots {\relax\ifmmode\ldots\else$\m@th\ldots\,$\fi} @@ -93,8 +89,6 @@ \bracelu\leaders\vrule\!!height\ht\z@\!!depth\z@\hfill\bracerd \braceld\leaders\vrule\!!height\ht\z@\!!depth\z@\hfill\braceru$} -\ifx\bye\undefined \def\bye{\par\vfill\supereject\end} \fi - \let\sp=^ % will become obsolete \let\sb=_ % will become obsolete @@ -111,18 +105,6 @@ \def\prim@s {\prime\futurelet\next\pr@m@s} -% \def\pr@m@s -% {\ifx'\next -% \let\nxt\pr@@@s -% \else -% \ifx^\next -% \let\nxt\pr@@@t -% \else -% \let\nxt\egroup -% \fi -% \fi -% \nxt} - \def\pr@m@s {\ifx'\next \@EA\pr@@@s @@ -313,23 +295,6 @@ #1\crcr}}% \,} -\newif\ifdt@p - -\def\displ@y - {\global\dt@ptrue - \openup\displayopenupvalue % was \openup\jot - \everycr - {\noalign - {\ifdt@p - \global\dt@pfalse - \ifdim\prevdepth>-1000\p@ - \vskip-\lineskiplimit - \vskip\normallineskiplimit - \fi - \else - \penalty\interdisplaylinepenalty - \fi}}} - \def\@lign % restore inside \displ@y {\tabskip\z@skip \everycr{}} diff --git a/Master/texmf-dist/tex/context/base/page-ini.tex b/Master/texmf-dist/tex/context/base/page-ini.tex index 020fd20cfb6..180b5ca4fda 100644 --- a/Master/texmf-dist/tex/context/base/page-ini.tex +++ b/Master/texmf-dist/tex/context/base/page-ini.tex @@ -944,6 +944,8 @@ \def\ejectpage {\doejectpage\eject} \def\superejectpage{\doejectpage\supereject} +\ifx\bye\undefined \def\bye{\par\vfill\supereject\end} \fi % plain tex command + % floats % % \def\ejectinsert diff --git a/Master/texmf-dist/tex/context/base/pdfr-def.tex b/Master/texmf-dist/tex/context/base/pdfr-def.tex new file mode 100644 index 00000000000..fb1aaa0604d --- /dev/null +++ b/Master/texmf-dist/tex/context/base/pdfr-def.tex @@ -0,0 +1,840 @@ +% This file is generated with Luatex using the +% character tables that come with ConTeXt MKIV. +% +\pdfglyphtounicode{space}{0020}% +\pdfglyphtounicode{exclam}{0021}% +\pdfglyphtounicode{quotedbl}{0022}% +\pdfglyphtounicode{numbersign}{0023}% +\pdfglyphtounicode{dollar}{0024}% +\pdfglyphtounicode{percent}{0025}% +\pdfglyphtounicode{ampersand}{0026}% +\pdfglyphtounicode{quotesingle}{0027}% +\pdfglyphtounicode{parenleft}{0028}% +\pdfglyphtounicode{parenright}{0029}% +\pdfglyphtounicode{asterisk}{002A}% +\pdfglyphtounicode{plus}{002B}% +\pdfglyphtounicode{comma}{002C}% +\pdfglyphtounicode{hyphen}{002D}% +\pdfglyphtounicode{period}{002E}% +\pdfglyphtounicode{slash}{002F}% +\pdfglyphtounicode{zero}{0030}% +\pdfglyphtounicode{one}{0031}% +\pdfglyphtounicode{two}{0032}% +\pdfglyphtounicode{three}{0033}% +\pdfglyphtounicode{four}{0034}% +\pdfglyphtounicode{five}{0035}% +\pdfglyphtounicode{six}{0036}% +\pdfglyphtounicode{seven}{0037}% +\pdfglyphtounicode{eight}{0038}% +\pdfglyphtounicode{nine}{0039}% +\pdfglyphtounicode{colon}{003A}% +\pdfglyphtounicode{semicolon}{003B}% +\pdfglyphtounicode{less}{003C}% +\pdfglyphtounicode{equal}{003D}% +\pdfglyphtounicode{greater}{003E}% +\pdfglyphtounicode{question}{003F}% +\pdfglyphtounicode{A}{0041}% +\pdfglyphtounicode{C}{0043}% +\pdfglyphtounicode{E}{0045}% +\pdfglyphtounicode{G}{0047}% +\pdfglyphtounicode{I}{0049}% +\pdfglyphtounicode{K}{004B}% +\pdfglyphtounicode{M}{004D}% +\pdfglyphtounicode{O}{004F}% +\pdfglyphtounicode{Q}{0051}% +\pdfglyphtounicode{S}{0053}% +\pdfglyphtounicode{U}{0055}% +\pdfglyphtounicode{W}{0057}% +\pdfglyphtounicode{Y}{0059}% +\pdfglyphtounicode{bracketleft}{005B}% +\pdfglyphtounicode{bracketright}{005D}% +\pdfglyphtounicode{underscore}{005F}% +\pdfglyphtounicode{a}{0061}% +\pdfglyphtounicode{c}{0063}% +\pdfglyphtounicode{e}{0065}% +\pdfglyphtounicode{g}{0067}% +\pdfglyphtounicode{i}{0069}% +\pdfglyphtounicode{k}{006B}% +\pdfglyphtounicode{m}{006D}% +\pdfglyphtounicode{o}{006F}% +\pdfglyphtounicode{q}{0071}% +\pdfglyphtounicode{s}{0073}% +\pdfglyphtounicode{u}{0075}% +\pdfglyphtounicode{w}{0077}% +\pdfglyphtounicode{y}{0079}% +\pdfglyphtounicode{braceleft}{007B}% +\pdfglyphtounicode{braceright}{007D}% +\pdfglyphtounicode{sterling}{00A3}% +\pdfglyphtounicode{section}{00A7}% +\pdfglyphtounicode{guillemotleft}{00AB}% +\pdfglyphtounicode{macron}{00AF}% +\pdfglyphtounicode{periodcentered}{00B7}% +\pdfglyphtounicode{guillemotright}{00BB}% +\pdfglyphtounicode{questiondown}{00BF}% +\pdfglyphtounicode{Atilde}{00C3}% +\pdfglyphtounicode{Ccedilla}{00C7}% +\pdfglyphtounicode{Edieresis}{00CB}% +\pdfglyphtounicode{Idieresis}{00CF}% +\pdfglyphtounicode{Oacute}{00D3}% +\pdfglyphtounicode{multiply}{00D7}% +\pdfglyphtounicode{Ucircumflex}{00DB}% +\pdfglyphtounicode{germandbls}{00DF}% +\pdfglyphtounicode{atilde}{00E3}% +\pdfglyphtounicode{ccedilla}{00E7}% +\pdfglyphtounicode{edieresis}{00EB}% +\pdfglyphtounicode{idieresis}{00EF}% +\pdfglyphtounicode{oacute}{00F3}% +\pdfglyphtounicode{divide}{00F7}% +\pdfglyphtounicode{ucircumflex}{00FB}% +\pdfglyphtounicode{ydieresis}{00FF}% +\pdfglyphtounicode{cacute}{0107}% +\pdfglyphtounicode{dcaron}{010F}% +\pdfglyphtounicode{edotaccent}{0117}% +\pdfglyphtounicode{gbreve}{011F}% +\pdfglyphtounicode{hbar}{0127}% +\pdfglyphtounicode{iogonek}{012F}% +\pdfglyphtounicode{kcommaaccent}{0137}% +\pdfglyphtounicode{Ldot}{013F}% +\pdfglyphtounicode{Ncaron}{0147}% +\pdfglyphtounicode{obreve}{014F}% +\pdfglyphtounicode{rcommaaccent}{0157}% +\pdfglyphtounicode{scedilla}{015F}% +\pdfglyphtounicode{tbar}{0167}% +\pdfglyphtounicode{uring}{016F}% +\pdfglyphtounicode{ycircumflex}{0177}% +\pdfglyphtounicode{longs}{017F}% +\pdfglyphtounicode{Uhorn}{01AF}% +\pdfglyphtounicode{gcaron}{01E7}% +\pdfglyphtounicode{oslashacute}{01FF}% +\pdfglyphtounicode{Omegatonos}{038F}% +\pdfglyphtounicode{Omicron}{039F}% +\pdfglyphtounicode{iotatonos}{03AF}% +\pdfglyphtounicode{omicron}{03BF}% +\pdfglyphtounicode{afii10033}{041F}% +\pdfglyphtounicode{afii10081}{043F}% +\pdfglyphtounicode{afii10193}{045F}% +\pdfglyphtounicode{afii57841}{05BF}% +\pdfglyphtounicode{afii57679}{05DF}% +\pdfglyphtounicode{afii57407}{061F}% +\pdfglyphtounicode{universal}{2200}% +\pdfglyphtounicode{SF100000}{2500}% +\pdfglyphtounicode{Wgrave}{1E80}% +\pdfglyphtounicode{partialdiff}{2202}% +\pdfglyphtounicode{house}{2302}% +\pdfglyphtounicode{SF110000}{2502}% +\pdfglyphtounicode{wgrave}{1E81}% +\pdfglyphtounicode{existential}{2203}% +\pdfglyphtounicode{Wacute}{1E82}% +\pdfglyphtounicode{afii61248}{2105}% +\pdfglyphtounicode{emptyset}{2205}% +\pdfglyphtounicode{Delta}{2206}% +\pdfglyphtounicode{afii10034}{0420}% +\pdfglyphtounicode{afii10082}{0440}% +\pdfglyphtounicode{afii57842}{05C0}% +\pdfglyphtounicode{afii57680}{05E0}% +\pdfglyphtounicode{afii57440}{0640}% +\pdfglyphtounicode{afii57392}{0660}% +\pdfglyphtounicode{wacute}{1E83}% +\pdfglyphtounicode{gradient}{2207}% +\pdfglyphtounicode{element}{2208}% +\pdfglyphtounicode{Wdieresis}{1E84}% +\pdfglyphtounicode{notelement}{2209}% +\pdfglyphtounicode{wdieresis}{1E85}% +\pdfglyphtounicode{suchthat}{220B}% +\pdfglyphtounicode{afii61664}{200C}% +\pdfglyphtounicode{SF010000}{250C}% +\pdfglyphtounicode{afii301}{200D}% +\pdfglyphtounicode{gravecomb}{0300}% +\pdfglyphtounicode{iotadieresistonos}{0390}% +\pdfglyphtounicode{Pi}{03A0}% +\pdfglyphtounicode{upsilondieresistonos}{03B0}% +\pdfglyphtounicode{pi}{03C0}% +\pdfglyphtounicode{afii10023}{0401}% +\pdfglyphtounicode{afii10035}{0421}% +\pdfglyphtounicode{afii10083}{0441}% +\pdfglyphtounicode{afii57804}{05C1}% +\pdfglyphtounicode{afii57681}{05E1}% +\pdfglyphtounicode{afii57409}{0621}% +\pdfglyphtounicode{afii57441}{0641}% +\pdfglyphtounicode{afii57393}{0661}% +\pdfglyphtounicode{afii300}{200F}% +\pdfglyphtounicode{product}{220F}% +\pdfglyphtounicode{revlogicalnot}{2310}% +\pdfglyphtounicode{SF030000}{2510}% +\pdfglyphtounicode{Ifraktur}{2111}% +\pdfglyphtounicode{summation}{2211}% +\pdfglyphtounicode{figuredash}{2012}% +\pdfglyphtounicode{minus}{2212}% +\pdfglyphtounicode{endash}{2013}% +\pdfglyphtounicode{afii61289}{2113}% +\pdfglyphtounicode{emdash}{2014}% +\pdfglyphtounicode{SF020000}{2514}% +\pdfglyphtounicode{afii00208}{2015}% +\pdfglyphtounicode{afii61352}{2116}% +\pdfglyphtounicode{afii10051}{0402}% +\pdfglyphtounicode{afii10036}{0422}% +\pdfglyphtounicode{afii10084}{0442}% +\pdfglyphtounicode{afii10146}{0462}% +\pdfglyphtounicode{afii57803}{05C2}% +\pdfglyphtounicode{afii57682}{05E2}% +\pdfglyphtounicode{afii57410}{0622}% +\pdfglyphtounicode{afii57442}{0642}% +\pdfglyphtounicode{afii57394}{0662}% +\pdfglyphtounicode{underscoredbl}{2017}% +\pdfglyphtounicode{asteriskmath}{2217}% +\pdfglyphtounicode{quoteleft}{2018}% +\pdfglyphtounicode{weierstrass}{2118}% +\pdfglyphtounicode{SF040000}{2518}% +\pdfglyphtounicode{quoteright}{2019}% +\pdfglyphtounicode{quotesinglbase}{201A}% +\pdfglyphtounicode{radical}{221A}% +\pdfglyphtounicode{quotereversed}{201B}% +\pdfglyphtounicode{quotedblleft}{201C}% +\pdfglyphtounicode{Rfraktur}{211C}% +\pdfglyphtounicode{SF080000}{251C}% +\pdfglyphtounicode{quotedblright}{201D}% +\pdfglyphtounicode{proportional}{221D}% +\pdfglyphtounicode{Amacron}{0100}% +\pdfglyphtounicode{Ccircumflex}{0108}% +\pdfglyphtounicode{Dcroat}{0110}% +\pdfglyphtounicode{Eogonek}{0118}% +\pdfglyphtounicode{Gdotaccent}{0120}% +\pdfglyphtounicode{Itilde}{0128}% +\pdfglyphtounicode{Idotaccent}{0130}% +\pdfglyphtounicode{kgreenlandic}{0138}% +\pdfglyphtounicode{ldot}{0140}% +\pdfglyphtounicode{ncaron}{0148}% +\pdfglyphtounicode{Ohungarumlaut}{0150}% +\pdfglyphtounicode{Rcaron}{0158}% +\pdfglyphtounicode{Scaron}{0160}% +\pdfglyphtounicode{Utilde}{0168}% +\pdfglyphtounicode{Uhungarumlaut}{0170}% +\pdfglyphtounicode{Ydieresis}{0178}% +\pdfglyphtounicode{Ohorn}{01A0}% +\pdfglyphtounicode{uhorn}{01B0}% +\pdfglyphtounicode{acutecomb}{0301}% +\pdfglyphtounicode{Alpha}{0391}% +\pdfglyphtounicode{Rho}{03A1}% +\pdfglyphtounicode{alpha}{03B1}% +\pdfglyphtounicode{rho}{03C1}% +\pdfglyphtounicode{theta1}{03D1}% +\pdfglyphtounicode{afii10052}{0403}% +\pdfglyphtounicode{afii10037}{0423}% +\pdfglyphtounicode{afii10085}{0443}% +\pdfglyphtounicode{afii10194}{0463}% +\pdfglyphtounicode{afii57658}{05C3}% +\pdfglyphtounicode{afii57683}{05E3}% +\pdfglyphtounicode{afii57411}{0623}% +\pdfglyphtounicode{afii57443}{0643}% +\pdfglyphtounicode{afii57395}{0663}% +\pdfglyphtounicode{orthogonal}{221F}% +\pdfglyphtounicode{dagger}{2020}% +\pdfglyphtounicode{angle}{2220}% +\pdfglyphtounicode{integraltp}{2320}% +\pdfglyphtounicode{daggerdbl}{2021}% +\pdfglyphtounicode{integralbt}{2321}% +\pdfglyphtounicode{bullet}{2022}% +\pdfglyphtounicode{trademark}{2122}% +\pdfglyphtounicode{onedotenleader}{2024}% +\pdfglyphtounicode{SF090000}{2524}% +\pdfglyphtounicode{twodotenleader}{2025}% +\pdfglyphtounicode{ellipsis}{2026}% +\pdfglyphtounicode{Omega}{2126}% +\pdfglyphtounicode{afii10053}{0404}% +\pdfglyphtounicode{afii10038}{0424}% +\pdfglyphtounicode{afii10086}{0444}% +\pdfglyphtounicode{afii57684}{05E4}% +\pdfglyphtounicode{afii57412}{0624}% +\pdfglyphtounicode{afii57444}{0644}% +\pdfglyphtounicode{afii57396}{0664}% +\pdfglyphtounicode{afii57505}{06A4}% +\pdfglyphtounicode{logicaland}{2227}% +\pdfglyphtounicode{logicalor}{2228}% +\pdfglyphtounicode{intersection}{2229}% +\pdfglyphtounicode{angleleft}{2329}% +\pdfglyphtounicode{union}{222A}% +\pdfglyphtounicode{angleright}{232A}% +\pdfglyphtounicode{integral}{222B}% +\pdfglyphtounicode{afii61573}{202C}% +\pdfglyphtounicode{SF060000}{252C}% +\pdfglyphtounicode{afii61574}{202D}% +\pdfglyphtounicode{Beta}{0392}% +\pdfglyphtounicode{beta}{03B2}% +\pdfglyphtounicode{sigma1}{03C2}% +\pdfglyphtounicode{Upsilon1}{03D2}% +\pdfglyphtounicode{afii10054}{0405}% +\pdfglyphtounicode{afii10039}{0425}% +\pdfglyphtounicode{afii10087}{0445}% +\pdfglyphtounicode{afii57685}{05E5}% +\pdfglyphtounicode{afii57413}{0625}% +\pdfglyphtounicode{afii57445}{0645}% +\pdfglyphtounicode{afii57397}{0665}% +\pdfglyphtounicode{perthousand}{2030}% +\pdfglyphtounicode{minute}{2032}% +\pdfglyphtounicode{second}{2033}% +\pdfglyphtounicode{therefore}{2234}% +\pdfglyphtounicode{SF070000}{2534}% +\pdfglyphtounicode{aleph}{2135}% +\pdfglyphtounicode{afii10055}{0406}% +\pdfglyphtounicode{afii10040}{0426}% +\pdfglyphtounicode{afii10088}{0446}% +\pdfglyphtounicode{afii57686}{05E6}% +\pdfglyphtounicode{afii57414}{0626}% +\pdfglyphtounicode{afii57446}{0646}% +\pdfglyphtounicode{afii57398}{0666}% +\pdfglyphtounicode{afii57507}{0686}% +\pdfglyphtounicode{guilsinglleft}{2039}% +\pdfglyphtounicode{guilsinglright}{203A}% +\pdfglyphtounicode{smileface}{263A}% +\pdfglyphtounicode{invsmileface}{263B}% +\pdfglyphtounicode{exclamdbl}{203C}% +\pdfglyphtounicode{similar}{223C}% +\pdfglyphtounicode{SF050000}{253C}% +\pdfglyphtounicode{sun}{263C}% +\pdfglyphtounicode{currency}{00A4}% +\pdfglyphtounicode{dieresis}{00A8}% +\pdfglyphtounicode{logicalnot}{00AC}% +\pdfglyphtounicode{degree}{00B0}% +\pdfglyphtounicode{acute}{00B4}% +\pdfglyphtounicode{cedilla}{00B8}% +\pdfglyphtounicode{onequarter}{00BC}% +\pdfglyphtounicode{Agrave}{00C0}% +\pdfglyphtounicode{Adieresis}{00C4}% +\pdfglyphtounicode{Egrave}{00C8}% +\pdfglyphtounicode{Igrave}{00CC}% +\pdfglyphtounicode{Eth}{00D0}% +\pdfglyphtounicode{Ocircumflex}{00D4}% +\pdfglyphtounicode{Oslash}{00D8}% +\pdfglyphtounicode{Udieresis}{00DC}% +\pdfglyphtounicode{agrave}{00E0}% +\pdfglyphtounicode{adieresis}{00E4}% +\pdfglyphtounicode{egrave}{00E8}% +\pdfglyphtounicode{igrave}{00EC}% +\pdfglyphtounicode{eth}{00F0}% +\pdfglyphtounicode{ocircumflex}{00F4}% +\pdfglyphtounicode{oslash}{00F8}% +\pdfglyphtounicode{udieresis}{00FC}% +\pdfglyphtounicode{amacron}{0101}% +\pdfglyphtounicode{ccircumflex}{0109}% +\pdfglyphtounicode{dcroat}{0111}% +\pdfglyphtounicode{eogonek}{0119}% +\pdfglyphtounicode{gdotaccent}{0121}% +\pdfglyphtounicode{itilde}{0129}% +\pdfglyphtounicode{dotlessi}{0131}% +\pdfglyphtounicode{Lacute}{0139}% +\pdfglyphtounicode{Lslash}{0141}% +\pdfglyphtounicode{napostrophe}{0149}% +\pdfglyphtounicode{ohungarumlaut}{0151}% +\pdfglyphtounicode{rcaron}{0159}% +\pdfglyphtounicode{scaron}{0161}% +\pdfglyphtounicode{utilde}{0169}% +\pdfglyphtounicode{uhungarumlaut}{0171}% +\pdfglyphtounicode{Zacute}{0179}% +\pdfglyphtounicode{ohorn}{01A1}% +\pdfglyphtounicode{tildecomb}{0303}% +\pdfglyphtounicode{dotbelowcomb}{0323}% +\pdfglyphtounicode{Gamma}{0393}% +\pdfglyphtounicode{Sigma}{03A3}% +\pdfglyphtounicode{gamma}{03B3}% +\pdfglyphtounicode{sigma}{03C3}% +\pdfglyphtounicode{afii10056}{0407}% +\pdfglyphtounicode{afii10041}{0427}% +\pdfglyphtounicode{afii10089}{0447}% +\pdfglyphtounicode{afii57687}{05E7}% +\pdfglyphtounicode{afii57415}{0627}% +\pdfglyphtounicode{afii57470}{0647}% +\pdfglyphtounicode{afii57399}{0667}% +\pdfglyphtounicode{female}{2640}% +\pdfglyphtounicode{male}{2642}% +\pdfglyphtounicode{fraction}{2044}% +\pdfglyphtounicode{congruent}{2245}% +\pdfglyphtounicode{afii10057}{0408}% +\pdfglyphtounicode{afii10042}{0428}% +\pdfglyphtounicode{afii10090}{0448}% +\pdfglyphtounicode{afii57688}{05E8}% +\pdfglyphtounicode{afii57416}{0628}% +\pdfglyphtounicode{afii57448}{0648}% +\pdfglyphtounicode{afii57400}{0668}% +\pdfglyphtounicode{afii57512}{0688}% +\pdfglyphtounicode{approxequal}{2248}% +\pdfglyphtounicode{tonos}{0384}% +\pdfglyphtounicode{Tau}{03A4}% +\pdfglyphtounicode{delta}{03B4}% +\pdfglyphtounicode{tau}{03C4}% +\pdfglyphtounicode{afii10058}{0409}% +\pdfglyphtounicode{afii10043}{0429}% +\pdfglyphtounicode{afii10091}{0449}% +\pdfglyphtounicode{afii57689}{05E9}% +\pdfglyphtounicode{afii57417}{0629}% +\pdfglyphtounicode{afii57449}{0649}% +\pdfglyphtounicode{afii57401}{0669}% +\pdfglyphtounicode{SF430000}{2550}% +\pdfglyphtounicode{SF240000}{2551}% +\pdfglyphtounicode{SF510000}{2552}% +\pdfglyphtounicode{onethird}{2153}% +\pdfglyphtounicode{SF520000}{2553}% +\pdfglyphtounicode{twothirds}{2154}% +\pdfglyphtounicode{SF390000}{2554}% +\pdfglyphtounicode{SF220000}{2555}% +\pdfglyphtounicode{SF210000}{2556}% +\pdfglyphtounicode{afii10059}{040A}% +\pdfglyphtounicode{afii10044}{042A}% +\pdfglyphtounicode{afii10092}{044A}% +\pdfglyphtounicode{afii57690}{05EA}% +\pdfglyphtounicode{afii57418}{062A}% +\pdfglyphtounicode{afii57450}{064A}% +\pdfglyphtounicode{afii57381}{066A}% +\pdfglyphtounicode{SF250000}{2557}% +\pdfglyphtounicode{SF500000}{2558}% +\pdfglyphtounicode{SF490000}{2559}% +\pdfglyphtounicode{SF380000}{255A}% +\pdfglyphtounicode{oneeighth}{215B}% +\pdfglyphtounicode{SF280000}{255B}% +\pdfglyphtounicode{threeeighths}{215C}% +\pdfglyphtounicode{SF270000}{255C}% +\pdfglyphtounicode{fiveeighths}{215D}% +\pdfglyphtounicode{SF260000}{255D}% +\pdfglyphtounicode{Abreve}{0102}% +\pdfglyphtounicode{Cdotaccent}{010A}% +\pdfglyphtounicode{Emacron}{0112}% +\pdfglyphtounicode{Ecaron}{011A}% +\pdfglyphtounicode{Gcommaaccent}{0122}% +\pdfglyphtounicode{Imacron}{012A}% +\pdfglyphtounicode{IJ}{0132}% +\pdfglyphtounicode{lacute}{013A}% +\pdfglyphtounicode{lslash}{0142}% +\pdfglyphtounicode{Eng}{014A}% +\pdfglyphtounicode{OE}{0152}% +\pdfglyphtounicode{Sacute}{015A}% +\pdfglyphtounicode{Tcommaaccent}{0162}% +\pdfglyphtounicode{Umacron}{016A}% +\pdfglyphtounicode{Uogonek}{0172}% +\pdfglyphtounicode{zacute}{017A}% +\pdfglyphtounicode{florin}{0192}% +\pdfglyphtounicode{Aringacute}{01FA}% +\pdfglyphtounicode{dieresistonos}{0385}% +\pdfglyphtounicode{Epsilon}{0395}% +\pdfglyphtounicode{Upsilon}{03A5}% +\pdfglyphtounicode{epsilon}{03B5}% +\pdfglyphtounicode{upsilon}{03C5}% +\pdfglyphtounicode{phi1}{03D5}% +\pdfglyphtounicode{afii10060}{040B}% +\pdfglyphtounicode{afii10045}{042B}% +\pdfglyphtounicode{afii10093}{044B}% +\pdfglyphtounicode{afii57419}{062B}% +\pdfglyphtounicode{afii57451}{064B}% +\pdfglyphtounicode{SF370000}{255F}% +\pdfglyphtounicode{notequal}{2260}% +\pdfglyphtounicode{SF420000}{2560}% +\pdfglyphtounicode{spade}{2660}% +\pdfglyphtounicode{equivalence}{2261}% +\pdfglyphtounicode{SF190000}{2561}% +\pdfglyphtounicode{SF200000}{2562}% +\pdfglyphtounicode{SF230000}{2563}% +\pdfglyphtounicode{club}{2663}% +\pdfglyphtounicode{lessequal}{2264}% +\pdfglyphtounicode{SF470000}{2564}% +\pdfglyphtounicode{greaterequal}{2265}% +\pdfglyphtounicode{SF480000}{2565}% +\pdfglyphtounicode{heart}{2665}% +\pdfglyphtounicode{SF410000}{2566}% +\pdfglyphtounicode{diamond}{2666}% +\pdfglyphtounicode{afii10061}{040C}% +\pdfglyphtounicode{afii10046}{042C}% +\pdfglyphtounicode{afii10094}{044C}% +\pdfglyphtounicode{afii57388}{060C}% +\pdfglyphtounicode{afii57420}{062C}% +\pdfglyphtounicode{afii57452}{064C}% +\pdfglyphtounicode{SF450000}{2567}% +\pdfglyphtounicode{SF460000}{2568}% +\pdfglyphtounicode{SF400000}{2569}% +\pdfglyphtounicode{SF540000}{256A}% +\pdfglyphtounicode{musicalnote}{266A}% +\pdfglyphtounicode{SF530000}{256B}% +\pdfglyphtounicode{musicalnotedbl}{266B}% +\pdfglyphtounicode{SF440000}{256C}% +\pdfglyphtounicode{circumflex}{02C6}% +\pdfglyphtounicode{Alphatonos}{0386}% +\pdfglyphtounicode{Zeta}{0396}% +\pdfglyphtounicode{Phi}{03A6}% +\pdfglyphtounicode{zeta}{03B6}% +\pdfglyphtounicode{phi}{03C6}% +\pdfglyphtounicode{omega1}{03D6}% +\pdfglyphtounicode{afii10047}{042D}% +\pdfglyphtounicode{afii10095}{044D}% +\pdfglyphtounicode{afii57421}{062D}% +\pdfglyphtounicode{afii57453}{064D}% +\pdfglyphtounicode{afii63167}{066D}% +\pdfglyphtounicode{afii10062}{040E}% +\pdfglyphtounicode{afii10048}{042E}% +\pdfglyphtounicode{afii10096}{044E}% +\pdfglyphtounicode{afii57422}{062E}% +\pdfglyphtounicode{afii57454}{064E}% +\pdfglyphtounicode{at}{0040}% +\pdfglyphtounicode{B}{0042}% +\pdfglyphtounicode{D}{0044}% +\pdfglyphtounicode{F}{0046}% +\pdfglyphtounicode{H}{0048}% +\pdfglyphtounicode{J}{004A}% +\pdfglyphtounicode{L}{004C}% +\pdfglyphtounicode{N}{004E}% +\pdfglyphtounicode{P}{0050}% +\pdfglyphtounicode{R}{0052}% +\pdfglyphtounicode{T}{0054}% +\pdfglyphtounicode{V}{0056}% +\pdfglyphtounicode{X}{0058}% +\pdfglyphtounicode{Z}{005A}% +\pdfglyphtounicode{backslash}{005C}% +\pdfglyphtounicode{asciicircum}{005E}% +\pdfglyphtounicode{grave}{0060}% +\pdfglyphtounicode{b}{0062}% +\pdfglyphtounicode{d}{0064}% +\pdfglyphtounicode{f}{0066}% +\pdfglyphtounicode{h}{0068}% +\pdfglyphtounicode{j}{006A}% +\pdfglyphtounicode{l}{006C}% +\pdfglyphtounicode{n}{006E}% +\pdfglyphtounicode{p}{0070}% +\pdfglyphtounicode{r}{0072}% +\pdfglyphtounicode{t}{0074}% +\pdfglyphtounicode{v}{0076}% +\pdfglyphtounicode{x}{0078}% +\pdfglyphtounicode{z}{007A}% +\pdfglyphtounicode{bar}{007C}% +\pdfglyphtounicode{asciitilde}{007E}% +\pdfglyphtounicode{exclamdown}{00A1}% +\pdfglyphtounicode{yen}{00A5}% +\pdfglyphtounicode{copyright}{00A9}% +\pdfglyphtounicode{plusminus}{00B1}% +\pdfglyphtounicode{mu}{00B5}% +\pdfglyphtounicode{onehalf}{00BD}% +\pdfglyphtounicode{Aacute}{00C1}% +\pdfglyphtounicode{Aring}{00C5}% +\pdfglyphtounicode{Eacute}{00C9}% +\pdfglyphtounicode{Iacute}{00CD}% +\pdfglyphtounicode{Ntilde}{00D1}% +\pdfglyphtounicode{Otilde}{00D5}% +\pdfglyphtounicode{Ugrave}{00D9}% +\pdfglyphtounicode{Yacute}{00DD}% +\pdfglyphtounicode{aacute}{00E1}% +\pdfglyphtounicode{aring}{00E5}% +\pdfglyphtounicode{eacute}{00E9}% +\pdfglyphtounicode{iacute}{00ED}% +\pdfglyphtounicode{ntilde}{00F1}% +\pdfglyphtounicode{otilde}{00F5}% +\pdfglyphtounicode{ugrave}{00F9}% +\pdfglyphtounicode{yacute}{00FD}% +\pdfglyphtounicode{abreve}{0103}% +\pdfglyphtounicode{cdotaccent}{010B}% +\pdfglyphtounicode{emacron}{0113}% +\pdfglyphtounicode{ecaron}{011B}% +\pdfglyphtounicode{gcommaaccent}{0123}% +\pdfglyphtounicode{imacron}{012B}% +\pdfglyphtounicode{ij}{0133}% +\pdfglyphtounicode{Lcommaaccent}{013B}% +\pdfglyphtounicode{Nacute}{0143}% +\pdfglyphtounicode{eng}{014B}% +\pdfglyphtounicode{oe}{0153}% +\pdfglyphtounicode{sacute}{015B}% +\pdfglyphtounicode{tcommaaccent}{0163}% +\pdfglyphtounicode{umacron}{016B}% +\pdfglyphtounicode{uogonek}{0173}% +\pdfglyphtounicode{Zdotaccent}{017B}% +\pdfglyphtounicode{aringacute}{01FB}% +\pdfglyphtounicode{caron}{02C7}% +\pdfglyphtounicode{anoteleia}{0387}% +\pdfglyphtounicode{Eta}{0397}% +\pdfglyphtounicode{Chi}{03A7}% +\pdfglyphtounicode{eta}{03B7}% +\pdfglyphtounicode{chi}{03C7}% +\pdfglyphtounicode{afii10145}{040F}% +\pdfglyphtounicode{afii10049}{042F}% +\pdfglyphtounicode{afii10097}{044F}% +\pdfglyphtounicode{afii57423}{062F}% +\pdfglyphtounicode{afii57455}{064F}% +\pdfglyphtounicode{afii57509}{06AF}% +\pdfglyphtounicode{upblock}{2580}% +\pdfglyphtounicode{propersubset}{2282}% +\pdfglyphtounicode{propersuperset}{2283}% +\pdfglyphtounicode{notsubset}{2284}% +\pdfglyphtounicode{dnblock}{2584}% +\pdfglyphtounicode{reflexsubset}{2286}% +\pdfglyphtounicode{afii10017}{0410}% +\pdfglyphtounicode{afii10065}{0430}% +\pdfglyphtounicode{afii10050}{0490}% +\pdfglyphtounicode{afii57799}{05B0}% +\pdfglyphtounicode{afii57664}{05D0}% +\pdfglyphtounicode{afii57716}{05F0}% +\pdfglyphtounicode{afii57424}{0630}% +\pdfglyphtounicode{afii57456}{0650}% +\pdfglyphtounicode{reflexsuperset}{2287}% +\pdfglyphtounicode{block}{2588}% +\pdfglyphtounicode{lfblock}{258C}% +\pdfglyphtounicode{Scommaaccent}{0218}% +\pdfglyphtounicode{breve}{02D8}% +\pdfglyphtounicode{Epsilontonos}{0388}% +\pdfglyphtounicode{Theta}{0398}% +\pdfglyphtounicode{Psi}{03A8}% +\pdfglyphtounicode{theta}{03B8}% +\pdfglyphtounicode{psi}{03C8}% +\pdfglyphtounicode{afii10018}{0411}% +\pdfglyphtounicode{afii10066}{0431}% +\pdfglyphtounicode{afii10071}{0451}% +\pdfglyphtounicode{afii10098}{0491}% +\pdfglyphtounicode{afii57801}{05B1}% +\pdfglyphtounicode{afii57665}{05D1}% +\pdfglyphtounicode{afii57717}{05F1}% +\pdfglyphtounicode{afii57425}{0631}% +\pdfglyphtounicode{afii57457}{0651}% +\pdfglyphtounicode{afii57513}{0691}% +\pdfglyphtounicode{arrowleft}{2190}% +\pdfglyphtounicode{rtblock}{2590}% +\pdfglyphtounicode{arrowup}{2191}% +\pdfglyphtounicode{ltshade}{2591}% +\pdfglyphtounicode{arrowright}{2192}% +\pdfglyphtounicode{shade}{2592}% +\pdfglyphtounicode{arrowdown}{2193}% +\pdfglyphtounicode{dkshade}{2593}% +\pdfglyphtounicode{arrowboth}{2194}% +\pdfglyphtounicode{arrowupdn}{2195}% +\pdfglyphtounicode{circleplus}{2295}% +\pdfglyphtounicode{afii10019}{0412}% +\pdfglyphtounicode{afii10067}{0432}% +\pdfglyphtounicode{afii10099}{0452}% +\pdfglyphtounicode{afii10147}{0472}% +\pdfglyphtounicode{afii57800}{05B2}% +\pdfglyphtounicode{afii57666}{05D2}% +\pdfglyphtounicode{afii57718}{05F2}% +\pdfglyphtounicode{afii57426}{0632}% +\pdfglyphtounicode{afii57458}{0652}% +\pdfglyphtounicode{afii57519}{06D2}% +\pdfglyphtounicode{circlemultiply}{2297}% +\pdfglyphtounicode{Aogonek}{0104}% +\pdfglyphtounicode{Ccaron}{010C}% +\pdfglyphtounicode{Ebreve}{0114}% +\pdfglyphtounicode{Gcircumflex}{011C}% +\pdfglyphtounicode{Hcircumflex}{0124}% +\pdfglyphtounicode{Ibreve}{012C}% +\pdfglyphtounicode{Jcircumflex}{0134}% +\pdfglyphtounicode{lcommaaccent}{013C}% +\pdfglyphtounicode{nacute}{0144}% +\pdfglyphtounicode{Omacron}{014C}% +\pdfglyphtounicode{Racute}{0154}% +\pdfglyphtounicode{Scircumflex}{015C}% +\pdfglyphtounicode{Tcaron}{0164}% +\pdfglyphtounicode{Ubreve}{016C}% +\pdfglyphtounicode{Wcircumflex}{0174}% +\pdfglyphtounicode{zdotaccent}{017C}% +\pdfglyphtounicode{AEacute}{01FC}% +\pdfglyphtounicode{scommaaccent}{0219}% +\pdfglyphtounicode{dotaccent}{02D9}% +\pdfglyphtounicode{hookabovecomb}{0309}% +\pdfglyphtounicode{Etatonos}{0389}% +\pdfglyphtounicode{Iota}{0399}% +\pdfglyphtounicode{iota}{03B9}% +\pdfglyphtounicode{omega}{03C9}% +\pdfglyphtounicode{afii10020}{0413}% +\pdfglyphtounicode{afii10068}{0433}% +\pdfglyphtounicode{afii10100}{0453}% +\pdfglyphtounicode{afii10195}{0473}% +\pdfglyphtounicode{afii57802}{05B3}% +\pdfglyphtounicode{afii57667}{05D3}% +\pdfglyphtounicode{afii57427}{0633}% +\pdfglyphtounicode{filledbox}{25A0}% +\pdfglyphtounicode{colonmonetary}{20A1}% +\pdfglyphtounicode{H22073}{25A1}% +\pdfglyphtounicode{franc}{20A3}% +\pdfglyphtounicode{lira}{20A4}% +\pdfglyphtounicode{perpendicular}{22A5}% +\pdfglyphtounicode{afii10021}{0414}% +\pdfglyphtounicode{afii10069}{0434}% +\pdfglyphtounicode{afii10101}{0454}% +\pdfglyphtounicode{afii10148}{0474}% +\pdfglyphtounicode{afii57793}{05B4}% +\pdfglyphtounicode{afii57668}{05D4}% +\pdfglyphtounicode{afii57428}{0634}% +\pdfglyphtounicode{peseta}{20A7}% +\pdfglyphtounicode{arrowupdnbse}{21A8}% +\pdfglyphtounicode{afii57636}{20AA}% +\pdfglyphtounicode{H18543}{25AA}% +\pdfglyphtounicode{dong}{20AB}% +\pdfglyphtounicode{H18551}{25AB}% +\pdfglyphtounicode{Euro}{20AC}% +\pdfglyphtounicode{filledrect}{25AC}% +\pdfglyphtounicode{ring}{02DA}% +\pdfglyphtounicode{Iotatonos}{038A}% +\pdfglyphtounicode{Kappa}{039A}% +\pdfglyphtounicode{Iotadieresis}{03AA}% +\pdfglyphtounicode{kappa}{03BA}% +\pdfglyphtounicode{iotadieresis}{03CA}% +\pdfglyphtounicode{afii10022}{0415}% +\pdfglyphtounicode{afii10070}{0435}% +\pdfglyphtounicode{afii10102}{0455}% +\pdfglyphtounicode{afii10196}{0475}% +\pdfglyphtounicode{afii57794}{05B5}% +\pdfglyphtounicode{afii57669}{05D5}% +\pdfglyphtounicode{afii57429}{0635}% +\pdfglyphtounicode{afii57534}{06D5}% +\pdfglyphtounicode{triagup}{25B2}% +\pdfglyphtounicode{carriagereturn}{21B5}% +\pdfglyphtounicode{afii10024}{0416}% +\pdfglyphtounicode{afii10072}{0436}% +\pdfglyphtounicode{afii10103}{0456}% +\pdfglyphtounicode{afii57795}{05B6}% +\pdfglyphtounicode{afii57670}{05D6}% +\pdfglyphtounicode{afii57430}{0636}% +\pdfglyphtounicode{triagrt}{25BA}% +\pdfglyphtounicode{triagdn}{25BC}% +\pdfglyphtounicode{cent}{00A2}% +\pdfglyphtounicode{brokenbar}{00A6}% +\pdfglyphtounicode{ordfeminine}{00AA}% +\pdfglyphtounicode{registered}{00AE}% +\pdfglyphtounicode{paragraph}{00B6}% +\pdfglyphtounicode{ordmasculine}{00BA}% +\pdfglyphtounicode{threequarters}{00BE}% +\pdfglyphtounicode{Acircumflex}{00C2}% +\pdfglyphtounicode{AE}{00C6}% +\pdfglyphtounicode{Ecircumflex}{00CA}% +\pdfglyphtounicode{Icircumflex}{00CE}% +\pdfglyphtounicode{Ograve}{00D2}% +\pdfglyphtounicode{Odieresis}{00D6}% +\pdfglyphtounicode{Uacute}{00DA}% +\pdfglyphtounicode{Thorn}{00DE}% +\pdfglyphtounicode{acircumflex}{00E2}% +\pdfglyphtounicode{ae}{00E6}% +\pdfglyphtounicode{ecircumflex}{00EA}% +\pdfglyphtounicode{icircumflex}{00EE}% +\pdfglyphtounicode{ograve}{00F2}% +\pdfglyphtounicode{odieresis}{00F6}% +\pdfglyphtounicode{uacute}{00FA}% +\pdfglyphtounicode{thorn}{00FE}% +\pdfglyphtounicode{aogonek}{0105}% +\pdfglyphtounicode{ccaron}{010D}% +\pdfglyphtounicode{ebreve}{0115}% +\pdfglyphtounicode{gcircumflex}{011D}% +\pdfglyphtounicode{hcircumflex}{0125}% +\pdfglyphtounicode{ibreve}{012D}% +\pdfglyphtounicode{jcircumflex}{0135}% +\pdfglyphtounicode{Lcaron}{013D}% +\pdfglyphtounicode{Ncommaaccent}{0145}% +\pdfglyphtounicode{omacron}{014D}% +\pdfglyphtounicode{racute}{0155}% +\pdfglyphtounicode{scircumflex}{015D}% +\pdfglyphtounicode{tcaron}{0165}% +\pdfglyphtounicode{ubreve}{016D}% +\pdfglyphtounicode{wcircumflex}{0175}% +\pdfglyphtounicode{Zcaron}{017D}% +\pdfglyphtounicode{aeacute}{01FD}% +\pdfglyphtounicode{ogonek}{02DB}% +\pdfglyphtounicode{Lambda}{039B}% +\pdfglyphtounicode{Upsilondieresis}{03AB}% +\pdfglyphtounicode{lambda}{03BB}% +\pdfglyphtounicode{upsilondieresis}{03CB}% +\pdfglyphtounicode{afii10025}{0417}% +\pdfglyphtounicode{afii10073}{0437}% +\pdfglyphtounicode{afii10104}{0457}% +\pdfglyphtounicode{afii57798}{05B7}% +\pdfglyphtounicode{afii57671}{05D7}% +\pdfglyphtounicode{afii57431}{0637}% +\pdfglyphtounicode{triaglf}{25C4}% +\pdfglyphtounicode{dotmath}{22C5}% +\pdfglyphtounicode{afii10026}{0418}% +\pdfglyphtounicode{afii10074}{0438}% +\pdfglyphtounicode{afii10105}{0458}% +\pdfglyphtounicode{afii57797}{05B8}% +\pdfglyphtounicode{afii57672}{05D8}% +\pdfglyphtounicode{afii57432}{0638}% +\pdfglyphtounicode{afii57508}{0698}% +\pdfglyphtounicode{lozenge}{25CA}% +\pdfglyphtounicode{circle}{25CB}% +\pdfglyphtounicode{afii57929}{02BC}% +\pdfglyphtounicode{tilde}{02DC}% +\pdfglyphtounicode{Omicrontonos}{038C}% +\pdfglyphtounicode{Mu}{039C}% +\pdfglyphtounicode{alphatonos}{03AC}% +\pdfglyphtounicode{omicrontonos}{03CC}% +\pdfglyphtounicode{afii10027}{0419}% +\pdfglyphtounicode{afii10075}{0439}% +\pdfglyphtounicode{afii10106}{0459}% +\pdfglyphtounicode{afii10846}{04D9}% +\pdfglyphtounicode{afii57806}{05B9}% +\pdfglyphtounicode{afii57673}{05D9}% +\pdfglyphtounicode{afii57433}{0639}% +\pdfglyphtounicode{afii57511}{0679}% +\pdfglyphtounicode{H18533}{25CF}% +\pdfglyphtounicode{arrowdblleft}{21D0}% +\pdfglyphtounicode{arrowdblup}{21D1}% +\pdfglyphtounicode{arrowdblright}{21D2}% +\pdfglyphtounicode{arrowdbldown}{21D3}% +\pdfglyphtounicode{arrowdblboth}{21D4}% +\pdfglyphtounicode{afii10028}{041A}% +\pdfglyphtounicode{afii10076}{043A}% +\pdfglyphtounicode{afii10107}{045A}% +\pdfglyphtounicode{afii57674}{05DA}% +\pdfglyphtounicode{afii57434}{063A}% +\pdfglyphtounicode{afii57514}{06BA}% +\pdfglyphtounicode{invbullet}{25D8}% +\pdfglyphtounicode{invcircle}{25D9}% +\pdfglyphtounicode{Cacute}{0106}% +\pdfglyphtounicode{Dcaron}{010E}% +\pdfglyphtounicode{Edotaccent}{0116}% +\pdfglyphtounicode{Gbreve}{011E}% +\pdfglyphtounicode{Hbar}{0126}% +\pdfglyphtounicode{Iogonek}{012E}% +\pdfglyphtounicode{Kcommaaccent}{0136}% +\pdfglyphtounicode{lcaron}{013E}% +\pdfglyphtounicode{ncommaaccent}{0146}% +\pdfglyphtounicode{Obreve}{014E}% +\pdfglyphtounicode{Rcommaaccent}{0156}% +\pdfglyphtounicode{Scedilla}{015E}% +\pdfglyphtounicode{Tbar}{0166}% +\pdfglyphtounicode{Uring}{016E}% +\pdfglyphtounicode{Ycircumflex}{0176}% +\pdfglyphtounicode{zcaron}{017E}% +\pdfglyphtounicode{Gcaron}{01E6}% +\pdfglyphtounicode{Oslashacute}{01FE}% +\pdfglyphtounicode{afii64937}{02BD}% +\pdfglyphtounicode{hungarumlaut}{02DD}% +\pdfglyphtounicode{Nu}{039D}% +\pdfglyphtounicode{epsilontonos}{03AD}% +\pdfglyphtounicode{nu}{03BD}% +\pdfglyphtounicode{upsilontonos}{03CD}% +\pdfglyphtounicode{afii10029}{041B}% +\pdfglyphtounicode{afii10077}{043B}% +\pdfglyphtounicode{afii10108}{045B}% +\pdfglyphtounicode{afii57796}{05BB}% +\pdfglyphtounicode{afii57675}{05DB}% +\pdfglyphtounicode{afii57403}{061B}% +\pdfglyphtounicode{estimated}{212E}% +\pdfglyphtounicode{infinity}{221E}% +\pdfglyphtounicode{SF360000}{255E}% +\pdfglyphtounicode{Ygrave}{1EF2}% +\pdfglyphtounicode{openbullet}{25E6}% +\pdfglyphtounicode{afii10030}{041C}% +\pdfglyphtounicode{afii10078}{043C}% +\pdfglyphtounicode{afii10109}{045C}% +\pdfglyphtounicode{afii57807}{05BC}% +\pdfglyphtounicode{afii57676}{05DC}% +\pdfglyphtounicode{ygrave}{1EF3}% +\pdfglyphtounicode{Upsilontonos}{038E}% +\pdfglyphtounicode{Xi}{039E}% +\pdfglyphtounicode{etatonos}{03AE}% +\pdfglyphtounicode{xi}{03BE}% +\pdfglyphtounicode{omegatonos}{03CE}% +\pdfglyphtounicode{afii10031}{041D}% +\pdfglyphtounicode{afii10079}{043D}% +\pdfglyphtounicode{afii57839}{05BD}% +\pdfglyphtounicode{afii57677}{05DD}% +\pdfglyphtounicode{afii10032}{041E}% +\pdfglyphtounicode{afii10080}{043E}% +\pdfglyphtounicode{afii10110}{045E}% +\pdfglyphtounicode{afii57645}{05BE}% +\pdfglyphtounicode{afii57678}{05DE}% +\pdfglyphtounicode{afii57506}{067E}% +\pdfglyphtounicode{seveneighths}{215E}% +\pdfglyphtounicode{prescription}{211E}% +\pdfglyphtounicode{afii61575}{202E}% +\pdfglyphtounicode{quotedblbase}{201E}% +\pdfglyphtounicode{afii299}{200E}% +% +\endinput diff --git a/Master/texmf-dist/tex/context/base/pdfr-il2.tex b/Master/texmf-dist/tex/context/base/pdfr-il2.tex deleted file mode 100644 index 70bcb25da38..00000000000 --- a/Master/texmf-dist/tex/context/base/pdfr-il2.tex +++ /dev/null @@ -1,233 +0,0 @@ -%D \module -%D [ file=pdfr-il2, -%D version=2000.12.10, -%D title=\CONTEXT\ PDF Font Resources, -%D subtitle=ISO Latin 2, -%D author={Ondrej Koala Vacha, Hans Hagen}, -%D date=\currentdate, -%D copyright={PRAGMA / Hans Hagen \& Ton Otten}] -%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 This vector is derived (but reformatted a bit) from a -%D sample send to me by Petr Ferdus. There was some Czech -%D comment in which I could recognize the name of Ondrej -%D Koala Vacha. More information on setting up such a vector -%D can be found in the \PDF\ reference manual. - -\startpdffontresource[il2] -/CIDInit /ProcSet findresource begin -12 dict begin - begincmap - /CIDSystemInfo - << /Registry (Adobe) - /Ordering (T1UV) - /Supplement 0 - >> def - /CMapName /Adobe-Identity-UCS def - /CMapType 1 def - 1 begincodespacerange - <00> <FF> - endcodespacerange - %%FontSpecificEncoding - 191 beginbfrange - <20> <20> <0020> % space dec: 32 oct:040 hex:20 - <21> <21> <0021> % exclam dec: 33 oct:041 hex:21 - <22> <22> <0022> % quotedbl dec: 34 oct:042 hex:22 - <23> <23> <0023> % numbersign dec: 35 oct:043 hex:23 - <24> <24> <0024> % dollar dec: 36 oct:044 hex:24 - <25> <25> <0025> % percent dec: 37 oct:045 hex:25 - <26> <26> <0026> % ampersand dec: 38 oct:046 hex:26 - <27> <27> <0027> % quotesingle dec: 39 oct:047 hex:27 - <28> <28> <0028> % parenleft dec: 40 oct:050 hex:28 - <29> <29> <0029> % parenright dec: 41 oct:051 hex:29 - <2a> <2a> <002a> % asterisk dec: 42 oct:052 hex:2a - <2b> <2b> <002b> % plus dec: 43 oct:053 hex:2b - <2c> <2c> <002c> % comma dec: 44 oct:054 hex:2c - <2d> <2d> <002d> % hyphen dec: 45 oct:055 hex:2d - <2e> <2e> <002e> % period dec: 46 oct:056 hex:2e - <2f> <2f> <002f> % slash dec: 47 oct:057 hex:2f - <30> <30> <0030> % zero dec: 48 oct:060 hex:30 - <31> <31> <0031> % one dec: 49 oct:061 hex:31 - <32> <32> <0032> % two dec: 50 oct:062 hex:32 - <33> <33> <0033> % three dec: 51 oct:063 hex:33 - <34> <34> <0034> % four dec: 52 oct:064 hex:34 - <35> <35> <0035> % five dec: 53 oct:065 hex:35 - <36> <36> <0036> % six dec: 54 oct:066 hex:36 - <37> <37> <0037> % seven dec: 55 oct:067 hex:37 - <38> <38> <0038> % eight dec: 56 oct:070 hex:38 - <39> <39> <0039> % nine dec: 57 oct:071 hex:39 - <3a> <3a> <003a> % colon dec: 58 oct:072 hex:3a - <3b> <3b> <003b> % semicolon dec: 59 oct:073 hex:3b - <3c> <3c> <003c> % less dec: 60 oct:074 hex:3c - <3d> <3d> <003d> % equal dec: 61 oct:075 hex:3d - <3e> <3e> <003e> % greater dec: 62 oct:076 hex:3e - <3f> <3f> <003f> % question dec: 63 oct:077 hex:3f - <40> <40> <0040> % at dec: 64 oct:100 hex:40 - <41> <41> <0041> % A dec: 65 oct:101 hex:41 - <42> <42> <0042> % B dec: 66 oct:102 hex:42 - <43> <43> <0043> % C dec: 67 oct:103 hex:43 - <44> <44> <0044> % D dec: 68 oct:104 hex:44 - <45> <45> <0045> % E dec: 69 oct:105 hex:45 - <46> <46> <0046> % F dec: 70 oct:106 hex:46 - <47> <47> <0047> % G dec: 71 oct:107 hex:47 - <48> <48> <0048> % H dec: 72 oct:110 hex:48 - <49> <49> <0049> % I dec: 73 oct:111 hex:49 - <4a> <4a> <004a> % J dec: 74 oct:112 hex:4a - <4b> <4b> <004b> % K dec: 75 oct:113 hex:4b - <4c> <4c> <004c> % L dec: 76 oct:114 hex:4c - <4d> <4d> <004d> % M dec: 77 oct:115 hex:4d - <4e> <4e> <004e> % N dec: 78 oct:116 hex:4e - <4f> <4f> <004f> % O dec: 79 oct:117 hex:4f - <50> <50> <0050> % P dec: 80 oct:120 hex:50 - <51> <51> <0051> % Q dec: 81 oct:121 hex:51 - <52> <52> <0052> % R dec: 82 oct:122 hex:52 - <53> <53> <0053> % S dec: 83 oct:123 hex:53 - <54> <54> <0054> % T dec: 84 oct:124 hex:54 - <55> <55> <0055> % U dec: 85 oct:125 hex:55 - <56> <56> <0056> % V dec: 86 oct:126 hex:56 - <57> <57> <0057> % W dec: 87 oct:127 hex:57 - <58> <58> <0058> % X dec: 88 oct:130 hex:58 - <59> <59> <0059> % Y dec: 89 oct:131 hex:59 - <5a> <5a> <005a> % Z dec: 90 oct:132 hex:5a - <5b> <5b> <005b> % bracketleft dec: 91 oct:133 hex:5b - <5c> <5c> <005c> % backslash dec: 92 oct:134 hex:5c - <5d> <5d> <005d> % bracketright dec: 93 oct:135 hex:5d - <5e> <5e> <005e> % asciicircum dec: 94 oct:136 hex:5e - <5f> <5f> <005f> % underscore dec: 95 oct:137 hex:5f - <60> <60> <0060> % grave dec: 96 oct:140 hex:60 - <61> <61> <0061> % a dec: 97 oct:141 hex:61 - <62> <62> <0062> % b dec: 98 oct:142 hex:62 - <63> <63> <0063> % c dec: 99 oct:143 hex:63 - <64> <64> <0064> % d dec:100 oct:144 hex:64 - <65> <65> <0065> % e dec:101 oct:145 hex:65 - <66> <66> <0066> % f dec:102 oct:146 hex:66 - <67> <67> <0067> % g dec:103 oct:147 hex:67 - <68> <68> <0068> % h dec:104 oct:150 hex:68 - <69> <69> <0069> % i dec:105 oct:151 hex:69 - <6a> <6a> <006a> % j dec:106 oct:152 hex:6a - <6b> <6b> <006b> % k dec:107 oct:153 hex:6b - <6c> <6c> <006c> % l dec:108 oct:154 hex:6c - <6d> <6d> <006d> % m dec:109 oct:155 hex:6d - <6e> <6e> <006e> % n dec:110 oct:156 hex:6e - <6f> <6f> <006f> % o dec:111 oct:157 hex:6f - <70> <70> <0070> % p dec:112 oct:160 hex:70 - <71> <71> <0071> % q dec:113 oct:161 hex:71 - <72> <72> <0072> % r dec:114 oct:162 hex:72 - <73> <73> <0073> % s dec:115 oct:163 hex:73 - <74> <74> <0074> % t dec:116 oct:164 hex:74 - <75> <75> <0075> % u dec:117 oct:165 hex:75 - <76> <76> <0076> % v dec:118 oct:166 hex:76 - <77> <77> <0077> % w dec:119 oct:167 hex:77 - <78> <78> <0078> % x dec:120 oct:170 hex:78 - <79> <79> <0079> % y dec:121 oct:171 hex:79 - <7a> <7a> <007a> % z dec:122 oct:172 hex:7a - <7b> <7b> <007b> % braceleft dec:123 oct:173 hex:7b - <7c> <7c> <007c> % bar dec:124 oct:174 hex:7c - <7d> <7d> <007d> % braceright dec:125 oct:175 hex:7d - <7e> <7e> <007e> % asciitilde dec:126 oct:176 hex:7e - <a0> <a0> <00a0> % nbspace dec:160 oct:240 hex:a0 - <a1> <a1> <0104> % Aogonek dec:161 oct:241 hex:a1 - <a2> <a2> <00a2> % breve dec:162 oct:242 hex:a2 - <a3> <a3> <00a3> % Lslash dec:163 oct:243 hex:a3 - <a4> <a4> <00a4> % currency dec:164 oct:244 hex:a4 - <a5> <a5> <013d> % Lcaron dec:165 oct:245 hex:a5 - <a6> <a6> <015a> % Sacute dec:166 oct:246 hex:a6 - <a7> <a7> <00a7> % section dec:167 oct:247 hex:a7 - <a8> <a8> <00a8> % dieresis dec:168 oct:250 hex:a8 - <a9> <a9> <0160> % Scaron dec:169 oct:251 hex:a9 - <aa> <aa> <015e> % Scedilla dec:170 oct:252 hex:aa - <ab> <ab> <0164> % Tcaron dec:171 oct:253 hex:ab - <ac> <ac> <0179> % Zacute dec:172 oct:254 hex:ac - <ad> <ad> <00ad> % sfthyphen dec:173 oct:255 hex:ad - <ae> <ae> <017d> % Zcaron dec:174 oct:256 hex:ae - <af> <af> <00af> % Zdotaccent dec:175 oct:257 hex:af - <b0> <b0> <00b0> % ring dec:176 oct:260 hex:b0 - <b1> <b1> <0105> % aogonek dec:177 oct:261 hex:b1 - <b2> <b2> <00b2> % ogonek dec:178 oct:262 hex:b2 - <b3> <b3> <00b3> % lslash dec:179 oct:263 hex:b3 - <b4> <b4> <00b4> % acute dec:180 oct:264 hex:b4 - <b5> <b5> <013e> % lcaron dec:181 oct:265 hex:b5 - <b6> <b6> <015b> % sacute dec:182 oct:266 hex:b6 - <b7> <b7> <00b7> % caron dec:183 oct:267 hex:b7 - <b8> <b8> <00b8> % cedilla dec:184 oct:270 hex:b8 - <b9> <b9> <0161> % scaron dec:185 oct:271 hex:b9 - <ba> <ba> <015f> % scedilla dec:186 oct:272 hex:ba - <bb> <bb> <0165> % tcaron dec:187 oct:273 hex:bb - <bc> <bc> <017a> % zacute dec:188 oct:274 hex:bc - <bd> <bd> <00bd> % hungarumlaut dec:189 oct:275 hex:bd - <be> <be> <017e> % zcaron dec:190 oct:276 hex:be - <bf> <bf> <00bf> % zdotaccent dec:191 oct:277 hex:bf - <c0> <c0> <0154> % Racute dec:192 oct:300 hex:c0 - <c1> <c1> <00c1> % Aacute dec:193 oct:301 hex:c1 - <c2> <c2> <00c2> % Acircumflex dec:194 oct:302 hex:c2 - <c3> <c3> <0102> % Abreve dec:195 oct:303 hex:c3 - <c4> <c4> <00c4> % Adieresis dec:196 oct:304 hex:c4 - <c5> <c5> <0139> % Lacute dec:197 oct:305 hex:c5 - <c6> <c6> <0106> % Cacute dec:198 oct:306 hex:c6 - <c7> <c7> <00c7> % Ccedilla dec:199 oct:307 hex:c7 - <c8> <c8> <010c> % Ccaron dec:200 oct:310 hex:c8 - <c9> <c9> <00c9> % Eacute dec:201 oct:311 hex:c9 - <ca> <ca> <0118> % Eogonek dec:202 oct:312 hex:ca - <cb> <cb> <00cb> % Edieresis dec:203 oct:313 hex:cb - <cc> <cc> <011a> % Ecaron dec:204 oct:314 hex:cc - <cd> <cd> <00cd> % Iacute dec:205 oct:315 hex:cd - <ce> <ce> <00ce> % Icircumflex dec:206 oct:316 hex:ce - <cf> <cf> <010e> % Dcaron dec:207 oct:317 hex:cf - <d0> <d0> <00d0> % Dslash dec:208 oct:320 hex:d0 - <d1> <d1> <0143> % Nacute dec:209 oct:321 hex:d1 - <d2> <d2> <0147> % Ncaron dec:210 oct:322 hex:d2 - <d3> <d3> <00d3> % Oacute dec:211 oct:323 hex:d3 - <d4> <d4> <00d4> % Ocircumflex dec:212 oct:324 hex:d4 - <d5> <d5> <00d5> % Ohungarumlaut dec:213 oct:325 hex:d5 - <d6> <d6> <00d6> % Odieresis dec:214 oct:326 hex:d6 - <d7> <d7> <00d7> % multiply dec:215 oct:327 hex:d7 - <d8> <d8> <0158> % Rcaron dec:216 oct:330 hex:d8 - <d9> <d9> <016e> % Uring dec:217 oct:331 hex:d9 - <da> <da> <00da> % Uacute dec:218 oct:332 hex:da - <db> <db> <00db> % Uhungarumlaut dec:219 oct:333 hex:db - <dc> <dc> <00dc> % Udieresis dec:220 oct:334 hex:dc - <dd> <dd> <00dd> % Yacute dec:221 oct:335 hex:dd - <de> <de> <00de> % Tcommaaccent dec:222 oct:336 hex:de - <df> <df> <00df> % germandbls dec:223 oct:337 hex:df - <e0> <e0> <0155> % racute dec:224 oct:340 hex:e0 - <e1> <e1> <00e1> % aacute dec:225 oct:341 hex:e1 - <e2> <e2> <00e2> % acircumflex dec:226 oct:342 hex:e2 - <e3> <e3> <0103> % abreve dec:227 oct:343 hex:e3 - <e4> <e4> <00e4> % adieresis dec:228 oct:344 hex:e4 - <e5> <e5> <013a> % lacute dec:229 oct:345 hex:e5 - <e6> <e6> <0107> % cacute dec:230 oct:346 hex:e6 - <e7> <e7> <00e7> % ccedilla dec:231 oct:347 hex:e7 - <e8> <e8> <010d> % ccaron dec:232 oct:350 hex:e8 - <e9> <e9> <00e9> % eacute dec:233 oct:351 hex:e9 - <ea> <ea> <0119> % eogonek dec:234 oct:352 hex:ea - <eb> <eb> <00eb> % edieresis dec:235 oct:353 hex:eb - <ec> <ec> <011b> % ecaron dec:236 oct:354 hex:ec - <ed> <ed> <00ed> % iacute dec:237 oct:355 hex:ed - <ee> <ee> <00ee> % icircumflex dec:238 oct:356 hex:ee - <ef> <ef> <010f> % dcaron dec:239 oct:357 hex:ef - <f0> <f0> <00f0> % dmacron dec:240 oct:360 hex:f0 - <f1> <f1> <0144> % nacute dec:241 oct:361 hex:f1 - <f2> <f2> <0148> % ncaron dec:242 oct:362 hex:f2 - <f3> <f3> <00f3> % oacute dec:243 oct:363 hex:f3 - <f4> <f4> <00f4> % ocircumflex dec:244 oct:364 hex:f4 - <f5> <f5> <00f5> % ohungarumlaut dec:245 oct:365 hex:f5 - <f6> <f6> <00f6> % odieresis dec:246 oct:366 hex:f6 - <f7> <f7> <00f7> % divide dec:247 oct:367 hex:f7 - <f8> <f8> <0159> % rcaron dec:248 oct:370 hex:f8 - <f9> <f9> <016f> % uring dec:249 oct:371 hex:f9 - <fa> <fa> <00fa> % uacute dec:250 oct:372 hex:fa - <fb> <fb> <00fb> % uhungarumlaut dec:251 oct:373 hex:fb - <fc> <fc> <00fc> % udieresis dec:252 oct:374 hex:fc - <fd> <fd> <00fd> % yacute dec:253 oct:375 hex:fd - <fe> <fe> <00fe> % tcommaaccent dec:254 oct:376 hex:fe - <ff> <ff> <00ff> % dotaccent dec:255 oct:377 hex:ff - endbfrange - endcmap -CMapName currentdict /CMap defineresource pop end -end -\stoppdffontresource - -\endinput diff --git a/Master/texmf-dist/tex/context/base/spec-def.tex b/Master/texmf-dist/tex/context/base/spec-def.tex index fa48700e672..933d4219777 100644 --- a/Master/texmf-dist/tex/context/base/spec-def.tex +++ b/Master/texmf-dist/tex/context/base/spec-def.tex @@ -903,10 +903,19 @@ %D This is one of the few specials where when using \PDFTEX\ %D the driver directly deals with the utility file. -\installspecial [\dosetposition] [or] [1] -\installspecial [\dosetpositionwhd] [or] [4] -\installspecial [\dosetpositionplus] [or] [5] -\installspecial [\dosetpositionpapersize] [or] [2] +%D Support is moved to spec-mis.tex. The whole idea originates +%D and was implemented first in \PDFTEX. Later \DVIPDFMX\ +%D supported the \CONTEXT\ specific specials and nowadays +%D \PDFTEX\ supports this feature in \DVI\ mode and \XETEX\ +%D implements it as well. This means that only \ALEPH\ is +%D still dependent on specials, but that variant of \TEX\ has +%D become obsolete anyway. + +% \installspecial [\dosetposition] [or] [1] +% \installspecial [\dosetpositionwhd] [or] [4] +% \installspecial [\dosetpositionplus] [or] [5] + +% \installspecial [\dosetpositionpapersize] [or] [2] %D \macros %D {dostarttransparency,dostoptransparency} diff --git a/Master/texmf-dist/tex/context/base/spec-dpx.tex b/Master/texmf-dist/tex/context/base/spec-dpx.tex index 1522304e7d3..44bbe10b699 100644 --- a/Master/texmf-dist/tex/context/base/spec-dpx.tex +++ b/Master/texmf-dist/tex/context/base/spec-dpx.tex @@ -798,41 +798,6 @@ \box\scratchbox \elabelgroup} -%D 7. Copied codes from \type{spec-dvi} - -% coming pdftex versions will provide pos support in dvi mode (untested) - -% \ifnum\pdftexversion>140 .. \fi - -\definespecial\dosetposition#1% - {\special{pos:pxy "#1"}} - -\definespecial\dosetpositionwhd#1#2#3#4% - {\special{pos:pxywhd "#1" #2 #3 #4}} - -\definespecial\dosetpositionplus#1#2#3#4#5% - {\special{pos:pxyplus "#1" #2 #3 #4 #5}} - -\let\flushDVIpositionpapersize\relax - -\definespecial\dosetpositionpapersize#1#2% - {\xdef\flushDVIpositionpapersize - {\special{pos:papersize \number#1 \number#2}% - \noexpand\installprogram{dvipos -o \jobname.tuo \jobname.dvi }% - \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}} - -\beginXETEX - - \definespecial\dosetpositionpapersize#1#2% - {\xdef\flushDVIpositionpapersize - {\special{pos:papersize \number#1 \number#2}% - \noexpand\installprogram{dvipos -o \jobname.tuo \jobname.xdv }% - \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}} - -\endXETEX - -\prependtoksonce \flushDVIpositionpapersize \to \everyshipout - \stopspecials \protect \endinput diff --git a/Master/texmf-dist/tex/context/base/spec-dvi.tex b/Master/texmf-dist/tex/context/base/spec-dvi.tex index 42fd8b259bb..1a8f653f050 100644 --- a/Master/texmf-dist/tex/context/base/spec-dvi.tex +++ b/Master/texmf-dist/tex/context/base/spec-dvi.tex @@ -87,27 +87,31 @@ %D The postprocessor should, of course, provide the \type %D {page}, \type {x}, and \type {y} values. -\definespecial\dosetposition#1% - {\special{pos:pxy "#1"}} +%D Now in spec-mis.tex: -\definespecial\dosetpositionwhd#1#2#3#4% - {\special{pos:pxywhd "#1" #2 #3 #4}} - -\definespecial\dosetpositionplus#1#2#3#4#5% - {\special{pos:pxyplus "#1" #2 #3 #4 #5}} +% \definespecial\dosetposition#1% +% {\special{pos:pxy "#1"}} +% +% \definespecial\dosetpositionwhd#1#2#3#4% +% {\special{pos:pxywhd "#1" #2 #3 #4}} +% +% \definespecial\dosetpositionplus#1#2#3#4#5% +% {\special{pos:pxyplus "#1" #2 #3 #4 #5}} %D The next special tells the position postprocessor what %D page dimensions were used. -\let\flushDVIpositionpapersize\relax - -\definespecial\dosetpositionpapersize#1#2% - {\xdef\flushDVIpositionpapersize% - {\special{pos:papersize \number#1 \number#2}% - \noexpand\installprogram{dvipos -o \jobname.tuo \jobname.dvi }% - \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}} - -\prependtoksonce \flushDVIpositionpapersize \to \everyshipout +%D Also in spec-mis.tex: + +% \let\flushDVIpositionpapersize\relax +% +% \definespecial\dosetpositionpapersize#1#2% +% {\xdef\flushDVIpositionpapersize% +% {\special{pos:papersize \number#1 \number#2}% +% \noexpand\installprogram{dvipos -o \jobname.tuo \jobname.dvi }% +% \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}} +% +% \prependtoksonce \flushDVIpositionpapersize \to \everyshipout \stopspecials diff --git a/Master/texmf-dist/tex/context/base/spec-mis.tex b/Master/texmf-dist/tex/context/base/spec-mis.tex index 06afb65c2e4..e2da6e53f96 100644 --- a/Master/texmf-dist/tex/context/base/spec-mis.tex +++ b/Master/texmf-dist/tex/context/base/spec-mis.tex @@ -207,4 +207,71 @@ \let\handleMPfshow\dohandleMPfshow \to \everyresetspecials +%D + +%D \macros +%D {dosetposition, dosetpositionwdh, dosetpositionplus} +%D +%D Opposite to its \DVI\ counterpart, the \PDFTEX\ backend +%D can provide positional information directly. Since +%D \CONTEXT\ only uses relative positions, the origin is of +%D less importance. Nowadays \XETEX\ also supports this +%D feature. + +\ifx\pdfsavepos\undefined + + % only for ancient pdftex, less old xetex and current aleph + + \def\dosetposition #1{\special{pos:pxy "#1"}} + \def\dosetpositionwhd #1#2#3#4{\special{pos:pxywhd "#1" #2 #3 #4}} + \def\dosetpositionplus#1#2#3#4#5{\special{pos:pxyplus "#1" #2 #3 #4 #5}} + + \let\flushDVIpositionpapersize\relax + + \def\dosetpositionpapersize#1#2% + {\xdef\flushDVIpositionpapersize + {\special{pos:papersize \number#1 \number#2}% + \noexpand\installprogram{dvipos -o \jobname.tuo \jobname.dvi }% + \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}} + + \beginXETEX + \def\dosetpositionpapersize#1#2% + {\xdef\flushDVIpositionpapersize + {\special{pos:papersize \number#1 \number#2}% + \noexpand\installprogram{dvipos -o \jobname.tuo \jobname.xdv }% + \global\noexpand\let\noexpand\flushDVIpositionpapersize\relax}} + \endXETEX + + \prependtoksonce \flushDVIpositionpapersize \to \everyshipout + +\else + + \def\dosetposition#1% + {\pdfsavepos + \dolazysaveposition + {#1}% + {\noexpand\realfolio}% + {\noexpand\the\dimexpr\pdflastxpos\scaledpoint\relax}% + {\noexpand\the\dimexpr\pdflastypos\scaledpoint\relax}}% + + \def\dosetpositionwhd#1#2#3#4% + {\pdfsavepos + \dolazysavepositionwhd + {#1}% + {\noexpand\realfolio}% + {\noexpand\the\dimexpr\pdflastxpos\scaledpoint\relax}% + {\noexpand\the\dimexpr\pdflastypos\scaledpoint\relax}% + {#2}{#3}{#4}} + + \def\dosetpositionplus#1#2#3#4#5% + {\pdfsavepos + \dolazysavepositionplus + {#1}% + {\noexpand\realfolio}% + {\noexpand\the\dimexpr\pdflastxpos\scaledpoint\relax}% + {\noexpand\the\dimexpr\pdflastypos\scaledpoint\relax}% + {#2}{#3}{#4}{#5}} + +\fi + \protect \endinput diff --git a/Master/texmf-dist/tex/context/base/spec-tpd.tex b/Master/texmf-dist/tex/context/base/spec-tpd.tex index 29d5c7a15ed..8d6d93d38eb 100644 --- a/Master/texmf-dist/tex/context/base/spec-tpd.tex +++ b/Master/texmf-dist/tex/context/base/spec-tpd.tex @@ -1022,40 +1022,6 @@ \definespecial\doregistercalculationset{\doFDFregistercalculationset} %D \macros -%D {dosetposition, dosetpositionwdh, dosetpositionplus} -%D -%D Opposite to its \DVI\ counterpart, the \PDFTEX\ backend -%D can provide positional information directly. Since -%D \CONTEXT\ only uses relative positions, the origin is of -%D less importance. - -\definespecial\dosetposition#1% - {\pdfsavepos - \dolazysaveposition - {#1}% - {\noexpand\realfolio}% - {\noexpand\the\dimexpr\pdflastxpos\scaledpoint\relax}% - {\noexpand\the\dimexpr\pdflastypos\scaledpoint\relax}}% - -\definespecial\dosetpositionwhd#1#2#3#4% - {\pdfsavepos - \dolazysavepositionwhd - {#1}% - {\noexpand\realfolio}% - {\noexpand\the\dimexpr\pdflastxpos\scaledpoint\relax}% - {\noexpand\the\dimexpr\pdflastypos\scaledpoint\relax}% - {#2}{#3}{#4}} - -\definespecial\dosetpositionplus#1#2#3#4#5% - {\pdfsavepos - \dolazysavepositionplus - {#1}% - {\noexpand\realfolio}% - {\noexpand\the\dimexpr\pdflastxpos\scaledpoint\relax}% - {\noexpand\the\dimexpr\pdflastypos\scaledpoint\relax}% - {#2}{#3}{#4}{#5}} - -%D \macros %D {doPDFdestination} %D %D Finally we implement some low level macros to deal with diff --git a/Master/texmf-dist/tex/context/base/spec-xtx.tex b/Master/texmf-dist/tex/context/base/spec-xtx.tex index b9c491e75d1..0cd9baaddec 100644 --- a/Master/texmf-dist/tex/context/base/spec-xtx.tex +++ b/Master/texmf-dist/tex/context/base/spec-xtx.tex @@ -130,6 +130,14 @@ \setupexternalfigures[\c!object=\v!no] +%D + +\ifx\pdfpagewidth\undefined \else + \definespecial\dosetuppaper#1#2#3% + {\global\pdfpagewidth #2\relax + \global\pdfpageheight#3\relax} +\fi + \stopspecials \protect \endinput diff --git a/Master/texmf-dist/tex/context/base/supp-mps.tex b/Master/texmf-dist/tex/context/base/supp-mps.tex index d6e015372ee..22d59a064b8 100644 --- a/Master/texmf-dist/tex/context/base/supp-mps.tex +++ b/Master/texmf-dist/tex/context/base/supp-mps.tex @@ -2079,21 +2079,27 @@ \writeMPgraphic{#2}% \writeMPgraphic{endfig; end.}% \immediate\closeout\MPwrite - \immediate\closeout\MPwrite - \runMPgraphicstrue \executeMPgraphicfile \elabelgroup} +% this will go to meta-ini + +\def\delaysystemcommand + {\ifx\installprogram\undefined + \expandafter\executesystemcommand + \else + \expandafter\installprogram + \fi} + +\def\MPgraphicfilerunner + {texmfstart --ifchanged=\MPgraphicfile.mp texexec --mpstatic \MPgraphicfile.mp} + \ifx\doifmode\undefined - \def\executeMPgraphicfile - {\executesystemcommand - {texmfstart --ifchanged=\MPgraphicfile.mp - texexec --mpstatic \MPgraphicfile.mp}} + \def\executeMPgraphicfile + {\ifrunMPgraphics\@EA\executesystemcommand\else\@EA\delaysystemcommand\fi{\MPgraphicfilerunner}} \else - \def\executeMPgraphicfile - {\doifmode{*\v!first}{\executesystemcommand - {texmfstart --ifchanged=\MPgraphicfile.mp - texexec --mpstatic \MPgraphicfile.mp}}} + \def\executeMPgraphicfile{\doifmode{*\v!first} + {\ifrunMPgraphics\@EA\executesystemcommand\else\@EA\delaysystemcommand\fi{\MPgraphicfilerunner}}} \fi %D Special for \XETEX\ (problem with newlines). This will go diff --git a/Master/texmf-dist/tex/context/base/symb-cow.tex b/Master/texmf-dist/tex/context/base/symb-cow.tex index 09f90030289..c04ca0108f7 100644 --- a/Master/texmf-dist/tex/context/base/symb-cow.tex +++ b/Master/texmf-dist/tex/context/base/symb-cow.tex @@ -57,8 +57,8 @@ {\color[cow:contour]{\hsmash{\getglyph{CowsLogoContour}{#1}}}% \color[cow:normal] {\getglyph{CowsLogo} {#1}}}} -\def\CowLogo#1% - {\getglyph{CowsLogo}{\char#1\relax}} +\def\CowLogo #1{\getglyph{CowsLogo} {\char#1\relax}} +\def\CowContourLogo#1{\getglyph{CowsLogoContour}{\char#1\relax}} \chardef\CowPragmaNormal= 1 \chardef\CowPragmaShaded=20 @@ -98,34 +98,34 @@ \startsymbolset[cowcontour] -\definesymbol[CowPragmaADE] [\CowLogo{0}] -\definesymbol[CowPragma] [\CowLogo{1}] -\definesymbol[CowConTeXt] [\CowLogo{2}] -\definesymbol[CowConTeXtComplete] [\CowLogo{3}] -\definesymbol[CowConTeXtShadow] [\CowLogo{4}] -\definesymbol[CowConTeXtContour] [\CowLogo{5}] -\definesymbol[CowConTeXtOutline] [\CowLogo{6}] -\definesymbol[CowConTeXtDots] [\CowLogo{7}] -\definesymbol[CowMP] [\CowLogo{8}] -\definesymbol[CowMPComplete] [\CowLogo{9}] -\definesymbol[CowTeX] [\CowLogo{10}] -\definesymbol[CowTeXComplete] [\CowLogo{11}] -\definesymbol[CowBoo] [\CowLogo{12}] -\definesymbol[CowCow] [\CowLogo{13}] -\definesymbol[CowExampleComplete] [\CowLogo{14}] -\definesymbol[CowFoxetComplete] [\CowLogo{15}] -\definesymbol[CowMetafun] [\CowLogo{16}] -\definesymbol[CowMetafunComplete] [\CowLogo{17}] -\definesymbol[CowTEXComplete] [\CowLogo{18}] -\definesymbol[CowWikiComplete] [\CowLogo{19}] -\definesymbol[CowPragmaADEComplete][\CowLogo{20}] -\definesymbol[CowPragmaComplete] [\CowLogo{21}] -\definesymbol[CowExample] [\CowLogo{22}] -\definesymbol[CowFoxet] [\CowLogo{23}] -\definesymbol[CowTEX] [\CowLogo{24}] -\definesymbol[CowWiki] [\CowLogo{25}] -\definesymbol[CowCowTeXtComplete] [\CowLogo{26}] -\definesymbol[CowCowTeXt] [\CowLogo{27}] +\definesymbol[CowPragmaADE] [\CowContourLogo{0}] +\definesymbol[CowPragma] [\CowContourLogo{1}] +\definesymbol[CowConTeXt] [\CowContourLogo{2}] +\definesymbol[CowConTeXtComplete] [\CowContourLogo{3}] +\definesymbol[CowConTeXtShadow] [\CowContourLogo{4}] +\definesymbol[CowConTeXtContour] [\CowContourLogo{5}] +\definesymbol[CowConTeXtOutline] [\CowContourLogo{6}] +\definesymbol[CowConTeXtDots] [\CowContourLogo{7}] +\definesymbol[CowMP] [\CowContourLogo{8}] +\definesymbol[CowMPComplete] [\CowContourLogo{9}] +\definesymbol[CowTeX] [\CowContourLogo{10}] +\definesymbol[CowTeXComplete] [\CowContourLogo{11}] +\definesymbol[CowBoo] [\CowContourLogo{12}] +\definesymbol[CowCow] [\CowContourLogo{13}] +\definesymbol[CowExampleComplete] [\CowContourLogo{14}] +\definesymbol[CowFoxetComplete] [\CowContourLogo{15}] +\definesymbol[CowMetafun] [\CowContourLogo{16}] +\definesymbol[CowMetafunComplete] [\CowContourLogo{17}] +\definesymbol[CowTEXComplete] [\CowContourLogo{18}] +\definesymbol[CowWikiComplete] [\CowContourLogo{19}] +\definesymbol[CowPragmaADEComplete][\CowContourLogo{20}] +\definesymbol[CowPragmaComplete] [\CowContourLogo{21}] +\definesymbol[CowExample] [\CowContourLogo{22}] +\definesymbol[CowFoxet] [\CowContourLogo{23}] +\definesymbol[CowTEX] [\CowContourLogo{24}] +\definesymbol[CowWiki] [\CowContourLogo{25}] +\definesymbol[CowCowTeXtComplete] [\CowContourLogo{26}] +\definesymbol[CowCowTeXt] [\CowContourLogo{27}] \stopsymbolset diff --git a/Master/texmf-dist/tex/context/base/syst-ext.tex b/Master/texmf-dist/tex/context/base/syst-ext.tex index 262d5f0b0df..bee6049bf24 100644 --- a/Master/texmf-dist/tex/context/base/syst-ext.tex +++ b/Master/texmf-dist/tex/context/base/syst-ext.tex @@ -2521,6 +2521,12 @@ {\scratchcounter#2% \setxvalue{#1}{\the\scratchcounter}} +\def\incrementcounter#1#2% #1 name #2 value + {\setxvalue{#1}{\the\numexpr\csname#1\endcsname+#2\relax}} + +\def\decrementcounter#1#2% #1 name #2 value + {\setxvalue{#1}{\the\numexpr\csname#1\endcsname-#2\relax}} + %D \macros %D {savecounter,restorecounter} %D diff --git a/Master/texmf-dist/tex/context/base/syst-mtx.tex b/Master/texmf-dist/tex/context/base/syst-mtx.tex index c865560b83f..4e5e2ef26a4 100644 --- a/Master/texmf-dist/tex/context/base/syst-mtx.tex +++ b/Master/texmf-dist/tex/context/base/syst-mtx.tex @@ -15,6 +15,18 @@ \unprotect +\ifnum\contextmarkmode=2 + + \input enco-utf.tex + + % patch needed for turkish + + \setcclcuc 201C 201C 201C + \setcclcuc 201D 201D 201D + +\fi + + %D Since the number of chars exceed 256 now, we can use \type %D {\chardef} instead of the more limited \type {\mathchardef}. diff --git a/Master/texmf-dist/tex/context/base/syst-pdt.tex b/Master/texmf-dist/tex/context/base/syst-pdt.tex index 79ecc8cbaa8..079c664ef65 100644 --- a/Master/texmf-dist/tex/context/base/syst-pdt.tex +++ b/Master/texmf-dist/tex/context/base/syst-pdt.tex @@ -37,7 +37,8 @@ \bindprimitive ifabsdim ifpdfabsdim \bindprimitive ifabsnum ifpdfabsnum -\ifx\pdfobjcompresslevel\undefined \newcount\pdfobjcompresslevel \fi +\ifx\pdfobjcompresslevel\undefined \newcount\pdfobjcompresslevel \else \pdfobjcompresslevel=3 \fi +\ifx\pdfgentounicode \undefined \newcount\pdfgentounicode \else \pdfgentounicode =1 \fi \def\nopdfcompression % for myself {\pdfcompresslevel \zerocount diff --git a/Master/texmf-dist/tex/context/base/syst-xtx.tex b/Master/texmf-dist/tex/context/base/syst-xtx.tex index 3cf5aa29bac..83a28d36d88 100644 --- a/Master/texmf-dist/tex/context/base/syst-xtx.tex +++ b/Master/texmf-dist/tex/context/base/syst-xtx.tex @@ -18,34 +18,15 @@ %D For the moment, the only thing needed is to load are the %D mappings from lower to uppercase characters. -\ifx\scratchread\undefined \newread\scratchread \fi - -\def\setcclcuc #1 #2 #3 % - {\global\catcode"#1=11 - \global\lccode "#1="#2 - \global\uccode "#1="#3 } - -\immediate\openin\scratchread=enco-xtx.tex \ifeof\scratchread - \immediate\openin\scratchread=unicode-letters.tex \ifeof\scratchread - \immediate\openin\scratchread=xplain.tex \ifeof\scratchread - % no initialization file - \else - \input xplain.tex - \fi - \else - \input unicode-letters.tex - \fi -\else - \input enco-xtx.tex -\fi - -\ifx\XeTeXuseglyphmetrics\undefined \else - \XeTeXuseglyphmetrics=1 -\fi +\input enco-utf.tex % patch needed for turkish \setcclcuc 201C 201C 201C \setcclcuc 201D 201D 201D +\ifx\XeTeXuseglyphmetrics\undefined \else + \XeTeXuseglyphmetrics=1 +\fi + \protect \endinput diff --git a/Master/texmf-dist/tex/context/base/type-gyr.tex b/Master/texmf-dist/tex/context/base/type-gyr.tex index 07b9b311127..ee53e25c2f5 100644 --- a/Master/texmf-dist/tex/context/base/type-gyr.tex +++ b/Master/texmf-dist/tex/context/base/type-gyr.tex @@ -33,12 +33,14 @@ \definetypescriptprefix [n:pagella] [TeXGyrePagella] \definetypescriptprefix [n:termes] [TeXGyreTermes] \definetypescriptprefix [n:bonum] [TeXGyreBonum] +\definetypescriptprefix [n:schola] [TeXGyreSchola] \definetypescriptprefix [f:pagella] [pl] \definetypescriptprefix [f:termes] [tm] \definetypescriptprefix [f:bonum] [bk] +\definetypescriptprefix [f:schola] [cs] -\starttypescript [serif] [pagella,termes,bonum] [texnansi,ec,8r,t5,qx] +\starttypescript [serif] [pagella,termes,bonum,schola] [ec,texnansi,cs,el,qx,rm,t5,t2a,t2b,t2c,l7x] \loadmapfile[\typescriptthree-q\typescriptprefix{f:\typescripttwo}.map] \definefontsynonym [\typescriptprefix{n:\typescripttwo}-Regular] [\typescriptthree-q\typescriptprefix{f:\typescripttwo}r] [encoding=\typescriptthree] @@ -54,7 +56,7 @@ \definefontsynonym [\typescriptprefix{n:\typescripttwo}-BoldSlanted] [\typescriptprefix{n:\typescripttwo}-BoldItalic] \stoptypescript -\starttypescript [serif] [pagella,termes,bonum] [name] +\starttypescript [serif] [pagella,termes,bonum,schola] [name] \definefontsynonym [Serif] [\typescriptprefix{n:\typescripttwo}-Regular] \definefontsynonym [SerifItalic] [\typescriptprefix{n:\typescripttwo}-Italic] \definefontsynonym [SerifBold] [\typescriptprefix{n:\typescripttwo}-Bold] @@ -77,7 +79,7 @@ \stoptypescript -\starttypescript [map] [pagella,termes,bonum] [ec,texnansi,t5,8r] +\starttypescript [map] [pagella,termes,bonum,schola] [ec,texnansi,cs,el,qx,rm,t5,t2a,t2b,t2c,l7x] \loadmapfile[\typescriptthree-q\typescriptprefix{f:\typescripttwo}.map] \stoptypescript @@ -90,7 +92,7 @@ % qplb TeXGyrePagella-Bold % qplbi TeXGyrePagella-BoldItalic -\starttypescript [serif] [palatino] [texnansi,ec,8r,t5,qx] +\starttypescript [serif] [palatino] [ec,texnansi,cs,el,qx,rm,t5,t2a,t2b,t2c,l7x] \loadmapfile[\typescriptthree-qpl.map] \definefontsynonym [Palatino] [\typescriptthree-qplr] [encoding=\typescriptthree] @@ -110,7 +112,7 @@ % qtmb TeXGyreTermes-Bold % qtmbi TeXGyreTermes-BoldItalic -\starttypescript [serif] [times] [texnansi,ec,8r,t5,qx] +\starttypescript [serif] [times] [ec,texnansi,cs,el,qx,rm,t5,t2a,t2b,t2c,l7x] \loadmapfile[\typescriptthree-qtm.map] \definefontsynonym [Times-Roman] [\typescriptthree-qtmr] [encoding=\typescriptthree] @@ -130,7 +132,7 @@ % qtmb TeXGyreBonum-Bold % qtmbi TeXGyreBonum-BoldItalic -\starttypescript [serif] [bookman] [texnansi,ec,8r,t5,qx] +\starttypescript [serif] [bookman] [ec,texnansi,cs,el,qx,rm,t5,t2a,t2b,t2c,l7x] \loadmapfile[\typescriptthree-qbk.map] \definefontsynonym [Bookman-Light] [\typescriptthree-qbkr] [encoding=\typescriptthree] @@ -143,4 +145,24 @@ \definefontsynonym [Bookman-DemiBoldSlanted] [Bookman-DemiBoldItalic] \stoptypescript +% TeXGyreScola +% +% qcsr TeXGyreSchola-Regular +% qcsri TeXGyreSchola-Italic +% qcsb TeXGyreSchola-Bold +% qcsbi TeXGyreSchola-BoldItalic + +\starttypescript [serif] [schoolbook] [ec,texnansi,cs,el,qx,rm,t5,t2a,t2b,t2c,l7x] + \loadmapfile[\typescriptthree-qcs.map] + + \definefontsynonym [Schoolbook-Roman] [\typescriptthree-qcsr] [encoding=\typescriptthree] + \definefontsynonym [Schoolbook-Italic] [\typescriptthree-qcsri] [encoding=\typescriptthree] + \definefontsynonym [Schoolbook-Bold] [\typescriptthree-qcsb] [encoding=\typescriptthree] + \definefontsynonym [Schoolbook-BoldItalic] [\typescriptthree-qcsbi] [encoding=\typescriptthree] + \definefontsynonym [Schoolbook-Roman-Caps] [\typescriptthree-qcsr-sc] [encoding=\typescriptthree] + + \definefontsynonym [Schoolbook-Slanted] [Schoolbook-Italic] + \definefontsynonym [Schoolbook-BoldSlanted] [Schoolbook-BoldItalic] +\stoptypescript + \stoptypescriptcollection |