From 1d1c81d42f36755f72bbd69c5a29c2d6a9fec04d Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Fri, 31 Jan 2020 03:01:20 +0000 Subject: CTAN sync 202001310301 --- macros/latex/contrib/babel-contrib/french/README | 49 ------------ .../latex/contrib/babel-contrib/french/README.md | 50 ++++++++++++ .../contrib/babel-contrib/french/frenchb-doc.pdf | Bin 158231 -> 156507 bytes .../contrib/babel-contrib/french/frenchb-doc.tex | 46 +++++------ .../latex/contrib/babel-contrib/french/frenchb.dtx | 84 ++++++++++++--------- .../latex/contrib/babel-contrib/french/frenchb.ins | 4 +- .../latex/contrib/babel-contrib/french/frenchb.pdf | Bin 245332 -> 246075 bytes macros/latex/contrib/unicode-math/CHANGES.md | 6 ++ macros/latex/contrib/unicode-math/um-code-main.dtx | 14 ++-- .../contrib/unicode-math/um-code-mathtext.dtx | 37 ++++++--- .../contrib/unicode-math/unicode-math-code.pdf | Bin 323520 -> 325165 bytes macros/latex/contrib/unicode-math/unicode-math.dtx | 23 +++--- macros/latex/contrib/unicode-math/unicode-math.pdf | Bin 162731 -> 162723 bytes .../latex/contrib/unicode-math/unimath-example.pdf | Bin 22002 -> 21851 bytes .../latex/contrib/unicode-math/unimath-symbols.pdf | Bin 1208308 -> 1194223 bytes 15 files changed, 178 insertions(+), 135 deletions(-) delete mode 100644 macros/latex/contrib/babel-contrib/french/README create mode 100644 macros/latex/contrib/babel-contrib/french/README.md (limited to 'macros') diff --git a/macros/latex/contrib/babel-contrib/french/README b/macros/latex/contrib/babel-contrib/french/README deleted file mode 100644 index 168ac33d58..0000000000 --- a/macros/latex/contrib/babel-contrib/french/README +++ /dev/null @@ -1,49 +0,0 @@ -========================================================================= -The babel-french bundle (formerly known as `frenchb') - -French language support for the babel multilingual package - -Copyright 1996--2019 Daniel Flipo -E-mail: daniel (dot) flipo (at) free (dot) fr - -Released under the LaTeX Project Public License v1.3 or later -See http://www.latex-project.org/lppl.txt -========================================================================= - -== PURPOSE == - -This bundle is an extension to the babel package for multilingual -typesetting. It provides all necessary macros, definitions and settings -to typeset French documents. It is designed to work with the following -engines: pdfTeX, XeTeX and LuaTeX. - -== CONTENTS == - -The bundle consists of the following files: - -* frenchb.ins: installation file to unpack the language definition files, -* frenchb.dtx: packed language definition files and documentation, -* frenchb.pdf: unpacked documentation for babel-french, -* frenchb-doc.pdf: comprehensive documentation in French, -* frenchb-doc.tex: source file of frenchb-doc.pdf, -* README (this file). - -== INSTALLATION == - -If the latest version of this package is not included in your LaTeX -distribution, do the following: - -* issue "luatex frenchb.ins" to unpack the language definition files; -* copy the files frenchb.lua, french.ldf, frenchb.ldf, francais.ldf, - acadian.ldf and canadien.ldf to a location where TeX can find them - (default location: $TEXMF/tex/generic/babel-french/); -* rebuild the database (mktexlsr or so). - -== DOCUMENTATION == - -See the included manuals for usage instructions: frenchb.pdf in English or -the French documentation frenchb-doc.pdf. - -== CHANGES == - -See the included manual frenchb.pdf, section "Change History". diff --git a/macros/latex/contrib/babel-contrib/french/README.md b/macros/latex/contrib/babel-contrib/french/README.md new file mode 100644 index 0000000000..103c7cc15a --- /dev/null +++ b/macros/latex/contrib/babel-contrib/french/README.md @@ -0,0 +1,50 @@ +The babel-french package (formerly known as `frenchb') +====================================================== + +## Description + +This package provides support for the French language for the babel +multilingual system. + +It is designed to work with the following engines: pdfTeX, XeTeX and LuaTeX. +Plain and LaTeX formats are supported. + +## Contents + +The bundle consists of the following files: + +* frenchb.ins: installation file to unpack the language definition files, +* frenchb.dtx: packed language definition files and documentation, +* frenchb.pdf: unpacked documentation for babel-french, +* frenchb-doc.pdf: comprehensive documentation in French, +* frenchb-doc.tex: source file of frenchb-doc.pdf, +* README.md (this file). + +## License + +Released under the LaTeX Project Public License v1.3 or later +See http://www.latex-project.org/lppl.txt + +## Installation + +If the latest version of this package is not included in your LaTeX +distribution, do the following: + +* issue "luatex frenchb.ins" to unpack the language definition files; +* copy the files frenchb.lua, french.ldf, frenchb.ldf, francais.ldf, + acadian.ldf and canadien.ldf to a location where TeX can find them + (default location: $TEXMF/tex/generic/babel-french/); +* rebuild the database (mktexlsr or so). + +## Documentation + +See the included manuals for usage instructions: frenchb.pdf in English or +the French documentation frenchb-doc.pdf. + +## Changes + +See the included manual frenchb.pdf, section "Change History". + +--- +Copyright 1996--2020 Daniel Flipo +E-mail: daniel (dot) flipo (at) free (dot) fr diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf index 4de5946fdf..f97bf7df85 100644 Binary files a/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf and b/macros/latex/contrib/babel-contrib/french/frenchb-doc.pdf differ diff --git a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex index 35c9779203..4b639840da 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex +++ b/macros/latex/contrib/babel-contrib/french/frenchb-doc.tex @@ -1,5 +1,9 @@ \documentclass[a4paper,12pt,german,english,french]{article} +% LuaTeX ONLY! +\usepackage{iftex}[2019/10/24] +\RequireLuaTeX + \usepackage{xspace} \usepackage{array,longtable} \usepackage{varioref} @@ -10,22 +14,16 @@ \usepackage{luatexbase} %%% Provisoire : pour microtype %%% Fontes OpenType avec moteur LuaTeX : Erewhon/Cabin/Inconsolata -\usepackage{fourier-otf} % Pour les maths seulement -%\usepackage[upright]{fourier} % Pour les maths seulement -%\usepackage[no-math]{fontspec} +\usepackage{fourier-otf} \usepackage{realscripts} -\setmainfont{Erewhon}[ - Extension = .otf, - UprightFont = *-Regular, - BoldFont = *-Bold, - ItalicFont = *-Italic, - BoldItalicFont = *-BoldItalic, -] \setsansfont{Cabin}[Scale=MatchLowercase] \setmonofont{Inconsolatazi4}% voir inconsolata-doc.pdf - [Scale=MatchLowercase,HyphenChar=None,StylisticSet={2,3}, - AutoFakeSlant=0.2 % XeTeX only, sans effet avec LuaTeX - ] + [Scale=MatchLowercase, HyphenChar=None, StylisticSet={2,3}, + ItalicFont = *-Regular, ItalicFeatures={FakeSlant=0.225}, % 13° + SlantedFont= *-Regular, SlantedFeatures={FakeSlant=0.225}, + BoldItalicFont = *-Bold, BoldItalicFeatures={FakeSlant=0.225}, + BoldSlantedFont= *-Bold, BoldSlantedFeatures={FakeSlant=0.225}, + ] %%% *** APRÈS fontspec *** \usepackage{babel} @@ -127,11 +125,11 @@ % \title{Documentation sur le module \ext{babel-french}} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\latestversion}{3.5f} +\newcommand*{\latestversion}{3.5g} \date{Version {\latestversion} -- \today} \begin{document} -\def\today{7 septembre 2019} +\def\today{30 janvier 2020} \maketitle \thispagestyle{empty} @@ -648,6 +646,7 @@ vertical des lettres supérieures simulées par |\fup| un message est affiché dans le fichier \file{.log} indiquant comment charger \ext{numprint}. Le chargement de \ext{numprint} n’est pas fait par \ext{babel-french} à cause du risque de conflit d’options. + Il doit se faire \emph{après} \ext{babel}. Les utilisateurs devraient s’habituer progressivement à utiliser |\numprint| (ou son raccourci |\np|) à la place de |\nombre|. @@ -658,7 +657,8 @@ les commandes |\ier|,\dots, |\ieres|, |\ieme|, |\iemes|, |\fg| et |\dots| sont -respectés sans avoir à les forcer par des |{}| ou des~\verb*+\ +. +respectés sans avoir à les forcer par des |{}| ou +des~\code{\boi\textvisiblespace}. \section{Personnalisation} \label{sec:Perso} @@ -955,7 +955,7 @@ La liste étant longue, les options sont regroupées par thèmes. utile pour recompiler à l’identique des anciens textes. \item [UnicodeNoBreakSpaces=true (false)];\hlabel{ucs-nbsp} cette option - expérimentale n’a d’effet qu’avec LuaLaTeX ; lorsqu’on la met à \fbo{true} + n’a d’effet qu’avec LuaLaTeX ; lorsqu’on la met à \fbo{true} les espaces insécables ajoutées par \ext{babel-french} dans le fichier PDF de sortie (ponctuation haute, guillemets, etc.) sont codées sous forme de caractères Unicode (U+A0 ou U+202F fine) au lieu des pénalités et ressorts @@ -964,8 +964,8 @@ La liste étant longue, les options sont regroupées par thèmes. version actuelle de \exe{pdftotext} ne les restitue pas correctement. En revanche, \exe{lwarp} (v.~0.37 et suivantes) est totalement compatible - avec \ext{babel-french} pour la conversion des fichiers PDF produits sous - XeLaTeX et pdfLaTeX : les espaces insécables sont préservées. + avec \ext{babel-french} pour la conversion en HTML des fichiers PDF produits + sous XeLaTeX et pdfLaTeX : les espaces insécables sont préservées. \end{description} @@ -1060,7 +1060,7 @@ La liste étant longue, les options sont regroupées par thèmes. des nombres, par une espace fine (par défaut c’est une espace mot insécable et sans élasticité en français). Cette option n’a d’effet que si l’extension \ext{numprint} est chargée - avec l’option \opt{autolanguage} ; + (\emph{après} \ext{babel}) avec l’option \opt{autolanguage} ; sans elle, \ext{numprint} formate les nombres indépendamment de la langue courante et le séparateur des milliers est par défaut l’espace fine. \par} @@ -1501,7 +1501,7 @@ aurait : } %\newpage -\section{Changements entre les versions 3.4 et 2.6} +\section{Changements entre les versions 3.5 et 2.6} \label{sec:changes-3.0} \subsection{Changements entre les versions \latestversion{} et 3.4d} @@ -1521,6 +1521,10 @@ incluse dans la distribution \ext{babel-french} sur CTAN. La commande |\NoEveryParQuote| a été ajoutée en version~3.5e, voir p.~\pageref{frquote}. +La version 3.5g corrige une bogue ancienne affectant l’usage des polices +type~1 avec Lua\-(La)TeX : tout crénage était supprimé pour ces polices depuis +la version~3.1f (2015) ; les polices OpenType elles, n’ont jamais été affectées. + \subsection{Changements entre les versions 3.4d et 3.3d} \label{ssec:changes-3.4} diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.dtx b/macros/latex/contrib/babel-contrib/french/frenchb.dtx index 8241658b28..4f9697f12d 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.dtx +++ b/macros/latex/contrib/babel-contrib/french/frenchb.dtx @@ -1,4 +1,4 @@ -%\CheckSum{3801} +%\CheckSum{3802} % %\iffalse % Tell the LaTeX system who we are and write an entry on the @@ -13,7 +13,7 @@ %\ProvidesLanguage{frenchb} %--[[ % File `frenchb.lua’ generated from frenchb.dtx - [2019/09/07 v3.5f French support from the babel system] + [2020/01/30 v3.5g French support from the babel system] %<*internal> \iffalse % @@ -123,7 +123,7 @@ % % \frenchb{} has been improved using helpful suggestions from many % people, mainly from Jacques André, Michel Bovani, Thierry Bouche, -% Vincent Jalby, Denis Bitouzé and Ulrike Fisher. +% Vincent Jalby, Denis Bitouzé, Ulrike Fisher and Marcel Krüger. % Thanks to all of them! % % LaTeX-2.09 is no longer supported. @@ -324,8 +324,9 @@ % \item A command |\nombre| was provided in 1.x versions to easily % format numbers in slices of three digits separated either % by a comma in English or with a space in French; |\nombre| -% is now mapped to |\numprint| from \file{numprint.sty}, see -% \file{numprint.pdf} for more information. +% is now mapped to |\numprint| from \file{numprint.sty}, which +% should be loaded \emph{after} \babel, see \file{numprint.pdf} +% for more information. % % \item \frenchb{} has been designed to take advantage of the % \pkg{xspace} package if present: adding @@ -763,7 +764,10 @@ % unwanted guillemets (typically when lists are embedded in % |\frquote{}|). % -% \subsubsection*{What’s new in version 3.4?} +% Version 3.5g fixes a long standing bug affecting LuaTeX: legacy +% kerning was disabled for Type1 fonts since v3.1g (2015). +% +% \subsubsection*{What’s new in version 3.4?} % % Version 3.4a adds a new command |\frenchdate| (see % p.~\pageref{frenchdate}) and slightly changes number formatting: @@ -1821,8 +1825,16 @@ local has_attribute = node.has_attribute % in french\_punctuation (Tikz \cs{nullfont}). % Bug pointed out by Paul Gaborit.} % +% \changes{v3.5g}{2020/01/30}{The kerning callback is a bit specific: +% adding code with add\_to\_callback actually deletes the legacy +% kerning as pointed out by Marcel Krüger on SE.} +% % \begin{macrocode} local function french_punctuation (head) +% \end{macrocode} +% Restore the built-in kerning for 8-bits fonts. +% \begin{macrocode} + node.kerning(head) for item in node.traverse_id(GLYPH, head) do local lang = item.lang local char = item.char @@ -2140,7 +2152,9 @@ return french_punctuation % % The next definition will be used to activate Lua punctuation: it % loads \file{frenchb.lua} and adds function |french_punctuation| -% at the end of the |kerning| callback (no priority). +% to the |kerning| callback; "adding" anything actually disables +% the built-in kerning for Type1 fonts (which is now added to +% |french_punctuation|). % \begin{macrocode} \def\activate@luatexpunct{% \directlua{% @@ -3693,7 +3707,7 @@ return french_punctuation Seizi\`eme,Dix-septi\`eme,Dix-huiti\`eme,Dix-neuvi\`eme,% Vingti\`eme} \AfterBabelCommands{% - \DeclareRobustCommand*{\FB@emptypart}{\def\thepart{}}% + \DeclareRobustCommand*{\FB@emptypart}{\def\thepart{\unskip}}% \DeclareRobustCommand*{\FB@partname}{% \ifFBPartNameFull \csname ordinal\romannumeral\value{part}\endcsname\space @@ -4925,16 +4939,16 @@ return french_punctuation ***** List of possible options for babel-french ****\MessageBreak [Default values between brackets when french is loaded *LAST*]% \MessageBreak - ShowOptions=true [false]\MessageBreak - StandardLayout=true [false]\MessageBreak - GlobalLayoutFrench=false [true]\MessageBreak - PartNameFull=false [true]\MessageBreak - IndentFirst=false [true]\MessageBreak - ListItemsAsPar=true [false]\MessageBreak - StandardListSpacing=true [false]\MessageBreak - StandardItemizeEnv=true [false]\MessageBreak - StandardEnumerateEnv=true [false]\MessageBreak - StandardItemLabels=true [false]\MessageBreak + ShowOptions [false]\MessageBreak + StandardLayout [false]\MessageBreak + GlobalLayoutFrench [true]\MessageBreak + PartNameFull [true]\MessageBreak + IndentFirst [true]\MessageBreak + ListItemsAsPar [false]\MessageBreak + StandardListSpacing [false]\MessageBreak + StandardItemizeEnv [false]\MessageBreak + StandardEnumerateEnv [false]\MessageBreak + StandardItemLabels [false]\MessageBreak ItemLabels=\textemdash, \textbullet, \protect\ding{43},... [\textendash]\MessageBreak ItemLabeli=\textemdash, \textbullet, @@ -4945,27 +4959,27 @@ return french_punctuation \protect\ding{43},... [\textendash]\MessageBreak ItemLabeliv=\textemdash, \textbullet, \protect\ding{43},... [\textendash]\MessageBreak - StandardLists=true [false]\MessageBreak - ListOldLayout=true [false]\MessageBreak - FrenchFootnotes=false [true]\MessageBreak - AutoSpaceFootnotes=false [true]\MessageBreak - AutoSpacePunctuation=false [true]\MessageBreak - ThinColonSpace=true [false]\MessageBreak - OriginalTypewriter=true [false]\MessageBreak - UnicodeNoBreakSpaces=true [false]\MessageBreak + StandardLists [false]\MessageBreak + ListOldLayout [false]\MessageBreak + FrenchFootnotes [true]\MessageBreak + AutoSpaceFootnotes [true]\MessageBreak + AutoSpacePunctuation [true]\MessageBreak + ThinColonSpace [false]\MessageBreak + OriginalTypewriter [false]\MessageBreak + UnicodeNoBreakSpaces [false]\MessageBreak og= , fg= % - INGuillSpace=true [false]\MessageBreak + INGuillSpace [false]\MessageBreak EveryParGuill=open, close, none [open]\MessageBreak EveryLineGuill=open, close, none [open in LuaTeX, none otherwise]\MessageBreak - InnerGuillSingle=true [false]\MessageBreak - ThinSpaceInFrenchNumbers=true [false]\MessageBreak - SmallCapsFigTabCaptions=false [true]\MessageBreak - CustomiseFigTabCaptions=false [true]\MessageBreak - OldFigTabCaptions=true [false]\MessageBreak - FrenchSuperscripts=false [true]\MessageBreak - LowercaseSuperscripts=false [true]\MessageBreak - SuppressWarning=true [false]\MessageBreak + InnerGuillSingle [false]\MessageBreak + ThinSpaceInFrenchNumbers [false]\MessageBreak + SmallCapsFigTabCaptions [true]\MessageBreak + CustomiseFigTabCaptions [true]\MessageBreak + OldFigTabCaptions [false]\MessageBreak + FrenchSuperscripts [true]\MessageBreak + LowercaseSuperscripts [true]\MessageBreak + SuppressWarning [false]\MessageBreak \MessageBreak *********************************************% \MessageBreak\protect\frenchsetup{ShowOptions}} diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.ins b/macros/latex/contrib/babel-contrib/french/frenchb.ins index 203ea2a6cc..4313f3501a 100644 --- a/macros/latex/contrib/babel-contrib/french/frenchb.ins +++ b/macros/latex/contrib/babel-contrib/french/frenchb.ins @@ -2,7 +2,7 @@ %% This file will generate fast loadable files and documentation driver %% files from the doc files in this package when run through LuaTeX. %% -%% Copyright 2001-2019 Daniel Flipo. All rights reserved. +%% Copyright 2001-2020 Daniel Flipo. All rights reserved. %% %% This is a generated file part of the the babel-french bundle %% to be used with the Babel system. @@ -14,7 +14,7 @@ %% %% --------------- start of docstrip commands ------------------ %% -\def\filedate{2017/07/06} +\def\filedate{2020/01/30} \def\batchfile{frenchb.ins} \input docstrip.tex diff --git a/macros/latex/contrib/babel-contrib/french/frenchb.pdf b/macros/latex/contrib/babel-contrib/french/frenchb.pdf index 35b6dee454..c1454ccc36 100644 Binary files a/macros/latex/contrib/babel-contrib/french/frenchb.pdf and b/macros/latex/contrib/babel-contrib/french/frenchb.pdf differ diff --git a/macros/latex/contrib/unicode-math/CHANGES.md b/macros/latex/contrib/unicode-math/CHANGES.md index 01dcd8a462..facafe8080 100644 --- a/macros/latex/contrib/unicode-math/CHANGES.md +++ b/macros/latex/contrib/unicode-math/CHANGES.md @@ -1,6 +1,12 @@ CHANGE HISTORY ============== +## v0.8q (2020/01/31) + + * Update to adapt to / support new features in the upcoming 2e kernel. + * Give a better error message if used on non-supported engines that are not pdfTeX. + + ## v0.8p (2019/09/26) * Remove dependency on `filehook` package. Just to simplify. diff --git a/macros/latex/contrib/unicode-math/um-code-main.dtx b/macros/latex/contrib/unicode-math/um-code-main.dtx index 2c6e7bb7db..ff132044e0 100644 --- a/macros/latex/contrib/unicode-math/um-code-main.dtx +++ b/macros/latex/contrib/unicode-math/um-code-main.dtx @@ -264,17 +264,17 @@ \cs_if_exist:cF { sym \l_@@_symfont_label_tl } { \DeclareSymbolFont{\l_@@_symfont_label_tl} - {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\shapedefault} } \SetSymbolFont{\l_@@_symfont_label_tl}{\l_@@_mversion_tl} - {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l_@@_family_tl}{\mddefault}{\shapedefault} % \end{macrocode} % Set the bold math version. % \begin{macrocode} \str_if_eq:eeT {\l_@@_mversion_tl} {normal} { \SetSymbolFont{\l_@@_symfont_label_tl}{bold} - {\encodingdefault}{\l_@@_family_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l_@@_family_tl}{\bfdefault}{\shapedefault} } } % \end{macrocode} @@ -312,12 +312,12 @@ } {\l_@@_fontname_tl} \SetSymbolFont{symbols}{\l_@@_mversion_tl} - {\encodingdefault}{\l_@@_fam_two_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l_@@_fam_two_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l_@@_mversion_tl} {normal} { \SetSymbolFont{symbols}{bold} - {\encodingdefault}{\l_@@_fam_two_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l_@@_fam_two_tl}{\bfdefault}{\shapedefault} } } % \end{macrocode} @@ -343,12 +343,12 @@ } {\l_@@_fontname_tl} \SetSymbolFont{largesymbols}{\l_@@_mversion_tl} - {\encodingdefault}{\l_@@_fam_three_tl}{\mddefault}{\updefault} + {\encodingdefault}{\l_@@_fam_three_tl}{\mddefault}{\shapedefault} \str_if_eq:eeT {\l_@@_mversion_tl} {normal} { \SetSymbolFont{largesymbols}{bold} - {\encodingdefault}{\l_@@_fam_three_tl}{\bfdefault}{\updefault} + {\encodingdefault}{\l_@@_fam_three_tl}{\bfdefault}{\shapedefault} } } % \end{macrocode} diff --git a/macros/latex/contrib/unicode-math/um-code-mathtext.dtx b/macros/latex/contrib/unicode-math/um-code-mathtext.dtx index 602ba01352..d002483378 100644 --- a/macros/latex/contrib/unicode-math/um-code-mathtext.dtx +++ b/macros/latex/contrib/unicode-math/um-code-mathtext.dtx @@ -32,10 +32,10 @@ \tl_if_empty:NT \l_@@_mversion_tl { \tl_set:Nn \l_@@_mversion_tl {normal} - \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\updefault} + \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\shapedefault} } - \SetMathAlphabet #1 {\l_@@_mversion_tl} {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\updefault} + \SetMathAlphabet #1 {\l_@@_mversion_tl} {\g_fontspec_encoding_tl} {\l_@@_tmpa_tl} {\mddefault} {\shapedefault} % integrate with fontspec's \setmathrm etc: \tl_case:Nn #1 @@ -169,35 +169,48 @@ % % \subsubsection{Maths font} % -% If the maths fonts are set explicitly, then the text commands above will not execute their branches to set the maths font alphabets. +% If the maths fonts are set explicitly, then the text commands above will not execute +% their branches to set the maths font alphabets. +% +% Helper macro for looking up customisable series' by family (new \LaTeXe\ feature 2020). +% \begin{macrocode} +\cs_new:Nn \@@_rm_series_default:n + { + \ifcsname #1series@rm\endcsname + \csname #1series@rm\endcsname + \else + \csname #1default\endcsname + \fi + } +% \end{macrocode} % \begin{macrocode} \@@_cs_set:Nn \__fontspec_setmathrm_hook:nn { - \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault - \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault - \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault + \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\@@_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\@@_rm_series_default:n {md}}\itdefault + \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\@@_rm_series_default:n {bf}}\shapedefault } % \end{macrocode} % \begin{macrocode} \@@_cs_set:Nn \__fontspec_setboldmathrm_hook:nn { - \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\updefault - \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\bfdefault\updefault + \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\@@_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\@@_rm_series_default:n {bf}}\shapedefault \SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault } % \end{macrocode} % \begin{macrocode} \@@_cs_set:Nn \__fontspec_setmathsf_hook:nn { - \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault - \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault + \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\@@_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\@@_rm_series_default:n {bf}}\shapedefault } % \end{macrocode} % \begin{macrocode} \@@_cs_set:Nn \__fontspec_setmathtt_hook:nn { - \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault - \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault + \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\@@_rm_series_default:n {md}}\shapedefault + \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\@@_rm_series_default:n {bf}}\shapedefault } % \end{macrocode} % diff --git a/macros/latex/contrib/unicode-math/unicode-math-code.pdf b/macros/latex/contrib/unicode-math/unicode-math-code.pdf index c251d66a18..9d87097173 100644 Binary files a/macros/latex/contrib/unicode-math/unicode-math-code.pdf and b/macros/latex/contrib/unicode-math/unicode-math-code.pdf differ diff --git a/macros/latex/contrib/unicode-math/unicode-math.dtx b/macros/latex/contrib/unicode-math/unicode-math.dtx index 3aee6d530b..1253cab5d4 100644 --- a/macros/latex/contrib/unicode-math/unicode-math.dtx +++ b/macros/latex/contrib/unicode-math/unicode-math.dtx @@ -60,15 +60,15 @@ %\ProvidesExplPackage{unicode-math} %\ProvidesExplPackage{unicode-math-xetex} %\ProvidesExplPackage{unicode-math-luatex} -% {2019/09/26} {0.8p} {Unicode maths in XeLaTeX and LuaLaTeX} +% {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX} % \end{macrocode} % % Here the version and date are setup for typesetting the documentation. % \begin{macrocode} %<*dtx> \date{ - \def\filedate{2019/09/26} - \def\fileversion{0.8p} + \def\filedate{2020/01/31} + \def\fileversion{0.8q} \filedate \qquad \fileversion } % @@ -80,14 +80,19 @@ % and then splits into a XeTeX- or LuaTeX-specific version of the package. % % \begin{macrocode} -%\sys_if_engine_luatex:T { \RequirePackageWithOptions{unicode-math-luatex} } -%\sys_if_engine_xetex:T { \RequirePackageWithOptions{unicode-math-xetex} } -%\sys_if_engine_pdftex:T +%\sys_if_engine_luatex:T % { -% \msg_new:nnn {unicode-math} {not-pdftex} -% { Cannot~ be~ run~ with~ pdfLaTeX!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. } -% \msg_error:nn {unicode-math} {not-pdftex} +% \RequirePackageWithOptions{unicode-math-luatex} +% \endinput % } +%\sys_if_engine_xetex:T +% { +% \RequirePackageWithOptions{unicode-math-xetex} +% \endinput +% } +%\msg_new:nnn {unicode-math} {unsupported-engine} +% { Cannot~ be~ run~ with~ \c_sys_engine_str!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. } +%\msg_error:nn {unicode-math} {unsupported-engine} %\endinput % \end{macrocode} diff --git a/macros/latex/contrib/unicode-math/unicode-math.pdf b/macros/latex/contrib/unicode-math/unicode-math.pdf index 41da2850e6..1d2cf0948a 100644 Binary files a/macros/latex/contrib/unicode-math/unicode-math.pdf and b/macros/latex/contrib/unicode-math/unicode-math.pdf differ diff --git a/macros/latex/contrib/unicode-math/unimath-example.pdf b/macros/latex/contrib/unicode-math/unimath-example.pdf index 315e19f268..a339e72f9d 100644 Binary files a/macros/latex/contrib/unicode-math/unimath-example.pdf and b/macros/latex/contrib/unicode-math/unimath-example.pdf differ diff --git a/macros/latex/contrib/unicode-math/unimath-symbols.pdf b/macros/latex/contrib/unicode-math/unimath-symbols.pdf index bd55866e6b..c2b54bc257 100644 Binary files a/macros/latex/contrib/unicode-math/unimath-symbols.pdf and b/macros/latex/contrib/unicode-math/unimath-symbols.pdf differ -- cgit v1.2.3