summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-03-17 20:34:15 +0000
committerKarl Berry <karl@freefriends.org>2022-03-17 20:34:15 +0000
commitbf6e6b6e18584d2cd98e95a8fe745a0de7bb78fb (patch)
tree25a17f32dc3193b0937f67c269e738ce76364460
parentc47535c840f22e8dc3cacd587723aaa9338193b3 (diff)
csplain (17mar22) (branch)
git-svn-id: svn://tug.org/texlive/branches/branch2021.final@62772 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/tex/csplain/base/csplain.ini5
-rw-r--r--Master/texmf-dist/tex/csplain/fonts/cyrchars.tex5
-rw-r--r--Master/texmf-dist/tex/csplain/fonts/uni-math.tex69
3 files changed, 72 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/csplain/base/csplain.ini b/Master/texmf-dist/tex/csplain/base/csplain.ini
index 6e5627f0cc1..00171c3847f 100644
--- a/Master/texmf-dist/tex/csplain/base/csplain.ini
+++ b/Master/texmf-dist/tex/csplain/base/csplain.ini
@@ -12,7 +12,7 @@
\input plaina4 % \hsize and \vsize for A4
\everyjob=\expandafter{\the\everyjob
- \message{The format: csplain <Mar. 2021>.}
+ \message{The format: csplain <Mar. 2022>.}
\message{The cs-fonts are preloaded and A4 size implicitly defined.}}
\ifx\xprncode\undefined \else %% The encTeX is detected
\count255=128 % All codes > 128 are printable:
@@ -280,6 +280,9 @@ file extcode.tex renamed to il2code.tex (suggested by Jan Kasprzak)
Mar. 2021
* opmac-bib.tex: \ifx\citelist\emtpty -- bug fixed
+* Mar. 2022
+ cyrchars.tex: cyrillic characters used in Ukrainian added
+ uni-math.tex: few missing characters added
COPYRIGHT
=========
diff --git a/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex b/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex
index 42f6562f17c..2c97d9a3a6f 100644
--- a/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/cyrchars.tex
@@ -343,6 +343,11 @@
\mubyte \cyry ^^d2^^af\endmubyte % ү - U+04AF - cyry
\mubyte \cyrotld ^^d3^^a9\endmubyte % ө - U+04E9 - cyrotld
+\mubyte \cyrie ^^d1^^94\endmubyte % є
+\mubyte \cyrii ^^d1^^96\endmubyte % і
+\mubyte \cyryi ^^d1^^97\endmubyte % ї
+\mubyte \cyrgup ^^d2^^91\endmubyte % ґ
+
\endinput
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/csplain/fonts/uni-math.tex b/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
index 6fb0922a266..2907197c726 100644
--- a/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
+++ b/Master/texmf-dist/tex/csplain/fonts/uni-math.tex
@@ -1,8 +1,9 @@
% uni-math.tex
%%%%%%%%%%%%%%%%%%%%%%%%
% Petr Olsak 2016, 2019
+% Benjamin Barenblat 2022
-\def\unimathversion{Mar. 2019} % Warning: this is at beta testing state
+\def\unimathversion{Jan. 2022} % Warning: this is at beta testing state
% Macros for loading Unicode math fonts in XeTeX or LuaTeX
@@ -148,7 +149,7 @@
\lccode`A="0391 \lccode`Z="03A9
\lowercase{\endgroup\umathrange{A-Z}}}
\def\umathrangegreek{\begingroup
- \lccode`A="03B1 \lccode`Z="03D6
+ \lccode`A="03B1 \lccode`Z="03D0
\lowercase{\endgroup\umathrange{A-Z}}}
\def\greekdef#1{\ifx#1\relax \else
\begingroup \lccode`X=\umathnumB \lowercase{\endgroup \def#1{X}}%
@@ -163,7 +164,53 @@
\umathnumB="03B1
\greekdef \alpha \beta \gamma \delta \epsilon \zeta \eta \theta \iota \kappa
\lambda \mu \nu \xi \omicron \pi \rho \varsigma \sigma \tau \upsilon
- \varphi \chi \psi \omega \varbeta \vartheta \phi \varpi \relax
+ \varphi \chi \psi \omega \vardelta \varepsilon \vartheta \varkappa \phi \varrho
+ \varpi \relax
+
+% Unfortunately, this order of Greek letters only holds for the Mathematical
+% Alphanumeric Symbols block; a couple of symbols are different in the Greek and
+% Coptic block. In particular,
+%
+% - GREEK CAPITAL THETA SYMBOL (\varTheta) is U+03F4 rather than U+03A2.
+% U+03A2 is unassigned.
+%
+% - PARTIAL DIFFERENTIAL (which is assigned to \varbeta here) is U+2202 rather
+% than U+03CA. U+03CA is GREEK SMALL LETTER IOTA WITH DIALYTIKA.
+%
+% - GREEK LUNATE EPSILON SYMBOL (which is assigned to \varepsilon here) is
+% U+03F5 rather than U+03CB. U+03CB is GREEK SMALL LETTER UPSILON WITH
+% DIALYTIKA.
+%
+% - GREEK THETA SYMBOL (\vartheta) is U+03D1 rather than U+03CC. U+03CC is
+% GREEK SMALL LETTER OMICRON WITH TONOS.
+%
+% - GREEK KAPPA SYMBOL (\varkappa) is U+03F0 rather than U+03CD. U+03CD is
+% GREEK SMALL LETTER UPSILON WITH TONOS.
+%
+% - GREEK PHI SYMBOL (the non-squiggly \phi) is U+03D5 rather than U+03CE.
+% U+03CE is GREEK SMALL LETTER OMEGA WITH TONOS.
+%
+% - GREEK RHO SYMBOL (\varrho) is U+03F1 rather than U+03CF. U+03CF is GREEK
+% CAPITAL KAI SYMBOL.
+%
+% - GREEK PI SYMBOL (\varpi) is U+03D6 rather than U+03D0. U+03D0 is GREEK
+% BETA SYMBOL.
+%
+% These macros apply these corrections. Fortunately, the characters they make
+% inaccessible are seldom used in mathematics typesetting. (They're also still
+% accessible in \textfont2 and \textfont3.)
+\def\umathfixgreekromanuppercase{%
+ \Umathcode "03A2 = 7 1 "03F4 % \varTheta
+}
+\def\umathfixgreekromanlowercase{%
+ \Umathcode "03CA = 7 1 "2202 % \varbeta
+ \Umathcode "03CB = 7 1 "03F5 % \varepsilon
+ \Umathcode "03CC = 7 1 "03D1 % \vartheta
+ \Umathcode "03CD = 7 1 "03F0 % \varkappa
+ \Umathcode "03CE = 7 1 "03D5 % \phi
+ \Umathcode "03CF = 7 1 "03F1 % \varrho
+ \Umathcode "03D0 = 7 1 "03D6 % \varpi
+}
\chardef\ncharrmA=`A \chardef\ncharrma=`a
\chardef\ncharbfA="1D400 \chardef\ncharbfa="1D41A
@@ -202,8 +249,14 @@
\chardef\greeksnA="1D756 \chardef\greeksna="1D770
\chardef\greeksiA="1D790 \chardef\greeksia="1D7AA
-\protected\def\nitgreek {\umathrangeGREEK\greekrmA \umathrangegreek\greekita}
-\protected\def\rmgreek {\umathrangeGREEK\greekrmA \umathrangegreek\greekrma}
+\protected\def\nitgreek{%
+ \umathrangeGREEK\greekrmA \umathfixgreekromanuppercase
+ \umathrangegreek\greekita
+}
+\protected\def\rmgreek{%
+ \umathrangeGREEK\greekrmA \umathfixgreekromanuppercase
+ \umathrangegreek\greekrma \umathfixgreekromanlowercase
+}
\protected\def\bfgreek {\umathrangeGREEK\greekbfA \umathrangegreek\greekbfa}
\protected\def\bigreek {\umathrangeGREEK\greekbfA \umathrangegreek\greekbia}
\protected\def\sansgreek {\umathrangeGREEK\greeksnA \umathrangegreek\greeksna}
@@ -211,7 +264,10 @@
% Another possibility (slanted capitals in \nitgreek, \bigreek, \isansgreek):
%\protected\def\nitgreek {\umathrangeGREEK\greekitA \umathrangegreek\greekita}
-%\protected\def\rmgreek {\umathrangeGREEK\greekrmA \umathrangegreek\greekrma}
+%\protected\def\rmgreek{%
+% \umathrangeGREEK\greekrmA \fixgreekromanuppercase
+% \umathrangegreek\greekrma \fixgreekromanlowercase
+%}
%\protected\def\bfgreek {\umathrangeGREEK\greekbfA \umathrangegreek\greekbfa}
%\protected\def\bigreek {\umathrangeGREEK\greekbiA \umathrangegreek\greekbia}
%\protected\def\sansgreek {\umathrangeGREEK\greeksnA \umathrangegreek\greeksna}
@@ -287,6 +343,7 @@
\nitgreek \nitvariables \rmdigits % default setting
\Umathcode `- = 2 1 "2212
+\Umathcode `\/ = 0 1 "2215
\let\{=\lbrace \let\}=\rbrace
\def\sqrt {\Uradical 1 "0221A }