summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/unicode-math/README16
-rw-r--r--Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex192
-rw-r--r--Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdfbin382531 -> 386208 bytes
-rw-r--r--Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdfbin1448746 -> 1448685 bytes
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/unicode-math-msg.dtx4
-rw-r--r--Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx98
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty51
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty51
-rw-r--r--Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty6
9 files changed, 230 insertions, 188 deletions
diff --git a/Master/texmf-dist/doc/latex/unicode-math/README b/Master/texmf-dist/doc/latex/unicode-math/README
index 2029a7940c5..59104c0f330 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/README
+++ b/Master/texmf-dist/doc/latex/unicode-math/README
@@ -14,9 +14,10 @@ interface and functionality should not be considered completely stable. But
the more the package is used the more stable it will become. (Things are
generally working now; it is only minutiae that may change in the future.)
-Unicode maths is currently supported to one degree or another by the fonts
+Unicode maths is currently supported by the fonts
- [Cambria Math][CM] (Microsoft),
+ - [Minion Math][MM] (Johannes Küster, typoma GmbH)
- [Latin Modern Math][LM] (Bogusław Jackowski, Janusz M. Nowacki)
- [TeX Gyre Pagella Math][PM] (Bogusław Jackowski, Janusz M. Nowacki)
- [Asana Math][AM] (Apostolos Syropolous),
@@ -32,6 +33,7 @@ I'm always looking for new fonts to test with, so please let me know of any
new releases.
[CM]: http://www.ascenderfonts.com/font/cambria-regular.aspx
+[MM]: http://www.typoma.com/en/fonts.html
[LM]: http://www.gust.org.pl/projects/e-foundry/lm-math
[PM]: http://www.ctan.org/pkg/tex-gyre-math-pagella
[AM]: http://www.ctan.org/tex-archive/fonts/Asana-Math/
@@ -80,6 +82,18 @@ Please file bug reports with minimal examples:
CHANGE HISTORY
--------------
+- v0.8a (2015/08/06)
+
+ * Fix bug with \vert, \|, \(l/r)vert, etc., displaying with the wrong characters.
+
+ * Improve documentation to properly reflect changes in v0.8 and fix some broken examples.
+
+ * No longer reset catcodes of : and @ during \setmathfont .
+
+ * Fix remapping of alphabets (needed for Minion Math) in cases such as:
+
+ \setmathfont[range=bfit->it]{MinionMath-Bold.otf}
+
- v0.8 (2015/07/29) **Breaking changes in this update!**
* `\mathrm` (`\mathup`), `\mathit`, `\mathbf`, `\mathsf`, and `\mathtt` revert to their traditional LaTeX meanings; they are set up to match their equivalent text fonts unless specifically set using `\setmathrm` and friends from `fontspec` or the new `\setmathfontface` in `unicode-math`. These commands should be used for *multi*-letter identifiers.
diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex
index 87c1518fdcb..29835b9a5b1 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex
+++ b/Master/texmf-dist/doc/latex/unicode-math/unicode-math-doc.tex
@@ -236,7 +236,7 @@ If you do not load an OpenType maths font before |\begin{document}|, Latin Moder
\subsection{New commands}
\textbf{New v0.8:}
-\pkg{unicode-math} provides the following commands (usage: |$\symbfsf{g}$|${}\to\symbfsf{g}$) to select specific `alphabets' within the unicode maths font:
+\pkg{unicode-math} provides the following commands to select specific `alphabets' within the unicode maths font: (usage, e.g.: |$\symbfsf{g}$|${}\to\symbfsf{g}$)
\begin{quote}
\ExplSyntaxOn
\clist_map_inline:nn {
@@ -323,8 +323,8 @@ maths glyphs and macro names (all 3298 — or however many — of them!). A
single command
\codeline{\cmd\setmathfont\marg{font name}\oarg{font features}}
implements this for every every symbol and alphabetic variant.
-That means |x| to $x$, |\xi| to $\xi$, |\leq| to $\leq$, etc., |\mathscr{H}|
-to $\mathscr{H}$ and so on, all for Unicode glyphs within a single font.
+That means |x| to $x$, |\xi| to $\xi$, |\leq| to $\leq$, etc., |\symscr{H}|
+to $\symscr{H}$ and so on, all for Unicode glyphs within a single font.
This package deals well with Unicode characters for maths
input. This includes using literal Greek letters in formulae,
@@ -372,10 +372,9 @@ As discussed earlier, Unicode mathematics consists of a number of `alphabet styl
\clist_use:Nn \g__um_named_ranges_clist {\,,\,~}
\ExplSyntaxOff
\end{quote}
-
-Fonts can be selected for specified ranges only; use the following syntax:
+Fonts can be selected for specified ranges only using the following syntax, in which case all other maths font setup remains untouched:
\begin{itemize}
-\item |[range=bb]| to use the font for `bb' letters only.
+\item |[range=bb]| to use the font for `|bb|' letters only.
\item |[range=bfsfit/{greek,Greek}]| for Greek lowercase and uppercase only (also with |latin|, |Latin|, |num| as possible options for Latin lower-/upper-case and numbers, resp.).
\item |[range=up->sfup]| to map to different output styles.
\end{itemize}
@@ -384,13 +383,40 @@ Note that `meta-styles' such as `|bf|' and `|sf|' are not included here since th
If a particular math style is not defined in the font, we fall back onto the lower-base plane (i.e., `upright') glyphs.
Therefore, to use an \ascii-encoded fractur font, for example, write
-\par{\centering|\setmathfont{SomeFracturFont}[range=frak]|\par}\noindent
+\begin{Verbatim}
+ \setmathfont{SomeFracturFont}[range=frak]
+\end{Verbatim}
and because the math plane fractur glyphs will be missing, \pkg{unicode-math} will know to use the \ascii\ ones instead.
If necessary this behaviour can be forced with |[range=frak->up]|, since the `|up|' range corresponds to \ascii\ letters.
If you wanted to swap the maths symbols with sans serif forms, it would be possible to write |[range={up->sfup,it->sfit}]|.
Note, however, that at present Unicode does not encode glyphs for sans serif Greek (\tabref{mathalphabets}).
+Users of the impressive Minion Math fonts (commercial) may use remapping to access the bold glyphs using:
+\begin{Verbatim}
+ \setmathfont{MinionMath-Regular.otf}
+ \setmathfont{MinionMath-Bold.otf}[range={bfup->up,bfit->it}]
+\end{Verbatim}
+To set up the complete range of optical sizes for these fonts, a font declaration such as the following may be used: (adjust may be desired according to the font size of the document)
+\begin{Verbatim}
+\setmathfont{Minion Math}[
+ SizeFeatures = {
+ {Size = -6.01, Font = MinionMath-Tiny},
+ {Size = 6.01-8.41, Font = MinionMath-Capt},
+ {Size = 8.41-13.01, Font = MinionMath-Regular},
+ {Size = 13.01-19.91, Font = MinionMath-Subh},
+ {Size = 19.91-, Font = MinionMath-Disp}
+ }]
+
+\setmathfont{Minion Math}[range = {bfup->up,bfit->it},
+ SizeFeatures = {
+ {Size = -6.01, Font = MinionMath-BoldTiny},
+ {Size = 6.01-8.41, Font = MinionMath-BoldCapt},
+ {Size = 8.41-13.01, Font = MinionMath-Bold},
+ {Size = 13.01-19.91, Font = MinionMath-BoldSubh},
+ {Size = 19.91-, Font = MinionMath-BoldDisp}
+ }]
+\end{Verbatim}
\textbf{v0.8:} Note that in previous versions of \pkg{unicode-math}, these features were labelled |[range=\mathbb]| and so on. This old syntax is still supported for backwards compatibility, but is now discouraged.
@@ -399,7 +425,8 @@ Note, however, that at present Unicode does not encode glyphs for sans serif Gre
Cambria Math uses OpenType font features to activate smaller optical sizes
for scriptsize and scriptscriptsize symbols (the $B$ and $C$, respectively,
-in $A_{B_C}$). Other fonts will possibly use entirely separate fonts.
+in $A_{B_C}$).
+Other typefaces (such as Minion Math) may use entirely separate font files.
The features |script-font| and |sscript-font| allow alternate fonts to be
selected for the script and scriptscript sizes, and |script-features| and
@@ -475,7 +502,7 @@ A series of package options (\tabref{legacyfontswitch}) are provided to facilita
Defaults (from `text' font) & From `maths symbols' \\
\midrule
|mathrm=text| & |mathrm=sym | \\
- |mathup=text|\llap{$^\ast$} & |mathup=sym |\llap{$^\ast$} \\
+ |mathup=text|\rlap{$^\ast$} & |mathup=sym|{}\rlap{$^\ast$} \\
|mathit=text| & |mathit=sym | \\
|mathsf=text| & |mathsf=sym | \\
|mathbf=text| & |mathbf=sym | \\
@@ -498,9 +525,9 @@ You may now change these using the command:
\end{Verbatim}
Or, to select a \pkg{unicode-math} range:
\begin{Verbatim}
-\setoperatorfont\symbf
+\setoperatorfont\symscr
\end{Verbatim}
-\setoperatorfont\symbf
+\setoperatorfont\symscr
For example, after the latter above, |$\sin x$| will produce `$\sin x$'.
\mathversion{normal}
@@ -521,15 +548,14 @@ readable input files.
Classically, \TeX\ uses italic lowercase Greek letters and \emph{upright}
uppercase Greek letters for variables in mathematics. This is contrary to
the \textsc{iso} standards of using italic forms for both upper- and lowercase.
-Furthermore, the French have been
-known to use upright uppercase \emph{Latin} letters as well as upright
-upper- and lowercase Greek. Finally, it is not unknown to use upright letters
+Furthermore, in various historical contexts, often associated with French typesetting, it was common to use upright uppercase \emph{Latin} letters as well as upright
+upper- and lowercase Greek, but italic lowercase latin. Finally, it is not unknown to use upright letters
for all characters, as seen in the Euler fonts.
-The \pkg{unicode-math} package accommodates these possibilities with an
-interface heavily inspired by Walter Schmidt's \pkg{lucimatx} package: a
-package option \opt{math-style} that takes one of four arguments:
-\opt{TeX}, \opt{ISO}, \opt{french}, or \opt{upright} (case sensitive).
+The \pkg{unicode-math} package accommodates these possibilities with the
+option \opt{math-style} that takes one of four (case sensitive) arguments:
+\opt{TeX}, \opt{ISO}, \opt{french}, or \opt{upright}.\footnote{Interface inspired by Walter Schmidt's \pkg{lucimatx} package.}
+The \opt{math-style} options' effects are shown in brief in \tabref{math-style}.
The philosophy behind the interface to the mathematical symbols
lies in \LaTeX's attempt of separating content and formatting. Because input
@@ -544,19 +570,17 @@ letters. The upright or italic forms are then chosen based on the
If glyphs are desired that do not map as per the package option (for
example, an upright `g' is desired but typing |$g$| yields `$g$'),
\emph{markup} is required to specify this; to follow from the example:
-|\mathup{g}|. Maths style commands such as \cmd\mathup\ are detailed
-later.
+|\symup{g}|.
+Maths style commands such as \cmd\symup\ are detailed later.
\paragraph{`Literal' interface}
-However, some users may not like this convention of normalising their input.
+Some may not like this convention of normalising their input.
For them, an upright |x| is an upright `x' and that's that.
(This will be the case when obtaining source text from copy/pasting PDF or
Microsoft Word documents, for example.)
For these users, the |literal| option to |math-style| will effect this behaviour.
The \cs{symliteral}\marg{syms} command can also be used, regardless of package setting, to force the style to match the literal input characters.
-This is a `mirror' to \cs{symnormal}\marg{syms} (also alias \cs{mathnormal}) which `resets' the character mapping in its argument to whatever originally set up through package options.
-
-The \opt{math-style} options' effects are shown in brief in \tabref{math-style}.
+This is a `mirror' to \cs{symnormal}\marg{syms} (also alias \cs{mathnormal}) which `resets' the character mapping in its argument to that originally set up through package options.
\begin{table}
\centering
@@ -568,10 +592,10 @@ The \opt{math-style} options' effects are shown in brief in \tabref{math-style}.
\cmidrule(l){2-3}
\rmfamily Package option & Latin & Greek \\
\midrule
- math-style=ISO & $(a,z,B,X)$ & $\mathit{(\alpha,\beta,\Gamma,\Xi)}$ \\
- math-style=TeX & $(a,z,B,X)$ & $(\mathit\alpha,\mathit\beta,\mathup\Gamma,\mathup\Xi)$ \\
- math-style=french & $(a,z,\mathup B,\mathup X)$ & $(\mathup\alpha,\mathup\beta,\mathup\Gamma,\mathup\Xi)$ \\
- math-style=upright & $(\mathup a,\mathup z,\mathup B,\mathup X)$ & $(\mathup\alpha,\mathup\beta,\mathup\Gamma,\mathup\Xi)$ \\
+ math-style=ISO & $(a,z,B,X)$ & $\symit{(\alpha,\beta,\Gamma,\Xi)}$ \\
+ math-style=TeX & $(a,z,B,X)$ & $(\symit\alpha,\symit\beta,\symup\Gamma,\symup\Xi)$ \\
+ math-style=french & $(a,z,\symup B,\symup X)$ & $(\symup\alpha,\symup\beta,\symup\Gamma,\symup\Xi)$ \\
+ math-style=upright & $(\symup a,\symup z,\symup B,\symup X)$ & $(\symup\alpha,\symup\beta,\symup\Gamma,\symup\Xi)$ \\
\bottomrule
\end{tabular}
\end{table}
@@ -583,25 +607,25 @@ The \opt{math-style} options' effects are shown in brief in \tabref{math-style}.
Similar as in the previous section, ISO standards differ somewhat to \TeX's
conventions (and classical typesetting) for `boldness' in mathematics. In
the past, it has been customary to use bold \emph{upright} letters to denote
-things like vectors and matrices. For example, \( \mathbfup{M} =
+things like vectors and matrices. For example, \( \symbfup{M} =
(\mitM_x,\mitM_y,\mitM_z) \). Presumably, this was due to the relatively
-scarcity of bold italic fonts in the pre-digital typesetting era. It has
-been suggested that \emph{italic} bold symbols are used nowadays instead.
+scarcity of bold italic fonts in the pre-digital typesetting era.
+It has been suggested by some that \emph{italic} bold symbols should be used nowadays instead, but this practise is certainly not widespread.
Bold Greek letters have simply been bold variant glyphs of their regular
weight, as in \( \mbfitxi = (\mitxi_\mitr,\mitxi_\mitphi,\mitxi_\mittheta)
-\). Confusingly, the syntax in \LaTeX\ has been different for these two
-examples: \cmd\mathbf\ in the former (`$\mathbfup{M}$'), and \cmd\bm\ (or
+\).
+Confusingly, the syntax in \LaTeX\ traditionally has been different for obtaining `normal' bold symbols in Latin and Greek: \cmd\mathbf\ in the former (`$\symbfup{M}$'), and \cmd\bm\ (or
\cmd\boldsymbol, deprecated) in the latter (`$\mbfitxi$').
-In \pkg{unicode-math}, the \cmd\mathbf\ command works directly with both
+In \pkg{unicode-math}, the \cmd\symbf\ command works directly with both
Greek and Latin maths characters and depending on package option
either switches to upright for Latin letters (|bold-style=TeX|) as well or
keeps them italic (|bold-style=ISO|).
-
To match the package options for non-bold characters, with option
|bold-style=upright| all bold characters are upright, and
|bold-style=literal| does not change the upright/italic shape of the letter.
+The \opt{bold-style} options' effects are shown in brief in \tabref{bold-style}.
Upright and italic bold mathematical letters input as direct Unicode
characters are normalised with the same rules. For example, with
@@ -609,12 +633,9 @@ characters are normalised with the same rules. For example, with
upright.
Note that \opt{bold-style} is independent of \opt{math-style}, although if
-the former is not specified then sensible defaults are chosen based on the
+the former is not specified then matching defaults are chosen based on the
latter.
-The \opt{bold-style} options' effects are shown in brief in
-\tabref{bold-style}.
-
\begin{table}
\centering
\topcaption{Effects of the \opt{bold-style} package option.}
@@ -625,9 +646,9 @@ The \opt{bold-style} options' effects are shown in brief in
\cmidrule(l){2-3}
\rmfamily Package option & Latin & Greek \\
\midrule
- bold-style=ISO & $(\mathbfit a, \mathbfit z, \mathbfit B, \mathbfit X)$ & $(\mathbfit\alpha, \mathbfit\beta, \mathbfit\Gamma, \mathbfit\Xi)$ \\
- bold-style=TeX & $(\mathbfup a,\mathbfup z,\mathbfup B,\mathbfup X)$ & $(\mathbfit\alpha, \mathbfit\beta,\mathbfup \Gamma,\mathbfup \Xi)$ \\
- bold-style=upright & $(\mathbfup a,\mathbfup z,\mathbfup B,\mathbfup X)$ & $(\mathbfup \alpha,\mathbfup \beta,\mathbfup \Gamma,\mathbfup \Xi)$ \\
+ bold-style=ISO & $(\symbfit a, \symbfit z, \symbfit B, \symbfit X)$ & $(\symbfit\alpha, \symbfit\beta, \symbfit\Gamma, \symbfit\Xi)$ \\
+ bold-style=TeX & $(\symbfup a,\symbfup z,\symbfup B,\symbfup X)$ & $(\symbfit\alpha, \symbfit\beta,\symbfup \Gamma,\symbfup \Xi)$ \\
+ bold-style=upright & $(\symbfup a,\symbfup z,\symbfup B,\symbfup X)$ & $(\symbfup \alpha,\symbfup \beta,\symbfup \Gamma,\symbfup \Xi)$ \\
\bottomrule
\end{tabular}
\end{table}
@@ -659,9 +680,10 @@ While you might want your bold upright and your sans serif italic, I don't belie
your bold sans serif upright (or all vice versa, if that's even conceivable). Therefore, bold sans
serif follows from the setting for sans serif; it is completely independent of the setting for bold.
-In other words, \cs{mathbfsf} is either \cs{mathbfsfup} or \cs{mathbfsfit} based on |[sans-style=upright]| or |[sans-style=italic]|, respectively. And |[sans-style=literal]| causes \cs{mathbfsf} to retain the same italic or upright shape as the input, and turns it bold sans serif.
+In other words, \cs{mathbfsf} is either \cs{mathbfsfup} or \cs{mathbfsfit} based on |[sans-style=upright]| or |[sans-style=italic]|, respectively. And \texttt{[sans-style = literal]} causes \cs{mathbfsf} to retain the same italic or upright shape as the input, and turns it bold sans serif.
-Note well! There is no medium-weight sans serif Greek range in Unicode; therefore, |\mathsf{\alpha}| does not make sense (simply produces `$\mathsf{\alpha}$') while |\mathbfsf{\alpha}| gives `$\mathsf{\alpha}$'.
+N.B.: there is no medium-weight sans serif Greek range in Unicode.
+Therefore, |\symsf{\alpha}| does not make sense (it produces `$\symsf{\alpha}$'), while |\symbfsf{\alpha}| gives `$\symbfsfup{\alpha}$' or `$\symbfsfit{\alpha}$' according to the |sans-style|.
\subsection{All (the rest) of the mathematical styles}
\seclabel{all-math-alphabets}
@@ -671,7 +693,7 @@ shape one may wish to use in mathematical notation. The complete list is shown
in \tabref{mathalphabets}. Some of these have been covered in the previous sections.
The math font switching commands do not nest; therefore if you want
-sans serif bold, you must write |\mathbfsf{...}| rather than |\mathbf{\mathsf{...}}|.
+sans serif bold, you must write |\symbfsf{...}| rather than |\symbf{\symsf{...}}|.
This may change in the future.
\begin{table}
@@ -679,7 +701,7 @@ This may change in the future.
\tablabel{mathalphabets}
\centering
\def\Y{\textbullet}
-\def\M{\textcolor{blue}{\textbullet}}
+\def\M{\textcolor[rgb]{0.5,0.5,1}{\textbullet}}
\begin{tabular}{@{} lll l ccc @{}}
\toprule
\multicolumn{3}{c}{Font} & & \multicolumn{3}{c}{Alphabet} \\
@@ -709,16 +731,16 @@ Fraktur & Upright & Normal & \cs{mathfrak} & \Y & & \\
\subsubsection{Double-struck}
The double-struck style (also known as `blackboard bold') consists of
-upright Latin letters $\{\mathbb{a}$--$\mathbb{z}$,$\mathbb{A}$$\mathbb{Z}\}$,
-numerals $\mathbb{0}$--$\mathbb{9}$, summation symbol $\mathbb\sum$, and four
-Greek letters only: $\{\mathbb{\gamma\pi\Gamma\Pi}\}$.
+upright Latin letters $\{\symbb{a}$--$\symbb{z}$,$\symbb{A}$$\symbb{Z}\}$,
+numerals $\symbb{0}$--$\symbb{9}$, summation symbol $\symbb\sum$, and four
+Greek letters only: $\{\symbb{\gamma\pi\Gamma\Pi}\}$.
-While |\mathbb{\sum}| does produce a double-struck summation symbol,
+While |\symbb{\sum}| does produce a double-struck summation symbol,
its limits aren't properly aligned. Therefore,
either the literal character or the control sequence \cs{Bbbsum} are
recommended instead.
-There are also five Latin \emph{italic} double-struck letters: $\mathbbit{Ddeij}$.
+There are also five Latin \emph{italic} double-struck letters: $\symbbit{Ddeij}$.
These can be accessed (if not with their literal characters or control sequences)
with the \cs{mathbbit} style switch, but note that only those five letters
will give the expected output.
@@ -736,14 +758,14 @@ This feature is currently only supported by the XITS~Math font, where
the caligraphic letters are accessed with the same glyph slots as the
script letters but with the first stylistic set feature (|ss01|) applied.
\begin{verbatim}
- \setmathfont{xits-math.otf}[range={\mathcal,\mathbfcal},StylisticSet=1]
+ \setmathfont{xits-math.otf}[range={cal,bfcal},StylisticSet=1]
\end{verbatim}
An example is shown below.
\begin{quote}
-\setmathfont{xits-math.otf}[range=\mathscr]
-\setmathfont{xits-math.otf}[range=\mathcal,StylisticSet=1]
-The Script style (\cs{mathscr}) in XITS Math is: $\mathscr{ABCXYZ}$\par
-The Caligraphic style (\cs{mathcal}) in XITS Math is: $\mathcal{ABCXYZ}$
+\setmathfont{xits-math.otf}[range=scr]
+\setmathfont{xits-math.otf}[range=cal,StylisticSet=1]
+The Script style (\cs{mathscr}) in XITS Math is: $\symscr{ABCXYZ}$\par
+The Caligraphic style (\cs{mathcal}) in XITS Math is: $\symcal{ABCXYZ}$
\end{quote}
@@ -760,13 +782,14 @@ The Caligraphic style (\cs{mathcal}) in XITS Math is: $\mathcal{ABCXYZ}$
The package options |nabla=upright| and
|nabla=italic| switch between the two choices, and |nabla=literal| respects
the shape of the input character. This is then inherited
- through \cmd\mathbf; \cmd\mathit\ and \cmd\mathup\ can be used to force one
+ through \cmd\symbf; \cmd\symit\ and \cmd\symup\ can be used to force one
way or the other.
|nabla=italic| is the default. |nabla=literal| is
activated automatically after |math-style=literal|.
\begin{table}
+ \begin{minipage}[b]{0.49\textwidth}
\centering
\topcaption{The various forms of nabla.}
\tablabel{nabla}
@@ -775,17 +798,36 @@ activated automatically after |math-style=literal|.
\toprule
\multicolumn{2}{@{}l}{Description} & Glyph
\\ \cmidrule(r){1-2}\cmidrule(l){3-3}
- Upright & Serif & $\mathup\nabla$ \\
- & Bold serif & $\mathbfup\nabla$ \\
- & Bold sans & $\mathbfsfup\nabla$ \\
+ Upright & Serif & $\symup\nabla$ \\
+ & Bold serif & $\symbfup\nabla$ \\
+ & Bold sans & $\symbfsfup\nabla$ \\
\cmidrule(lr){1-2}\cmidrule(lr){3-3}
- Italic & Serif & $\mathit\nabla$ \\
- & Bold serif & $\mathbfit\nabla$ \\
- & Bold sans & $\mathbfsfit\nabla$ \\
+ Italic & Serif & $\symit\nabla$ \\
+ & Bold serif & $\symbfit\nabla$ \\
+ & Bold sans & $\symbfsfit\nabla$ \\
+ \bottomrule
+ \end{tabular}
+ \end{minipage}\hfill
+ \begin{minipage}[b]{0.49\textwidth}
+ \centering
+ \topcaption{The partial differential.}
+ \tablabel{partial}
+ \begin{tabular}{@{}llc@{}}
+ \toprule
+ \multicolumn{2}{@{}l}{Description} & Glyph
+ \\ \cmidrule(r){1-2}\cmidrule(l){3-3}
+ Regular & Upright & $\symup\partial$ \\
+ & Italic & $\symit\partial$ \\
+ Bold & Upright & $\symbfup\partial$ \\
+ & Italic & $\symbfit\partial$ \\
+ Sans bold & Upright & $\symbfsfup\partial$ \\
+ & Italic & $\symbfsfit\partial$ \\
\bottomrule
\end{tabular}
+ \end{minipage}
\end{table}
+
\subsubsection{Partial}
\seclabel{partial}
@@ -808,26 +850,6 @@ is activated following |math-style=literal|.
See \tabref{partial} for the variations on the partial differential symbol.
-\begin{table}
- \centering
- \topcaption{The various forms of the partial differential. Note that in
-the fonts used to display these glyphs, the first upright partial is
-incorrectly shown in an italic style.}
- \tablabel{partial}
- \begin{tabular}{@{}llc@{}}
- \toprule
- \multicolumn{2}{@{}l}{Description} & Glyph
- \\ \cmidrule(r){1-2}\cmidrule(l){3-3}
- Regular & Upright & $\mathup\partial$ \\
- & Italic & $\mathit\partial$ \\
- Bold & Upright & $\mathbfup\partial$ \\
- & Italic & $\mathbfit\partial$ \\
- Sans bold & Upright & $\mathbfsfup\partial$ \\
- & Italic & $\mathbfsfit\partial$ \\
- \bottomrule
- \end{tabular}
-\end{table}
-
\subsubsection{Epsilon and phi: $\epsilon$ vs.\ $\varepsilon$ and $\phi$ vs.\ $\varphi$}
\seclabel{vargreek-shape}
@@ -1035,7 +1057,7 @@ Of the above characters, the following are allowed to be used after
However, we assume that there is only \emph{one} stretchy slash
in the font; this is assumed by default to be \unichar{002F} {solidus}.
-Writing \cs{left/} or \cs{left}\cs{slash} or \cs{left}{fracslash}
+Writing \cs{left/} or \cs{left}\cs{slash} or \cs{left}\cs{fracslash}
will all result in the same stretchy delimiter being used.
The delimiter used can be changed with the |slash-delimiter| package option.
@@ -1206,7 +1228,7 @@ If you are writing some code that needs to know the current
maths style (\cs{mathbf}, \cs{mathit}, etc.), you can query the
variable \cs{l_@@_mathstyle_tl}. It will contain the maths style
without the leading `math' string; for example,
-|\mathbf { \show \l_@@_mathstyle_tl }|
+|\symbf { \show \l_@@_mathstyle_tl }|
will produce `bf'.
\StopEventually{\end{document}}
diff --git a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf
index d0f6639082d..ae835ea73f3 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf
+++ b/Master/texmf-dist/doc/latex/unicode-math/unicode-math.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf
index 6c206c8b919..bad02fc07cc 100644
--- a/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf
+++ b/Master/texmf-dist/doc/latex/unicode-math/unimath-symbols.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math-msg.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math-msg.dtx
index 9dc26b4a80d..b65f2de0201 100644
--- a/Master/texmf-dist/source/latex/unicode-math/unicode-math-msg.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math-msg.dtx
@@ -46,8 +46,8 @@
}
\msg_new:nnn {unicode-math} {no-alphabet}
{
- I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.
- See~ file~ "unicode-math-alphabets.dtx".
+ I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.~
+ (See~ source~ file~ "unicode-math-alphabets.dtx"~ to~ debug.)
}
\msg_new:nnn { unicode-math } { no-named-range }
{
diff --git a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
index b656390278f..848935c481b 100644
--- a/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
+++ b/Master/texmf-dist/source/latex/unicode-math/unicode-math.dtx
@@ -39,20 +39,25 @@ This work is "maintained" by Will Robertson.
\askforoverwritefalse
\let\MetaPrefix\DoubleperCent
\usepreamble\texpreamble
+\ifx\UMDEBUG\undefined
+ \def\UMDEBUG{}%
+\else
+ \def\UMDEBUG{,debug}%
+\fi
\generate{\file{unicode-math.sty}{
- \from{unicode-math.dtx}{preamble}
- \from{unicode-math-msg.dtx}{msg}
- \from{unicode-math-usv.dtx}{usv}
- \from{unicode-math.dtx}{load}
- \from{unicode-math-alphabets.dtx}{alphabets}
+ \from{unicode-math.dtx}{preamble\UMDEBUG}
+ \from{unicode-math-msg.dtx}{msg\UMDEBUG}
+ \from{unicode-math-usv.dtx}{usv\UMDEBUG}
+ \from{unicode-math.dtx}{load\UMDEBUG}
+ \from{unicode-math-alphabets.dtx}{alphabets\UMDEBUG}
}}
\generate{\file{unicode-math-xetex.sty}{
- \from{unicode-math.dtx}{package,XE}
- \from{unicode-math-compat.dtx}{compat,XE}
+ \from{unicode-math.dtx}{package,XE\UMDEBUG}
+ \from{unicode-math-compat.dtx}{compat,XE\UMDEBUG}
}}
\generate{\file{unicode-math-luatex.sty}{
- \from{unicode-math.dtx}{package,LU}
- \from{unicode-math-compat.dtx}{compat,LU}
+ \from{unicode-math.dtx}{package,LU\UMDEBUG}
+ \from{unicode-math-compat.dtx}{compat,LU\UMDEBUG}
}}
\def\tempa{plain}
\ifx\tempa\fmtname\endgroup\expandafter\bye\fi
@@ -64,7 +69,7 @@ This work is "maintained" by Will Robertson.
%<preamble&XE>\ProvidesPackage{unicode-math-xetex}
%<preamble&LU>\ProvidesPackage{unicode-math-luatex}
%<*preamble>
- [2014/07/30 v0.8 Unicode maths in XeLaTeX and LuaLaTeX]
+ [2014/08/06 v0.8a Unicode maths in XeLaTeX and LuaLaTeX]
%</preamble>
%<*internal>
\def\DOCUMENTEND{F}
@@ -756,10 +761,15 @@ This work is "maintained" by Will Robertson.
% The following assignments should all be fairly straightforward.
%
% The catcode setting is to work around (strange?) behaviour in LuaTeX in which catcode 11 characters don't have italic correction for maths.
+% We don't adjust ascii chars, however, because certain punctuation should not have their catcodes changed.
% \begin{macrocode}
\cs_set:Nn \@@_set_mathsymbol:nNNn
{
- \int_compare:nT { \char_value_catcode:n {#4} == 11 }
+ \bool_if:nT
+ {
+ \int_compare_p:nNn {#4} > {127} &&
+ \int_compare_p:nNn { \char_value_catcode:n {#4} } = {11}
+ }
{ \char_set_catcode_other:n {#4} }
\tl_case:Nn #3
@@ -1106,9 +1116,9 @@ This work is "maintained" by Will Robertson.
% After loading the font, we detect what sizes it recommends for scriptsize and scriptscriptsize, so after setting those values appropriately, we reload the font to take these into account.
% \begin{macrocode}
- \csname TIC\endcsname
+%<debug> \csname TIC\endcsname
\@@_fontspec_select_font:
- \csname TOC\endcsname
+%<debug> \csname TOC\endcsname
\bool_if:nT { \l_@@_ot_math_bool && !\g_@@_mainfont_already_set_bool }
{
\@@_declare_math_sizes:
@@ -1147,9 +1157,9 @@ This work is "maintained" by Will Robertson.
% \end{macrocode}
% And now we input every single maths char.
% \begin{macrocode}
- \csname TIC\endcsname
+%<debug> \csname TIC\endcsname
\@@_input_math_symbol_table:
- \csname TOC\endcsname
+%<debug> \csname TOC\endcsname
% \end{macrocode}
% Finally,
% \begin{itemize}
@@ -1163,9 +1173,9 @@ This work is "maintained" by Will Robertson.
\@@_remap_symbols:
\@@_setup_mathactives:
\@@_setup_delcodes:
- \csname TIC\endcsname
+%<debug> \csname TIC\endcsname
\@@_setup_alphabets:
- \csname TOC\endcsname
+%<debug> \csname TOC\endcsname
\@@_setup_negations:
% \end{macrocode}
% Prevent spaces, and that's it:
@@ -2348,7 +2358,10 @@ This work is "maintained" by Will Robertson.
}
% \end{macrocode}
% \begin{macrocode}
-\cs_new:Nn \@@_alphabet_config:nnn { \use:c {@@_config_#1_#2:n} {#3} }
+\cs_new:Nn \@@_alphabet_config:nnn
+ {
+ \use:c {@@_config_#1_#2:n} {#3}
+ }
% \end{macrocode}
% \begin{macrocode}
\prg_new_conditional:Nnn \@@_if_alphabet_exists:nn {T,TF}
@@ -2366,6 +2379,7 @@ This work is "maintained" by Will Robertson.
{
\seq_put_right:Nx \g_@@_named_ranges_seq { \tl_to_str:n {#1} }
\seq_put_right:Nn \g_@@_default_mathalph_seq {{#1}{#2}{#3}}
+ \prop_gput:cnn { g_@@_named_range_#1_prop } { default-alpha } {#2}
}
\@@_default_mathalph:nnn {up } {latin,Latin,greek,Greek,num,misc} {up }
\@@_default_mathalph:nnn {it } {latin,Latin,greek,Greek,misc} {it }
@@ -2531,42 +2545,38 @@ This work is "maintained" by Will Robertson.
\cs_set_eq:NN \@@_set_mathalphabet_char:nnn \@@_mathmap_noparse:nnn
\cs_set_eq:NN \@@_map_char_single:nn \@@_map_char_noparse:nn
}
-% \end{macrocode}
-% Now perform the mapping:
-% \begin{macrocode}
+
+ % Now perform the mapping:
\seq_map_inline:Nn \l_@@_mathalph_seq
{
- \tl_set:No \l_@@_style_tl { \use_i:nnn ##1 }
+ \tl_set:No \l_@@_style_tl { \use_i:nnn ##1 }
\clist_set:No \l_@@_alphabet_clist { \use_ii:nnn ##1 }
- \tl_set:No \l_@@_remap_style_tl { \use_iii:nnn ##1 }
+ \tl_set:No \l_@@_remap_style_tl { \use_iii:nnn ##1 }
+ % If no set of alphabets is defined:
\clist_if_empty:NT \l_@@_alphabet_clist
{
\cs_set_eq:NN \@@_maybe_init_alphabet:n \@@_init_alphabet:n
- \clist_set:Nn \l_@@_alphabet_clist { latin, Latin, greek, Greek, num, misc }
+ \prop_get:cnN { g_@@_named_range_ \l_@@_style_tl _prop }
+ { default-alpha } \l_@@_alphabet_clist
}
- \@@_setup_math_alphabet:NNN
- \l_@@_style_tl \l_@@_alphabet_clist \l_@@_remap_style_tl
+ \@@_setup_math_alphabet:
}
\seq_if_empty:NF \l_@@_missing_alph_seq { \@@_log:n { missing-alphabets } }
}
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\@@_setup_math_alphabet:NNN}
-% \darg{Math font style (e.g., \cs{bb})}
-% \darg{Math alphabets, comma separated of \{latin,Latin,greek,Greek,num\}}
-% \darg{Name of the output math style (usually same as the name of the style \texttt{bb})}
+% \begin{macro}{\@@_setup_math_alphabet:}
% \begin{macrocode}
-\cs_new:Nn \@@_setup_math_alphabet:NNN
+\cs_new:Nn \@@_setup_math_alphabet:
{
- \tl_set_eq:NN \l_@@_style_tl #1% actually a no-op but makes the code clearer!
% \end{macrocode}
% First check that at least one of the alphabets for the font shape is defined
% (this process is fast) \dots
% \begin{macrocode}
- \clist_map_inline:Nn #2
+ \clist_map_inline:Nn \l_@@_alphabet_clist
{
\tl_set:Nn \l_@@_alphabet_tl {##1}
\@@_if_alphabet_exists:nnTF \l_@@_style_tl \l_@@_alphabet_tl
@@ -2590,22 +2600,22 @@ This work is "maintained" by Will Robertson.
% \dots and then loop through them defining the individual ranges:
% (currently this process is slow)
% \begin{macrocode}
- \csname TIC\endcsname
- \clist_map_inline:Nn #2
+%<debug> \csname TIC\endcsname
+ \clist_map_inline:Nn \l_@@_alphabet_clist
{
\tl_set:Nx \l_@@_alphabet_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {@@_config_ \l_@@_style_tl _ \l_@@_alphabet_tl :n}
{
\exp_args:No \tl_if_eq:nnTF \l_@@_alphabet_tl {misc}
{
- \@@_log:nx {setup-alph} {math \l_@@_style_tl~(\l_@@_alphabet_tl)}
- \@@_alphabet_config:nnn {\l_@@_style_tl} {\l_@@_alphabet_tl} {#3}
+ \@@_log:nx {setup-alph} {sym \l_@@_style_tl~(\l_@@_alphabet_tl)}
+ \@@_alphabet_config:nnn {\l_@@_style_tl} {\l_@@_alphabet_tl} {\l_@@_remap_style_tl}
}
{
- \@@_glyph_if_exist:nTF { \@@_to_usv:nn {\l_@@_style_tl} {\l_@@_alphabet_tl} }
+ \@@_glyph_if_exist:nTF { \@@_to_usv:nn {\l_@@_remap_style_tl} {\l_@@_alphabet_tl} }
{
- \@@_log:nx {setup-alph} {math \l_@@_style_tl~(\l_@@_alphabet_tl)}
- \@@_alphabet_config:nnn {\l_@@_style_tl} {\l_@@_alphabet_tl} {#3}
+ \@@_log:nx {setup-alph} {sym \l_@@_style_tl~(\l_@@_alphabet_tl)}
+ \@@_alphabet_config:nnn {\l_@@_style_tl} {\l_@@_alphabet_tl} {\l_@@_remap_style_tl}
}
{
\bool_if:NTF \l_@@_implicit_alph_bool
@@ -2623,7 +2633,7 @@ This work is "maintained" by Will Robertson.
}
}
}
- \csname TOC\endcsname
+%<debug> \csname TOC\endcsname
}
% \end{macrocode}
% \end{macro}
@@ -3851,12 +3861,6 @@ This work is "maintained" by Will Robertson.
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}{\mathrm}
-% \begin{macrocode}
-\let\mathfence\mathord
-% \end{macrocode}
-% \end{macro}
-%
% \begin{macro}{\digamma}
% \begin{macro}{\Digamma}
% I might end up just changing these in the table.
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
index 8755025b92f..1866de6a515 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-luatex.sty
@@ -39,7 +39,11 @@
}
\cs_set:Nn \__um_set_mathsymbol:nNNn
{
- \int_compare:nT { \char_value_catcode:n {#4} == 11 }
+ \bool_if:nT
+ {
+ \int_compare_p:nNn {#4} > {127} &&
+ \int_compare_p:nNn { \char_value_catcode:n {#4} } = {11}
+ }
{ \char_set_catcode_other:n {#4} }
\tl_case:Nn #3
@@ -243,9 +247,7 @@
\keys_set_known:nnN {unicode-math} {#1,#3} \l__um_unknown_keys_clist
\bool_if:NT \l__um_init_bool { \__um_log:n {default-math-font} }
- \csname TIC\endcsname
\__um_fontspec_select_font:
- \csname TOC\endcsname
\bool_if:nT { \l__um_ot_math_bool && !\g__um_mainfont_already_set_bool }
{
\__um_declare_math_sizes:
@@ -270,15 +272,11 @@
\__um_setup_legacy_fam_two:
\__um_setup_legacy_fam_three:
}
- \csname TIC\endcsname
\__um_input_math_symbol_table:
- \csname TOC\endcsname
\__um_remap_symbols:
\__um_setup_mathactives:
\__um_setup_delcodes:
- \csname TIC\endcsname
\__um_setup_alphabets:
- \csname TOC\endcsname
\__um_setup_negations:
\ignorespaces
}
@@ -830,7 +828,10 @@
\cs_new:cn { __um_config_#1_#2:n } {#3}
}
-\cs_new:Nn \__um_alphabet_config:nnn { \use:c {__um_config_#1_#2:n} {#3} }
+\cs_new:Nn \__um_alphabet_config:nnn
+ {
+ \use:c {__um_config_#1_#2:n} {#3}
+ }
\prg_new_conditional:Nnn \__um_if_alphabet_exists:nn {T,TF}
{
\cs_if_exist:cTF {__um_config_#1_#2:n}
@@ -840,6 +841,7 @@
{
\seq_put_right:Nx \g__um_named_ranges_seq { \tl_to_str:n {#1} }
\seq_put_right:Nn \g__um_default_mathalph_seq {{#1}{#2}{#3}}
+ \prop_gput:cnn { g__um_named_range_#1_prop } { default-alpha } {#2}
}
\__um_default_mathalph:nnn {up } {latin,Latin,greek,Greek,num,misc} {up }
\__um_default_mathalph:nnn {it } {latin,Latin,greek,Greek,misc} {it }
@@ -911,27 +913,29 @@
\cs_set_eq:NN \__um_set_mathalphabet_char:nnn \__um_mathmap_noparse:nnn
\cs_set_eq:NN \__um_map_char_single:nn \__um_map_char_noparse:nn
}
+
+ % Now perform the mapping:
\seq_map_inline:Nn \l__um_mathalph_seq
{
- \tl_set:No \l__um_style_tl { \use_i:nnn ##1 }
+ \tl_set:No \l__um_style_tl { \use_i:nnn ##1 }
\clist_set:No \l__um_alphabet_clist { \use_ii:nnn ##1 }
- \tl_set:No \l__um_remap_style_tl { \use_iii:nnn ##1 }
+ \tl_set:No \l__um_remap_style_tl { \use_iii:nnn ##1 }
+ % If no set of alphabets is defined:
\clist_if_empty:NT \l__um_alphabet_clist
{
\cs_set_eq:NN \__um_maybe_init_alphabet:n \__um_init_alphabet:n
- \clist_set:Nn \l__um_alphabet_clist { latin, Latin, greek, Greek, num, misc }
+ \prop_get:cnN { g__um_named_range_ \l__um_style_tl _prop }
+ { default-alpha } \l__um_alphabet_clist
}
- \__um_setup_math_alphabet:NNN
- \l__um_style_tl \l__um_alphabet_clist \l__um_remap_style_tl
+ \__um_setup_math_alphabet:
}
\seq_if_empty:NF \l__um_missing_alph_seq { \__um_log:n { missing-alphabets } }
}
-\cs_new:Nn \__um_setup_math_alphabet:NNN
+\cs_new:Nn \__um_setup_math_alphabet:
{
- \tl_set_eq:NN \l__um_style_tl #1% actually a no-op but makes the code clearer!
- \clist_map_inline:Nn #2
+ \clist_map_inline:Nn \l__um_alphabet_clist
{
\tl_set:Nn \l__um_alphabet_tl {##1}
\__um_if_alphabet_exists:nnTF \l__um_style_tl \l__um_alphabet_tl
@@ -951,22 +955,21 @@
}
{ \msg_warning:nnx {unicode-math} {no-alphabet} { \l__um_style_tl / \l__um_alphabet_tl } }
}
- \csname TIC\endcsname
- \clist_map_inline:Nn #2
+ \clist_map_inline:Nn \l__um_alphabet_clist
{
\tl_set:Nx \l__um_alphabet_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {__um_config_ \l__um_style_tl _ \l__um_alphabet_tl :n}
{
\exp_args:No \tl_if_eq:nnTF \l__um_alphabet_tl {misc}
{
- \__um_log:nx {setup-alph} {math \l__um_style_tl~(\l__um_alphabet_tl)}
- \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {#3}
+ \__um_log:nx {setup-alph} {sym \l__um_style_tl~(\l__um_alphabet_tl)}
+ \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {\l__um_remap_style_tl}
}
{
- \__um_glyph_if_exist:nTF { \__um_to_usv:nn {\l__um_style_tl} {\l__um_alphabet_tl} }
+ \__um_glyph_if_exist:nTF { \__um_to_usv:nn {\l__um_remap_style_tl} {\l__um_alphabet_tl} }
{
- \__um_log:nx {setup-alph} {math \l__um_style_tl~(\l__um_alphabet_tl)}
- \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {#3}
+ \__um_log:nx {setup-alph} {sym \l__um_style_tl~(\l__um_alphabet_tl)}
+ \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {\l__um_remap_style_tl}
}
{
\bool_if:NTF \l__um_implicit_alph_bool
@@ -984,7 +987,6 @@
}
}
}
- \csname TOC\endcsname
}
\cs_new:Nn \__um_map_char_noparse:nn
{ \__um_set_mathcode:nnnn {#1}{\mathalpha}{\__um_symfont_tl}{#2} }
@@ -1748,7 +1750,6 @@
\bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
}
}
-\let\mathfence\mathord
\def\digamma{\updigamma}
\def\Digamma{\upDigamma}
\cs_set:Npn \| {\Vert}
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
index 72c9dc0878a..b7b7113ee80 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math-xetex.sty
@@ -37,7 +37,11 @@
}
\cs_set:Nn \__um_set_mathsymbol:nNNn
{
- \int_compare:nT { \char_value_catcode:n {#4} == 11 }
+ \bool_if:nT
+ {
+ \int_compare_p:nNn {#4} > {127} &&
+ \int_compare_p:nNn { \char_value_catcode:n {#4} } = {11}
+ }
{ \char_set_catcode_other:n {#4} }
\tl_case:Nn #3
@@ -241,9 +245,7 @@
\keys_set_known:nnN {unicode-math} {#1,#3} \l__um_unknown_keys_clist
\bool_if:NT \l__um_init_bool { \__um_log:n {default-math-font} }
- \csname TIC\endcsname
\__um_fontspec_select_font:
- \csname TOC\endcsname
\bool_if:nT { \l__um_ot_math_bool && !\g__um_mainfont_already_set_bool }
{
\__um_declare_math_sizes:
@@ -268,15 +270,11 @@
\__um_setup_legacy_fam_two:
\__um_setup_legacy_fam_three:
}
- \csname TIC\endcsname
\__um_input_math_symbol_table:
- \csname TOC\endcsname
\__um_remap_symbols:
\__um_setup_mathactives:
\__um_setup_delcodes:
- \csname TIC\endcsname
\__um_setup_alphabets:
- \csname TOC\endcsname
\__um_setup_negations:
\ignorespaces
}
@@ -858,7 +856,10 @@
\cs_new:cn { __um_config_#1_#2:n } {#3}
}
-\cs_new:Nn \__um_alphabet_config:nnn { \use:c {__um_config_#1_#2:n} {#3} }
+\cs_new:Nn \__um_alphabet_config:nnn
+ {
+ \use:c {__um_config_#1_#2:n} {#3}
+ }
\prg_new_conditional:Nnn \__um_if_alphabet_exists:nn {T,TF}
{
\cs_if_exist:cTF {__um_config_#1_#2:n}
@@ -868,6 +869,7 @@
{
\seq_put_right:Nx \g__um_named_ranges_seq { \tl_to_str:n {#1} }
\seq_put_right:Nn \g__um_default_mathalph_seq {{#1}{#2}{#3}}
+ \prop_gput:cnn { g__um_named_range_#1_prop } { default-alpha } {#2}
}
\__um_default_mathalph:nnn {up } {latin,Latin,greek,Greek,num,misc} {up }
\__um_default_mathalph:nnn {it } {latin,Latin,greek,Greek,misc} {it }
@@ -939,27 +941,29 @@
\cs_set_eq:NN \__um_set_mathalphabet_char:nnn \__um_mathmap_noparse:nnn
\cs_set_eq:NN \__um_map_char_single:nn \__um_map_char_noparse:nn
}
+
+ % Now perform the mapping:
\seq_map_inline:Nn \l__um_mathalph_seq
{
- \tl_set:No \l__um_style_tl { \use_i:nnn ##1 }
+ \tl_set:No \l__um_style_tl { \use_i:nnn ##1 }
\clist_set:No \l__um_alphabet_clist { \use_ii:nnn ##1 }
- \tl_set:No \l__um_remap_style_tl { \use_iii:nnn ##1 }
+ \tl_set:No \l__um_remap_style_tl { \use_iii:nnn ##1 }
+ % If no set of alphabets is defined:
\clist_if_empty:NT \l__um_alphabet_clist
{
\cs_set_eq:NN \__um_maybe_init_alphabet:n \__um_init_alphabet:n
- \clist_set:Nn \l__um_alphabet_clist { latin, Latin, greek, Greek, num, misc }
+ \prop_get:cnN { g__um_named_range_ \l__um_style_tl _prop }
+ { default-alpha } \l__um_alphabet_clist
}
- \__um_setup_math_alphabet:NNN
- \l__um_style_tl \l__um_alphabet_clist \l__um_remap_style_tl
+ \__um_setup_math_alphabet:
}
\seq_if_empty:NF \l__um_missing_alph_seq { \__um_log:n { missing-alphabets } }
}
-\cs_new:Nn \__um_setup_math_alphabet:NNN
+\cs_new:Nn \__um_setup_math_alphabet:
{
- \tl_set_eq:NN \l__um_style_tl #1% actually a no-op but makes the code clearer!
- \clist_map_inline:Nn #2
+ \clist_map_inline:Nn \l__um_alphabet_clist
{
\tl_set:Nn \l__um_alphabet_tl {##1}
\__um_if_alphabet_exists:nnTF \l__um_style_tl \l__um_alphabet_tl
@@ -979,22 +983,21 @@
}
{ \msg_warning:nnx {unicode-math} {no-alphabet} { \l__um_style_tl / \l__um_alphabet_tl } }
}
- \csname TIC\endcsname
- \clist_map_inline:Nn #2
+ \clist_map_inline:Nn \l__um_alphabet_clist
{
\tl_set:Nx \l__um_alphabet_tl { \tl_trim_spaces:n {##1} }
\cs_if_exist:cT {__um_config_ \l__um_style_tl _ \l__um_alphabet_tl :n}
{
\exp_args:No \tl_if_eq:nnTF \l__um_alphabet_tl {misc}
{
- \__um_log:nx {setup-alph} {math \l__um_style_tl~(\l__um_alphabet_tl)}
- \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {#3}
+ \__um_log:nx {setup-alph} {sym \l__um_style_tl~(\l__um_alphabet_tl)}
+ \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {\l__um_remap_style_tl}
}
{
- \__um_glyph_if_exist:nTF { \__um_to_usv:nn {\l__um_style_tl} {\l__um_alphabet_tl} }
+ \__um_glyph_if_exist:nTF { \__um_to_usv:nn {\l__um_remap_style_tl} {\l__um_alphabet_tl} }
{
- \__um_log:nx {setup-alph} {math \l__um_style_tl~(\l__um_alphabet_tl)}
- \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {#3}
+ \__um_log:nx {setup-alph} {sym \l__um_style_tl~(\l__um_alphabet_tl)}
+ \__um_alphabet_config:nnn {\l__um_style_tl} {\l__um_alphabet_tl} {\l__um_remap_style_tl}
}
{
\bool_if:NTF \l__um_implicit_alph_bool
@@ -1012,7 +1015,6 @@
}
}
}
- \csname TOC\endcsname
}
\cs_new:Nn \__um_map_char_noparse:nn
{ \__um_set_mathcode:nnnn {#1}{\mathalpha}{\__um_symfont_tl}{#2} }
@@ -1794,7 +1796,6 @@
\bool_if:NTF \g__um_literal_colon_bool {:} { \mathpunct{:} }
}
}
-\let\mathfence\mathord
\def\digamma{\updigamma}
\def\Digamma{\upDigamma}
\cs_set:Npn \| {\Vert}
diff --git a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
index f0422ef27c9..ff499293d04 100644
--- a/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
+++ b/Master/texmf-dist/tex/latex/unicode-math/unicode-math.sty
@@ -19,7 +19,7 @@
%%
%% This work is "maintained" by Will Robertson.
\ProvidesPackage{unicode-math}
- [2014/07/30 v0.8 Unicode maths in XeLaTeX and LuaLaTeX]
+ [2014/08/06 v0.8a Unicode maths in XeLaTeX and LuaLaTeX]
\usepackage{ifxetex,ifluatex}
\ifxetex
\ifdim\number\XeTeXversion\XeTeXrevision in<0.9998in%
@@ -426,8 +426,8 @@
}
\msg_new:nnn {unicode-math} {no-alphabet}
{
- I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.
- See~ file~ "unicode-math-alphabets.dtx".
+ I~ am~ trying~ to~ set~ up~ alphabet~"#1"~ but~ there~ are~ no~ configuration~ settings~ for~ it.~
+ (See~ source~ file~ "unicode-math-alphabets.dtx"~ to~ debug.)
}
\msg_new:nnn { unicode-math } { no-named-range }
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 07:17:43 +0000