concmath-otf (28sep22)

git-svn-id: svn://tug.org/texlive/trunk@64542 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 37 insertions, 58 deletions

diff --git a/Master/texmf-dist/doc/fonts/concmath-otf/README.md b/Master/texmf-dist/doc/fonts/concmath-otf/README.md
index eefc1647cd9..d1f20c220c3 100644
--- a/Master/texmf-dist/doc/fonts/concmath-otf/README.md
+++ b/Master/texmf-dist/doc/fonts/concmath-otf/README.md
@@ -52,6 +52,10 @@ Either version 1.3 or, at your option, any later version.
     make them upright.
   - More integrals added: U+222F to U+2233 and U+2A11.
   - Corrected symbols prime, dprime, etc. (U+2032 to U+2037).
+* v. 0.22
+  - concmath-otf.sty loads Concrete-Math.otf by file name for XeTeX.
+  - Glyphs corrections: \sum, \prod, \coprod and \amalg, \infty, 
+    \propto, \wp, \ell redesigned;
   
 ---
 Copyright 2022-  Daniel Flipo  
diff --git a/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.ltx b/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.ltx
index e1370c02b7d..fd880d986b7 100644
--- a/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.ltx
+++ b/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.ltx
@@ -10,7 +10,7 @@
 \usepackage{realscripts}
 \usepackage{microtype}
 \usepackage{hyperref}
-\hypersetup{pdftitle={Concrete-Math Opentype User’s Guide},
+\hypersetup{pdftitle={Concrete-Math OpenType User’s Guide},
             pdfauthor={Daniel FLIPO},
             bookmarksopen,
             colorlinks
@@ -28,14 +28,14 @@
 \title{Concrete Math font, OTF version}
 \author{Daniel Flipo \\ \texttt{daniel.flipo@free.fr}}
 
-\newcommand*{\version}{0.21}
+\newcommand*{\version}{0.22}
 
 \begin{document}
 \maketitle
 
 \section{What is \CCM{}?}
 
-The \CCM{} package offers an Opentype version of the Concrete Math font
+The \CCM{} package offers an OpenType version of the Concrete Math font
 created by Ulrik Vieth in MetaFont. \file{concmath-otf.sty} is a replacement
 for the original \file{concmath.sty} package.
 
@@ -54,17 +54,20 @@ A basic call for \CCM{} would be:
 \begin{verbatim}
 \usepackage{unicode-math}
 \setmathfont{Concrete-Math.otf} % Call by file name or
-\setmathfont{Concrete Math}     % Call by font name
+\setmathfont{Concrete Math}     % Call by file name
 \end{verbatim}
-this loads \CCM{} as math font with the default options, see
-subsections~\vref{ssection-um}, \vref{ssection-cv} and~\vref{ssection-ss}
-for customisation.
+this loads \CCM{} as maths font %
+\footnote{Both calls work equally well with LuaTeX; with XeTeX a call by font
+  name will fail unless the font is declared as a \emph{system font}.}
+with the default options, see subsections~\vref{ssection-um},
+\vref{ssection-cv} and~\vref{ssection-ss} for customisation.
 
-\enlargethispage*{\baselineskip}
 Please note that the three sets of text fonts have to be chosen separately,
 f.i. if you want the Concrete text fonts%
 \footnote{They are part of the \pkg{cm-unicode} package.}
-as Roman font:\\[.25\baselineskip]
+as Roman font:%\\[.25\baselineskip]
+
+\pagebreak[4]\noindent
 \verb+\setmainfont{cmunorm.otf}        +\\
 \verb+  [BoldFont =       cmunobx.otf ,+\\
 \verb+   ItalicFont =     cmunoti.otf ,+\\
@@ -80,14 +83,14 @@ A (recommended) alternative is:\\[.5\baselineskip]
   \ref{ssection-cv} and \ref{ssection-ss}.}%
 \verb+ ]{concmath-otf}+\\[.5\baselineskip]
 it loads \pkg{unicode-math} with the default options, sets Concrete-Math
-as Math font and Concrete Text fonts as Roman fonts
+as maths font and Concrete text fonts as Roman fonts
 (families \textit{sf} and \textit{tt} left unchanged) but does a bit more:
 \begin{enumerate}
 \item it checks at \verb+\begin{document}+ if packages \pkg{amssymb} or
   \pkg{latexsym} are loaded and issues warnings in case they are;
 \item it provides aliases for glyphs named differently in Unicode, so that
   \pkg{latexsym} or AMS names are also available;
-\item it reduces spacing in math mode: \cmd{thinmuskip}, \cmd{medmuskip}
+\item it reduces spacing in maths mode: \cmd{thinmuskip}, \cmd{medmuskip}
   and \cmd{thickmuskip} are reduced as in \file{fourier.sty}.
 %  \verb+\thinmuskip=2mu+,\\
 %  \verb+\medmuskip=2.5mu plus 1mu minus 2.5mu+,\\
@@ -95,7 +98,7 @@ as Math font and Concrete Text fonts as Roman fonts
   The option \opt{loose} disables these settings.
 \end{enumerate}
 
-Apart from the \opt{loose} option mentionned above, \pkg{concmath-otf.sty}
+Apart from the \opt{loose} option mentioned above, \pkg{concmath-otf.sty}
 provides an option \opt{no-text} to be used for loading the \CCM{} font
 together with roman text fonts other than Concrete.
 
@@ -110,15 +113,15 @@ Sans-serif, typewriter glyphs are not supplied.
 A full list of available glyphs is shown in file \file{unimath-concrete.pdf}.
 
 See in section~\vref{ssec-math-alphabets} how to choose
-from other Math fonts for these styles.
+from other maths fonts for these styles.
 
 \subsection{Upright or slanted?}
 \label{ssection-um}
 
 Package \pkg{unicode-math} follows \TeX{} conventions for Latin and Greek
 letters: in math mode, the default option (\opt{math-style=TeX}) prints
-Latin letters $a$…$z$ $A$…$Z$ and lowercase greek letters $\alpha$…$\omega$
-slanted (italic) while uppercase greek letters $\Alpha \Beta \Gamma$…$\Omega$
+Latin letters $a$…$z$ $A$…$Z$ and lowercase Greek letters $\alpha$…$\omega$
+slanted (italic) while uppercase Greek letters $\Alpha \Beta \Gamma$…$\Omega$
 are printed upright.
 This can be changed by option \opt{math-style} as shown in
 table~\vref{math-style}.
@@ -184,7 +187,7 @@ while the default settings would print
 Both shapes remain available anytime: \verb+$\uppi,\itpi$+
 prints $\uppi, \itpi$.
 
-If your text editor is able to handle greek letters or math symbols, they can
+If your text editor is able to handle Greek letters or maths symbols, they can
 be entered in the code instead control sequences (i.e.
 $\symup{α}$, $\symup{β}$, $\symup{Γ}$,… for \cmd{alpha}, \cmd{beta},
 \cmd{Gamma},…).
@@ -242,7 +245,7 @@ Note: \pkg{unicode-math} defines \cmd{hbar} as
 (italic h with horizontal or diagonal stroke).\\
 \pkg{concmath-otf} follows \pkg{unicode-math}; the italic h with horizontal
 stroke can be printed using \cmd{hslash} or \cmd{hbar} together with character
-variant \texttt{cv01} or with \cmd{mithbar} (replacement for AMS’ command
+variant \opt{cv01} or with \cmd{mithbar} (replacement for AMS’ command
 \cmd{hbar}).
 
 
@@ -250,11 +253,11 @@ variant \texttt{cv01} or with \cmd{mithbar} (replacement for AMS’ command
 \label{ssection-ss}
 
 \CCM{} provides four ``Stylistic Sets’’ options to choose between different
-glyphs for families of mathematical symbols.
+glyphs for families of maths symbols.
 
 \verb+StylisticSet=4+, alias%
-\footnote{These \texttt{Style} aliases are provided by \file{concmath-otf.sty}.}
-\verb+Style=leqslant+, converts (large) inequalites into their slanted
+\footnote{These \opt{Style} aliases are provided by \file{concmath-otf.sty}.}
+\verb+Style=leqslant+, converts (large) inequalities into their slanted
 variants as shown by table~\vref{ss04}.
 
 \verb+StylisticSet=5+, alias \verb+Style=smaller+, converts some symbols into
@@ -327,11 +330,11 @@ $x\leq y \quad A \subsetneq B$
 \subsection{Standard \LaTeX{} math commands}
 \label{ssec-math-commands}
 
-All standard \LaTeX{} math commands, all \pkg{amssymb} commands and all
+All standard \LaTeX{} maths commands, all \pkg{amssymb} commands and all
 \pkg{latexsym} commands are supported by \CCM{}, for some of them loading
 \pkg{concmath-otf.sty} is required.
 
-Various wide acccents are also supported:
+Various wide accents are also supported:
 \begin{itemize}
 \item \cmd{widehat} and \cmd{widetilde}
 \[\widehat{x}\; \widehat{xx} \;\widehat{xxx} \;\widehat{xxxx}\;
@@ -431,7 +434,7 @@ $\symtt{ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz}$
 \subsection{Missing symbols}
 
 \CCM{} does not aim at being as complete as \file{STIXTwoMath-Regular} or
-\file{Cambria}, the current glyph coverage compares with TeXGyre Math fonts.
+\file{Cambria}, the current glyph coverage compares with TeXGyre maths fonts.
 In case some symbols do not show up in the output file, you will see warnings
 in the \file{.log} file, for instance:
 
@@ -457,7 +460,7 @@ helped a lot while cleaning the glyphs.
 
 I am grateful to George Williams and his co-workers for providing and
 maintaining FontForge and to Ulrik Vieth for his illuminating paper published
-in TUGboat~2009 Volume~30 about Open Type Math.
+in TUGboat~2009 Volume~30 about OpenType Math.
 
 \end{document}
 
diff --git a/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.pdf b/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.pdf
index 6bcb46bf6c0..e6ace599238 100644
--- a/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.pdf
+++ b/Master/texmf-dist/doc/fonts/concmath-otf/concmath-otf.pdf
diff --git a/Master/texmf-dist/doc/fonts/concmath-otf/unimath-concrete.pdf b/Master/texmf-dist/doc/fonts/concmath-otf/unimath-concrete.pdf
index 6c2b45ce289..5f4dda7b38d 100644
--- a/Master/texmf-dist/doc/fonts/concmath-otf/unimath-concrete.pdf
+++ b/Master/texmf-dist/doc/fonts/concmath-otf/unimath-concrete.pdf
diff --git a/Master/texmf-dist/fonts/opentype/public/concmath-otf/Concrete-Math.otf b/Master/texmf-dist/fonts/opentype/public/concmath-otf/Concrete-Math.otf
index ed2f8846cce..cad4e6ddec8 100644
--- a/Master/texmf-dist/fonts/opentype/public/concmath-otf/Concrete-Math.otf
+++ b/Master/texmf-dist/fonts/opentype/public/concmath-otf/Concrete-Math.otf
diff --git a/Master/texmf-dist/tex/latex/concmath-otf/concmath-otf.sty b/Master/texmf-dist/tex/latex/concmath-otf/concmath-otf.sty
index cbc332b97ad..eac943f885a 100644
--- a/Master/texmf-dist/tex/latex/concmath-otf/concmath-otf.sty
+++ b/Master/texmf-dist/tex/latex/concmath-otf/concmath-otf.sty
@@ -1,6 +1,6 @@
 \NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\def\fileversion{0.21}
-\def\filedate{2022-04-21}
+\def\fileversion{0.22}
+\def\filedate{2022-09-28}
 \ProvidesPackage{concmath-otf}[\filedate\space\fileversion]
 
 % Ensure luatex or xetex engine
@@ -35,11 +35,11 @@
 \ExecuteOptionsX{tight}
 \ProcessOptionsX
 %
-%\ifCMM@tight
+\ifCCM@tight
   \thinmuskip=2mu
   \medmuskip=2.5mu plus 1mu minus 2.5mu
   \thickmuskip=3.5mu plus 2.5mu
-%\fi
+\fi
 
 % Text Serif fonts:
 \ifCCM@notext
@@ -56,7 +56,7 @@
 \begingroup
   \edef\temp{%
     \endgroup
-    \noexpand\setmathfont{Concrete Math}%
+    \noexpand\setmathfont{Concrete-Math.otf}%
     [\unexpanded\expandafter{\the\CCMtoks}]%
   }
   \temp
@@ -65,39 +65,11 @@
 % Text Typewriter fonts: default (lmtt unless specified)
 
 \AtBeginDocument{%
-  % Fourier specific math
-  \Umathchardef\Bbbbackslash =        0 0 "E020 \relax
+  % Concrete specific math
   \Umathchardef\varemptyset =         0 0 "E021 \relax
-  \Umathchardef\mupvarzero =          0 0 "E022 \relax
-  \Umathchardef\mbfvarzero =          0 0 "E023 \relax
-  \Umathchardef\mupvarvarpi =         0 0 "E032 \relax
-  \Umathchardef\mbfvarpartial =       0 0 "E040 \relax
-  \Umathchardef\mbfvarvarrho =        0 0 "E041 \relax
-  \Umathchardef\mbfvarvarpi =         0 0 "E042 \relax
-  \Umathchardef\mbfvec =              0 0 "E044 \relax
-  \Umathchardef\mbfwp =               0 0 "E045 \relax
   \Umathchardef\mbfdotlessi =         0 0 "E046 \relax
   \Umathchardef\mbfdotlessj =         0 0 "E047 \relax
-  \Umathchardef\mbfhbar =             0 0 "E048 \relax
-  \Umathchardef\mbfell =              0 0 "E049 \relax
-  \Umathchardef\mbftriangleleft =     0 0 "E04E \relax
-  \Umathchardef\mbftriangleright =    0 0 "E04F \relax
-  \Umathchardef\mbfitvarpartial =     0 0 "E060 \relax
-  \Umathchardef\mbfitvarvarrho =      0 0 "E061 \relax
-  \Umathchardef\mbfitvarvarpi =       0 0 "E062 \relax
-  \Umathchardef\mbfitwp =             0 0 "E065 \relax
-  \Umathchardef\mbfimath =            0 0 "E066 \relax
-  \Umathchardef\mbfjmath =            0 0 "E067 \relax
-  \Umathchardef\mbfithbar =           0 0 "E068 \relax
-  \Umathchardef\mbfitell =            0 0 "E069 \relax
-  \Umathchardef\mitvarpartial =       0 0 "E070 \relax
-  \Umathchardef\mitvarvarrho =        0 0 "E071 \relax
-  \Umathchardef\mitvarvarpi =         0 0 "E072 \relax
   \Umathchardef\mithbar =             0 0 "E078 \relax
-  \Umathchardef\parallelslant  =      3 0 "E090 \relax
-  \Umathchardef\nparallelslant =      3 0 "E091 \relax
-  \Umathchardef\shortparallelslant =  3 0 "E092 \relax
-  \Umathchardef\nshortparallelslant = 3 0 "E093 \relax
   \Umathchardef\lesseqslantgtr =      3 0 "E094 \relax
   \Umathchardef\gtreqslantless =      3 0 "E095 \relax
   \Umathchardef\lesseqqslantgtr =     3 0 "E096 \relax