diff options
author | Norbert Preining <norbert@preining.info> | 2023-12-22 03:02:07 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2023-12-22 03:02:07 +0000 |
commit | 49150e453072cff2c2ecaba1d1a55d8333d191d3 (patch) | |
tree | bd7e16e55839f6baf784320bb751d2892bcb88cc /macros/latex/contrib | |
parent | 838a56d5436e7e7e526d6dffe2461cf050643168 (diff) |
CTAN sync 202312220302
Diffstat (limited to 'macros/latex/contrib')
26 files changed, 1345 insertions, 502 deletions
diff --git a/macros/latex/contrib/mathastext/README.md b/macros/latex/contrib/mathastext/README.md index 59ebf89913..ca1c2c1387 100644 --- a/macros/latex/contrib/mathastext/README.md +++ b/macros/latex/contrib/mathastext/README.md @@ -14,7 +14,7 @@ The Author of this Work is Jean-Francois Burnol (`jfbu at free dot fr`) Copyright (C) 2011-2016, 2018, 2019, 2022, 2023 Jean-Francois Burnol - Source: mathastext.dtx 1.3z 2023/09/01 + Source: mathastext.dtx 1.3za 2023/12/20 DESCRIPTION @@ -82,6 +82,34 @@ Main options: `italic`, `subdued`, `LGRgreek`. RECENT CHANGES ============== +1.3za \[2023/12/20\] +----- + +* Under `LGRgreek` and `LGRgreeks` options, new math alphabets + `\mathgreekupbold` and `\mathgreekitbold`. + +* New options `LGRgreek+` and `LGRgreeks+`. + + Thanks to Holger Gerhardt for feature request and code ideas. + Please find and read the relevant documentation in the PDF. + +* The meaning of `defaultalphabets` and related individual + options such as `defaultbf` has been modified (reverted to pre + `1.15f` release): even under these options, the package always + creates `\mathnormalbold`, `\Mathnormal`, `\Mathrm`, `\Mathbf` + etc..., commands. This may break documents which used these + options in order to reserve these command names. This was done + with some hesitancy, but for the sake of internal logical + coherence. + +* Fix an obscure bug with no real consequences regarding + interaction of `subdued` with `LGRgreek` and `\MTgreekfont`. + See the `LGRgreek` documentation in the complete list of + options for details. + +* Fix long-standing hyperlink problems in the documentation: + blue color words should now all be functioning hyperlinks. + 1.3z \[2023/09/01\] ---- diff --git a/macros/latex/contrib/mathastext/mathastext.dtx b/macros/latex/contrib/mathastext/mathastext.dtx index 0bc64214ab..365b4675dd 100644 --- a/macros/latex/contrib/mathastext/mathastext.dtx +++ b/macros/latex/contrib/mathastext/mathastext.dtx @@ -2,8 +2,8 @@ % N.B.: this dtx file does NOT use \DocInput, it only uses docstrip. % The LaTeX source of the documentation is NOT prefixed with %'s. %<*dtx> -\def\dtxtimestamp {Time-stamp: <30-08-2023 at 21:41:24 CEST>} -\def\docdate{2023/09/01} +\def\dtxtimestamp {Time-stamp: <21-12-2023 at 13:22:21 CET>} +\def\docdate{2023/12/20} % To extract run etex on this file, then to build documentation run % latexmk on mathastext.tex then dvipdfmx on the dvi. % For more information see http://jf.burnol.free.fr/v13/INSTALL.txt @@ -11,8 +11,8 @@ % due to usage of § (<A7>) as an active character. %</dtx> %<*drv> -\def\MSTpkgdate {2023/09/01} -\def\MSTpkgversion {1.3z} +\def\MSTpkgdate {2023/12/20} +\def\MSTpkgversion {1.3za} %</drv> %<*dtx> \iffalse % meta-comment @@ -34,7 +34,7 @@ The Author of this Work is Jean-Francois Burnol (`jfbu at free dot fr`) Copyright (C) 2011-2016, 2018, 2019, 2022, 2023 Jean-Francois Burnol - Source: mathastext.dtx 1.3z 2023/09/01 + Source: mathastext.dtx 1.3za 2023/12/20 %</readme> %<*dtx> @@ -44,7 +44,7 @@ Copyright (C) 2011-2016, 2018, 2019, 2022, 2023 Jean-Francois Burnol %%---------------------------------------------------------------- %% Package: mathastext %% Info: Use the text font in math mode (JFB) -%% Version: 1.3z 2023/09/01 +%% Version: 1.3za 2023/12/20 %% License: LPPL 1.3c (http://www.latex-project.org/lppl/lppl-1-3c.txt) %% Copyright (C) 2011-2016, 2018, 2019, 2022, 2023 Jean-Francois Burnol %% <jfbu at free dot fr> @@ -200,6 +200,34 @@ MATHASTEXT CHANGE LOG %</changelog> %<*readme|changelog> +1.3za \[2023/12/20\] +----- + +* Under `LGRgreek` and `LGRgreeks` options, new math alphabets + `\mathgreekupbold` and `\mathgreekitbold`. + +* New options `LGRgreek+` and `LGRgreeks+`. + + Thanks to Holger Gerhardt for feature request and code ideas. + Please find and read the relevant documentation in the PDF. + +* The meaning of `defaultalphabets` and related individual + options such as `defaultbf` has been modified (reverted to pre + `1.15f` release): even under these options, the package always + creates `\mathnormalbold`, `\Mathnormal`, `\Mathrm`, `\Mathbf` + etc..., commands. This may break documents which used these + options in order to reserve these command names. This was done + with some hesitancy, but for the sake of internal logical + coherence. + +* Fix an obscure bug with no real consequences regarding + interaction of `subdued` with `LGRgreek` and `\MTgreekfont`. + See the `LGRgreek` documentation in the complete list of + options for details. + +* Fix long-standing hyperlink problems in the documentation: + blue color words should now all be functioning hyperlinks. + 1.3z \[2023/09/01\] ---- @@ -1419,6 +1447,11 @@ $\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$ %</alphabets> %<*dtx> ^^Afi^^Aendgroup % end of big \iffalse block including generated files +% Removal of the *sfixed found in tex/latex/mlmodern/omxmlmex.fd +\DeclareFontFamily{OMX}{mlmex}{} +\DeclareFontShape{OMX}{mlmex}{m}{n}{% + <->mlmex10% + }{} % customization should be done in mathastext.tex, not here. \documentclass{scrartcl} \makeatletter @@ -1549,6 +1582,7 @@ $\mathnormal{ff}$, $\mathrm{ff}$, $\mathit{ff}$, $\mathbf{ff}$, $\mathtt{ff}$ \usepackage{color} \definecolor{DarkMagenta}{RGB}{139,0,139} \definecolor{joli}{RGB}{225,95,0} +\definecolor{monmarron}{RGB}{136,24,24} \usepackage{xspace} %\usepackage{metalogo}% on utilise dejà hologo \usepackage{framed} @@ -1579,6 +1613,7 @@ pdfpagemode=UseOutlines,% {\hyperref[#1]{\ttfamily\hyphenchar\font=127 \char`\\#1}} \newcommand*\blueit[1]{\texorpdfstring{\blueitaux #1\relax}{#1}} +% utiliser \texttt plutôt que \ttfamily ? \def\blueitaux #1#2\relax{\hyperref[#2]{\ttfamily #1#2}} % 2 septembre 2013, 22:25 @@ -1599,11 +1634,17 @@ pdfpagemode=UseOutlines,% \let\oldexists\exists\let\oldforall\forall \let\originalbullet\bullet + +% MEMO: due to LGRgreek option, symbol font alphabets mtgreekup and mtgreekit +% are declared using the \familydefault at times of loading so here mlmr. +% It is not important that mlmr does not exist in LGR encoding, because +% we will not use the \mathgreekup or \mathgreekit alphabet in the subdued +% normal math versions, and besides the Greek letters are left untouched. \usepackage[subdued,% asterisk,% defaultmathsizes,% symbolmisc,symbolre,% - LGRgreek]{mathastext} + LGRgreek+]{mathastext} \let\symbolbullet\bullet \let\bullet\originalbullet % This version will use the mlmodern font which is current @@ -1644,14 +1685,15 @@ pdfpagemode=UseOutlines,% \MTseries{bx} \Mathastext[timesbold][bold] -\usepackage[scaled]{helvet} -\MTfamily{\sfdefault} +\usepackage[scaled]{helvet}% attention modifie \sfdefault +\MTfamily{\sfdefault}% phv \MTlettershape{it} \MTseries{m} \MTitgreek \MTgreekfont{cmss} \Mathastext[helvet] +\renewcommand{\ttdefault}{mlmtt} \MTfamily{LibertinusSerif-TLF} \MTlettershape{n} \MTseries{m} @@ -1660,10 +1702,11 @@ pdfpagemode=UseOutlines,% \Mathastext[libertinus] \MTseries{sb} % attention je veux pas courier quand je ferai \texttt avec cette version -% donc -\renewcommand{\ttdefault}{mlmtt} +% donc (a été déplacé plus haut) +% \renewcommand{\ttdefault}{mlmtt} \Mathastext[libertinussemibold] +% la ligne suivante semble superflue maintenant \renewcommand\familydefault\sfdefault% attention that it is phv at this stage % pas nécessaire car je fais \MTversion{normal} après \begin{document} @@ -2006,23 +2049,41 @@ and \emph{before} \mst. \item[math alphabets:] \begin{itemize} \item We define a new math alphabet command - \cs{mathnormalbold} which gives direct access to - the bold version of the \cs{mathnormal} alphabet + §\mathnormalbold§ which gives direct access to + the bold version of the §\mathnormal§ alphabet (rather than using either the \cs{bm} command from the |bm| package or the \cs{boldsymbol} command from the |amsbsy| package). As it does not exist in the default \LaTeX{} math font set-up, this alphabet is \emph{not} subjected to the {subdued option} action. - \item The other math alphabet changing commands - defined by the package are \cs{MathEulerBold}, - \cs{MathEuler} and \cs{MathPSymbol}. - \item \cs{mathnormal}, \cs{mathrm}, \cs{mathbf}, - \cs{mathit}, \cs{mathsf} and \cs{mathtt} are modified - to make reference to the document text fonts (this - can be disabled by suitable package options). -\item \RLNote{new:}{1.3x}§\mathgreekup§ and §\mathgreekit§ are math alphabets - modifying the shape of Greek letters, only available under - §LGRgreek§ (or §LGRgreeks§) option. + \item Depending on options, further math alphabet commands + are defined by the package: §\MathEulerBold§, + §\MathEuler§, §\MathPSymbol§, and since |1.3x| under + the §LGRgreek§ family of options also + §\mathgreekup§ and §\mathgreekit§. + \item \RLNote{new:}{1.3za}Addition of §\mathgreekupbold§ and + §\mathgreekitbold§ under the §LGRgreek§ family of options. + \item §\mathnormal§, §\mathrm§, §\mathbf§, §\mathit§, + §\mathsf§ and §\mathtt§ are modified to use the \mst-ified + text fonts; this can be disabled via §defaultalphabets§ and + related individual options, but the package always provides + §\Mathnormal§, §\Mathrm§, etc..., to match the \mst font + configuration (\RLNote{changed:}{1.3za}prior to |1.3za| + §defaultalphabets§ and related options also caused the \mst + alphabet commands not to be defined). Recall that there may + arise a ``too many math alphabets'' error if too many of these + commands are \emph{used} in the document: + \emph{declaring} them is not by itself the cause of the error. See the + \LaTeX\ news entry of its \texttt{2021-11-15} release for + the counter \texttt{localmathalphabets} (with default value 2) + which can be now be used if one hits such a difficulty. + + Please\RLNote{new:}{1.3za} note that in case of the + §LGRgreek+§ option which enhances Greek letters with a + specific behavior when in the arguments of some of these + commands, this works only with the lowercase named commands, + not with the ones having an uppercase initial. See \autoref{sec:newgreekplus}. + \item version |1.2| of \mst has extended the scope of the math alphabets to apply to non-alphabetical characters and to operator names. This respects the automatic white spaces @@ -2335,7 +2396,7 @@ and has added an example using the Libertinus font in type-1 format% % although there is an existing accompanying math font% \footnote{Michael \textsc{Sharpe}, \emph{A Type 1 font and \LaTeX\ support for Libertinus - Math}, \url{https://ctan.org/pkg/libertinust1math}. Note that it is then highly + Math},\\ \url{https://ctan.org/pkg/libertinust1math}. Note that it is then highly advantageous to use \texttt{latex+dvipdfmx} and not \texttt{pdflatex} for reasons of PDF file size.}% .% @@ -2343,7 +2404,7 @@ reasons of PDF file size.}% \subsection{Main options} - \subsubsection[The italic option]{The \blueit{italic} option} + \subsubsection{The \blueit{italic} option} In the initial version |1.0|, the Latin letters in mathematical mode assumed the exact same shape as in @@ -2831,6 +2892,12 @@ provided by \mst: If you use the §italic§ option note that the italic Greek letters from the |cbfonts| are not the same glyphs as the default Greek letters from the |OML| encoded font |cmmi|. +\item[§LGRgreek+§:] \RLNote{new:}{1.3za}extends §LGRgreek§ to allow abusive + usage of \cs{mathrm} and alike commands with Greek letters. + This is very much not in the spirit (especially with traditional + ``8bit'' \TeX\ fonts) of the \LaTeX\ kernel concept of math alphabet + commands. Check \autoref{sec:newgreekplus} for + relevant information. \item[§eulergreek§:] the Greek letters will be taken from the Euler font (the document does not have to load the eulervm package, \mst directly uses some file included in this package, as it provides a mechanism to scale @@ -2845,10 +2912,10 @@ provided by \mst: not have to be |OT1|. \end{description} -There is also §LGRgreeks§ which tells \mst to pick up in each math -version the letters from the |LGR| encoded font used in that version, -and §selfGreeks§ to tell \mst to do as for §selfGreek§ but -separately in all math versions. +There is also §LGRgreeks§ (and §LGRgreeks+§) which tells \mst to +pick up in each math version the letters from the |LGR| encoded +font used in that version, and §selfGreeks§ to tell \mst to do +as for §selfGreek§ but separately in all math versions. Under the §subdued§ option the Greek letters in the normal and bold math versions are kept to their defaults as found at the time of loading the @@ -2904,55 +2971,47 @@ from the lowest to the highest priority: \end{description} So, the default gives the classic \TeX{} behavior when option §italic§ -was passed. Each call to \cs{Mathastext} (or \cs{MathastextWillUse}) -macros (described in a later section) reinitializes the computation of -the shapes. +was passed. -The commands §\MTitgreek§, §\MTupgreek§, §\MTitGreek§ and §\MTupGreek§ were -added at |1.15c|, they act like the options with the analogous names, as if -these options were activated only at time of use of these commands in the -preamble, prior to some §\Mathastext§, or -§\Mathastext§\oarg{math\_version}, or §\MTDeclareVersion§. +% on comprend pas bien ce que ça veut dire. +% Each call to \cs{Mathastext} (or \cs{MathastextWillUse}) +% macros (described in a later section) reinitializes the computation of +% the shapes. + +As mentioned already the package allows to define various ``math +versions''. There are commands to be used inside the preamble to +influence the shapes, and even the font, used for Greek letters +in each given \mst-declared math version: §\MTitgreek§, +§\MTupgreek§, §\MTitGreek§, §\MTupGreek§ and +§\MTgreekfont§|{name_of_font}|. + +Their effect is as the options of the alike name, except that +the effect applies only to \mst-math versions declared +\emph{next} in the preamble (be it via §\Mathastext§ or +§\MTDeclareVersion§). + +To use §\MTgreekfont§ you need to know the name of a suitable +font family available in |LGR| encoding: for example |lmr|, +|txr| (needs |txfontsb| package on your system), +|DejaVuSerif-TLF| (needs |dejavu| package on your system), +etc\dots \begin{framed} - These commands have some effect only if one of the §LGRgreek§, §LGRgreeks§, + §\MTitgreek§, §\MTupgreek§, §\MTitGreek§, §\MTupGreek§ + have some effect only if one of the §LGRgreek§, §LGRgreeks§, §selfGreek§ or §selfGreeks§ options was passed to the package. - Once anyone of these commands has been made use of, changes in the shape - configuration of the Latin letters for new math versions (or prior to using - §\Mathastext§ to redefine the default configuration) via §\MTlettershape§, - or to the shape of letters of operator names via §\MTshape§ (or via the - arguments of §\MTDeclareVersion§), will stop being kept in sync with the - shape of the Greek letters. The shape of the Greek letters will respond - only to the way \mst-math versions (or default behaviour if using - §\Mathastext§ in the preamble) are subsequently re-configured via usage of - the §\MTitgreek§, §\MTupgreek§, §\MTitGreek§ and §\MTupGreek§ commands in - the preamble. + Once any of these commands has been made use of, changes in the shape + configuration of the Latin letters will stop having any influence on the + shape of the Greek letters. + + §\MTgreekfont§ has an effect only for §LGRgreek§ and §selfGreek§. It is + without any effect with §LGRgreeks§ and §selfGreeks§. \end{framed} -As mentioned already the package allows to define various ``math -versions''. In the case of §eulergreek§ or §symbolgreek§ they apply -to all these versions. In the case of the options §LGRgreeks§ or -§selfGreeks§ (notice the additional ``s''), each math version is -assumed to have its text font available in |LGR| (or |OT1| -encoding) and also the shapes will be local to the math version. - -Finally version |1.15c| of \mst introduces new preamble-only -commands to change the shapes, and even the font, used for Greek -letters, in case of package options §LGRgreek§/§selfGreek§. They -are §\MTitgreek§, §\MTupgreek§, §\MTitGreek§, §\MTupGreek§: these -are used like the options and change only the shapes for the math -versions which will be declared \emph{next} in the preamble; and -§\MTgreekfont§|{name_of_font}| will tell the \emph{next} math -versions to use that font family. To use this command you need to -know the (little) name of a suitable font family available in |LGR| -encoding: for example |lmr|, |txr| (needs |txfontsb| -package on your system), |DejaVuSerif-TLF| (needs |dejavu| package -on your system), etc\dots - -\subsubsection{New with \texttt{1.3x}: alphabets \cs{mathgreekup} and - \cs{mathgreekit}, control sequences to access directly upright or italic - Greek letters} + +\subsubsection{Control sequences to access directly upright or italic + shape for Greek under \texttt{LGRgreek} option} \label{sec:newgreek} Some changes were made at |1.3x| to enhance the §LGRgreek§ (and §LGRgreeks§) @@ -2965,7 +3024,7 @@ by `upright' or `italic' is configured via defining §\MTgreekupdefault§ and §\MTgreekitdefault§ respectively. Their default definitions are to expand to `|n|' and `|it|' respectively. -See\RLNote{new:}{1.3x} the \autoref{table:greekup} and \autoref{table:greekit} +See\RightNote{1.3x} the \autoref{table:greekup} and \autoref{table:greekit} for illustrations (using here the Libertinus Serif font). \begin{table}[htbp] \MTversion{libertinus} @@ -3110,7 +3169,7 @@ etc\dots\ options or §\MTitgreek§ et al.\@ commands. This is on a per \mst-enri math version basis, depending only on how the options or commands were used in the preamble. -Furthermore\RLNote{new:}{1.3x} two math alphabets are provided +Furthermore\RightNote{1.3x} two math alphabets are provided \centeredline{§\mathgreekup§} \centeredline{§\mathgreekit§} which can be used to map a letter to the corresponding Greek fonts. @@ -3127,7 +3186,7 @@ was stored as a \mst-enriched math version with name |libertinussemibold|): \centeredline{$\mathgreekit{W}=\mathgreekit{\Omega}=\mathgreekit{\Omegaup}=\Omegait$} } -Some\RLNote{changed!}{1.3x} refactoring% +Some\RightNote{1.3x} refactoring% % \footnote{Technically, formerly two symbol fonts were declared, one for the lowercase Greek letters and one for the uppercase Greek letters; now those @@ -3159,6 +3218,270 @@ the above attempted description of the only partial backwards compatibility. +\subsubsection{\cs{mathgreekupbold} and \cs{mathgreekitbold}} +\label{sec:newgreekbold} + +Again this applies only to §LGRgreek§ and §LGRgreeks§ options (and the |1.3za| +added §LGRgreek+§ and §LGRgreeks+§). + +See\RLNote{new:}{1.3za} the \autoref{table:greekupbold} and \autoref{table:greekitbold} +for illustration of usage (in math mode only) of code such as +\begin{verbatim} + \mathgreekupbold{\alpha} +or \mathgreekitbold{\alpha} +\end{verbatim} +Note that all three of \cs{alpha}, \cs{alphaup} and \cs{alphait} +would give the same output. +These two tables again use the +Libertinus Serif font via an \mst math version which was +configured in the preamble using this set-up (and the package §LGRgreek§ +option): +\begin{verbatim} +\MTfamily{LibertinusSerif-TLF} +\MTlettershape{n} +\MTseries{m} +\MTgreekfont{LibertinusSerif-TLF} +\MTupgreek +\Mathastext[libertinus] +\end{verbatim} +Some examples here to illustrate the effet of the math alphabet +commands on Latin letters also: +{%\MTversion{libertinus} +\centeredline{|$\mathgreekupbold{a}=\mathgreekupbold{\alpha}$|} +\centeredline{\MTversion{libertinus}$\mathgreekupbold{a}=\mathgreekupbold{\alpha}$} +\centeredline{|$\mathgreekupbold{G}=\mathgreekupbold{\Gamma}$|} +\centeredline{\MTversion{libertinus}$\mathgreekupbold{G}=\mathgreekupbold{\Gamma}$} +\centeredline{|$\mathgreekitbold{z}=\mathgreekitbold{\zeta}$|} +\centeredline{\MTversion{libertinus}$\mathgreekitbold{z}=\mathgreekitbold{\zeta}$} +\centeredline{|$\mathgreekitbold{W}=\mathgreekitbold{\Omega}$|} +\centeredline{\MTversion{libertinus}$\mathgreekitbold{W}=\mathgreekitbold{\Omega}$} +} + +\begin{table}[htbp] +\MTversion{libertinus} +\begin{framed} +\begin{multicols}{4} +\noindent +\string\Alpha\ $\rightarrow\mathgreekupbold{\Alpha}$\\ +\string\Beta\ $\rightarrow\mathgreekupbold{\Beta}$\\ +\string\Gamma\ $\rightarrow\mathgreekupbold{\Gamma}$\\ +\string\Delta\ $\rightarrow\mathgreekupbold{\Delta}$\\ +\string\Epsilon\ $\rightarrow\mathgreekupbold{\Epsilon}$\\ +\string\Zeta\ $\rightarrow\mathgreekupbold{\Zeta}$\\ +\string\Eta\ $\rightarrow\mathgreekupbold{\Eta}$\\ +\string\Theta\ $\rightarrow\mathgreekupbold{\Theta}$\\ +\string\Iota\ $\rightarrow\mathgreekupbold{\Iota}$\\ +\string\Kappa\ $\rightarrow\mathgreekupbold{\Kappa}$\\ +\string\Lambda\ $\rightarrow\mathgreekupbold{\Lambda}$\\ +\string\Mu\ $\rightarrow\mathgreekupbold{\Mu}$\\ +\string\Nu\ $\rightarrow\mathgreekupbold{\Nu}$\\ +\string\Xi\ $\rightarrow\mathgreekupbold{\Xi}$\\ +\string\Omicron\ $\rightarrow\mathgreekupbold{\Omicron}$\\ +\string\Pi\ $\rightarrow\mathgreekupbold{\Pi}$\\ +\string\Rho\ $\rightarrow\mathgreekupbold{\Rho}$\\ +\string\Sigma\ $\rightarrow\mathgreekupbold{\Sigma}$\\ +\string\Tau\ $\rightarrow\mathgreekupbold{\Tau}$\\ +\string\Upsilon\ $\rightarrow\mathgreekupbold{\Upsilon}$\\ +\string\Phi\ $\rightarrow\mathgreekupbold{\Phi}$\\ +\string\Chi\ $\rightarrow\mathgreekupbold{\Chi}$\\ +\string\Psi\ $\rightarrow\mathgreekupbold{\Psi}$\\ +\string\Omega\ $\rightarrow\mathgreekupbold{\Omega}$\\ +\string\Digamma\ $\rightarrow\mathgreekupbold{\Digamma}$\\ +% \columnbreak ne fonctionne pas comme espéré +\mbox{}\\ +\string\alpha\ $\rightarrow\mathgreekupbold{\alpha}$\\ +\string\beta\ $\rightarrow\mathgreekupbold{\beta}$\\ +\string\gamma\ $\rightarrow\mathgreekupbold{\gamma}$\\ +\string\delta\ $\rightarrow\mathgreekupbold{\delta}$\\ +\string\epsilon\ $\rightarrow\mathgreekupbold{\epsilon}$\\ +\string\zeta\ $\rightarrow\mathgreekupbold{\zeta}$\\ +\string\eta\ $\rightarrow\mathgreekupbold{\eta}$\\ +\string\theta\ $\rightarrow\mathgreekupbold{\theta}$\\ +\string\iota\ $\rightarrow\mathgreekupbold{\iota}$\\ +\string\kappa\ $\rightarrow\mathgreekupbold{\kappa}$\\ +\string\lambda\ $\rightarrow\mathgreekupbold{\lambda}$\\ +\string\mu\ $\rightarrow\mathgreekupbold{\mu}$\\ +\string\nu\ $\rightarrow\mathgreekupbold{\nu}$\\ +\string\xi\ $\rightarrow\mathgreekupbold{\xi}$\\ +\string\omicron\ $\rightarrow\mathgreekupbold{\omicron}$\\ +\string\pi\ $\rightarrow\mathgreekupbold{\pi}$\\ +\string\rho\ $\rightarrow\mathgreekupbold{\rho}$\\ +\string\sigma\ $\rightarrow\mathgreekupbold{\sigma}$\\ +\string\tau\ $\rightarrow\mathgreekupbold{\tau}$\\ +\string\upsilon\ $\rightarrow\mathgreekupbold{\upsilon}$\\ +\string\phi\ $\rightarrow\mathgreekupbold{\phi}$\\ +\string\chi\ $\rightarrow\mathgreekupbold{\chi}$\\ +\string\psi\ $\rightarrow\mathgreekupbold{\psi}$\\ +\string\omega\ $\rightarrow\mathgreekupbold{\omega}$\\ +\string\digamma\ $\rightarrow\mathgreekupbold{\digamma}$\\ +\string\varsigma\ $\rightarrow\mathgreekupbold{\varsigma}$ +\end{multicols} +\end{framed} +% il y a bien sûr d'horribles espacement verticaux typiques de LaTeX +\vspace*{-\baselineskip} +\caption{Greek control sequences in the argument of + \texttt{\cs{mathgreekupbold}}.} +\label{table:greekupbold} +\end{table} +\begin{table}[htbp] +\MTversion{libertinus} +\begin{framed} +\begin{multicols}{4} +\noindent +\string\Alpha\ $\rightarrow\mathgreekitbold{\Alpha}$\\ +\string\Beta\ $\rightarrow\mathgreekitbold{\Beta}$\\ +\string\Gamma\ $\rightarrow\mathgreekitbold{\Gamma}$\\ +\string\Delta\ $\rightarrow\mathgreekitbold{\Delta}$\\ +\string\Epsilon\ $\rightarrow\mathgreekitbold{\Epsilon}$\\ +\string\Zeta\ $\rightarrow\mathgreekitbold{\Zeta}$\\ +\string\Eta\ $\rightarrow\mathgreekitbold{\Eta}$\\ +\string\Theta\ $\rightarrow\mathgreekitbold{\Theta}$\\ +\string\Iota\ $\rightarrow\mathgreekitbold{\Iota}$\\ +\string\Kappa\ $\rightarrow\mathgreekitbold{\Kappa}$\\ +\string\Lambda\ $\rightarrow\mathgreekitbold{\Lambda}$\\ +\string\Mu\ $\rightarrow\mathgreekitbold{\Mu}$\\ +\string\Nu\ $\rightarrow\mathgreekitbold{\Nu}$\\ +\string\Xi\ $\rightarrow\mathgreekitbold{\Xi}$\\ +\string\Omicron\ $\rightarrow\mathgreekitbold{\Omicron}$\\ +\string\Pi\ $\rightarrow\mathgreekitbold{\Pi}$\\ +\string\Rho\ $\rightarrow\mathgreekitbold{\Rho}$\\ +\string\Sigma\ $\rightarrow\mathgreekitbold{\Sigma}$\\ +\string\Tau\ $\rightarrow\mathgreekitbold{\Tau}$\\ +\string\Upsilon\ $\rightarrow\mathgreekitbold{\Upsilon}$\\ +\string\Phi\ $\rightarrow\mathgreekitbold{\Phi}$\\ +\string\Chi\ $\rightarrow\mathgreekitbold{\Chi}$\\ +\string\Psi\ $\rightarrow\mathgreekitbold{\Psi}$\\ +\string\Omega\ $\rightarrow\mathgreekitbold{\Omega}$\\ +% \string\Digamma\ $\rightarrow\mathgreekitbold{\Digamma}$\\ +\string\Digamma\ $\rightarrow N/A$\\ +% \columnbreak ne fonctionne pas comme espéré +\mbox{}\\ +\string\alpha\ $\rightarrow\mathgreekitbold{\alpha}$\\ +\string\beta\ $\rightarrow\mathgreekitbold{\beta}$\\ +\string\gamma\ $\rightarrow\mathgreekitbold{\gamma}$\\ +\string\delta\ $\rightarrow\mathgreekitbold{\delta}$\\ +\string\epsilon\ $\rightarrow\mathgreekitbold{\epsilon}$\\ +\string\zeta\ $\rightarrow\mathgreekitbold{\zeta}$\\ +\string\eta\ $\rightarrow\mathgreekitbold{\eta}$\\ +\string\theta\ $\rightarrow\mathgreekitbold{\theta}$\\ +\string\iota\ $\rightarrow\mathgreekitbold{\iota}$\\ +\string\kappa\ $\rightarrow\mathgreekitbold{\kappa}$\\ +\string\lambda\ $\rightarrow\mathgreekitbold{\lambda}$\\ +\string\mu\ $\rightarrow\mathgreekitbold{\mu}$\\ +\string\nu\ $\rightarrow\mathgreekitbold{\nu}$\\ +\string\xi\ $\rightarrow\mathgreekitbold{\xi}$\\ +\string\omicron\ $\rightarrow\mathgreekitbold{\omicron}$\\ +\string\pi\ $\rightarrow\mathgreekitbold{\pi}$\\ +\string\rho\ $\rightarrow\mathgreekitbold{\rho}$\\ +\string\sigma\ $\rightarrow\mathgreekitbold{\sigma}$\\ +\string\tau\ $\rightarrow\mathgreekitbold{\tau}$\\ +\string\upsilon\ $\rightarrow\mathgreekitbold{\upsilon}$\\ +\string\phi\ $\rightarrow\mathgreekitbold{\phi}$\\ +\string\chi\ $\rightarrow\mathgreekitbold{\chi}$\\ +\string\psi\ $\rightarrow\mathgreekitbold{\psi}$\\ +\string\omega\ $\rightarrow\mathgreekitbold{\omega}$\\ +% \string\digamma\ $\rightarrow\mathgreekitbold{\digamma}$\\ +\string\digamma\ $\rightarrow N/A$\\ +\string\varsigma\ $\rightarrow\mathgreekitbold{\varsigma}$ +\end{multicols} +\end{framed} +% il y a bien sûr d'horribles espacement verticaux typiques de LaTeX +\vspace*{-\baselineskip} +\caption{Greek control sequences in the argument of the + \texttt{\cs{mathgreekitbold}} command. This font has + no bold italic Digamma nor digamma (last tested 2023/12/19).} +\label{table:greekitbold} +\end{table} +% 2023/12/19 mais comme j'ai configuré Latexmk pour lever une +% erreur en cas de "bad warning" je supprime de la source +% le test avec \Digamma et \digamma + +\subsubsection{Special behavior of + \cs{mathrm}, \cs{mathbf}, \cs{mathit} with Greek letters via + the \texttt{LGRgreek+} option} +\label{sec:newgreekplus} + +If option\RLNote{new:}{1.3za} §LGRgreek+§ or §LGRgreeks+§ has +been used, \mst makes Greek letters attempt to react suitably when +in the scope of §\mathnormal§, §\mathrm§, §\mathit§, +§\mathbf§, and §\mathnormalbold§ (but not further math +alphabet commands, and not when using the \mst defined commands +named with an uppercased initial). + +Here is an example +\begin{verbatim} +\[\def\zzz{abCD\alpha\pi\Delta\Gamma} + \begin{array}{c} + \zzz\\ + mathnormal: \mathnormal{\zzz}\\ + mathrm: \mathrm{\zzz}\\% \mathrm on Greek is like \mathgreekup + mathit: \mathit{\zzz}\\% \mathit on Greek is like \mathgreekit + mathbf: \mathbf{\zzz}\\% \mathbf on Greek is like \mathgreekupbold + mathnormalbold: \mathnormalbold{\zzz}\\% + mathgreekup: \mathgreekup{\zzz}\\% + mathgreekit: \mathgreekit{\zzz}\\% + mathgreekupbold: \mathgreekupbold{\zzz}\\% + mathgreekitbold: \mathgreekitbold{\zzz}% + \end{array} +\] +\end{verbatim} +% putain d'espacement vertical LaTeX +% +This will be typeset here with the same ``libertinus'' version as in the +previous section. Please check it there, it is reproduced verbatim. This +math version was configured to use upright shape for both Latin letters and +Greek letters, which explains the output of §\mathnormal§ and +§\mathnormalbold§ here below, and also the fact that §\mathrm§ appears to +change nothing. In a simple package configuration with only options §italic§ +and §LGRgreek+§ the lowercase Greek letters would be in italic by default, +hence also in the output of §\mathnormal§ and §\mathnormalbold§. +% +{\MTversion{libertinus}\[\def\zzz{abCD\alpha\pi\Delta\Gamma} + \begin{array}{c} + \zzz\\ + mathnormal: \mathnormal{\zzz}\\ + mathrm: \mathrm{\zzz}\\% \mathrm on Greek is like \mathgreekup + mathit: \mathit{\zzz}\\% \mathit on Greek is like \mathgreekit + mathbf: \mathbf{\zzz}\\% \mathbf on Greek is like \mathgreekupbold + mathnormalbold: \mathnormalbold{\zzz}\\ + mathgreekup: \mathgreekup{\zzz}\\% + mathgreekit: \mathgreekit{\zzz}\\% + mathgreekupbold: \mathgreekupbold{\zzz}\\% + mathgreekitbold: \mathgreekitbold{\zzz}% + \end{array} +\] +}% +% +The difference here with §LGRgreek§ is that with the latter the Latin +math alphabets such as §\mathrm§, §\mathit§, §\mathbf§ +produce a Latin letter when acting on a Greek control sequence, +as the latter are defined by \mst under §LGRgreek§ to be of +``variable family type'' for usage with §\mathgreekup§ and §\mathgreekit§. + +\mst has no logical way to sync shape of Latin and Greek letters +once usage has been made of Greek related commands. +Hence \verb|\mathnormal| is configured to do nothing on Greek +letters, they are as without it, whereas on Latin letters it will give to an +uppercase letter the shape as used for lowercase letters. In the +example above this is not visible because both lowercase and +uppercase Latin letters were configured to be upright. + +Because neither \LaTeX\ nor \mst define an \cs{mathbfit} +alphabet per default, no mechanism was added for it, but advanced +\TeX\ hackers will be able to check the \mst source code and add +the needed definitions. + +Remark: this §LGRgreek+§ functionality is considered by its author an abuse of +the concept of a math alphabet command and required accomodating a serious +deviation from internal logical design of \mst. I don't know if it is because +\LaTeX\ documentations are deficient or misleading on such matters but it +appears many \LaTeX\ users are surprised when |$\mathrm{\pi}$| does not give +an upright pi letter but this is completely to be expected in a world with +fonts having only 128 or 256 glyphs, and from the fact that §\mathrm§ and +§\mathbf§ originate in Plain \TeX\ \cs{rm} and \cs{bf} and are still quite +akin to it, they are font switching commands nothing more or less. + + \subsection{Extra spaces around letters} \label{sec:mathskips} @@ -3856,9 +4179,6 @@ when the earlier package had made the character `mathematically active'). Conversely most of the set-up done by \mst may well be overruled by packages loaded later which do math related things. -In case of a `too many math alphabets' message try the |defaultalphabets| -option or one of its |defaultnormal|, |defaulttt|, etc\dots sub-options. - Starting with version |1.2|, \mst makes some characters `mathematically active' to achieve certain effects: automatic insertion of the italic corrections when using an upright text font in math, extended scope of @@ -3966,11 +4286,15 @@ the character was mathematically active remained true). % 2 septembre 2013; finalisé 22:58 +% Mardi 19 décembre 2023: l'utilisation de bleu alors que ce n'est +% pas un lien était très mauvais. +% New mark-up \mstopt, and \mstcmd I had been too lazy and could +% never resolved some issues of missing hyperlinks with the trick +% formerly used here to redefine the short verb §foo§. \makeatletter -\def\@jfendshrtverb #1#2§{\@ifundefined{FLAG#2}% - {\color{blue}\ttfamily #1#2\endgroup - \global\@namedef{FLAG#2}{}\label{#2}}% - {\hyperref[#2]{\ttfamily #1#2}\endgroup}} +\newcounter{machin} +\def\mstopt#1{{\textcolor{monmarron}{#1}\refstepcounter{machin}\expandafter\label\expandafter{\@gobble#1}}} +\def\mstcmd#1{{\textcolor{monmarron}{\ttfamily\@backslashchar#1}\label{#1}}} \makeatother \newsavebox\boite @@ -3985,7 +4309,7 @@ extended sense. It is not necessary to use them to activate the package basic functionalities, as loading \mst is enough (except with the |subdued| option). \begin{enumerate}[label=$\bullet$, leftmargin=1em] -\item §\Mathastext§ (or §\mathastext§) reinitializes \mst: it sets the +\item \mstcmd{Mathastext} (or \mstcmd{mathastext}) reinitializes \mst: it sets the fonts used in math mode (in versions |normal| and |bold|) for letters, digits and a few ascii symbols to the \emph{current} defaults of encoding, family, series and shape.\footnote{\texttt{\char92Mathastext} updates also @@ -3993,10 +4317,8 @@ option). skips to be inserted after the symbols $\oldforall$ and $\oldexists$, see \emph{infra.}} Both the normal and bold math version are modified by this action of §\Mathastext§. - \begin{enumerate}[label=$\bullet$] - \item \textbf{math versions:} - \csb{Mathastext} accepts an optional argument \oarg{name}. With - this (within square brackets) argument, rather than redefining the + \item %\textbf{math versions:} + \csb{Mathastext}\oarg{version\_name} rather than redefining the fonts for math mode, §\Mathastext§ declares a new \emph{math version}, and it is this math version which will use the then current text font in math @@ -4005,14 +4327,15 @@ option). |\string\Mathastext[foo]| \emph{with |foo| equal to ``normal'' or ``bold'';} this is already taken care of by the initial loading of the package or a later command \cs{Mathastext} - without any optional argument.} - \item \textbf{inheritance:} starting\RightNote{1.3c} with version |1.3c| a second optional - argument \oarg{other\_version} will transfer its set-up for things not - affected by \mst action, like large symbols, to the declared math - version whose name was given as first optional argument. The main use - will be with |[bold]| in order for the symbols and large symbols to be - typeset as in the |bold| math version. For example, this document has in - its preamble:\hfill\break\begingroup\small + without any optional argument. And it will be rejected.} + \item %\textbf{inheritance:} + \csb{Mathastext}\oarg{version\_name}\oarg{parent\_name} + declares \meta{version\_name} and configures it to inherit + from \meta{parent\_name} all which is not under the scope of + \mst, such as large symbols. The main use will be with + |[bold]| in order for the symbols and large symbols to be + typeset as in the |bold| math version. For example, this + document has in its preamble:\hfill\break\begingroup\small \begin{lrbox}{\boite}|\usepackage{newcent}% this package makes New Century the roman font|\end{lrbox}\rlap{\usebox{\boite}}\hfill\break |\Mathastext[newcent]% this math version will use New Century|\hfill\break |\MTseries{b} % next \Mathastext will use a bold font|\hfill\break @@ -4030,27 +4353,33 @@ option). |\DeclareSymbolFont{largesymbols}{OMX}{txex}{m}{n}|\hfill\break |\SetSymbolFont{largesymbols}{bold}{OMX}{txex}{bx}{n}|\hfill\break |\DeclareFontSubstitution{OMX}{txex}{m}{n}| - \end{enumerate} - \item §\Mathastext§ may be preceded optionally by one or - more of\footnote{these commands exist also with + \item + \mstcmd{MTencoding}\marg{enc}, + \mstcmd{MTfamily}\marg{fam}, + \mstcmd{MTseries}\marg{ser}, + \mstcmd{MTshape}\marg{sh}, and + \mstcmd{MTlettershape}\marg{sh}.% +% +\footnote{These commands exist also with long names: \texttt{\char92Mathastextencoding}, etc\dots{} The same applies to the other commands mentioned in this section.} - §\MTencoding§\marg{enc}, - §\MTfamily§\marg{fam}, - §\MTseries§\marg{ser}, - §\MTshape§\marg{sh}, and §\MTlettershape§\marg{sh}. For - example valid values are, respectively, \meta{T1}, - \meta{phv}, \meta{m}, \meta{n}, and \meta{it}: this - is the Helvetica font in T1-encoding, regular - (medium) series, upright shape, and the letters - will be in italic shape. Once used their effect applies to all - succeeding calls to \cs{Mathastext}, and can only be undone by using - them again. +% +For example valid respective arguments are, respectively, \meta{T1}, +\meta{phv}, \meta{m}, \meta{n}, and \meta{it}: this is the +Helvetica font in T1-encoding, regular (medium) series, upright +shape, and the letters will be in italic shape. Once used their +effect applies to all succeeding calls to \cs{Mathastext}, and +can only be undone by using them again with other settings, again +followed by a call to \cs{Mathastext}. + +NOTE: \emph{only} if +\cs{Mathastext} is used next (possibly with a version name as +optional argument) will these commands have any real effect. \item - §\MTWillUse§\oarg{ltsh}\marg{enc}\marg{fam}\marg{ser}\marg{sh} + \mstcmd{MTWillUse}\oarg{ltsh}\marg{enc}\marg{fam}\marg{ser}\marg{sh} tells \mst to use the font with the specified encoding, family, series, and shape for the letters and digits (and all other afflicted @@ -4059,7 +4388,7 @@ option). example \cs{itdefault}, or directly \meta{it} or \meta{sc}. -\item §\MTDeclareVersion§\oarg{ltsh}\marg{name}\marg{enc}\marg{fam}\marg{ser}\marg{sh}\oarg{other\_version}: +\item \mstcmd{MTDeclareVersion}\oarg{ltsh}\marg{name}\marg{enc}\marg{fam}\marg{ser}\marg{sh}\oarg{other\_version}: declares that the document will have access to the font with the specified characteristics, under the math version name \meta{name}. For example: @@ -4084,34 +4413,36 @@ option). version whose name was passed as optional argument (typical use will be with |[bold]|). -\item §\MTboldvariant§\marg{var}: when used before §\Mathastext§, +\item \mstcmd{MTboldvariant}\marg{var}: when used before §\Mathastext§, specifies which bold (|b|, |sb|, |bx|, \dots) to be used by \cs{mathbf} (and \cs{boldmath}). Default is the \cs{bfdefault} at the time of loading \mst. When used before the declaration of a version, decides the way \cs{mathbf} will act in this version. -\item §\MTEulerScale§\marg{factor}: scales the Euler font by +\item \mstcmd{MTEulerScale}\marg{factor}: scales the Euler font by \meta{factor}. -\item §\MTSymbolScale§\marg{factor}: scales the Symbol font by +\item \mstcmd{MTSymbolScale}\marg{factor}: scales the Symbol font by \meta{factor}. -\item §\MTitgreek§, §\MTupgreek§, §\MTitGreek§, §\MTupGreek§: these commands - are active in case the \blueit{LGRgreek} option was used; they act - as the options of the similar names §itgreek§, §upgreek§, §itGreek§, - §upGreek§, but only for the Greek letters in the versions yet to be - defined. -\item §\MTgreekfont§\marg{fontfamily}: a command with a mandatory argument +\item \mstcmd{MTitgreek}, \mstcmd{MTupgreek}, \mstcmd{MTitGreek}, + \mstcmd{MTupGreek}: these commands are active in case the \blueit{LGRgreek} + option was used; they act as the options of the similar names §itgreek§, + §upgreek§, §itGreek§, §upGreek§, but only for the Greek letters in the + versions yet to be defined. Their effect become recorded only when the + version is declared via §\Mathastext§ or §\MTDeclareVersion§. +\item \mstcmd{MTgreekfont}\marg{fontfamily}: a command with a mandatory argument which specifies the font family for Greek letters in all \mst math versions declared afterwards via §\Mathastext§ or §\MTDeclareVersion§. Only - effective if \blueit{LGRgreek} option was passed to the package. + effective if §LGRgreek§ (or §LGRgreek+§) or §selfGreek§ option was passed to the package. + Check the §LGRgreek§ documentation for some relevant information. \end{enumerate} \subsubsection{Commands for body or math} \begin{enumerate}[label=$\bullet$, leftmargin=1em] -\item §\MTversion§\oarg{nametext}\marg{namemath}, +\item \mstcmd{MTversion}\oarg{nametext}\marg{namemath}, §\MTversion§$\ast$\marg{namemath}, also known as - §\Mathastextversion§ (and as \cs{MTVersion}, and + \mstcmd{Mathastextversion} (and as \cs{MTVersion}, and \cs{mathastextversion}): \begin{enumerate}[label=$\bullet$] \item the non-starred version changes @@ -4128,7 +4459,7 @@ option). set-up, which summarizes what is done additionally to only using \LaTeX{}'s |\mathversion|). \end{enumerate} - \cs{MTversion}\oarg{nametext}\marg{namemath} does §\MTeverymathdefault§ + §\MTversion§\oarg{nametext}\marg{namemath} does §\MTeverymathdefault§ (except for |\MTversion{normal}| and |\MTversion{bold}| under package option |subdued|), which in particular activates the insertion of skips around letters specified by §\MTsetmathskips§ and also, if the font used is not @@ -4137,12 +4468,12 @@ option). option the package checks separately the letter shape for lowercase and uppercase. - \RightNote{1.3j}\cs{MTversion} also does §\MTexistsdoesskip§, + \RightNote{1.3j}§\MTversion§ also does §\MTexistsdoesskip§, §\MTforalldoesskip§, and also §\MTprimedoesskip§, \csb{MTmathoperatorsobeymathxx}, except under the |subdued| option for \emph{normal} and \emph{bold}, in which case it does the opposite actions. -\item §\hbar§: this macro is by default redefined (in a way compatible with +\item \mstcmd{hbar}: this macro is by default redefined (in a way compatible with the |italic| option) combining the |h| letter and the \={ } accent from the \mst font. Note that \cs{mathrm}|{\hbar}| and \cs{mathbf}|{\hbar}| will work and that \cs{hbar} does scale in subscripts and exponents. Since @@ -4158,37 +4489,104 @@ option). \footnote{\RightNote{1.3u}The \cs{hbar} redefinition is canceled in normal and bold math versions under the |subdued| option.} -\item §\fouriervec§: this is a |\vec| accent taken from the Fourier font; +\item \mstcmd{fouriervec}: this is a |\vec| accent taken from the Fourier font; the |fourier| package need not be loaded. Active only if option §fouriervec§. -\item §\pmvec§: this provides a poor man \cs{vec} accent command, for +\item \mstcmd{pmvec}: this provides a poor man \cs{vec} accent command, for upright letters. It uses the right arrow. Does not change size in subscripts and exponents. - \item §\mathnormal§, §\mathrm§, §\mathbf§, §\mathit§, §\mathsf§, -§\mathtt§: modifications of the original \cs{mathnormal}, -\cs{mathrm}, \cs{mathbf}, \cs{mathit}, \cs{mathsf}, \cs{mathtt} to -use the mathastextified font. The -underlying internal \LaTeX{} structures related to the original -commands are not overwritten, so the original commands can be saved under -other names before |\usepackage{mathastext}|, to be used in case of -necessity (this is what option |subdued| does.) - \item §\mathnormalbold§: a bold version of \cs{mathnormal}. Differs -from §\mathbf§ when the |italic| option has been used, or when use -has been made of §\MTlettershape§ to specify a shape for letters -distinct from the one for digits and operator names, or similarly -when the math version has been declared via §\MTDeclareVersion§ with -its optional parameter for shape of letters. -\item \RLNote{new:}{1.3x}§\mathgreekup§: math alphabet, only available under - §LGRgreek§ (or §LGRgreeks§) option (and if with §subdued§ only in the - non-|normal| and non-|bold| \mst-enriched math versions) which gives access - to `upright' Greek letters (picked up from a font available in - |LGR|-encoding). The actual shape is configurable via re-defining §\MTgreekupdefault§. -\item \RLNote{new:}{1.3x}§\mathgreekit§: math alphabet, only available under - §LGRgreek§ (or §LGRgreeks§) option (and if with §subdued§ only in the - non-|normal| and non-|bold| \mst-enriched math versions) which gives access - to `italic' Greek letters (picked up from a font available in - |LGR|-encoding). The actual shape is configurable via re-defining §\MTgreekitdefault§. -\item §\inodot§, §\jnodot§: the corresponding glyphs in the \mst-ified +\item \RLNote{new description:}{1.3za}\mstcmd{Mathnormal}, \mstcmd{Mathrm}, + \mstcmd{Mathbf}, \mstcmd{Mathit}, \mstcmd{Mathsf}, \mstcmd{Mathtt}: they use the + \mst-ified fonts. By default, \mstcmd{mathnormal}, \mstcmd{mathrm}, + \mstcmd{mathbf}, \mstcmd{mathit}, \mstcmd{mathsf}, \mstcmd{mathtt} are redefined + to map to these new commands using the \mst fonts. The option + §defaultalphabets§ tells to keep them with their original + meanings. Alternatively the original commands can be saved + under other names before loading \mst: the underlying + architecture is not deleted by the package, and aliases + defined before loading \mst will work as expected. +\item \mstcmd{mathnormalbold}: a bold version of \cs{mathnormal}, i.e. picks + up the math alphabet used for ascii letters as mathematical variables, but + in a bold weight. When the package typesets such letters in the same shape + as for operator names (i.e.\@ neither §italic§ option nor the + §\MTlettershape§ command have been used) the output is as the one of + §\mathbf§. + + This command is also made available under §subdued§ option in + the ``normal'' and ``bold'' math versions, as \LaTeX\ does not define it a + priori, contrarily to §\mathbf§ and other math alphabet commands. + \item \RightNote{1.3x}\mstcmd{mathgreekup}: math alphabet, only available + under §LGRgreek§ (or §LGRgreeks§) option, which gives access to `upright' + Greek letters (picked up from a font available in |LGR|-encoding). Note + that the package also defines \cs{alphaup}, \dots, \cs{piup}, \dots\ + mathematical character tokens, see \autoref{sec:newgreek}. What + ``\texttt{up}'' shape really means may be math version dependent. It is + configurable in the preamble via re-defining §\MTgreekupdefault§ and then + declaring the math version via §\Mathastext§ (with optional argument if for + a math version other than the ``normal'' one), or §\MTDeclareVersion§. The + font used is also math version dependent: it is the one which was similarly + configured via usage of §\MTgreekfont§ prior to the §\Mathastext§ or + §\MTDeclareVersion§ step. In absence of any such configuration in the + preamble, it will be (in all math versions) the family default at time of + loading the package (which thus has then to be available in \texttt{LGR} + encoding; it is not a problem if the family default has no \texttt{LGR} + support as long as suitable usage of §\MTgreekfont§ later on configures a + suitable font). + + \RLNote{new:}{1.3za}Also \mstcmd{mathgreekupbold}. + +\begin{footnotesize} + These math alphabets are also available under §subdued§ option in the + ``normal'' and ``bold'' math versions, as \LaTeX\ does not (a priori) define + analog ones, so \mst has no reason not to leave them live. Note though that + |\mathgreekup{\pi}| will work only if the original \cs{pi} is of ``variable + family type'' which is not the case except if some math package handling + Greek was used, but then why load \mst with option §LGRgreek§? + + But you can use |\mathgreekup{p}| as the slot number of + \texttt{p} in the \LaTeX\ font for mathematical letters is the same as the slot + number of $\pi$ in \texttt{LGR} encoding. + + Or, use rather \cs{piup} because it is not undefined by \mst in §subdued§ + normal mode, as \LaTeX\ has no a priori definition for it. Or use (but + why?) |\mathgreekup{\piit}|. + + The \texttt{LGR} font family used will be the latest one configured by + §\MTgreekfont§ usage followed by §\Mathastext§ (\emph{without} optional + argument) in the preamble which is what is needed to modify the non-subdued + aspects of subdued ``normal'' math; if no such configuration was done, the + font family will be the family default found at time of loading the package. + + Worse: $\Delta$ is per \LaTeX\ default of variable family type but its slot + number in its assigned font is not at all the one of the \texttt{LGR} + encoding, so |\mathgreekupbold{\Delta}| will give some unrelated + glyph. This is because \mst restores the pristine \cs{Delta} in §subdued§ + normal mode to its original meaning. But it keeps its own defined + \cs{Deltaup} and \cs{Deltait}, so you can use |\mathgreekupbold{\Deltaup}| + for example. Or |\mathgreekupbold{D}| as the mathematical letter \texttt{D} + slot number in \LaTeX\ is also the one of $\Delta$ in \texttt{LGR} encoding. + + I am sorry for such lengthy explanations, but this is to comment on why \mst + keeps also in §subdued§ normal math some of its Greek related functionality, + if option §LGRgreek§ was used. Most \mst users will not use + the §subdued§ option anyhow.\par +\end{footnotesize} + +\item \RightNote{1.3x}\mstcmd{mathgreekit}: math alphabet, only available + under §LGRgreek§ (or §LGRgreeks§) option, which gives access to `italic' + Greek letters (picked up from a font available in |LGR|-encoding). The + actual shape is configurable via re-defining §\MTgreekitdefault§ and then + redeclaring the math version via §\Mathastext§ (with optional argument if + for a math version other than the ``normal'' one), or §\MTDeclareVersion§. + + \RLNote{new:}{1.3za}Also \mstcmd{mathgreekitbold}. + + \begin{footnotesize} + See the discussion of §\mathgreekup§ for some \TeX\ hacker level + information on what happens with §subdued§ option + in the ``normal'' (or ``bold'') math version.\par + \end{footnotesize} +\item \mstcmd{inodot}, \mstcmd{jnodot}: the corresponding glyphs in the \mst-ified font for use in math mode. By default, |\imath| and |\jmath| are redefined to use them. Since \texttt{1.3t}, these macros obey the \texttt{subdued} regime. @@ -4199,10 +4597,10 @@ its optional parameter for shape of letters. in the latter. I have decided it wasn't such a good idea and there is from now on \texttt{1.3t} no such redefinition of \texttt{\string\i} and \texttt{\string\j}!} -\item §\MathEuler§, §\MathEulerBold§: math alphabets to access +\item \mstcmd{MathEuler}, \mstcmd{MathEulerBold}: math alphabets to access all the glyphs of the Euler font, if option |eulergreek| (or |eulerdigits| was passed to the package. -\item §\MathPSymbol§: math alphabet to access the Symbol font. +\item \mstcmd{MathPSymbol}: math alphabet to access the Symbol font. \item when one of the options \blueit{symbolgreek}, \blueit{eulergreek}, or \blueit{selfGreek} is passed to the package the capital Greek letters which look like their Latin @@ -4317,7 +4715,7 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by \DeleteShortVerb{\|}% -\item §\MTsetmathskips§\marg{a-z|A-Z}\marg{muglue\_before}\marg{muglue\_after}: +\item \mstcmd{MTsetmathskips}\marg{a-z|A-Z}\marg{muglue\_before}\marg{muglue\_after}: % \MakeShortVerb{\|}% % @@ -4370,7 +4768,7 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by \DeleteShortVerb{\|} -\item §\MTunsetmathskips§\marg{a-z|A-Z}: +\item \mstcmd{MTunsetmathskips}\marg{a-z|A-Z}: % \MakeShortVerb{\|} % @@ -4389,7 +4787,7 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by The argument may be a macro (or any expandable code) expanding to a letter. -\item §\MTexistsskip§\marg{math glue}: specifies the amount of skip or more +\item \mstcmd{MTexistsskip}\marg{math glue}: specifies the amount of skip or more generally glue to put after each $\oldexists$ math symbol. Indeed, upright letters (or digits for that matter) often appear to be positioned a bit too close to the quantifier: $\oldexists\mathrm{B}$. The package default is to @@ -4404,13 +4802,13 @@ for all. The command \csb{MTeverymathoff} cancels all actions done by Formerly, it was set to |0mu|.} In the case of the option |italic|, the default skip is set to zero. -\item \RightNote{1.3j}§\MTnormalexists§, §\MTexistsdoesskip§: the +\item \RightNote{1.3j}\mstcmd{MTnormalexists}, \mstcmd{MTexistsdoesskip}: the latter (done by default if not |subdued|, and also on each use of |\MTversion| in the body of the document) makes it so that $\oldexists$ takes into account the math glue as specified by \csb{MTexistsskip}. The former is its opposite. -\item §\MTforallskip§\marg{math glue}: the default is to add a |.6667mu| math +\item \mstcmd{MTforallskip}\marg{math glue}: the default is to add a |.6667mu| math skip after each $\oldforall$ (except with the option |italic| for which the default skip is set to zero). Compare $\oldforall\mskip.6667mu\mathrm{F}$ (has the skip) with $\oldforall\mathrm{F}$ (has no skip). Use this command @@ -4421,13 +4819,13 @@ Formerly, it was set to |0mu|.} In the case of the option |italic|, the case of the option |italic|, the default skip is zero for all math versions. One may use the command at any location in the document. -\item \RightNote{1.3j}§\MTnormalforall§, §\MTforalldoesskip§: the +\item \RightNote{1.3j}\mstcmd{MTnormalforall}, \mstcmd{MTforalldoesskip}: the latter (done by default if not |subdued|, and also on each use of |\MTversion| in the body of the document) makes it so that $\oldforall$ takes into account the math glue as specified by \csb{MTforallskip}. The former is its opposite. -\item §\MTprimeskip§\marg{math glue}: the default is to add a |0.5mu| skip +\item \mstcmd{MTprimeskip}\marg{math glue}: the default is to add a |0.5mu| skip before the derivative glyph, except for the |italic| option. In the case of the option |subdued|, the skip is canceled in the \emph{normal} and \emph{bold} math versions.\footnote{\RightNote{1.3j}Formerly, it was set to @@ -4439,7 +4837,7 @@ Formerly, it was set to |0mu|.} In the case of the option |italic|, the % these commands are used at the beginning of the document, % even under option \texttt{subdued}.} -\item §\MTlowerast§\marg{dimen}: a \cs{raisebox} command is +\item \mstcmd{MTlowerast}\marg{dimen}: a \cs{raisebox} command is used to lower the text asterisk to produce a reasonable math asterisk. The package uses this command initially with argument |0.3\height|, this will have to be fine-tuned for @@ -4448,14 +4846,14 @@ Formerly, it was set to |0mu|.} In the case of the option |italic|, the sub-scripts and sub-sub-scripts, so it is best not to use an absolute dimension. -\item §\MTmathoperatorsobeymathxx§, §\MTmathoperatorsdonotobeymathxx§: the +\item \mstcmd{MTmathoperatorsobeymathxx}, \mstcmd{MTmathoperatorsdonotobeymathxx}: the former is done by default, it makes operator names obey math alphabets. See also section \ref{sec:mathxx}. This functionality \emph{does {\normalfont\bfseries not} rely} on ``math active characters''. Automatically issued by each \cs{MTversion}, except under option |subdued| when switching to \emph{normal} or \emph{bold}. - \item §\MTcustomgreek§:\RightNote{1.3d} in case \mst has been loaded with one of its + \item \mstcmd{MTcustomgreek}:\RightNote{1.3d} in case \mst has been loaded with one of its Greek related options, this activates the corresponding customization of Greek letters in math mode. It is issued automatically by the package in the preamble (except if loaded with @@ -4464,7 +4862,7 @@ Formerly, it was set to |0mu|.} In the case of the option |italic|, the versions in subdued mode). Also available as |\Mathastextcustomgreek|. May be used even inside of math mode. - \item §\MTstandardgreek§:\RightNote{1.3d} in case \mst was loaded with one of the Greek + \item \mstcmd{MTstandardgreek}:\RightNote{1.3d} in case \mst was loaded with one of the Greek related options this command reverts the customization, it resets the Greek letters to their definitions in force at package loading time. Can be used in the preamble, but is mainly for the document body (may even be used @@ -4476,7 +4874,7 @@ Formerly, it was set to |0mu|.} In the case of the option |italic|, the \subsubsection{Expert commands which are preamble-only} \begin{enumerate}[label=$\bullet$, leftmargin=1em] -\item §\MTgreekupdefault§:\RLNote{new:}{1.3x} a command with +\item \mstcmd{MTgreekupdefault}:\RightNote{1.3x} a command with no argument whose expansion specifies, under §LGRgreek§ regime, the shape for the `|up|' Greek control sequences (and for the no-postfix Greek control sequences under §upgreek§ option) in all \mst math @@ -4489,7 +4887,7 @@ Formerly, it was set to |0mu|.} In the case of the option |italic|, the as the package itself only does: \centeredline{|\providecommand*\MTgreekupdefault{n}|} -\item §\MTgreekitdefault§:\RLNote{new:}{1.3x} a command with +\item \mstcmd{MTgreekitdefault}:\RightNote{1.3x} a command with no argument whose expansion specifies, under §LGRgreek§ regime, the shape for the `|it|' Greek control sequences (and for the no-postfix Greek control sequences under §itgreek§ option) in all \mst math @@ -4511,7 +4909,7 @@ by \mst to the \cs{everymath} and \cs{everydisplay} token list variables. \begin{enumerate}[label=$\bullet$, leftmargin=1em] -\item §\MTmathactiveletters§: activates the `math activation' of Latin +\item \mstcmd{MTmathactiveletters}: activates the `math activation' of Latin letters. This is done by the package during loading, except under the |subdued| option.\footnote{\RightNote{1.3j}Formerly, it was also executed from each \cs{Mathastext} in the preamble.} It is again executed in the @@ -4524,11 +4922,11 @@ by \mst to the \cs{everymath} and \cs{everydisplay} token list variables. \csb{MTsetmathskips} (see section \ref{sec:mathskips}), and also possibly the italic corrections when using upright fonts (see section \ref{sec:ic}). -\item §\MTmathstandardletters§: cancels the `math activation' of the letters. +\item \mstcmd{MTmathstandardletters}: cancels the `math activation' of the letters. Must be re-issued after each \csb{MTversion}, but see \csb{MTeverymathdefault}. -\item §\MTicinmath§: this command is executed by default by \mst except in +\item \mstcmd{MTicinmath}: this command is executed by default by \mst except in case of option |subdued| or if the user chosen letter shape is oblique (|it| or |sl|). It tells \mst to add italic corrections after all letters in math mode, except within the scope of math alphabets.\footnote{\RightNote{1.3i}% @@ -4553,11 +4951,11 @@ Formerly, italic corrections were added to the (non-oblique) letters of §\MTmathactiveletters§ will have an effect only if issued prior to entering math mode. - §\MTnoicinmath§: this command deactivates the package added + \mstcmd{MTnoicinmath}: this command deactivates the package added italic corrections. It can be used inside as well as outside of math mode (or in the preamble of the document). - §\MTICinmath§, §\MTnoICinmath§: these commands activate the italic + \mstcmd{MTICinmath}, \mstcmd{MTnoICinmath}: these commands activate the italic corrections only for the uppercase letters (but recall that \cs{MTicinmath} is done by default, thus this will typically have to follow \cs{MTnoicinmath}.) @@ -4571,7 +4969,7 @@ Formerly, italic corrections were added to the (non-oblique) letters of % No italic corrections are explicitly added inside arguments of math % alphabets. - §\MTicalsoinmathxx§: this command de-activates the de-activation of + \mstcmd{MTicalsoinmathxx}: this command de-activates the de-activation of the italic corrections inside the arguments to the math alphabet commands. % apart from \cs{mathnormal}. @@ -4587,19 +4985,19 @@ Formerly, italic corrections were added to the (non-oblique) letters of } -\item §\MTnormalasterisk§, §\MTactiveasterisk§: the latter will use for |*| +\item \mstcmd{MTnormalasterisk}, \mstcmd{MTactiveasterisk}: the latter will use for |*| and |\ast| the text font asterisk, suitably lowered; the former tells \mst to not modify the \LaTeX\ default. Both are no-op without option §asterisk§. -\item §\MTeasynonlettersobeymathxx§, §\MTeasynonlettersdonotobeymathxx§: the +\item \mstcmd{MTeasynonlettersobeymathxx}, \mstcmd{MTeasynonlettersdonotobeymathxx}: the former is done by default, it makes characters \verb+.+, \verb+/+, \verb+|+, \verb+\+, \verb+#+, \verb+$+, \verb+%+, and \verb+&+ (if not excluded by package options) obey math alphabet commands. See also section \ref{sec:mathxx}. This functionality does \emph{not} make the characters ``math active'' (but it does modify |\mathcode|'s, naturally). -\item §\MTnonlettersobeymathxx§, §\MTnonlettersdonotobeymathxx§: the former +\item \mstcmd{MTnonlettersobeymathxx}, \mstcmd{MTnonlettersdonotobeymathxx}: the former will make (except if excluded by relevant package options) \verb|!|, \verb|?|, \verb|,|, \verb|:|, \verb|;|, \verb|+|, \verb|-|, \verb|=|, \verb|(|, \verb|)|, \verb|[|, \verb|]|, \verb|<|, and \verb|>| obey the math @@ -4624,12 +5022,12 @@ Formerly, italic corrections were added to the (non-oblique) letters of \emph{normal} or \emph{bold} math versions. \end{framed} -\item §\MTexplicitbracesobeymathxx§: extends an earlier §\MTnonlettersobeymathxx§ +\item \mstcmd{MTexplicitbracesobeymathxx}: extends an earlier §\MTnonlettersobeymathxx§ to also treat \verb|\{| and \verb|\}|. But then |\left\{|, |\right\}| must be coded |\left\lbrace|, |\right\rbrace| rather. There is also - §\MTexplicitbracesdonotobeymathxx§. + \mstcmd{MTexplicitbracesdonotobeymathxx}. -\item \RightNote{1.3j}§\MTnormalprime§, §\MTprimedoesskip§: the latter (done by default if not +\item \RightNote{1.3j}\mstcmd{MTnormalprime}, \mstcmd{MTprimedoesskip}: the latter (done by default if not |subdued|, and also on each use of \csb{MTversion} in the body of the document except for the |subdued| \emph{normal} and \emph{bold} math version) makes it so that $'$ takes into account the math glue as specified by @@ -4641,7 +5039,7 @@ Formerly, italic corrections were added to the (non-oblique) letters of no-op from inside math mode. -\item \RightNote{1.3j}§\MTeverymathdefault§: this hook is executed by +\item \RightNote{1.3j}\mstcmd{MTeverymathdefault}: this hook is executed by \csb{MTversion}\marg{version\_name}, except under option |subdued| when switching to the \emph{normal} or \emph{bold} math versions. Its default meaning is: @@ -4669,7 +5067,7 @@ or \emph{bold} if |subdued| does \csb{MTforalldoesskip} and \csb{MTexistsdoesskip}, which are not included in \cs{MTeverymathdefault} actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par} -\item \RightNote{1.3j}§\MTeverymathoff§: does §\MTnormalasterisk§, +\item \RightNote{1.3j}\mstcmd{MTeverymathoff}: does §\MTnormalasterisk§, §\MTnormalprime§, §\MTnonlettersdonotobeymathxx§, §\MTeasynonlettersdonotobeymathxx§, §\MTmathstandardletters§ and §\MTdonotfixfonts§. @@ -4691,7 +5089,7 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par} \small -\item \RightNote{1.3o}§\MTfixfonts§: this is operant only under +\item \RightNote{1.3o}\mstcmd{MTfixfonts}: this is operant only under \LuaLaTeX{}. It has the effect that each time math mode is entered macro \csb{MTfixmathfonts} will be executed. The latter forces so-called |base| mode for the used text font in math mode, in an effort to (only partially, @@ -4699,7 +5097,7 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par} Figures were in some cases not being applied in math mode when one uses text fonts there (text fonts are declared by \LuaTeX+|luaotfload| to use |node| mode, which is non-functional in math.) It is invoked automatically by the - package (except for |normal| and |bold| math versions under §subdued§ + package (except for |normal| and |bold| math versions under |subdued| option), and in normal situations, there is no reason to use it directly. % pas envie de perdre mon temps là-dessus. D'ailleurs peut-être déjà pour @@ -4707,7 +5105,7 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par} % Notice (not tested) that package |bm| is presumably not compatible. -\item \RightNote{1.3o}§\MTdonotfixfonts§: cancels the job of +\item \RightNote{1.3o}\mstcmd{MTdonotfixfonts}: cancels the job of |\MTfixfonts|. Done automatically in §subdued§ mode when in the |normal| or |bold| math version; in normal contexts, there is no reason to use this command. Only operant under \LuaLaTeX. @@ -4719,7 +5117,7 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par} \begin{enumerate}[label=$\bullet$, leftmargin=1em] {\small \item\RightNote{1.3p}% -§\MTfixmathfonts§: this used to be an internal package macro +\mstcmd{MTfixmathfonts}: this used to be an internal package macro but it is given a public name at |1.3p| because I discovered that |$..\hbox{\mathversion{foo}$..$}..$| causes an issue and one needs to invoke again \cs{MTfixmathfonts} \emph{after} the @@ -4733,37 +5131,42 @@ actions as they are not related to \cs{everymath} and \cs{everydisplay}.\par} \subsection{Summary of main options} \begin{description} -\item[{§italic§, §frenchmath§}:] italic letters in -math, upright uppercase if §frenchmath§. - \item[{§subdued§}:] acts in a subdued way. The \LaTeX{} normal and bold - math versions are left (quasi) unchanged. With version |1.15e| of - the package this statement applies also to the math alphabets - \cs{mathbf}, \cs{mathit}, \cs{mathsf}, and \cs{mathtt} (and not - only to \cs{mathnormal} and \cs{mathrm} as in previous versions.) -\item[{§LGRgreek§, §eulergreek§, §symbolgreek§}:] the - Greek letters will be taken, respectively from the - text font itself (in |LGR| encoding), or from the Euler - font, or from the Postscript Symbol font. -\item[{§symbolmax§}:] all characters +\item[{\blueit{italic}}:] tells \mst to typeset the ascii letters in math + using italic shape; indeed, its legacy historical default is to typeset them + in roman (upright) shape. +\item[{\blueit{frenchmath}}:] lowercase ascii letters in italic shape, + uppercase in upright shape. Also lets the Greek letters, if the latter are + under \mst influence, be upright, i.e.\@ also the lowercase ones. +\item[{\blueit{subdued}}:] tells \mst to not change the default fonts or the math + alphabets for the normal and bold math versions. The \mst-ification + activates only after §\MTversion§\marg{version\_name} usage in the + document body, where the \meta{version\_name} was declared as an \mst + enriched math version in the preamble via §\Mathastext§\oarg{version\_name} + or akin package commands.% +\item[{\blueit{LGRgreek}, \blueit{eulergreek}, \blueit{symbolgreek}}:] the + Greek letters will be taken, respectively from the text font itself (which + must be available in |LGR| encoding), or respectively the Euler or Symbol + font. +\item[{\blueit{symbolmax}}:] all characters other than letters and digits, are taken from the Symbol font. This option also makes a number of further glyphs available, such as some basic mathematical arrows, and the sum and product signs. For documents with very simple needs in mathematical symbols, \mst with option - §symbolmax§ may give in the end a PDF file quite + §symbolmax§ may give in the end a PDF file size quite smaller than the one one would get without the - package. -\item[{§defaultmathsizes§}:] \mst sets up bigger sizes -for subscripts (it also copies code from the |moresize| package to redefine - \cs{Huge} and define \cs{HUGE}). Use this option to prevent it from - doing so. -\item[{§defaultalphabets§}:] by default, \mst redeclares the math - alphabets \cs{mathrm}, \cs{mathit}, \cs{mathtt} etc\dots{} (but not - \cs{mathcal} of course) to refer to the current document text fonts (at the - time of loading the package and in each \mst math version). Use - this option to prevent it from doing so (each alphabet also has - its own disabling option). + package.% +% +\footnote{It is even better if compiled via \texttt{latex+dvipdfmx}.} + +\item[{\blueit{defaultmathsizes}}:] prevents \mst from setting up, as it does + per default, larger subscripts and superscripts in math mode, and from + copying code from the |moresize| package% +% +\footnote{Christian \textsc{Cornelssen}, \emph{Allows font sizes up to 35.83pt}, \url{https://ctan.org/pkg/moresize}.} +% + in order to redefine \cs{Huge} and define a \cs{HUGE} command. \end{description} \subsection{Complete list of options} @@ -4773,17 +5176,68 @@ for subscripts (it also copies code from the |moresize| package to redefine and not consider all possible configurations, particularly those resulting from usage of the package commands in the preamble to configure math versions. + + Note that this list in not in alphabetical order, the items are grouped + roughly by themes. So, objectively, the best for the diligent reader is to + read thoroughly all descriptions. \begin{enumerate}[label=$\bullet$, leftmargin=1em] - \item §basic§: only mathastextify letters and digits. - \item §subdued§: do not change the default fonts or the math alphabets in math - mode for the normal and bold math versions, turn on the \mst-ification only - after an explicit \csb{MTversion} (or \cs{mathastextversion}) command - activating an additional math version as declared in the preamble. With - option |subdued| \cs{MTversion\{normal\}} and \cs{MTversion\{bold\}} do + \item \mstopt{basic}: only mathastextify letters and digits. + \item \mstopt{subdued}: acts in a subdued way, which means that the \LaTeX\ + ``normal'' (default) and ``bold'' (triggered by \cs{boldmath} or + \cs{mathversion}|{bold}|, undone by \cs{unboldmath} or on exit from a + scope limiting context such as an environment) math versions are + left (not quite: check \autoref{sec:subdued} for specifics) unchanged and the + \mst action is triggered only when switching via + §\MTversion§\marg{version\_name} (or its starred variant) in the document + body to a version previously defined in the preamble via + §\Mathastext§\oarg{version\_name} (or alternative declarative interface such + as §\MTDeclareVersion§). +% +\footnote{Under this option + \cs{MTversion\{normal\}} and \cs{MTversion\{bold\}} execute automatically \csb{MTmathoperatorsdonotobeymathxx}, \csb{MTeasynonlettersdonotobeymathxx}, - \csb{MTnonlettersdonotobeymathxx}, \csb{MTmathstandardletters}. - \item §italic§: the Latin letters (both lowercase and uppercase) use - the italic shape (\cs{itdefault}) in math mode; if the package + \csb{MTnonlettersdonotobeymathxx}, \csb{MTmathstandardletters}.} + +\item \mstopt{defaultalphabets}: \RLNote{new behavior}{1.3za}\mst + always defines \cs{Mathnormal}, \cs{Mathrm}, \cs{Mathbf} etc... to + refer to the \mst-ified text fonts, and redefines the math + alphabets \cs{mathrm}, \cs{mathit}, \cs{mathtt} etc\dots{} (but + not \cs{mathcal} of course) to use them. To avoid the remapping + and keep the \cs{mathrm} et al.\@ to refer to the non \mst-ified + fonts, use this option. The \cs{Mathnormal} et al.\@ commands with an + initial uppercase will always + be available whether or not this option is made use of. + + \begin{footnotesize} + Prior to |1.3za| (and since |1.15f|), this option also prevented the + package to declare the \cs{Mathnormal} et al.\@ and \cs{mathnormalbold} + commands. In this context, recall that the dreaded ``too many math + alphabets'' error can only occur on \emph{use} in the document of too many + of such commands, and not at the time of their declarations. The author's + notes from time of |1.15f| release (|2012/10/25|) only say that it may not + be ``useful'' to package user to have both (for example) |\mathrm| and + |\Mathrm|, which sounds weird if they are to acquire distinct meanings. + So since |1.3za| both will exist. In the default package configuration + |\mathrm| is configured to expand to |\Mathrm| (with some extra behavior + under §LGRgreek+§), and with this option or the §defaultrm§ option + |\mathrm| is kept with its original meaning (and the §LGRgreek+§ extras do + not work).\par + \end{footnotesize} + +\item \RLNote{changed:}{1.3za}\mstopt{defaultnormal}, \mstopt{defaultrm}, + \mstopt{defaultbf}, \mstopt{defaultit}, \mstopt{defaultsf}, + \mstopt{defaulttt}: tell \mst to not set up, respectively, the + \cs{mathnormal}, \cs{mathrm}, \cs{mathbf}, \cs{mathit}, \cs{mathsf}, and + \cs{mathtt} commands to use the mathastext-ified font which are accessible + always via \cs{Mathnormal}, \cs{Mathrm}, \cs{Mathbf}, \cs{Mathit}, etc... + + \begin{footnotesize} + Prior to |1.3za| these options also prevented the creation of the + corresponding \mst command with an uppercased initial.\par + \end{footnotesize} + + \item \mstopt{italic}: let the Latin letters (both lowercase and uppercase) use + the italic shape (\cs{itdefault}) in math mode. If the package handles Greek letters, also lowercase (but not uppercase) Greek letters will use this a priori italic shape except if some other option such as \blueit{upgreek} was used.% @@ -4791,7 +5245,7 @@ for subscripts (it also copies code from the |moresize| package to redefine option in addition to \blueit{italic}, the \cs{MTgreekitdefault} shape is then used for lowercase Greek letters and \cs{MTgreekupdefault} for uppercase.} - \item §frenchmath§: it configures for lowercase Latin letters to use + \item \mstopt{frenchmath}: configures for lowercase Latin letters to use italic shape (\cs{itdefault}), and uppercase Latin letters to be in same shape as for digits and operator names (i.e.\@ a priori \cs{shapedefault}). If the package handles Greek letters both @@ -4804,7 +5258,9 @@ for subscripts (it also copies code from the |moresize| package to redefine \footnote{Under \blueit{LGRgreek} and since |1.3x|, the \cs{MTgreekupdefault} is used for Greek letters if no other option such as \blueit{itgreek} was employed.} -\item §ncccomma§:\RLNote{new:}{1.3x} it triggers the loading of the + + +\item \mstopt{ncccomma}:\RightNote{1.3x} it triggers the loading of the \href{https://ctan.org/pkg/ncccomma}{ncccomma} package% % \footnote{Alexander I. \textsc{Rozhenko}, \emph{Use comma as decimal @@ -4827,7 +5283,7 @@ those parts of the document using another language than French.% switches from French to English; and switching back to French does not reenact it. For background on this issue see \url{https://github.com/latex3/babel/issues/190}.} -\item §binarysemicolon§:\RLNote{new:}{1.3x} sets (except if +\item \mstopt{binarysemicolon}:\RightNote{1.3x} sets (except if \blueit{nopunctuation} is used) the semi-colon to let \TeX\ use spacing of binary type, not punctuation type, around the semi-colon (it is often used in French mathematical typesetting as separator in @@ -4837,39 +5293,39 @@ those parts of the document using another language than French.% The effect applies to all math versions, even the \emph{normal} and \emph{bold} math versions with \mst having been loaded with the \blueit{subdued} option. -\item §frenchmath*§:\RLNote{new:}{1.3x} does all three of \blueit{frenchmath}, +\item \mstopt{frenchmath*}:\RightNote{1.3x} does all three of \blueit{frenchmath}, \blueit{ncccomma} and \blueit{binarysemicolon}. -\item §endash§, §emdash§: use the text font en-dash (\textendash) or even +\item \mstopt{endash}, \mstopt{emdash}: use the text font en-dash (\textendash) or even the em-dash (\textemdash, but this seems crazy) for the minus sign rather than {}-{}. §endash§ option is default for the package. -\item §unicodeminus§:\RightNote{1.3q} use the |MINUS SIGN U+2212| (requires +\item \mstopt{unicodeminus}:\RightNote{1.3q} use the |MINUS SIGN U+2212| (requires |fontspec|.) Or, in the form |unicodeminus=HHHH| with four \emph{uppercased} hexadecimal digits: use the |U+HHHH| code point. As §noendash§ really means ``use the hyphen from the text font'', §unicodeminus§ remains without effect under it, or, naturally, under §nominus§. Without this option, \mst uses the |EN DASH U+2013| by default for OpenType fonts. -\item §asterisk§: use the text font (or the Symbol font) asterisk in math mode. -\item §nohbar§: prevents \mst from defining its own +\item \mstopt{asterisk}: use the text font (or the Symbol font) asterisk in math mode. +\item \mstopt{nohbar}: prevents \mst from defining its own \cs{hbar}. -\item §noendash§: the minus sign will be the - from the +\item \mstopt{noendash}: the minus sign will be the - from the text font, not the en-dash \textendash. -\item §nolessnomore§: besides +\item \mstopt{nolessnomore}: besides !\,?\,,\,.\,:\,;\,+\,\textendash\,=\,(\,)\,[\,]\,/\,\#\,\$\,\%\,\& \mst treats also \DeleteShortVerb{\|} $\mathord{<}\,\mathord{>}\,\mathord{|}$\, \{\,\} and $\backslash$.\MakeShortVerb{\|} Use this option to let it not do it. This is the default in case of |OT1|-encoding. -\item further excluding options: §noexclam§ !\,?\ -\ §nopunctuation§ ,\,.\,:\,;\ §noplus§, -§nominus§, §noplusnominus§\ +\,\textendash{} §noequal§ =\ -§noparenthesis§ (\,)\,[\,]\,/\ §nospecials§ -\#\,\$\,\%\,\&\ and §nodigits§. - \item §alldelims§: true by default, means that the +\item further excluding options: \mstopt{noexclam} !\,?\ +\ \mstopt{nopunctuation} ,\,.\,:\,;\ \mstopt{noplus}, +\mstopt{nominus}, \mstopt{noplusnominus}\ +\,\textendash{} \mstopt{noequal} =\ +\mstopt{noparenthesis} (\,)\,[\,]\,/\ \mstopt{nospecials} +\#\,\$\,\%\,\&\ and \mstopt{nodigits}. + \item \mstopt{alldelims}: true by default, means that the characters excluded by §nolessnomore§ are treated. Use this option in case of a mono-width |OT1|-encoded font. -\item §nosmalldelims§: this prevents \mst from trying to pick up in the text +\item \mstopt{nosmalldelims}: this prevents \mst from trying to pick up in the text font the `small variants' of some math delimiters; it only affects what happens when a character such as a left parenthesis $($ or $[$ is used as a delimiter, and in the event that \TeX{} has chosen the smallest sized @@ -4880,71 +5336,123 @@ treated. Use this option in case of a mono-width this rule and they require both of \csb{MTnonlettersobeymathxx} and \csb{MTexplicitbracesobeymathxx} for being picked up from the text font when not used as delimiters.} - \item §symbolgreek§, §symboldigits§: to let Greek letters (digits) use the + \item \mstopt{symbolgreek}, \mstopt{symboldigits}: to let Greek letters (digits) use the Symbol font. - \item §symbolre§: replaces \cs{Re} and \cs{Im} by the + \item \mstopt{symbolre}: replaces \cs{Re} and \cs{Im} by the Symbol glyphs $\Re, \Im$ and defines a \cs{DotTriangle} command ($\DotTriangle$). -\item §symbolmisc§: takes quite a few glyphs, including logical arrows, product +\item \mstopt{symbolmisc}: takes quite a few glyphs, including logical arrows, product and sum signs from Symbol. They are listed \hyperlink{symbolmisc}{\emph{supra}}. Doing \cs{renewcommand\{\string\int\}\{\string\smallint\}} will maximize even more the use of the Symbol font. - \item §symboldelimiters§: the characters apart from + \item \mstopt{symboldelimiters}: the characters apart from letters and digits will be taken from the Symbol font. - \item §symbol§: combines §symbolgreek§, §symbolre§, and §symbolmisc§. - \item §symbolmax§: combines §symbol§ and §symboldelimiters§. - \item §eulergreek§, §eulerdigits§: to let Greek letters (digits) use the + \item \mstopt{symbol}: combines §symbolgreek§, §symbolre§, and §symbolmisc§. + \item \mstopt{symbolmax}: combines §symbol§ and §symboldelimiters§. + \item \mstopt{eulergreek}, \mstopt{eulerdigits}: to let Greek letters (digits) use the Euler font. - \item §LGRgreek§: this configures the Greek letters in math mode to use the - text font in - LGR-encoding (it is up to user to ascertain that the font familty is indeed - available in the LGR encoding). It also - activates the command §\MTgreekfont§ which can be used to set a specific - (LGR-encoded) font family for Greek, possibly not related to the font family - for Latin letters. But each use §\MTgreekfont§ must be followed by a §\Mathastext§ - or §\Mathastext§\oarg{version\_name} to be effective. - \item §LGRgreeks§: each declared math version will be supposed to be with a - font which is also available in LGR-encoding. Attention that macro - §\MTgreekfont§ becomes then inoperant. - \item §selfGreek§: this is for a font which is also available in - |OT1|-encoding and contains the glyphs for the default eleven capital Greek -letters. - \item §selfGreeks§: each declared math version will be supposed to be with - a font with the eleven capital Greek letters in its |OT1|-encoded - version. - \item §upgreek§, §itgreek§, §upGreek§, §itGreek§: - options to tell to use \cs{itdefault} or \cs{updefault} for the lowercase - and uppercase (or only the uppercase) Greek letters. Only operant - in the case of the |LGRgreek(s)| and |selfGreek(s)| options. - - \RLNote{changed:}{1.3x}These options now use \cs{MTgreekitdefault} and - \cs{MTgreekupdefault} rather. - \item §mathaccents§: use the text font also for the math +\item \mstopt{LGRgreek}: this configures the Greek letters in math mode to use + the text font (i.e. a priori the font which was default at time of loading + the package) in LGR-encoding. The command §\MTgreekfont§ can be used to set + a specific (LGR-encoded) font family. Each use of §\MTgreekfont§ must be + followed at some point by a §\Mathastext§ or + §\Mathastext§\oarg{version\_name} to be effective. Any subsequent math + version declaration will be influenced by it until §\MTgreekfont§ is used + again to configure another font for Greek letters.% + % + \footnote{You can check the documentation of the + \url{https://ctan.org/pkg/lgrmath} package for how to find out systematically which + fonts are available on your system in \texttt{LGR} encoding.} + + If §\MTgreekfont§ is never used the font family for Greek under + option §LGRgreek§ will be, in all math versions except under §subdued§ for + the ``normal'' and ``bold'', the family which was the default at time of + loading the package. You must use §\MTgreekfont§ to change it. + + See further on this topic the §upgreek§, §itgreek§, §upGreek§ and §itGreek§ + options as well as the §\MTupgreek§, §\MTitgreek§, §\MTupGreek§ and + §\MTitGreek§ commands. + + It is up to the user to ascertain that the font family is indeed available + in the LGR encoding; if it is not, only at time of the first math mode + typesetting will \LaTeX\ issue warnings such as this one:% + % + \centeredline{|Font shape `LGR/ptm/m/n' undefined|}% + \centeredline{|using `LGR/cmr/m/n' instead on input line 28|}% + % + + The §LGRgreek§ option also triggers pre-definition of Greek character tokens + such as \cs{alphaup} or \cs{betait}, see \autoref{sec:newgreek} for the + explanations. + + \begin{footnotesize} + Although under §subdued§ option \mst does not modify Latin + and Greek letters in the ``normal'' and ``bold'' math + versions it still under §LGRgreek§ option declares two + additional symbol fonts with the associated §\mathgreekup§ + and §\mathgreekit§ commands to access them, and also since + |1.3za| §\mathgreekupbold§ and §\mathgreekitbold§, and these + math alphabets can be used also in the ``normal'' and + ``bold'' math versions. They will work on mathchar tokens + which are of ``variable family type''; \mst makes all Greek + letters of such ``variable family type'' but only of course + in non-subdued math versions so this situation depends on the + math configuration of the document. As per the font used by these + alphabets in the subdued ``normal'' and ``bold'' it is either + the one in \texttt{LGR} encoding which was the family default + at time of loading the package or the one configured last by + §\MTgreekfont§ when the command §\Mathastext§ (without + optional argument) was used in the preamble. + + |1.3za| fixes here a bug which froze the target font to be + the one at time of loading the package: this bug applied + (only) to the subdued ``normal'' and ``bold'' math versions + and was not readily visible as there is a priori no reason to + use in these subdued math versions these \mst-provided Greek + font alphabets.\par + \end{footnotesize} + +\item \mstopt{LGRgreeks}: each declared math version will be supposed to be + with a font which is also available in LGR-encoding. This is a shortcut to + using §\MTgreekfont§ systematically to keep in sync in all declared math + versions the font for Greek with the font for Latin letters. Please note + that macro §\MTgreekfont§ becomes then inoperant, and if you need one math + version without this Latin-Greek synching, you will have to use rather + §LGRgreek§ and then §\MTgreekfont§ manually appropriately. + +\item \mstopt{LGRgreek+} and + \mstopt{LGRgreeks+}:\RLNote{new:}{1.3za} they extend + respectively §LGRgreek§ or §LGRgreeks§ to let Greek letters + control sequences when in the scope of §\mathrm§, §\mathit§, + and §\mathbf§ behave as would be expected by LaTeX users who + have not read \texttt{fntguide.pdf} or any other \LaTeX\ + documentation but have used \texttt{unicode-math}. See + \autoref{sec:newgreekplus} for details. + +\item \mstopt{selfGreek}: this is for a font which is also available in + |OT1|-encoding and contains the glyphs for the default eleven capital Greek + letters. +\item \mstopt{selfGreeks}: each declared math version will be supposed to be + with a font with the eleven capital Greek letters in its |OT1|-encoded + version. +\item \mstopt{upgreek}, \mstopt{itgreek}: options to tell \mst to use + §\MTgreekupdefault§ or §\MTgreekitdefault§ for the lowercase and uppercase + Greek letters shape. These two commands can be defined prior to loading the + package. This option is operant only under the |LGRgreek(s)| or + |selfGreek(s)| options. +\item \mstopt{upGreek}, \mstopt{itGreek}: influence only uppercase Greek. + \item \mstopt{mathaccents}: use the text font also for the math accents. As in vanilla \LaTeX{}, they are taken from the font for the digits and \cs{log}-like names. Obey the alphabet changing commands. - \item §unimathaccents§:\RightNote{1.3u} extends |mathaccents| to + \item \mstopt{unimathaccents}:\RightNote{1.3u} extends |mathaccents| to OpenType fonts. Gave bad results in my brief testing. - \item §defaultbf§, §defaultit§, §defaultsf§, §defaulttt§: do not -set up, respectively, the \cs{mathbf}, \cs{mathit}, \cs{mathsf}, -and \cs{mathtt} commands to use the mathastext-ified -font. This also prevents \mst to create internally -\cs{Mathxx} alphabets (it never overwrites the original -\cs{mathxx} things but let \cs{mathxx} point to \cs{Mathxx} -instead), so one can use these options if one encounters a `too -many math alphabets' \LaTeX{} error. -\item §defaulnormal§, §defaultrm§: do not identify the default -\cs{mathnormal} (resp. \cs{mathrm}) with the newly created -\cs{Mathnormal} (resp. \cs{Mathrm}) commands which use the -mathastextified fonts in each math version. -\item §defaultalphabets§: all the §defaultxx§ options together, and -additionally tells \mst not to create the \cs{mathnormalbold} alphabet either. - \item §defaultimath§: do not overwrite \cs{imath} and + \item \mstopt{defaultimath}: do not overwrite \cs{imath} and \cs{jmath} to use \cs{inodot} and \cs{jnodot}. - \item §defaultmathsizes§: do not change the \LaTeX{} defaults for the sizes + \item \mstopt{defaultmathsizes}: do not change the \LaTeX{} defaults for the sizes of exponents and subscripts. - \item §fouriervec§: provides a \cs{fouriervec} command. The user can then + \item \mstopt{fouriervec}: provides a \cs{fouriervec} command. The user can then add in the preamble \cs{let}\cs{vec}$=$\cs{fouriervec}. There is also always available a ``poor man'' vec accent \cs{pmvec} for upright letters. \end{enumerate} @@ -5093,7 +5601,7 @@ Numerous examples will be found there:\\ % \begin{macrocode} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage {mathastext} - [2023/09/01 v1.3z Use the text font in math mode (JFB)] + [2023/12/20 v1.3za Use the text font in math mode (JFB)] % \end{macrocode} % \LaTeX{} |2019-10-01| release has made robust math macros such as the math % accents and \cs{hbar}. @@ -5202,7 +5710,7 @@ Numerous examples will be found there:\\ % Greek at the time of \cs{usepackage}. Modifiable in the preamble % via \cs{MTgreekfont}\marg{font\_name}\cs{Mathastext}. % \begin{macrocode} - \edef\mst@greekfont{\familydefault} %% v 1.15c + \edef\mst@greekfont{\familydefault} % \end{macrocode} % \end{macro} % \begin{macro}{Package options} @@ -5210,7 +5718,10 @@ Numerous examples will be found there:\\ % of \cs{if...} conditionals, for better readability (by myself) of % the code. % -% |1.3x| of |2022/11/03| adds |ncccomma|, |binarysemicolon| and |frenchmath*| options. +% |1.3x| of |2022/11/03| adds |ncccomma|, |binarysemicolon| and +% |frenchmath*| options. +% +% |1.3za| adds |LGRgreek+| and |LGRgreeks+|. % \begin{macrocode} \newif\ifmst@italic \newif\ifmst@frenchmath @@ -5300,6 +5811,9 @@ Numerous examples will be found there:\\ \newif\ifmst@LGRgreeks \DeclareOption{LGRgreeks}{\mst@LGRgreekstrue\mst@LGRgreektrue \mst@customgreektrue} +\newif\ifmst@greekplus + \DeclareOption{LGRgreek+}{\ExecuteOptions{LGRgreek}\mst@greekplustrue} + \DeclareOption{LGRgreeks+}{\ExecuteOptions{LGRgreeks}\mst@greekplustrue} \def\mst@greek@select{0} \newif\ifmst@itgreek \newif\ifmst@upgreek @@ -5313,6 +5827,12 @@ Numerous examples will be found there:\\ % prevent it from identifying the `mathxx' with the new `Mathxx'. The % `Mathnormal' and `Mathrm' alphabet commands are always created as they are % SymbolFontAlphabets. +% +% This was again changed at |1.3za|. The additional alphabets are +% always declared, the options only prevent mapping the existing +% `mathxx' to the new `Mathxx'. This may be breaking change if +% people used these options because they had a need for the +% |\Mathbf| etc... names. % \begin{macrocode} \newif\ifmst@defaultnormal \DeclareOption{defaultnormal}{\mst@defaultnormaltrue} @@ -5326,9 +5846,12 @@ Numerous examples will be found there:\\ \DeclareOption{defaultsf}{\mst@defaultsftrue} \newif\ifmst@defaulttt \DeclareOption{defaulttt}{\mst@defaulttttrue} -\newif\ifmst@nonormalbold +% \end{macrocode} +% Here and elsewhere |1.3za| has removed an +% \cs{ifmst@nonormalbold} conditional. +% \begin{macrocode} \DeclareOption{defaultalphabets}{\ExecuteOptions{defaultnormal,defaultrm,% -defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} +defaultbf,defaultit,defaultsf,defaulttt}} % \end{macrocode} % |mathastext| considers the default script and especially scriptscript sizes to % be far too small, and it will modify them. An option maintains the default. @@ -6333,7 +6856,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % \begin{macro}{\Mathit} % \begin{macro}{\Mathsf} % \begin{macro}{\Mathtt} -% \begin{macro}{\mathnormalbold} +% \begin{macro}{\Mathnormalbold} % We redefine the default normal, rm, bf, it, sf, and tt alphabets, % but this will be done via |\renewcommand*{\mathrm}{\Mathrm}| etc\dots % (not anymore, see comment below). @@ -6370,26 +6893,26 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % simply use |\protected\def| in place of obeying strictly \LaTeX2e % robustness (except of course in the subdued math versions as there the math % alphabets acquire back their original robust meanings.) +% +% Potential breaking change at |1.3za|, the |defaultbf| etc... options do +% not prevent the package declaring |\Mathbf| etc... commands. +% +% |1.3za| defines a \cs{Mathnormalbold} and then defines \cs{mathnormalbold} +% in terms of it in place of defining directly \cs{mathnormalbold} as a math +% alphabet. This is in relation to implementation of the |LGRgreek+| +% option. There was some hesitation though to restrict this change to that +% option only or not. % \begin{macrocode} \let\mst@alph@omicron\mathnormal \@ifpackageloaded{fourier}{\ifsloped\else\let\mst@alph@omicron\mathrm\fi}{} \DeclareSymbolFontAlphabet{\Mathnormal}{mtletterfont} \DeclareSymbolFontAlphabet{\Mathrm}{mtoperatorfont} -\ifmst@nonormalbold\else - \DeclareMathAlphabet{\mathnormalbold}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@ltsh} -\fi -\ifmst@defaultbf\else + \DeclareMathAlphabet{\Mathnormalbold}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@ltsh} + \protected\def\mathnormalbold{\Mathnormalbold} \DeclareMathAlphabet{\Mathbf}{\mst@enc}{\mst@fam}{\mst@bold}{\mst@opsh} -\fi -\ifmst@defaultit\else \DeclareMathAlphabet{\Mathit}{\mst@enc}{\mst@fam}{\mst@ser}{\itdefault} -\fi -\ifmst@defaultsf\else \DeclareMathAlphabet{\Mathsf}{\mst@enc}{\sfdefault}{\mst@ser}{\mst@opsh} -\fi -\ifmst@defaulttt\else \DeclareMathAlphabet{\Mathtt}{\mst@enc}{\ttdefault}{\mst@ser}{\mst@opsh} -\fi % \end{macrocode} % The \cs{mathxx} macros being \LaTeX2e robust, or course the meanings here % are known, and «original» macros are sort of superfluous but well it works. @@ -6406,14 +6929,53 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \let\mathbf\mst@original@bf \let\mathit\mst@original@it \let\mathsf\mst@original@sf - \let\mathtt\mst@original@tt} -\def\mst@setalphabets{% + \let\mathtt\mst@original@tt + } +\ifmst@greekplus +% \end{macrocode} +% \begin{macro}{\mst@mathalph} +% The \LaTeX\ kernel code regarding math fonts is too complex and rigid for +% there to be a robust and easy way to know when one is in the argument of +% \cs{mathrm} or \cs{mathbf}, and the code is spread on various chapters of +% \texttt{source2e.pdf}, and the comments are often not up-to-date. So I did +% not try a too complex hack and decided for |1.3za| to add a numeric +% indicator to let Greek letters react to it. It incorporates a space to be +% self-delimiting in an \cs{ifcase} to maintain expandability in numeric +% context of the to-be-defined Greek control sequences. +% \begin{macrocode} + \def\mst@mathalph{-1} + \def\mst@setalphabets{% + \protected\def + \mathnormalbold##1{\def\mst@mathalph{4 }\Mathnormalbold{##1}\def\mst@mathalph{-1 }}% + \ifmst@defaultnormal\else + \protected\def + \mathnormal##1{\def\mst@mathalph{0 }\Mathnormal{##1}\def\mst@mathalph{-1 }}% + \fi + \ifmst@defaultrm\else + \protected\def + \mathrm##1{\def\mst@mathalph{1 }\Mathrm{##1}\def\mst@mathalph{-1 }}% + \fi + \ifmst@defaultbf\else + \protected\def + \mathbf##1{\def\mst@mathalph{2 }\Mathbf{##1}\def\mst@mathalph{-1 }}% + \fi + \ifmst@defaultit\else + \protected\def + \mathit##1{\def\mst@mathalph{3 }\Mathit{##1}\def\mst@mathalph{-1 }}% + \fi + \ifmst@defaultsf\else\protected\def\mathsf{\Mathsf}\fi + \ifmst@defaulttt\else\protected\def\mathtt{\Mathtt}\fi + } +\else + \def\mst@setalphabets{% \ifmst@defaultnormal\else\protected\def\mathnormal{\Mathnormal}\fi \ifmst@defaultrm\else\protected\def\mathrm{\Mathrm}\fi \ifmst@defaultbf\else\protected\def\mathbf{\Mathbf}\fi \ifmst@defaultit\else\protected\def\mathit{\Mathit}\fi \ifmst@defaultsf\else\protected\def\mathsf{\Mathsf}\fi - \ifmst@defaulttt\else\protected\def\mathtt{\Mathtt}\fi} + \ifmst@defaulttt\else\protected\def\mathtt{\Mathtt}\fi + } +\fi \ifmst@subdued\else\mst@setalphabets\fi % \end{macrocode} % \end{macro} @@ -6423,6 +6985,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % \begin{macro}{LGRgreek} % \begin{macro}{\MTgreekupdefault} % \begin{macro}{\MTgreekitdefault} @@ -6551,12 +7114,16 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % \begin{macro}{mtgreekit} % \begin{macro}{\mathgreekup} % \begin{macro}{\mathgreekit} +% \begin{macro}{\mathgreekupbold} +% \begin{macro}{\mathgreekitbold} % The |1.3x| refactoring was done in order to be able to define \cs{alphaup}, % etc \dots\ control sequences (\cs{mathchar}'s), as well as the italic ones. % Formerly two math fonts were created but to be used respectively with % lowercase or uppercase Greek. Now we have two fonts indexed by their shape, % and we take advantage to create two math alphabets mapping to the two % defined symbol fonts |mtgreekup| and |mtgreekit|. +% +% |1.3za| adds \cs{mathgreekupbold} and \cs{mathgreekitbold}. % \begin{macrocode} \ifmst@LGRgreek \DeclareFontEncoding{LGR}{}{} @@ -6564,6 +7131,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \DeclareSymbolFont{mtgreekit}{LGR}{\mst@fam}{\mst@ser}{\MTgreekitdefault} \DeclareSymbolFontAlphabet{\mathgreekup}{mtgreekup} \DeclareSymbolFontAlphabet{\mathgreekit}{mtgreekit} + \DeclareMathAlphabet{\mathgreekupbold}{LGR}{\mst@fam}{\mst@bold}{\MTgreekupdefault} + \DeclareMathAlphabet{\mathgreekitbold}{LGR}{\mst@fam}{\mst@bold}{\MTgreekitdefault} \else % \end{macrocode} % \begin{macro}{mtselfGreekfont} @@ -6581,6 +7150,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % \end{macro} % \end{macro} % \end{macro} +% \end{macro} +% \end{macro} % \begin{macro}{mteulervm} % \begin{macro}{\MathEuler} % \begin{macro}{\MathEulerBold} @@ -6599,7 +7170,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % capital Greek letters are of type |mathalpha|, but the % lower Greek letters of type |mathord|, so that \cs{mathbf} % does not act on them, although lowercase Greek letters and -% Latin letters are from the same font. This is because +% Latin letters are from the same font. ^^A qui est cmmi encodage OML +% This is because % \cs{mathbf} is set up to be like a bold version of % \cs{mathrm}, and \cs{mathrm} uses the `operators' font, by % default |cmr|, where there are NO lowercase greek @@ -6695,6 +7267,10 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % to set up math versions with a given font for math mode, and at the % same time not modifying the \cs{familydefault} or \cs{romandefault} % etc\dots +% +% At time of |1.3za| I considered letting |LGRgreeks| and |selfGreeks| +% support \cs{MTgreekfont} and this needed a chaneg to \cs{MTfamily} +% here but I dropped the idea. Too wary of documentation changes. % \begin{macrocode} \newcommand*\MTencoding[1]{\def\mst@enc{#1}} \newcommand*\MTfamily[1]{\def\mst@fam{#1}} @@ -6723,9 +7299,12 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % |1.15c|: These new macros can be used in-between calls to \cs{Mathastext}. % They reset the shapes for Greek letters (applies to LGRgreek(s) and % selfGreek(s) options). The \cs{MTgreekfont} presupposes either LGRgreek or -% selfGreek (it is inoperant under LGRgreeks or selfGreeks). +% selfGreek (it is inoperant under |LGRgreeks| or |selfGreeks|). % |\MTgreekfont{\familydefault}| is somewhat like using LGRgreeks or % selfGreeks. +% +% At time of |1.3za| I let \cs{MTgreekfont} also have an effect under option +% |LGRgreeks| or |selfGreeks|, via a refactoring which also modified \cs{MTfamily}. % \begin{macrocode} \newcommand*\MTitgreek{\mst@itgreektrue\mst@upgreekfalse\def\mst@greek@select{0}} \newcommand*\MTupgreek{\mst@upgreektrue\mst@itgreekfalse\def\mst@greek@select{0}} @@ -6735,7 +7314,7 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \let\Mathastextupgreek\MTupgreek \let\MathastextitGreek\MTitGreek \let\MathastextupGreek\MTupGreek - \newcommand*\MTgreekfont[1]{\def\mst@greekfont{#1}} +\newcommand*\MTgreekfont[1]{\def\mst@greekfont{#1}} \let\Mathastextgreekfont\MTgreekfont % \end{macrocode} % \end{macro} @@ -8142,6 +8721,98 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \let\wp\mst@origwp \let\ell\mst@origell }% \MTstandardgreek +\ifmst@greekplus +% \end{macrocode} +% |1.3za| implementation of |LGRgreek+| option. It is not exactly +% clear what we should do for \cs{mathnormal} and \cs{mathnormalbold}. +% +% This definition allows usage of \cs{alpha} for example in numerical +% context. To be completely clean perhaps we should get rid of +% final \cs{fi}, but old-fashioned \LaTeX\ does not have built-in +% conveniences, were it not for the nested if's simple \cs{expandafter} +% would do, but here we would need three in four places. Or simply +% wrap the whole in \cs{expanded}. Anyway, not really important. +% \begin{macrocode} +\def\mst@define@lowergreekletter#1#2{% + \protected\def#1{\ifcase\mst@mathalph + \ifmst@greek@lower@up\mathgreekup{#2}\else\mathgreekit{#2}\fi + \or % rm + \mathgreekup{#2}% + \or % bf + \mathgreekupbold{#2}% + \or % it + \mathgreekit{#2}% + \or % normalbold + \ifmst@greek@lower@up\mathgreekupbold{#2}\else\mathgreekitbold{#2}\fi + \else #2\fi}% + } +\def\mst@define@uppergreekletter#1#2{% + \protected\def#1{\ifcase\mst@mathalph + \ifmst@greek@upper@up\mathgreekup{#2}\else\mathgreekit{#2}\fi + \or % rm + \mathgreekup{#2}% + \or % bf + \mathgreekupbold{#2}% + \or % it + \mathgreekit{#2}% + \or % mathnormalbold + \ifmst@greek@upper@up\mathgreekupbold{#2}\else\mathgreekitbold{#2}\fi + \else #2\fi}% + } +\renewcommand*{\MTcustomgreek}{% + \mst@define@uppergreekletter\Alpha\mst@Alpha + \mst@define@uppergreekletter\Beta\mst@Beta + \mst@define@uppergreekletter\Epsilon\mst@Epsilon + \mst@define@uppergreekletter\Zeta\mst@Zeta + \mst@define@uppergreekletter\Eta\mst@Eta + \mst@define@uppergreekletter\Iota\mst@Iota + \mst@define@uppergreekletter\Kappa\mst@Kappa + \mst@define@uppergreekletter\Mu\mst@Mu + \mst@define@uppergreekletter\Nu\mst@Nu + \mst@define@uppergreekletter\Omicron\mst@Omicron + \mst@define@uppergreekletter\Rho\mst@Rho + \mst@define@uppergreekletter\Tau\mst@Tau + \mst@define@uppergreekletter\Chi\mst@Chi + \mst@define@uppergreekletter\Digamma\mst@Digamma + \mst@define@uppergreekletter\Gamma\mst@Gamma + \mst@define@uppergreekletter\Delta\mst@Delta + \mst@define@uppergreekletter\Theta\mst@Theta + \mst@define@uppergreekletter\Lambda\mst@Lambda + \mst@define@uppergreekletter\Xi\mst@Xi + \mst@define@uppergreekletter\Pi\mst@Pi + \mst@define@uppergreekletter\Sigma\mst@Sigma + \mst@define@uppergreekletter\Upsilon\mst@Upsilon + \mst@define@uppergreekletter\Phi\mst@Phi + \mst@define@uppergreekletter\Psi\mst@Psi + \mst@define@uppergreekletter\Omega\mst@Omega + \mst@define@lowergreekletter\alpha\mst@alpha + \mst@define@lowergreekletter\beta\mst@beta + \mst@define@lowergreekletter\gamma\mst@gamma + \mst@define@lowergreekletter\delta\mst@delta + \mst@define@lowergreekletter\epsilon\mst@epsilon + \mst@define@lowergreekletter\zeta\mst@zeta + \mst@define@lowergreekletter\eta\mst@eta + \mst@define@lowergreekletter\theta\mst@theta + \mst@define@lowergreekletter\iota\mst@iota + \mst@define@lowergreekletter\kappa\mst@kappa + \mst@define@lowergreekletter\lambda\mst@lambda + \mst@define@lowergreekletter\mu\mst@mu + \mst@define@lowergreekletter\nu\mst@nu + \mst@define@lowergreekletter\xi\mst@xi + \mst@define@lowergreekletter\omicron\mst@omicron + \mst@define@lowergreekletter\pi\mst@pi + \mst@define@lowergreekletter\rho\mst@rho + \mst@define@lowergreekletter\sigma\mst@sigma + \mst@define@lowergreekletter\tau\mst@tau + \mst@define@lowergreekletter\upsilon\mst@upsilon + \mst@define@lowergreekletter\phi\mst@phi + \mst@define@lowergreekletter\chi\mst@chi + \mst@define@lowergreekletter\psi\mst@psi + \mst@define@lowergreekletter\omega\mst@omega + \mst@define@lowergreekletter\varsigma\mst@varsigma + \mst@define@lowergreekletter\digamma\mst@digamma +}% end of True branch of \ifmst@greekplus +\else % \end{macrocode} % Under |selfGreek| or other Greek option but not |LGRgreek|, these Greek % letter control sequences are already |\mathchar|'s, but under |LGRgreek| @@ -8243,7 +8914,8 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \fi \fi }% \MTcustomgreek -\fi% end of \ifcustomgreek +\fi% end of else branch of \ifmst@greekplus +\fi% end of \ifmst@customgreek \let\Mathastextstandardgreek\MTstandardgreek \let\Mathastextcustomgreek\MTcustomgreek \ifmst@subdued\else\MTcustomgreek\fi @@ -8651,15 +9323,21 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} names will be in `#6\string' shape.}% \expandafter\edef\csname mst@ltshape@\mst@version\endcsname{#1}% \fi - \ifmst@nonormalbold\else - \SetMathAlphabet{\mathnormalbold}{#2}{#3}{#4}{\mst@bold}% +% \end{macrocode} +% Here and elsewhere |1.3za| has removed an +% \cs{ifmst@nonormalbold} conditional. +% \begin{macrocode} + \SetMathAlphabet{\Mathnormalbold}{#2}{#3}{#4}{\mst@bold}% {\csname mst@ltshape@\mst@version\endcsname}% - \fi \SetSymbolFont{mtoperatorfont}{#2}{#3}{#4}{#5}{#6}% - \ifmst@defaultbf\else\SetMathAlphabet{\Mathbf}{#2}{#3}{#4}{\mst@bold}{#6}\fi - \ifmst@defaultit\else\SetMathAlphabet{\Mathit}{#2}{#3}{#4}{#5}{\itdefault}\fi - \ifmst@defaultsf\else\SetMathAlphabet{\Mathsf}{#2}{#3}{\sfdefault}{#5}{#6}\fi - \ifmst@defaulttt\else\SetMathAlphabet{\Mathtt}{#2}{#3}{\ttdefault}{#5}{#6}\fi +% \end{macrocode} +% Since |1.3za| (and prior to |1.15f|) these math alphabet +% commands are always defined. +% \begin{macrocode} + \SetMathAlphabet{\Mathbf}{#2}{#3}{#4}{\mst@bold}{#6} + \SetMathAlphabet{\Mathit}{#2}{#3}{#4}{#5}{\itdefault} + \SetMathAlphabet{\Mathsf}{#2}{#3}{\sfdefault}{#5}{#6} + \SetMathAlphabet{\Mathtt}{#2}{#3}{\ttdefault}{#5}{#6} \ifmst@needeuler \SetMathAlphabet{\MathEulerBold}{#2}{U}{zeur}{\mst@bold}{n}% \fi @@ -8720,36 +9398,20 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \def\mst@greek@ush@loc{\MTgreekupdefault}% \mst@greek@upper@uptrue \fi - \ifmst@LGRgreeks - \SetSymbolFont{mtgreekup}{#2}{LGR}{#4}{#5}{\MTgreekupdefault}% - \SetSymbolFont{mtgreekit}{#2}{LGR}{#4}{#5}{\MTgreekitdefault}% % \end{macrocode} -% This is where the shape of uppercase/lowercase Greek letters is recorded, -% for \cs{MTversion}'s triggered \cs{MTcustomgreek} to do the right thing. -% Also |1.3x| fixes some strange log messages which did not recall -% the math version name and referred to `non subdued versions' (strange). +% |1.3za| refactoring to reduce code duplication; I briefly considered +% trying to enhance \cs{MTgreekfont} to work also with |LGRgreeks| and +% |selfGreeks| but I have dropped the idea for now. % \begin{macrocode} - \expandafter\let\csname ifmst@greek@\mst@version @upper@up\expandafter\endcsname - \csname ifmst@greek@upper@up\endcsname - \expandafter\let\csname ifmst@greek@\mst@version @lower@up\expandafter\endcsname - \csname ifmst@greek@lower@up\endcsname - \typeout{** Greek letters (upper: - `\ifmst@greek@upper@up\MTgreekupdefault\else\MTgreekitdefault\fi\string', - lower: - `\ifmst@greek@lower@up\MTgreekupdefault\else\MTgreekitdefault\fi\string') - will use - font family `#4\string' (LGR)^^J** - in mathastext math version `\mst@version\string'.}% - \else - \ifmst@selfGreeks - \SetSymbolFont{mtselfGreekfont}{#2}{OT1}{#4}{#5}{\mst@greek@ush@loc}% - \typeout{** Capital Greek letters (shape `\mst@greek@ush@loc\string') - will use font family `#4\string' (OT1)^^J** - in mathastext math version `\mst@version\string'.}% - \else + \ifmst@LGRgreeks \def\mst@greekfont{#4}\fi + \ifmst@selfGreeks\def\mst@greekfont{#4}\fi \ifmst@LGRgreek \SetSymbolFont{mtgreekup}{#2}{LGR}{\mst@greekfont}{#5}{\MTgreekupdefault}% \SetSymbolFont{mtgreekit}{#2}{LGR}{\mst@greekfont}{#5}{\MTgreekitdefault}% + \SetMathAlphabet{\mathgreekupbold}{#2}{LGR}{\mst@greekfont} + {\mst@bold}{\MTgreekupdefault}% + \SetMathAlphabet{\mathgreekitbold}{#2}{LGR}{\mst@greekfont} + {\mst@bold}{\MTgreekitdefault}% % \end{macrocode} % This is where the shape of uppercase/lowercase Greek letters is recorded, % for \cs{MTversion}'s triggered \cs{MTcustomgreek} to do the right thing. @@ -8773,8 +9435,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} in mathastext math version `\mst@version\string'.}% \fi \fi - \fi - \fi \edef\mst@tmp{\expandafter\noexpand\csname mst@hbar@mv#2\endcsname \expandafter\noexpand\csname mst@ltbar@mv#2\endcsname}% \expandafter\mst@dothe@hbarstuff\mst@tmp{#3}% @@ -9133,18 +9793,18 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \mst@prime@muskip\mst@prime@skip\relax \fi \fi -%% v1.15f - \ifmst@nonormalbold\else - \SetMathAlphabet{\mathnormalbold}{normal}{\mst@encoding@normal}% +% \end{macrocode} +% Here and elsewhere |1.3za| has removed usage of an +% \cs{ifmst@nonormalbold} conditional which was added at |1.15f|. +% \begin{macrocode} + \SetMathAlphabet{\Mathnormalbold}{normal}{\mst@encoding@normal}% {\mst@family@normal}% {\mst@boldvariant@normal}% {\mst@ltshape@normal}% - \SetMathAlphabet{\mathnormalbold}{bold}{\mst@encoding@bold}% + \SetMathAlphabet{\Mathnormalbold}{bold}{\mst@encoding@bold}% {\mst@family@bold}% {\mst@boldvariant@bold}% {\mst@ltshape@bold}% - \fi -%% v1.15f adds \ifmst@default.. checks \ifmst@subdued\else \SetSymbolFont{mtletterfont}{normal}{\mst@encoding@normal}% {\mst@family@normal}% @@ -9162,7 +9822,9 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} {\mst@family@bold}% {\mst@series@bold}% {\mst@shape@bold}% - \ifmst@defaultbf\else +% \end{macrocode} +% |1.3za| removes the |1.15f| added conditional checks. +% \begin{macrocode} \SetMathAlphabet{\Mathbf}{normal}{\mst@encoding@normal}% {\mst@family@normal}% {\mst@series@bold}% @@ -9171,8 +9833,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} {\mst@family@bold}% {\mst@series@bold}% {\mst@shape@bold}% - \fi - \ifmst@defaultit\else \SetMathAlphabet{\Mathit}{normal}{\mst@encoding@normal}% {\mst@family@normal}% {\mst@series@normal}% @@ -9181,8 +9841,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} {\mst@family@bold}% {\mst@series@bold}% {\mst@itdefault@bold}% - \fi - \ifmst@defaultsf\else \SetMathAlphabet{\Mathsf}{normal}{\mst@encoding@normal}% {\mst@sfdefault@normal}% {\mst@series@normal}% @@ -9191,8 +9849,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} {\mst@sfdefault@bold}% {\mst@series@bold}% {\mst@shape@bold}% - \fi - \ifmst@defaulttt\else \SetMathAlphabet{\Mathtt}{normal}{\mst@encoding@normal}% {\mst@ttdefault@normal}% {\mst@series@normal}% @@ -9201,7 +9857,6 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} {\mst@ttdefault@bold}% {\mst@series@bold}% {\mst@shape@bold}% - \fi \fi % de \ifmst@subdued % \end{macrocode} % \begin{macro}{\MathEulerBold} @@ -9215,13 +9870,13 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} \SetMathAlphabet{\MathEulerBold}{normal}% {U}{zeur}{\mst@boldvariant@normal}{n}% \SetMathAlphabet{\MathEulerBold}{bold}% - {U}{zeur}{\mst@boldvariant@normal}{n}% + {U}{zeur}{\mst@boldvariant@bold}{n}% \fi % \end{macrocode} % \end{macro} % \begin{macrocode} \ifmst@needsymbol\SetSymbolFont{mtpsymbol}{bold}% - {U}{psy}{\mst@boldvariant@normal}{n}% + {U}{psy}{\mst@boldvariant@bold}{n}% \fi % \end{macrocode} % \begin{macro}{LGRgreek*} @@ -9229,17 +9884,37 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} % LGRgreek, LGRgreeks, selfGreek, and selfGreeks options. % % |1.3x| has refactored the |LGRgreek| associated math fonts. +% +% |1.3za| adds the math alphabets \cs{mathgreekitbold} and +% \cs{mathgreekupbold}. +% And it executes this code also in |subdued| mode, because +% anyhow the symbolfonts |mtgreekup| and |mtgreekit| and +% associated alphabets have been declared also, at time of +% loading the package, so not doing it here means that effect +% of \cs{MTgreekfont} would be ignored; which was probably +% a bug. And by the way, documentation says \cs{MTgreekfont} +% has no effect under |LGRgreeks| and |selfGreeks| option +% so we need to enforce it here (for time being). % \begin{macrocode} - \ifmst@subdued\else + \ifmst@LGRgreeks \edef\mst@greekfont{\mst@fam}\fi + \ifmst@selfGreeks\edef\mst@greekfont{\mst@fam}\fi \ifmst@LGRgreek \SetSymbolFont{mtgreekup}{normal}{LGR}% {\mst@greekfont}{\mst@series@normal}{\MTgreekupdefault}% \SetSymbolFont{mtgreekup}{bold}{LGR}% - {\mst@greekfont}{\mst@boldvariant@normal}{\MTgreekupdefault}% + {\mst@greekfont}{\mst@boldvariant@bold}{\MTgreekupdefault}% \SetSymbolFont{mtgreekit}{normal}{LGR}% {\mst@greekfont}{\mst@series@normal}{\MTgreekitdefault}% \SetSymbolFont{mtgreekit}{bold}{LGR}% {\mst@greekfont}{\mst@boldvariant@bold}{\MTgreekitdefault}% + \SetMathAlphabet{\mathgreekupbold}{normal}{LGR}% + {\mst@greekfont}{\mst@boldvariant@normal}{\MTgreekupdefault}% + \SetMathAlphabet{\mathgreekupbold}{bold}{LGR}% + {\mst@greekfont}{\mst@boldvariant@bold}{\MTgreekupdefault}% + \SetMathAlphabet{\mathgreekitbold}{normal}{LGR}% + {\mst@greekfont}{\mst@boldvariant@normal}{\MTgreekitdefault}% + \SetMathAlphabet{\mathgreekitbold}{bold}{LGR}% + {\mst@greekfont}{\mst@boldvariant@bold}{\MTgreekitdefault}% \else \ifmst@selfGreek \SetSymbolFont{mtselfGreekfont}{normal}{OT1}% @@ -9248,23 +9923,30 @@ defaultbf,defaultit,defaultsf,defaulttt}\mst@nonormalboldtrue} {\mst@greekfont}{\mst@boldvariant@bold}{\mst@greek@ush}% \fi \fi - \fi % \end{macrocode} % \end{macro} % \end{macro} +% |1.3za| adds the log message in case of |selfGreek| option. % \begin{macrocode} \ifmst@subdued - \typeout{** subdued mode will be activated for the `normal\string' and `bold\string' math versions}% + \typeout{** subdued mode applies to the `normal\string' and `bold\string' math versions}% \else \typeout{** Latin letters in the `normal\string' (resp. `bold\string') math versions are now^^J% ** set up to use the fonts - \mst@encoding@normal/\mst@family@normal/\mst@series@normal% - (\mst@boldvariant@normal)/\mst@ltshape@normal}% + \mst@encoding@normal/\mst@family@normal/\mst@series@normal% + (\mst@boldvariant@normal)/\mst@ltshape@normal + }% \ifmst@LGRgreek\typeout{** Greek letters (upper: `\ifmst@greek@upper@up\MTgreekupdefault\else\MTgreekitdefault\fi\string', lower: `\ifmst@greek@lower@up\MTgreekupdefault\else\MTgreekitdefault\fi\string') will use font family `\mst@greekfont\string' (LGR)}% + \else + \ifmst@selfGreek + \typeout{** Capital Greek letters + (shape `\mst@greek@ush\string') + will use font family `\mst@greekfont\string' (OT1)}% + \fi \fi \ifmst@nodigits\else \typeout{** Other characters (digits, ...) and \protect\log-like names will be^^J% diff --git a/macros/latex/contrib/mathastext/mathastext.pdf b/macros/latex/contrib/mathastext/mathastext.pdf Binary files differindex 461c8e6b4a..e4ebca43c4 100644 --- a/macros/latex/contrib/mathastext/mathastext.pdf +++ b/macros/latex/contrib/mathastext/mathastext.pdf diff --git a/macros/latex/contrib/pagelayout/README.md b/macros/latex/contrib/pagelayout/README.md index 16ab16e72c..1947399306 100644 --- a/macros/latex/contrib/pagelayout/README.md +++ b/macros/latex/contrib/pagelayout/README.md @@ -15,7 +15,7 @@ The pagelayout class also integrates the [TikZ](https://www.ctan.org/pkg/pgf) an Generic templates are the easiest way to put content on a page. The template name describes the layout. You can arrange [l]andscape, [p]ortrait, [s]quare, [w]ide, [g]olden ratio, g[o]lden upright ratio or [f]lexible placeholders in rows [-]. A valid template name for example is `sg-ff`. Notice you cannot combine flexible with fixed aspect ratio placeholders within a row. ```latex -\template{ss}{ +\template{ff}{ \text{ This text fills the first placeholder. } @@ -73,7 +73,7 @@ For a complete reference, read the [manual](doc/pagelayout-manual.pdf). In general, you should use the package manager shipped with your TeX distribution to install the pagelayout package. -To install manually, copy the contents of [pagelayout.tds.zip](https://github.com/friedemannbartels/latex-pagelayout/releases/download/v1.0.4/pagelayout.tds.zip) to your local TeX directory tree and run the command `texhash`. +To install manually, copy the contents of [pagelayout.tds.zip](https://github.com/friedemannbartels/latex-pagelayout/releases/download/v1.0.5/pagelayout.tds.zip) to your local TeX directory tree and run the command `texhash`. To enable image optimization, shadow creation, and preflight, perform these installation steps: @@ -88,3 +88,7 @@ To enable image optimization, shadow creation, and preflight, perform these inst ## Development Run visual regression tests inside the _tests_ directory with the command `textestvis`. + +## License + +Copyright (c) 2022-2023 Friedemann Bartels. Free use of this software is granted under the terms of the LaTeX Project Public License version 1.3c or later. diff --git a/macros/latex/contrib/pagelayout/doc/pagelayout-manual.pdf b/macros/latex/contrib/pagelayout/doc/pagelayout-manual.pdf Binary files differindex 85d1fb4985..a09ac3d752 100644 --- a/macros/latex/contrib/pagelayout/doc/pagelayout-manual.pdf +++ b/macros/latex/contrib/pagelayout/doc/pagelayout-manual.pdf diff --git a/macros/latex/contrib/pagelayout/doc/pagelayout-manual.tex b/macros/latex/contrib/pagelayout/doc/pagelayout-manual.tex index abab7ba9cf..15e57bcafc 100644 --- a/macros/latex/contrib/pagelayout/doc/pagelayout-manual.tex +++ b/macros/latex/contrib/pagelayout/doc/pagelayout-manual.tex @@ -18,7 +18,7 @@ \usepackage{tikz} \OnlyDescription \hypersetup{pdfborder={0 0 0}} -\def\pagelayoutversion{1.0.4} +\def\pagelayoutversion{1.0.5} \begin{document} diff --git a/macros/latex/contrib/pagelayout/doc/quickstart-1.svg b/macros/latex/contrib/pagelayout/doc/quickstart-1.svg index f21a2f9710..5d184af7e0 100644 --- a/macros/latex/contrib/pagelayout/doc/quickstart-1.svg +++ b/macros/latex/contrib/pagelayout/doc/quickstart-1.svg @@ -1 +1 @@ -<svg width="320" height="239" viewBox="0 0 240 179.25" version="1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><symbol overflow="visible" id="a"><path style="stroke:none" d="M.14-4.563h3.485v.532H2.187V0h-.609v-4.031H.141zm0 0"/></symbol><symbol overflow="visible" id="b"><path style="stroke:none" d="M3.203-2.125V0h-.562v-2.125c0-.3-.059-.523-.172-.672-.106-.144-.274-.219-.5-.219-.262 0-.465.094-.61.282-.136.187-.203.453-.203.796V0H.594v-4.75h.562v1.844a1.03 1.03 0 0 1 .407-.438c.164-.101.367-.156.609-.156.344 0 .598.117.765.344.176.23.266.574.266 1.031zm0 0"/></symbol><symbol overflow="visible" id="c"><path style="stroke:none" d="M.969-3.406h1.437v2.969h1.11V0H.719v-.438h1.125v-2.53H.969zm.875-1.328h.562v.703h-.562zm0 0"/></symbol><symbol overflow="visible" id="d"><path style="stroke:none" d="M2.969-3.297v.547a1.853 1.853 0 0 0-.485-.203 1.731 1.731 0 0 0-.5-.078c-.25 0-.437.043-.562.125a.427.427 0 0 0-.188.375c0 .156.047.273.141.344.094.074.32.148.688.218l.234.047c.281.055.488.156.625.313.144.156.219.367.219.625 0 .336-.121.601-.36.796-.242.188-.574.282-1 .282-.168 0-.343-.024-.531-.063a3.437 3.437 0 0 1-.594-.156v-.578c.207.105.406.187.594.25.188.055.367.078.547.078.25 0 .441-.05.578-.156a.505.505 0 0 0 .203-.422c0-.258-.25-.442-.75-.547h-.031l-.203-.047c-.324-.062-.563-.164-.719-.312-.148-.157-.219-.36-.219-.61 0-.332.11-.586.328-.765.227-.176.547-.266.954-.266.187 0 .363.016.53.047.165.031.333.086.5.156zm0 0"/></symbol><symbol overflow="visible" id="e"><path style="stroke:none" d="M1.875-4.39v.968h1.281v.438H1.875v1.859c0 .25.047.43.14.531.094.094.258.14.5.14h.641V0H2.47c-.43 0-.73-.082-.906-.25-.168-.164-.25-.457-.25-.875v-1.86H.405v-.437h.906v-.969zm0 0"/></symbol><symbol overflow="visible" id="f"><path style="stroke:none" d="M3.422-1.984v.265H.984v.016c-.011.469.079.808.266 1.016.195.199.473.296.828.296.176 0 .363-.023.563-.078.195-.062.406-.148.625-.265v.562a3.72 3.72 0 0 1-.625.188c-.2.05-.391.078-.579.078-.53 0-.949-.157-1.25-.469C.52-.695.376-1.141.376-1.703c0-.55.145-.988.438-1.313.289-.32.68-.484 1.171-.484.438 0 .782.152 1.032.453.25.293.382.649.406 1.063zm-.563-.172a1.14 1.14 0 0 0-.265-.61c-.149-.175-.356-.265-.625-.265a.879.879 0 0 0-.672.281.943.943 0 0 0-.297.594Zm0 0"/></symbol><symbol overflow="visible" id="g"><path style="stroke:none" d="m3.406-3.422-1.219 1.64L3.532 0h-.656l-1-1.375L.875 0h-.64l1.343-1.781-1.234-1.64h.625l.906 1.233.906-1.234Zm0 0"/></symbol><symbol overflow="visible" id="h"><path style="stroke:none" d="M3.25-4.75v.469h-.64c-.212 0-.356.043-.438.125-.074.086-.11.23-.11.437v.297H3.25v.438H2.062V0H1.5v-2.984H.594v-.438H1.5v-.234c0-.375.082-.649.25-.828.176-.176.445-.266.813-.266Zm0 0"/></symbol><symbol overflow="visible" id="i"><path style="stroke:none" d="M2.188-1.234c0 .25.046.445.14.578.094.125.235.187.422.187h.656V0h-.719c-.335 0-.593-.102-.78-.313-.188-.218-.282-.523-.282-.921v-3.094h-.89v-.438h1.453Zm0 0"/></symbol><symbol overflow="visible" id="j"><path style="stroke:none" d="M3.531-2.719a1.364 1.364 0 0 0-.375-.203 1.361 1.361 0 0 0-.406-.062c-.355 0-.625.109-.813.328-.18.219-.265.539-.265.953V0h-.563v-3.422h.563v.672c.094-.238.234-.422.422-.547a1.22 1.22 0 0 1 .703-.203c.133 0 .258.023.375.063.125.03.242.085.36.156zm0 0"/></symbol><symbol overflow="visible" id="k"><path style="stroke:none" d="M1.14-.438v1.735H.579v-4.719h.563v.438a.961.961 0 0 1 .375-.375c.156-.094.336-.141.546-.141.407 0 .723.164.954.484.238.313.359.758.359 1.329 0 .554-.121.992-.36 1.312-.23.313-.546.469-.953.469-.21 0-.39-.043-.546-.125a.996.996 0 0 1-.375-.406zm1.657-1.265c0-.438-.074-.766-.219-.984a.67.67 0 0 0-.61-.344.7.7 0 0 0-.624.344c-.137.218-.203.546-.203.984 0 .43.066.758.203.984a.702.702 0 0 0 .625.328c.27 0 .472-.109.61-.328.144-.219.218-.547.218-.984zm0 0"/></symbol><symbol overflow="visible" id="l"><path style="stroke:none" d="M2.14-1.719h-.187c-.324 0-.57.059-.734.172-.168.117-.25.29-.25.516 0 .21.062.37.187.484.125.117.297.172.516.172.312 0 .555-.11.734-.328.176-.219.266-.516.266-.89v-.126zm1.094-.234V0h-.562v-.5c-.125.2-.281.352-.469.453a1.4 1.4 0 0 1-.656.14c-.344 0-.621-.097-.828-.296C.508-.398.406-.664.406-1c0-.375.125-.66.375-.86.258-.195.633-.296 1.125-.296h.766v-.094c0-.27-.074-.469-.219-.594-.137-.125-.351-.187-.64-.187-.2 0-.399.031-.594.094a2.867 2.867 0 0 0-.563.234v-.563a6.11 6.11 0 0 1 .594-.171c.188-.04.375-.063.563-.063.28 0 .519.043.718.125.196.086.36.21.485.375a.92.92 0 0 1 .171.375c.032.148.047.371.047.672zm0 0"/></symbol><symbol overflow="visible" id="m"><path style="stroke:none" d="M3.234-.172a1.732 1.732 0 0 1-.468.188c-.157.05-.32.078-.485.078-.531 0-.949-.157-1.25-.469-.293-.32-.437-.766-.437-1.328 0-.563.144-1 .437-1.313.301-.32.719-.484 1.25-.484.164 0 .328.023.485.063.156.042.312.109.468.203v.578a1.665 1.665 0 0 0-.453-.281 1.268 1.268 0 0 0-.5-.094c-.355 0-.625.117-.812.344-.188.23-.282.558-.282.984 0 .418.094.742.282.969.195.23.468.343.812.343.196 0 .375-.023.531-.078.157-.062.297-.156.422-.281Zm0 0"/></symbol><symbol overflow="visible" id="n"><path style="stroke:none" d="M.313-2.203h3.234v.515H.312Zm0 0"/></symbol><symbol overflow="visible" id="o"><path style="stroke:none" d="M1.875-3.031a.716.716 0 0 0-.64.344c-.15.218-.22.546-.22.984 0 .43.07.758.22.984.144.219.359.328.64.328.29 0 .508-.109.656-.328.145-.226.219-.554.219-.984 0-.438-.074-.766-.219-.984a.738.738 0 0 0-.656-.344Zm0-.469c.477 0 .844.156 1.094.469.25.304.375.746.375 1.328 0 .586-.125 1.031-.375 1.344-.25.304-.617.453-1.094.453-.469 0-.828-.149-1.078-.453-.25-.313-.375-.758-.375-1.344 0-.582.125-1.024.375-1.328.25-.313.61-.469 1.078-.469Zm0 0"/></symbol><symbol overflow="visible" id="p"><path style="stroke:none" d="M2.625-2.984V-4.75h.563V0h-.563v-.438a.996.996 0 0 1-.375.407c-.156.082-.34.125-.547.125-.406 0-.73-.16-.969-.485C.492-.71.375-1.156.375-1.719c0-.55.117-.984.36-1.297a1.15 1.15 0 0 1 .968-.484 1.046 1.046 0 0 1 .922.516zM.969-1.704c0 .438.066.766.203.985.133.219.336.328.61.328a.71.71 0 0 0 .624-.328c.145-.226.219-.554.219-.984 0-.438-.074-.766-.219-.984a.708.708 0 0 0-.625-.344.662.662 0 0 0-.61.344c-.136.218-.202.546-.202.984zm0 0"/></symbol><symbol overflow="visible" id="q"><path style="stroke:none" d="M1.188-1.234h1.078V0H1.187Zm0 0"/></symbol><symbol overflow="visible" id="r"><path style="stroke:none" d="M5.984-3.578h8.672V0H1.578v-3.469l2.219-2.344C6.41-8.601 8-10.316 8.562-10.953c.688-.79 1.18-1.492 1.485-2.11.3-.613.453-1.218.453-1.812 0-.914-.277-1.625-.828-2.125-.555-.5-1.34-.75-2.36-.75-.73 0-1.546.148-2.453.438-.906.28-1.851.699-2.828 1.25v-3.797a20.224 20.224 0 0 1 2.875-.813 13.977 13.977 0 0 1 2.719-.281c2.176 0 3.883.512 5.125 1.531 1.25 1.012 1.875 2.39 1.875 4.14A6.37 6.37 0 0 1 14.219-13c-.274.71-.735 1.496-1.39 2.36-.493.624-1.829 2.03-4.017 4.218a517.956 517.956 0 0 0-2.828 2.844zm0 0"/></symbol></defs><path style="fill:#fff;stroke-width:1.43381" d="M4.065.004h231.869a4.056 4.056 0 0 1 4.065 4.065v170.906a4.056 4.056 0 0 1-4.065 4.064H4.064A4.056 4.056 0 0 1 0 174.975V4.07A4.056 4.056 0 0 1 4.065.004Z"/><path style="fill:#a6a6a6;fill-opacity:.2;stroke-width:1.43381" d="M0 179.037v-.203h239.999v.203zm0-4.06v-.204h239.999v.204zm0-4.066v-.204h239.999v.204zm0-4.068v-.2h239.999v.2zm0-4.058v-.205h239.999v.204zm0-4.066v-.205h239.999v.205zm0-4.066v-.205h239.999v.205zm0-4.061v-.205h239.999v.205zm0-4.066v-.205h239.999v.205zm0-4.067v-.205h239.999v.205zm0-4.06v-.205h239.999v.205zm0-4.066v-.205h239.999v.205zm0-4.067v-.205h239.999v.205zm0-4.06V126h239.999v.205zm0-4.067v-.205h239.999v.205zm0-4.069v-.2h239.999v.2zm0-4.06v-.201h239.999v.2zm0-4.067v-.2h239.999v.2zm0-4.066v-.2h239.999v.2zm0-4.058v-.205h239.999v.205zm0-4.069v-.2h239.999v.2zm0-4.066v-.2h239.999v.2zm0-4.066v-.201h239.999v.2zm0-4.058v-.204h239.999v.204zm0-4.07v-.2h239.999v.2zm0-4.063v-.2h239.999v.2zm0-4.06v-.204h239.999v.204ZM0 69.3v-.204h239.999v.204zm0-4.067v-.203h239.999v.203zm0-4.06v-.204h239.999v.204zm0-4.067v-.203h239.999v.203zm0-4.066v-.204h239.999v.204zm0-4.06v-.204h239.999v.204zm0-4.067v-.203h239.999v.203zm0-4.066v-.204h239.999v.204zm0-4.06v-.204h239.999v.203zm0-4.066v-.205h239.999v.205zm0-4.066v-.205h239.999v.205zm0-4.06v-.205h239.999v.205zm0-4.067v-.205h239.999v.205zm0-4.066v-.205h239.999v.205zm0-4.06v-.206h239.999v.205zm0-4.067V8.13h239.999v.205zM0 4.27v-.205h239.999v.205zM0 .21V.003h239.999V.21z"/><path style="fill:#a6a6a6;fill-opacity:.2;stroke-width:1.43381" d="M0 179.035V0h.2v179.033zm4.065 0V0h.2v179.033zm4.06 0V0h.2v179.033zm4.065 0V0h.202v179.033zm4.066 0V0h.202v179.033zm4.06 0V0h.203v179.033zm4.067 0V0h.202v179.033zm4.066 0V0h.203v179.033zm4.061 0V0h.202v179.033zm4.066 0V0h.201v179.033zm4.067 0V0h.205v179.033zm4.06 0V0h.2v179.033zm4.066 0V0h.205v179.033zm4.067 0V0h.205v179.033zm4.06 0V0h.205v179.033zm4.067 0V0h.205v179.033zm4.066 0V0h.2v179.033zm4.06 0V0h.208v179.033h-.2Zm4.067 0V0h.2v179.033zm4.066 0V0h.2v179.033zm4.06 0V0h.201v179.033zm4.067 0V0h.2v179.033zm4.066 0V0h.2v179.033zm4.066 0V0h.201v179.033zm4.061 0V0h.2v179.033zm4.066 0V0h.201v179.033zm4.067 0V0h.2v179.033zm4.06 0V0h.204v179.033zm4.066 0V0h.201v179.033zm4.067 0V0h.2v179.033zm4.06 0V0h.201v179.033zm4.067 0V0h.203v179.033zm4.066 0V0h.2v179.033zm4.06 0V0h.201v179.033zm4.067 0V0h.2v179.033zm4.065 0V0h.202v179.033zm4.057 0V0h.205v179.033zm4.07 0V0h.202v179.033zm4.066 0V0h.202v179.033zm4.06 0V0h.203v179.033zm4.064 0V0h.205v179.033zm4.069 0V0h.205v179.033zm4.06 0V0h.201v179.033zm4.067 0V0h.205v179.033zm4.063 0V0h.205v179.033zm4.064 0V0h.205v179.033zm4.066 0V0h.205v179.033zm4.066 0V0h.201v179.033zm4.06 0V0h.202v179.033zm4.067 0V0h.205v179.033zm4.066 0V0h.201v179.033zm4.061 0V0h.2v179.033zm4.066 0V0h.201v179.033zm4.067 0V0h.2v179.033zm4.06 0V0h.2v179.033zm4.066 0V0h.201v179.033zm4.067 0V0h.2v179.033zm4.06 0V0h.208v179.033h-.2zm4.067 0V0h.2v179.033zm4.066 0V0h.2v179.033z"/><path style="fill:#000;stroke-width:1.43381" d="M7.94.004v4.163h.57V.004zm223.546 0v4.163h.572V.004ZM0 7.946v.57h4.164v-.568H0Zm235.833 0v.57H240v-.568h-4.167zM0 170.525v.57h4.164v-.572H0Zm235.833 0v.57H240v-.572h-4.168zm-227.896 4.35v4.164h.571v-4.164zm223.546 0v4.164h.572v-4.164h-.57z"/><path style="fill:#a6a6a6;fill-opacity:.2;stroke-width:1.43381" d="M0 170.91v-.203h239.999v.204zm0-20.318v-.205h239.999v.205zm0-20.326v-.205h239.999v.205zm0-20.323v-.2h239.999v.2zm0-20.325v-.201h239.999v.2zM0 69.3v-.204h239.999v.204zm0-20.32v-.204h239.999v.204zm0-20.325v-.205h239.999v.205zm0-20.32V8.13h239.999v.205z"/><path style="fill:#a6a6a6;fill-opacity:.2;stroke-width:1.43381" d="M8.125 179.035V0h.2v179.033zm20.324 0V0h.203v179.033zm20.32 0V0h.205v179.033zm20.32 0V0h.208v179.033h-.2Zm20.326 0V0h.2v179.033zm20.32 0V0h.204v179.033zm20.326 0V0h.2v179.033zm20.318 0V0h.203v179.033zm20.32 0V0h.201v179.033zm20.326 0V0h.201v179.033zm20.32 0V0h.201v179.033zm20.32 0V0h.208v179.033h-.2z"/><use xlink:href="#a" x="19.654" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#b" x="23.431" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#c" x="27.208" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#d" x="30.984" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#e" x="38.644" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#f" x="42.421" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#g" x="46.198" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#e" x="49.981" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#h" x="57.635" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#c" x="61.412" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#i" x="65.195" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#i" x="68.971" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#d" x="72.748" y="38.799" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#e" x="19.842" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#b" x="23.619" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#f" x="27.396" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#h" x="34.018" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#c" x="37.794" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#j" x="41.571" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#d" x="45.348" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#e" x="49.131" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#k" x="55.747" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#i" x="59.524" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#l" x="63.3" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#m" x="67.083" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#f" x="70.86" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#n" x="74.637" y="47.366" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#b" x="19.842" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#o" x="23.619" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#i" x="27.396" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#p" x="31.172" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#f" x="34.956" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#j" x="38.732" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><use xlink:href="#q" x="42.509" y="55.934" width="100%" height="100%" style="fill:#000;fill-opacity:1" transform="translate(.102 .102) scale(1.43381)"/><path style="fill:#b3e6fa;fill-opacity:.3;fill-rule:nonzero;stroke:#66ccf5;stroke-width:.28346;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:.3" d="M.002.002v56.691h56.691V.002Zm0 0" transform="matrix(1.43381 0 0 -1.43381 130.162 130.156)"/><use xlink:href="#r" x="110.523" y="72.878" width="100%" height="100%" style="fill:#66ccf5;fill-opacity:.3" transform="translate(.102 .102) scale(1.43381)"/></svg>
\ No newline at end of file +<svg width="320" height="239" viewBox="0 0 167.24 124.72" version="1.2" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"><defs><symbol overflow="visible" id="b"><path style="stroke:none" d="M.14-4.563h3.485v.532H2.187V0h-.609v-4.031H.141Zm0 0"/></symbol><symbol overflow="visible" id="c"><path style="stroke:none" d="M3.203-2.125V0h-.562v-2.125c0-.3-.059-.523-.172-.672-.106-.144-.274-.219-.5-.219-.262 0-.465.094-.61.282-.136.187-.203.453-.203.796V0H.594v-4.75h.562v1.844a1.03 1.03 0 0 1 .407-.438c.164-.101.367-.156.609-.156.344 0 .598.117.765.344.176.23.266.574.266 1.031Zm0 0"/></symbol><symbol overflow="visible" id="d"><path style="stroke:none" d="M.969-3.406h1.437v2.969h1.11V0H.719v-.438h1.125v-2.53H.969Zm.875-1.328h.562v.703h-.562Zm0 0"/></symbol><symbol overflow="visible" id="e"><path style="stroke:none" d="M2.969-3.297v.547a1.853 1.853 0 0 0-.485-.203 1.731 1.731 0 0 0-.5-.078c-.25 0-.437.043-.562.125a.427.427 0 0 0-.188.375c0 .156.047.273.141.344.094.074.32.148.688.218l.234.047c.281.055.488.156.625.313.144.156.219.367.219.625 0 .336-.121.601-.36.796-.242.188-.574.282-1 .282-.168 0-.343-.024-.531-.063a3.437 3.437 0 0 1-.594-.156v-.578c.207.105.406.187.594.25.188.055.367.078.547.078.25 0 .441-.05.578-.156a.505.505 0 0 0 .203-.422c0-.258-.25-.442-.75-.547h-.031l-.203-.047c-.324-.062-.563-.164-.719-.312-.148-.157-.219-.36-.219-.61 0-.332.11-.586.328-.765.227-.176.547-.266.954-.266.187 0 .363.016.53.047.165.031.333.086.5.156Zm0 0"/></symbol><symbol overflow="visible" id="f"><path style="stroke:none" d="M1.875-4.39v.968h1.281v.438H1.875v1.859c0 .25.047.43.14.531.094.094.258.14.5.14h.641V0H2.47c-.43 0-.73-.082-.906-.25-.168-.164-.25-.457-.25-.875v-1.86H.405v-.437h.906v-.969Zm0 0"/></symbol><symbol overflow="visible" id="g"><path style="stroke:none" d="M3.422-1.984v.265H.984v.016c-.011.469.079.808.266 1.016.195.199.473.296.828.296.176 0 .363-.023.563-.078.195-.062.406-.148.625-.265v.562a3.72 3.72 0 0 1-.625.188c-.2.05-.391.078-.579.078-.53 0-.949-.157-1.25-.469C.52-.695.376-1.141.376-1.703c0-.55.145-.988.438-1.313.289-.32.68-.484 1.171-.484.438 0 .782.152 1.032.453.25.293.382.649.406 1.063Zm-.563-.172a1.14 1.14 0 0 0-.265-.61c-.149-.175-.356-.265-.625-.265a.879.879 0 0 0-.672.281.943.943 0 0 0-.297.594Zm0 0"/></symbol><symbol overflow="visible" id="h"><path style="stroke:none" d="m3.406-3.422-1.219 1.64L3.532 0h-.656l-1-1.375L.875 0h-.64l1.343-1.781-1.234-1.64h.625l.906 1.233.906-1.234Zm0 0"/></symbol><symbol overflow="visible" id="i"><path style="stroke:none" d="M3.25-4.75v.469h-.64c-.212 0-.356.043-.438.125-.074.086-.11.23-.11.437v.297H3.25v.438H2.062V0H1.5v-2.984H.594v-.438H1.5v-.234c0-.375.082-.649.25-.828.176-.176.445-.266.813-.266Zm0 0"/></symbol><symbol overflow="visible" id="j"><path style="stroke:none" d="M2.188-1.234c0 .25.046.445.14.578.094.125.235.187.422.187h.656V0h-.719c-.335 0-.593-.102-.78-.313-.188-.218-.282-.523-.282-.921v-3.094h-.89v-.438h1.453Zm0 0"/></symbol><symbol overflow="visible" id="k"><path style="stroke:none" d="M3.531-2.719a1.364 1.364 0 0 0-.375-.203 1.361 1.361 0 0 0-.406-.062c-.355 0-.625.109-.813.328-.18.219-.265.539-.265.953V0h-.563v-3.422h.563v.672c.094-.238.234-.422.422-.547.195-.133.43-.203.703-.203.133 0 .258.023.375.063.125.03.242.085.36.156Zm0 0"/></symbol><symbol overflow="visible" id="l"><path style="stroke:none" d="M1.14-.438v1.735H.579v-4.719h.563v.438a.961.961 0 0 1 .375-.375c.156-.094.336-.141.546-.141.407 0 .723.164.954.484.238.313.359.758.359 1.329 0 .554-.121.992-.36 1.312-.23.313-.546.469-.953.469-.21 0-.39-.043-.546-.125a.996.996 0 0 1-.375-.406Zm1.657-1.265c0-.438-.074-.766-.219-.984a.67.67 0 0 0-.61-.344.7.7 0 0 0-.624.344c-.137.218-.203.546-.203.984 0 .43.066.758.203.984a.702.702 0 0 0 .625.328c.27 0 .472-.109.61-.328.144-.219.218-.547.218-.984Zm0 0"/></symbol><symbol overflow="visible" id="m"><path style="stroke:none" d="M2.14-1.719h-.187c-.324 0-.57.059-.734.172-.168.117-.25.29-.25.516 0 .21.062.37.187.484.125.117.297.172.516.172.312 0 .555-.11.734-.328.176-.219.266-.516.266-.89v-.126Zm1.094-.234V0h-.562v-.5c-.125.2-.281.352-.469.453-.18.094-.398.14-.656.14-.344 0-.621-.097-.828-.296C.508-.398.406-.664.406-1c0-.375.125-.66.375-.86.258-.195.633-.296 1.125-.296h.766v-.094c0-.27-.074-.469-.219-.594-.137-.125-.351-.187-.64-.187-.2 0-.399.031-.594.094a2.867 2.867 0 0 0-.563.234v-.563a6.11 6.11 0 0 1 .594-.171c.188-.04.375-.063.563-.063.28 0 .519.043.718.125.196.086.36.21.485.375a.92.92 0 0 1 .171.375c.032.148.047.371.047.672Zm0 0"/></symbol><symbol overflow="visible" id="n"><path style="stroke:none" d="M3.234-.172a1.732 1.732 0 0 1-.468.188c-.157.05-.32.078-.485.078-.531 0-.949-.157-1.25-.469-.293-.32-.437-.766-.437-1.328 0-.563.144-1 .437-1.313.301-.32.719-.484 1.25-.484.164 0 .328.023.485.063.156.042.312.109.468.203v.578a1.665 1.665 0 0 0-.453-.281 1.268 1.268 0 0 0-.5-.094c-.355 0-.625.117-.812.344-.188.23-.282.558-.282.984 0 .418.094.742.282.969.195.23.468.343.812.343.196 0 .375-.023.531-.078.157-.062.297-.156.422-.281Zm0 0"/></symbol><symbol overflow="visible" id="o"><path style="stroke:none" d="M.313-2.203h3.234v.515H.312Zm0 0"/></symbol><symbol overflow="visible" id="p"><path style="stroke:none" d="M1.875-3.031a.716.716 0 0 0-.64.344c-.15.218-.22.546-.22.984 0 .43.07.758.22.984.144.219.359.328.64.328.29 0 .508-.109.656-.328.145-.226.219-.554.219-.984 0-.438-.074-.766-.219-.984a.738.738 0 0 0-.656-.344Zm0-.469c.477 0 .844.156 1.094.469.25.304.375.746.375 1.328 0 .586-.125 1.031-.375 1.344-.25.304-.617.453-1.094.453-.469 0-.828-.149-1.078-.453-.25-.313-.375-.758-.375-1.344 0-.582.125-1.024.375-1.328.25-.313.61-.469 1.078-.469Zm0 0"/></symbol><symbol overflow="visible" id="q"><path style="stroke:none" d="M2.625-2.984V-4.75h.563V0h-.563v-.438a.996.996 0 0 1-.375.407c-.156.082-.34.125-.547.125-.406 0-.73-.16-.969-.485C.492-.71.375-1.156.375-1.719c0-.55.117-.984.36-1.297a1.15 1.15 0 0 1 .968-.484 1.046 1.046 0 0 1 .922.516ZM.969-1.704c0 .438.066.766.203.985.133.219.336.328.61.328.269 0 .476-.109.624-.328.145-.226.219-.554.219-.984 0-.438-.074-.766-.219-.984a.708.708 0 0 0-.625-.344.662.662 0 0 0-.61.344c-.136.218-.202.546-.202.984Zm0 0"/></symbol><symbol overflow="visible" id="r"><path style="stroke:none" d="M1.188-1.234h1.078V0H1.187Zm0 0"/></symbol><symbol overflow="visible" id="s"><path style="stroke:none" d="M5.984-3.578h8.672V0H1.578v-3.469l2.219-2.344C6.41-8.601 8-10.316 8.562-10.953c.688-.79 1.18-1.492 1.485-2.11.3-.613.453-1.218.453-1.812 0-.914-.277-1.625-.828-2.125-.555-.5-1.34-.75-2.36-.75-.73 0-1.546.148-2.453.438-.906.28-1.851.699-2.828 1.25v-3.797a20.224 20.224 0 0 1 2.875-.813 13.977 13.977 0 0 1 2.719-.281c2.176 0 3.883.512 5.125 1.531 1.25 1.012 1.875 2.39 1.875 4.14 0 .813-.137 1.575-.406 2.282-.274.71-.735 1.496-1.39 2.36-.493.624-1.829 2.03-4.017 4.218a517.956 517.956 0 0 0-2.828 2.844Zm0 0"/></symbol><clipPath id="a"><path d="M0 0h167.238v124.719H0Zm0 0"/></clipPath><clipPath id="t"><path d="M5 121h1v3.719H5Zm0 0"/></clipPath><clipPath id="u"><path d="M164 118h3.238v2H164Zm0 0"/></clipPath><clipPath id="v"><path d="M161 121h1v3.719h-1Zm0 0"/></clipPath><clipPath id="w"><path d="M164 5h3.238v1H164Zm0 0"/></clipPath></defs><g clip-path="url(#a)"><path style="fill:none;stroke-width:.14172;stroke-linecap:square;stroke-linejoin:miter;stroke:#a6a6a6;stroke-opacity:.2;stroke-miterlimit:10" d="M0 .001h175.75M0 2.833h175.75M0 5.67h175.75M0 8.505h175.75M0 11.337h175.75M0 14.173h175.75M0 17.01h175.75M0 19.841h175.75M0 22.677h175.75M0 25.513h175.75M0 28.345h175.75M0 31.181h175.75M0 34.017h175.75M0 36.849h175.75M0 39.685h175.75M0 42.52h175.75M0 45.353h175.75M0 48.189h175.75M0 51.025h175.75M0 53.857h175.75M0 56.693h175.75M0 59.529h175.75M0 62.36h175.75M0 65.197h175.75M0 68.033h175.75M0 70.869h175.75M0 73.7h175.75M0 76.537h175.75M0 79.371h175.75M0 82.204h175.75M0 85.04h175.75M0 87.876h175.75M0 90.708h175.75M0 93.544h175.75M0 96.38h175.75M0 99.212h175.75M0 102.048h175.75M0 104.884h175.75M0 107.716h175.75M0 110.552h175.75M0 113.388h175.75M0 116.22h175.75M0 119.056h175.75M0 121.892h175.75M0 124.724h175.75M0 127.56h175.75M0 130.396h175.75M0 133.228h175.75M0 0v133.23M2.836.002v133.23M5.668.002v133.23M8.504.002v133.23M11.34.002v133.23M14.172.002v133.23M17.008.002v133.23M19.844.002v133.23M22.676.002v133.23M25.512.002v133.23M28.348.002v133.23M31.18.002v133.23M34.016.002v133.23M36.852.002v133.23M39.684.002v133.23M42.52.002v133.23M45.356.002v133.23M48.188.002v133.23M51.024.002v133.23M53.859.002v133.23M56.691.002v133.23M59.527.002v133.23M62.363.002v133.23M65.195.002v133.23M68.031.002v133.23M70.867.002v133.23M73.703.002v133.23M76.535.002v133.23M79.371.002v133.23M82.207.002v133.23M85.04.002v133.23M87.875.002v133.23M90.711.002v133.23M93.543.002v133.23M96.38.002v133.23M99.215.002v133.23M102.047.002v133.23M104.883.002v133.23M107.719.002v133.23M110.55.002v133.23M113.387.002v133.23M116.223.002v133.23M119.055.002v133.23M121.89.002v133.23M124.727.002v133.23M127.559.002v133.23M130.395.002v133.23M133.23.002v133.23M136.063.002v133.23M138.899.002v133.23M141.734.002v133.23M144.566.002v133.23M147.403.002v133.23M150.238.002v133.23M153.07.002v133.23M155.906.002v133.23M158.742.002v133.23M161.574.002v133.23M164.41.002v133.23M167.246.002v133.23M170.078.002v133.23M172.914.002v133.23M175.75.002v133.23M0 .001h175.75M0 14.173h175.75M0 28.345h175.75M0 42.521h175.75M0 56.693h175.75M0 70.869h175.75M0 85.04h175.75M0 99.212h175.75M0 113.388h175.75M0 127.56h175.75M0 0v133.23M14.172.002v133.23M28.348.002v133.23M42.52.002v133.23M56.695.002v133.23M70.867.002v133.23M85.04.002v133.23M99.215.002v133.23M113.387.002v133.23M127.559.002v133.23M141.734.002v133.23M155.906.002v133.23M170.082.002v133.23" transform="matrix(1 0 0 -1 -8.504 133.224)"/></g><use xlink:href="#b" x="19.654" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#c" x="23.431" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#d" x="27.208" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#e" x="30.984" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#f" x="38.644" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#g" x="42.421" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#h" x="46.198" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#f" x="49.981" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#i" x="57.635" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#d" x="61.412" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#j" x="65.195" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#j" x="68.971" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#e" x="72.748" y="24.625" style="fill:#000;fill-opacity:1"/><use xlink:href="#f" x="19.842" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#c" x="23.619" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#g" x="27.396" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#i" x="34.018" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#d" x="37.794" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#k" x="41.571" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#e" x="45.348" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#f" x="49.131" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#l" x="55.747" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#j" x="59.524" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#m" x="63.3" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#n" x="67.083" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#g" x="70.86" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#o" x="74.637" y="33.193" style="fill:#000;fill-opacity:1"/><use xlink:href="#c" x="19.842" y="41.761" style="fill:#000;fill-opacity:1"/><use xlink:href="#p" x="23.619" y="41.761" style="fill:#000;fill-opacity:1"/><use xlink:href="#j" x="27.396" y="41.761" style="fill:#000;fill-opacity:1"/><use xlink:href="#q" x="31.172" y="41.761" style="fill:#000;fill-opacity:1"/><use xlink:href="#g" x="34.956" y="41.761" style="fill:#000;fill-opacity:1"/><use xlink:href="#k" x="38.732" y="41.761" style="fill:#000;fill-opacity:1"/><use xlink:href="#r" x="42.509" y="41.761" style="fill:#000;fill-opacity:1"/><path style="fill-rule:nonzero;fill:#b3e6fa;fill-opacity:.3;stroke-width:.28346;stroke-linecap:butt;stroke-linejoin:miter;stroke:#66cef5;stroke-opacity:.3;stroke-miterlimit:10" d="M.002 0v85.042h56.691V0Zm0 0" transform="matrix(1 0 0 -1 90.709 104.878)"/><use xlink:href="#s" x="110.523" y="72.877" style="fill:#66cef5;fill-opacity:.3"/><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-2.836 5.67h5.672" transform="matrix(1 0 0 -1 0 124.72)"/><g clip-path="url(#t)"><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M5.668-2.835v5.668" transform="matrix(1 0 0 -1 0 124.72)"/></g><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M-2.836 119.056h5.672M5.668 127.56v-5.668" transform="matrix(1 0 0 -1 0 124.72)"/><g clip-path="url(#u)"><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M170.082 5.67h-5.672" transform="matrix(1 0 0 -1 0 124.72)"/></g><g clip-path="url(#v)"><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M161.578-2.835v5.668" transform="matrix(1 0 0 -1 0 124.72)"/></g><g clip-path="url(#w)"><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M170.082 119.056h-5.672" transform="matrix(1 0 0 -1 0 124.72)"/></g><path style="fill:none;stroke-width:.3985;stroke-linecap:butt;stroke-linejoin:miter;stroke:#000;stroke-opacity:1;stroke-miterlimit:10" d="M161.578 127.56v-5.668" transform="matrix(1 0 0 -1 0 124.72)"/></svg>
\ No newline at end of file diff --git a/macros/latex/contrib/pagelayout/doc/quickstart.pdf b/macros/latex/contrib/pagelayout/doc/quickstart.pdf Binary files differindex 9fe5b29071..2af22e071a 100644 --- a/macros/latex/contrib/pagelayout/doc/quickstart.pdf +++ b/macros/latex/contrib/pagelayout/doc/quickstart.pdf diff --git a/macros/latex/contrib/pagelayout/doc/quickstart.tex b/macros/latex/contrib/pagelayout/doc/quickstart.tex index 095c98d288..3a503dd28d 100644 --- a/macros/latex/contrib/pagelayout/doc/quickstart.tex +++ b/macros/latex/contrib/pagelayout/doc/quickstart.tex @@ -28,7 +28,7 @@ \fontsize{6.3pt}{8.6pt}\selectfont % generic template - \template{ss}{ + \template{ff}{ \text{ This text fills the first placeholder. } diff --git a/macros/latex/contrib/pagelayout/scripts/pagelayoutapi b/macros/latex/contrib/pagelayout/scripts/pagelayoutapi index 4c6888a249..7533cf722e 100755 --- a/macros/latex/contrib/pagelayout/scripts/pagelayoutapi +++ b/macros/latex/contrib/pagelayout/scripts/pagelayoutapi @@ -13,7 +13,7 @@ # LaTeX version 2008/05/04 or later. # -version=1.0.4 +version=1.0.5 _convert() { turbo=$1 @@ -100,6 +100,17 @@ getwidth() { fi } +getheight() { + if command -v magick >/dev/null 2>&1; then + filename=$1 + + originalheight=$( magick identify -ping -format %h "$filename" ) + echo $originalheight + else + echo errormagicknotinstalled + fi +} + optimize() { if command -v magick >/dev/null 2>&1; then filenamecache=$2 @@ -299,6 +310,7 @@ batchoptimize() { usage() { cat <<HELP_USAGE usage: pagelayoutapi getwidth % FILE + pagelayoutapi getheight % FILE pagelayoutapi optimize % FILE % FILENAME % EXTENSION % ORIGINALWIDTH % ORIGINALHEIGHT % CROPLEFT % CROPRIGHT % CROPTOP % CROPBOTTOM % DENSITY % WIDTH % HEIGHT % DOWNSAMPLETHRESHOLD % UNSHARP % QUALITY @@ -327,6 +339,11 @@ getwidth) getwidth "$1" ;; +getheight) + shift + + getheight "$1" + ;; optimize) shift diff --git a/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1 b/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1 index 368e411ef7..dab9b89f1c 100644 --- a/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1 +++ b/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "PAGELAYOUTAPI" "1" "January 2023" "" "" +.TH "PAGELAYOUTAPI" "1" "December 2023" "" "" . .SH "NAME" \fBpagelayoutapi\fR \- API for the pagelayout LaTeX class @@ -10,6 +10,9 @@ \fBpagelayoutapi getwidth\fR % FILE . .P +\fBpagelayoutapi getheight\fR % FILE +. +.P \fBpagelayoutapi optimize\fR % FILE % FILENAME % EXTENSION % ORIGINALWIDTH % ORIGINALHEIGHT % CROPLEFT % CROPRIGHT % CROPTOP % CROPBOTTOM % DENSITY % WIDTH % HEIGHT % DOWNSAMPLETHRESHOLD % UNSHARP % QUALITY . .P @@ -29,6 +32,10 @@ This script provides an API for the pagelayout LaTeX class\. Returns the width in pixels for the given image file\. . .TP +\fBpagelayoutapi getheight\fR +Returns the height in pixels for the given image file\. +. +.TP \fBpagelayoutapi optimize\fR Creates a cropped, rezised, sharpend and compressed image and stores it in the cache directory\. . @@ -122,4 +129,4 @@ Defines a system wide import directory\. \fBpagelayoutapi\fR was written by Friedemann Bartels\. \fIhttps://github\.com/friedemannbartels\fR . .SH "LICENSE" -Copyright (c) 2022-2023 Friedemann Bartels\. Free use of this software is granted under the terms of the LaTeX Project Public License version 1\.3c or later\. +Copyright (c) 2022\-2023 Friedemann Bartels\. Free use of this software is granted under the terms of the LaTeX Project Public License version 1\.3c or later\. diff --git a/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1.md b/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1.md index ab04ddd0b8..881554a124 100644 --- a/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1.md +++ b/macros/latex/contrib/pagelayout/scripts/pagelayoutapi.1.md @@ -5,6 +5,8 @@ pagelayoutapi(1) -- API for the pagelayout LaTeX class `pagelayoutapi getwidth` % FILE +`pagelayoutapi getheight` % FILE + `pagelayoutapi optimize` % FILE % FILENAME % EXTENSION % ORIGINALWIDTH % ORIGINALHEIGHT % CROPLEFT % CROPRIGHT % CROPTOP % CROPBOTTOM % DENSITY % WIDTH % HEIGHT % DOWNSAMPLETHRESHOLD % UNSHARP % QUALITY `pagelayoutapi makeshadow` % FILENAME % STANDARDDEVIATION % OPACITY % COLOR % WIDTH % HEIGHT % FRAMEWIDTH % FRAMEHEIGHT % MARGIN % BORDERRADIUS @@ -20,6 +22,9 @@ This script provides an API for the pagelayout LaTeX class. * `pagelayoutapi getwidth`: Returns the width in pixels for the given image file. +* `pagelayoutapi getheight`: + Returns the height in pixels for the given image file. + * `pagelayoutapi optimize`: Creates a cropped, rezised, sharpend and compressed image and stores it in the cache directory. diff --git a/macros/latex/contrib/pagelayout/scripts/textestvis b/macros/latex/contrib/pagelayout/scripts/textestvis index dba5e4c1aa..53dcedddca 100755 --- a/macros/latex/contrib/pagelayout/scripts/textestvis +++ b/macros/latex/contrib/pagelayout/scripts/textestvis @@ -13,7 +13,7 @@ # LaTeX version 2008/05/04 or later. # -version=1.0.4 +version=1.0.5 OK="$( tput setaf 2 )•$( tput sgr0 )" FAILED="$( tput setaf 1 )$( tput bold )x$( tput sgr0 )" diff --git a/macros/latex/contrib/pagelayout/scripts/textestvis.1 b/macros/latex/contrib/pagelayout/scripts/textestvis.1 index 7f7b7df740..69ed008f7d 100644 --- a/macros/latex/contrib/pagelayout/scripts/textestvis.1 +++ b/macros/latex/contrib/pagelayout/scripts/textestvis.1 @@ -1,7 +1,7 @@ .\" generated with Ronn/v0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3 . -.TH "TEXTESTVIS" "1" "January 2023" "" "" +.TH "TEXTESTVIS" "1" "December 2023" "" "" . .SH "NAME" \fBtextestvis\fR \- visual regression tests for LaTeX @@ -70,4 +70,4 @@ Prints version information\. \fBtextestvis\fR was written by Friedemann Bartels\. \fIhttps://github\.com/friedemannbartels\fR . .SH "LICENSE" -Copyright (c) 2022-2023 Friedemann Bartels\. Free use of this software is granted under the terms of the LaTeX Project Public License version 1\.3c or later\. +Copyright (c) 2022\-2023 Friedemann Bartels\. Free use of this software is granted under the terms of the LaTeX Project Public License version 1\.3c or later\. diff --git a/macros/latex/contrib/pagelayout/tex/pagelayout.cls b/macros/latex/contrib/pagelayout/tex/pagelayout.cls index 219520dc7b..fbc4a507ff 100644 --- a/macros/latex/contrib/pagelayout/tex/pagelayout.cls +++ b/macros/latex/contrib/pagelayout/tex/pagelayout.cls @@ -13,8 +13,8 @@ %% \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesClass{pagelayout}[2023/03/05 Layout graphic rich documents] -\def\pagelayoutversion{1.0.4} +\ProvidesClass{pagelayout}[2023/12/21 Layout graphic rich documents] +\def\pagelayoutversion{1.0.5} % packages \RequirePackage{pgfopts} @@ -2825,6 +2825,7 @@ \fi \fi } +\newcommand\xpage[2][]{} \newcommand\pal@standardpage[2][]{ \global\pal@placeholdercounter=0\relax \ifpal@backcover @@ -3160,6 +3161,8 @@ \newif\ifpal@placeholderoptions \newif\ifpal@placeholdermode \newif\ifpal@isplace +\newif\ifpal@template +\newif\ifpal@currentplaceholder \pal@placeholderoptionstrue \newcount\pal@placeholdercounter \newcount\pal@contentcounter @@ -3218,7 +3221,7 @@ \else \global\pal@isplacetrue \fi - \def\pal@currentplaceholder{} + \def\pal@currentplaceholdercontent{} \ifnum#1=0 \global\advance \pal@placeholdercounter by 1 \else @@ -3228,9 +3231,22 @@ \def\pal@tmp{\pal@currentcontents} \pal@placeholdermode{1} \pal@tmp + \pal@templatetrue \pal@placeholdermode{0} \pal@putcontent{ - \ifx\pal@emptystring\pal@currentplaceholder + \ifpal@currentplaceholder + \ifx#2\pal@emptystring + \else + \pal@setgridframe #2 \\ + \fi + \ifx\pal@currentplaceholderoptions\pal@emptystring + \pal@placeholderoptionsfalse + \csname \pal@currentplaceholdertype\endcsname{\pal@currentplaceholdercontent} + \pal@placeholderoptionstrue + \else + \csname \pal@currentplaceholdertype\endcsname[\pal@currentplaceholderoptions]{\pal@currentplaceholdercontent} + \fi + \else \ifpal@placeholder \ifx#2\pal@emptystring \else @@ -3273,20 +3289,9 @@ \fi \fi \fi - \else - \ifx#2\pal@emptystring - \else - \pal@setgridframe #2 \\ - \fi - \ifx\pal@currentplaceholderoptions\pal@emptystring - \pal@placeholderoptionsfalse - \csname \pal@currentplaceholdertype\endcsname{\pal@currentplaceholder} - \pal@placeholderoptionstrue - \else - \csname \pal@currentplaceholdertype\endcsname[\pal@currentplaceholderoptions]{\pal@currentplaceholder} - \fi \fi } + \pal@templatefalse \endgroup } \newcommand\pal@graphic[2][]{ @@ -3299,7 +3304,8 @@ \csname pal@graphic@#2\endcsname[2]{#1}% \fi - \edef\pal@currentplaceholder{\pal@graphicoptionfile} + \edef\pal@currentplaceholdercontent{\pal@graphicoptionfile} + \pal@currentplaceholdertrue \fi } \newcommand\pal@xput[1]{ @@ -3307,7 +3313,8 @@ \ifnum\pal@contentcounter=\pal@placeholdercounter \def\pal@currentplaceholdertype{xput} \def\pal@currentplaceholderoptions{} - \def\pal@currentplaceholder{#1} + \def\pal@currentplaceholdercontent{#1} + \pal@currentplaceholdertrue \fi } \newcommand\pal@tikz[1]{ @@ -3315,7 +3322,8 @@ \ifnum\pal@contentcounter=\pal@placeholdercounter \def\pal@currentplaceholdertype{tikzgraphic} \def\pal@currentplaceholderoptions{} - \def\pal@currentplaceholder{#1} + \def\pal@currentplaceholdercontent{#1} + \pal@currentplaceholdertrue \fi } \newcommand\pal@text[2][]{ @@ -3328,7 +3336,8 @@ \edef\pal@currentbordercolor{\pal@defaultbordercolor} \edef\pal@currentborderopacity{\pal@defaultborderopacity} \pgfkeys{text,name=default,color=\ifx\pal@pageoptioncolor\pal@emptystring\paloptions@color\else\pal@pageoptioncolor\fi,border radius=\pal@currentborderradius,border width=\pal@currentborderwidth,border color=\pal@currentbordercolor,border opacity=\pal@currentborderopacity,#1} - \def\pal@currentplaceholder{#2} + \def\pal@currentplaceholdercontent{#2} + \pal@currentplaceholdertrue \fi } \def\pal@placeholdertypeusetext{usetext} @@ -3337,7 +3346,8 @@ \ifnum\pal@contentcounter=\pal@placeholdercounter \edef\pal@currentplaceholdertype{\pal@placeholdertypeusetext} \def\pal@currentplaceholderoptions{#1} - \def\pal@currentplaceholder{} + \def\pal@currentplaceholdercontent{} + \pal@currentplaceholdertrue \fi } \newcommand\pal@rendertemplate[3]{ @@ -3363,6 +3373,7 @@ #3 } } +\newcommand\xtemplate[3][]{} \newcommand\graphic{} \newcommand\xput{} \newcommand\tikzgraphic{} @@ -3390,7 +3401,9 @@ \ifcsname pal@graphic@##2\endcsname% \csname pal@graphic@##2\endcsname[2]{##1} \else - \pgfkeys{graphic,file={##2},scale=1,vpos=0.5,hpos=0.5,unsharp=\pal@unsharp,##1} + \ifpal@template\else + \pgfkeys{graphic,file={##2},scale=1,vpos=0.5,hpos=0.5,unsharp=\pal@unsharp,##1} + \fi \fi \fi \pal@putgraphic{\pal@framey}{\pal@framex}{\pal@frameyy}{\pal@framexx}{\pal@graphicoptionfile}% @@ -3421,7 +3434,9 @@ \edef\pal@currentborderwidth{\pal@defaultborderwidth} \edef\pal@currentbordercolor{\pal@defaultbordercolor} \edef\pal@currentborderopacity{\pal@defaultborderopacity} - \pgfkeys{text,name=default,color=\ifx\pal@pageoptioncolor\pal@emptystring\paloptions@color\else\pal@pageoptioncolor\fi,border radius=\pal@currentborderradius,border width=\pal@currentborderwidth,border color=\pal@currentbordercolor,border opacity=\pal@currentborderopacity,##1} + \ifpal@template\else + \pgfkeys{text,name=default,color=\ifx\pal@pageoptioncolor\pal@emptystring\paloptions@color\else\pal@pageoptioncolor\fi,border radius=\pal@currentborderradius,border width=\pal@currentborderwidth,border color=\pal@currentbordercolor,border opacity=\pal@currentborderopacity,##1} + \fi \pal@puttext{\pal@framey}{\pal@framex}{\pal@frameyy}{\pal@framexx}{##2}% \pal@resetgridframe } @@ -3617,20 +3632,24 @@ \def\pal@err@magicknotinstalled{errormagicknotinstalled} \def\pal@err@inkscapenotinstalled{errorinkscapenotinstalled} \newcommand\pal@getppi[1]{ - \immediate\openin\pal@scriptresult={|pagelayoutapi getwidth\% "#1"} + \immediate\openin\pal@scriptresult={|pagelayoutapi \ifdim\pal@originalgraphicwidth<\pal@originalgraphicheight getwidth\else getheight\fi\% "#1"} \ifeof\pal@scriptresult \pal@errmsg@shellaccessforbidden{Ppi not calculated} \else \endlinechar=-1 - \read\pal@scriptresult to \pal@graphicwidth + \read\pal@scriptresult to \pal@graphicsize \endlinechar=13 - \ifx\pal@graphicwidth\pal@emptystring + \ifx\pal@graphicsize\pal@emptystring \pal@errmsg@shellaccessfailed{Ppi not calculated} \else - \ifx\pal@graphicwidth\pal@err@magicknotinstalled + \ifx\pal@graphicsize\pal@err@magicknotinstalled \pal@errmsg@magicknotinstalled{Ppi not calculated} \else - \pgfmathqparse{(\pal@originalgraphicwidth - \pal@cropleft - \pal@cropright) / \pal@originalgraphicwidth * \pal@graphicwidth pt / \the\width * 72.27pt} + \ifdim\pal@originalgraphicwidth<\pal@originalgraphicheight + \pgfmathqparse{(\pal@originalgraphicwidth - \pal@cropleft - \pal@cropright) / \pal@originalgraphicwidth * \pal@graphicsize pt / \the\width * 72.27pt} + \else + \pgfmathqparse{(\pal@originalgraphicheight - \pal@croptop - \pal@cropbottom) / \pal@originalgraphicheight * \pal@graphicsize pt / \the\height * 72.27pt} + \fi \pgfmathint{\pgfmathresult} \edef\pal@graphicdensity{\pgfmathresult} diff --git a/macros/latex/contrib/unbtex/README.md b/macros/latex/contrib/unbtex/README.md index a5ceb2f316..7b8bf46c1c 100644 --- a/macros/latex/contrib/unbtex/README.md +++ b/macros/latex/contrib/unbtex/README.md @@ -1,6 +1,6 @@ # UnBTeX: A class for bachelor, master, and doctoral thesis at the # University of Brasilia (UnB), Brazil. -# Version 1.4.2 2023/12/15 +# Version 1.4.3 2023/12/22 Copyright (C) 2021-2023 by Henrique C. Ferreira <hcferreira@unb.br> @@ -88,6 +88,10 @@ Here is a history of changes: have been enhanced, and page numbering has been removed . The Cutter code has been removed from the copyright page . The example chapters have been reorganized + 1.4.3 (2023-12-22): + . Keywords in English have been included on the copyright page if the + document is written in this language + . Examples of long tables and rotated tables have been included ## Overleaf diff --git a/macros/latex/contrib/unbtex/unbtex-example.pdf b/macros/latex/contrib/unbtex/unbtex-example.pdf Binary files differindex fce7fa264c..03972cb0fb 100644 --- a/macros/latex/contrib/unbtex/unbtex-example.pdf +++ b/macros/latex/contrib/unbtex/unbtex-example.pdf diff --git a/macros/latex/contrib/unbtex/unbtex-example.tex b/macros/latex/contrib/unbtex/unbtex-example.tex index 39bab94b58..909bad49ac 100644 --- a/macros/latex/contrib/unbtex/unbtex-example.tex +++ b/macros/latex/contrib/unbtex/unbtex-example.tex @@ -1,7 +1,7 @@ %% %% UnBTeX: A class for bachelor, master, and doctoral thesis at the %% University of Brasilia (UnB), Brazil -%% Version 1.4.2 2023/12/15 +%% Version 1.4.3 2023/12/22 %% Copyright (C) 2021-2023 by Henrique C. Ferreira <hcferreira@unb.br> %% %% This class file may be distributed and/or modified under the conditions @@ -33,6 +33,10 @@ % Pacotes básicos (Adicione abaixo pacotes úteis para o seu trabalho) % --- +\RequirePackage{longtable} % Pacote para tabelas que ocupam mais de uma página +\RequirePackage{rotating} % Pacote para girar tabelas (e outros objetos) +\RequirePackage{pdfpages} % Pacote para incluir documentos pdf + % Lista na bibliografia o número das páginas que cada referência é citada \RequirePackage[hyperpageref]{backref} % Bibliografia nas normas da ABNT, formato autor-data @@ -60,7 +64,7 @@ % Espaço entre os itens das listas \setlength{\nomitemsep}{-\parsep} % Separa os grupos das listas e imprime -\newcommand{\nomenclheader}[1]{\section*{\hspace*{-\leftmargin}#1}} +\newcommand{\nomenclheader}[1]{\section*{\hspace*{-\leftmargin}\large#1}} \renewcommand\nomgroup[1]{% \IfStrEqCase{#1}{% {A}{\vspace{-42pt}\nomenclheader{}} % Lista de abreviaturas e siglas @@ -75,7 +79,7 @@ } % Compila as listas \makenomenclature -% Ajusta largura da margem da descrição +% Ajusta largura da margem da descrição do sÃmbolo/sigla/abreviatura \RequirePackage{xpatch} \makeatletter \xapptocmd\thenomenclature{\let\@item\nomencl@item\def\nomencl@width{0pt}}{}{} @@ -133,7 +137,7 @@ % Local e data \local{BrasÃlia} -\dia{15} +\dia{22} \mes{dezembro} \ano{2023} @@ -146,6 +150,8 @@ \kwordiii{Keyword 3} \pchaveiv{Palavra chave 4} % deixar vazio se não tiver \kwordiv{Keyword 4} % deixar vazio se não tiver +\pchavev{} % deixar vazio se não tiver +\kwordv{} % deixar vazio se não tiver % Código Cutter para a ficha catalográfica: %\numerocutter{000} % Correspondente ao seu nome (encontre, por exemplo, no site https://www.tabelacutter.com/) @@ -222,12 +228,7 @@ % --- % Define os textos da citação \renewcommand*{\backref}[1]{} -\renewcommand*{\backrefalt}[4]{ - \ifcase #1 \nocitation - \or \citedp~#2. - \else \citedpp~#2. - \fi -} +\renewcommand*{\backrefalt}[4]{\ifcase#1\nocitation\or\citedp~#2.\else\citedpp~#2.\fi} % --- % ------------------------------------------------------------------------ @@ -339,7 +340,7 @@ Segundo a \citeonline[seções 3.1-3.2]{NBR6028:2003}, o resumo deve ressaltar o \vspace{\onelineskip} \noindent -\textbf{Palavras-chave}: \pchaveinome. \pchaveiinome. \pchaveiiinome. \ifthenelse{\equal{\pchaveivnome}{}}{}{\pchaveivnome.} +\textbf{Palavras-chave}: \pchaveinome. \pchaveiinome. \pchaveiiinome. \ifthenelse{\equal{\pchaveivnome}{}}{}{\pchaveivnome. \ifthenelse{\equal{\pchavevnome}{}}{}{\pchavevnome.}} \end{resumo}} % Resumo em inglês @@ -354,7 +355,7 @@ This is the english abstract. \vspace{\onelineskip} \noindent -\textbf{Keywords}: \kwordinome. \kwordiinome. \kwordiiinome. \ifthenelse{\equal{\kwordivnome}{}}{}{\kwordivnome.} +\textbf{Keywords}: \kwordinome. \kwordiinome. \kwordiiinome. \ifthenelse{\equal{\kwordivnome}{}}{}{\kwordivnome. \ifthenelse{\equal{\kwordvnome}{}}{}{\kwordvnome.}} \end{otherlanguage*} \end{resumo}} % --- diff --git a/macros/latex/contrib/unbtex/unbtex-example/anexo-a.tex b/macros/latex/contrib/unbtex/unbtex-example/anexo-a.tex index ecb054d1a1..0a90ec65eb 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/anexo-a.tex +++ b/macros/latex/contrib/unbtex/unbtex-example/anexo-a.tex @@ -1,15 +1,103 @@ % ---------------------------------------------------------- -\chapter{Figuras de exemplo}\label{anx:fig} +\chapter{Tabelas longas e rotacionadas}\label{anx:tabs} % ---------------------------------------------------------- -% Fonte: https://tex.stackexchange.com/a/231741/91816 (Gonzalo Medina) +\begin{longtable}{L{2.5cm}C{2.5cm}C{1cm}C{1.5cm}C{1cm}C{1.5cm}C{1cm}C{1.5cm}} +% Cabeçalho no inÃcio da tabela +\caption{Descriptive Statistics (\%): Commerce Faculty ($N = 6508$)} +\label{tab:dscf} \\ +\toprule +\multirow{3}{*}{\bfseries Variable} & +\multirow{3}{*}{\parbox{2.5cm}{\centering\bfseries Proportions in Sample}} & +\multicolumn{6}{c}{\bfseries Proportions by Subtype} \\ +\cmidrule{3-8} +& & +\multicolumn{2}{c}{\bfseries Graduated} & \multicolumn{2}{C{3cm}}{\bfseries Academically Excluded} & +\multicolumn{2}{c}{\bfseries Censored} \\ +\midrule +\endfirsthead +% Cabeçalho da continuação da tabela no topo da página seguinte +\caption[]{Descriptive Statistics (\%): Commerce Faculty ($N = 6508$) (continuação)} \\ \toprule +\multirow{3}{*}{\bfseries Variable} & +\multirow{3}{*}{\parbox{2.5cm}{\centering\bfseries Proportions in Sample}} & +\multicolumn{6}{c}{\bfseries Proportions by Subtypes} \\ +\cmidrule{3-8} +& & +\multicolumn{2}{c}{\bfseries Graduated} & \multicolumn{2}{C{3cm}}{\bfseries Academically Excluded} & +\multicolumn{2}{c}{\bfseries Censored} \\ +\midrule +\endhead +\bottomrule +\endlastfoot +\bfseries Total & 100.0 & 50.1 & (45.8) & 7.5 & (14.9) & 42.4 & (39.3) \\ +\addlinespace +\bfseries Gender \\ +Male & 52.4 & 49.6 & (44.3) & 8.7 & (17.3) & 41.7 & (38.5) \\ +Female & 47.6 & 50.7 & (48.0) & 6.2 & (11.5) & 43.1 & (40.5) \\ +\addlinespace +\bfseries Race \\ +White & 40.3 & 59.8 & (58.7) & 3.0 & (4.6) & 37.2 & (36.7) \\ +Black & 32.4 & 38.7 & (32.5) & 13.1 & (26.3) & 48.2 & (41.2) \\ +Coloured & 13.0 & 49.8 & (44.5) & 7.4 & (16.1) & 42.8 & (39.5) \\ +Indian/Asian & 14.3 & 48.9 & (44.6) & 7.9 & (13.3) & 43.3 & (42.1) \\ +\addlinespace +\bfseries Financial Aid \\ +Ineligible for Financial Aid & 82.3 & 52.1 & (48.7) & 5.5 & (10.6) & 42.4 & (40.7) \\ +Eligible for Financial Aid & 17.7 & 40.7 & (35.2) & 17.2 & (30.3) & 42.1 & (34.5) \\ +\addlinespace +\bfseries Programme \\ +Mainstream & 76.9 & 55.4 & (51.3) & 5.7 & (10.8) & 38.9 & (37.9) \\ +Academic Development & 23.1 & 32.5 & (27.1) & 13.7 & (28.7) & 53.8 & (44.2) \\ +\addlinespace +\bfseries English Home Language \\ +Yes & 69.3 & 55.1 & (52.8) & 4.9 & (8.6) & 39.9 & (38.6) \\ +No & 30.7 & 38.8 & (32.8) & 13.4 & (26.6) & 47.8 & (40.6) \\ +\addlinespace +\bfseries School Quintile \\ +1 & 0.8 & 34.6 & (26.1) & 30.8 & (42.6) & 34.6 & (31.3) \\ +2 & 1.6 & 30.2 & (28.1) & 16.0 & (35.1) & 53.8 & (36.8) \\ +3 & 5.0 & 32.0 & (27.7) & 17.5 & (35.3) & 50.5 & (37.0) \\ +4 & 4.1 & 37.7 & (29.5) & 17.7 & (32.0) & 44.5 & (38.5) \\ +5 & 45.4 & 52.0 & (49.2) & 6.9 & (12.0) & 41.1 & (38.9) \\ +Independent & 43.1 & 52.5 & (50.4) & 5.3 & (8.6) & 42.2 & (41.0) \\ +\addlinespace +{\bfseries Province} \\ +Western Cape & 40.0 & 55.1 & (51.3) &5.9 & (11.6) &39.0 & (37.0) \\ +Non-Western Cape & 59.9 & 46.8 & (41.9) & 8.6 & (17.2) & 44.6 & (41.0) \\ +\addlinespace +{\bfseries Year of First Registration} \\ +{2006} & 11.6 & 87.8 & (79.9) & 11.3 & (18.9) & 0.9 & (1.2) \\ +{2007} & 11.9 & 88.2 & (79.4) & 10.1 & (19.2) & 1.7 & (1.4) \\ +{2008} & 12.6 & 87.1 & (76.7) & 10.3 & (20.3) & 2.6 & (3.0) \\ +{2009} & 11.9 & 80.9 & (64.9) & 9.7 & (24.9) & 9.4 & (10.2) \\ +{2010} & 11.1 & 62.6 & (57.5) & 6.4 & (12.7) & 31.1 & (29.8) \\ +{2011} & 11.7 & 15.8 & (15.3) & 7.2 & (12.8) & 77.0 & (71.9) \\ +{2012} & 14.1 & 0.0 & (0.0) & 5.4 & (7.5) & 94.6 & (92.5) \\ +{2013} & 15.1 & 0.0 & (0.0) & 1.7 & (3.0) & 98.3 & (97.0) \\ +\end{longtable} -\noindent\includegraphics[width=3cm]{example-image-a}\qquad -\includegraphics[width=3cm]{example-image-golden}\qquad -\includegraphics[width=3cm]{example-grid-100x100pt} - -\noindent\includegraphics[height=5cm]{example-image-b} - -\noindent\includegraphics[scale=0.5]{example-image-c} - -\noindent\includegraphics[width=3cm]{example-image}
\ No newline at end of file +\begin{sidewaystable} +\begin{center}% +\small +\caption{Tabela rotacionada}\label{tab:rot} +\setlength\tabcolsep{3pt} % controla o espaço entre colunas +\begin{tabular}{L{1.1cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}L{1.6cm}}\toprule +Sv,ieq & 000436xa & 000594xa & 001715xa & 001932ya & 006040ya & 006263xa & 007162ya & 007257ya & IT0605ya & IT0790xa & emiliaeo-retro & emilians-retro \\ \midrule +0.4 & 2.447 & 2.177 & 2.304 & 4.921 & 4.298 & 2.121 & 3.928 & 3.478 & 3.462 & 1.751 & 0.875 & 0.525 \\ +0.8 & 4.894 & 4.354 & 4.609 & 9.843 & 8.597 & 4.241 & 7.857 & 6.957 & 6.924 & 3.502 & 1.750 & 1.049 \\ +1.2 & 7.341 & 6.530 & 6.913 & 14.764 & 12.895 & 6.362 & 11.785 & 10.435 & 10.386 & 5.252 & 2.625 & 1.574 \\ +1.6 & 9.789 & 8.707 & 9.218 & 19.686 & 17.194 & 8.482 & 15.713 & 13.914 & 13.848 & 7.003 & 3.500 & 2.099 \\ +2 & 12.236 & 10.884 & 11.522 & 24.607 & 21.492 & 10.603 & 19.642 & 17.392 & 17.310 & 8.754 & 4.375 & 2.624 \\ +2.4 & 14.683 & 13.061 & 13.827 & 29.529 & 25.791 & 12.723 & 23.570 & 20.871 & 20.772 & 10.505 & 5.250 & 3.148 \\ +2.8 & 17.130 & 15.237 & 16.131 & 34.450 & 30.089 & 14.844 & 27.498 & 24.349 & 24.234 & 12.256 & 6.125 & 3.673 \\ +3.2 & 19.577 & 17.414 & 18.435 & 39.372 & 34.388 & 16.965 & 31.427 & 27.828 & 27.697 & 14.006 & 7.000 & 4.198 \\ +3.6 & 22.024 & 19.591 & 20.740 & 44.293 & 38.686 & 19.085 & 35.355 & 31.306 & 31.159 & 15.757 & 7.875 & 4.723 \\ +4 & 24.471 & 21.768 & 23.044 & 49.215 & 42.984 & 21.206 & 39.283 & 34.784 & 34.621 & 17.508 & 8.750 & 5.247 \\ +4.4 & 26.919 & 23.945 & 25.349 & 54.136 & 47.283 & 23.326 & 43.212 & 38.263 & 38.083 & 19.259 & 9.625 & 5.772 \\ +4.8 & 29.366 & 26.121 & 27.653 & 59.058 & 51.581 & 25.447 & 47.140 & 41.741 & 41.545 & 21.009 & 10.500 & 6.297 \\ +5.2 & 31.813 & 28.298 & 29.957 & 63.979 & 55.880 & 27.567 & 51.068 & 45.220 & 45.007 & 22.760 & 11.375 & 6.821 \\ +5.6 & 34.260 & 30.475 & 32.262 & 68.900 & 60.178 & 29.688 & 54.996 & 48.698 & 48.469 & 24.511 & 12.250 & 7.346 \\ +6 & 36.707 & 32.652 & 34.566 & 73.822 & 64.477 & 31.809 & 58.925 & 52.177 & 51.931 & 26.262 & 13.125 & 7.871 \\ \bottomrule +\end{tabular} +\end{center}% +\end{sidewaystable}
\ No newline at end of file diff --git a/macros/latex/contrib/unbtex/unbtex-example/anexo-b.tex b/macros/latex/contrib/unbtex/unbtex-example/anexo-b.tex index b74fa71981..b5ba38f064 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/anexo-b.tex +++ b/macros/latex/contrib/unbtex/unbtex-example/anexo-b.tex @@ -1,23 +1,11 @@ % ---------------------------------------------------------- -\chapter{Logo LaTeX}\label{anx:logo} +\chapter{Paleta de cores UnB}\label{anx:coresunb} % ---------------------------------------------------------- -\vfill +A página a seguir foi extraÃda do \emph{manual de identidade visual}\footnote{DisponÃvel em \url{http://marca.unb.br}} da UnB. -\begin{center} -{\fontsize{50pt}{800pt}\selectfont \LaTeX}\ -\end{center} - -\vfill - -\begin{center} -{\color{azulunb}\fontsize{50pt}{800pt}\selectfont \LaTeX}\ -\end{center} - -\vfill - -\begin{center} -{\color{verdeunb}\fontsize{50pt}{800pt}\selectfont \LaTeX}\ -\end{center} - -\vfill
\ No newline at end of file +\includepdf[ + pages=-, % intervalo das páginas do pdf que serão incluÃdas + scale=1, % controla o tamanho da página inserida + pagecommand={\thispagestyle{simple}}, % numeração da página + ]{unbtex-example/figuras/coresunb} \cleardoublepage
\ No newline at end of file diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex index ceb9ceaea5..bb27c530fe 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex +++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo2.tex @@ -84,7 +84,7 @@ u_{li}(t) &= - \textrm{sign}(s_{li}(t))\eta. \label{eq:u_xbi} \begin{equation}\label{eq:point-mass-velocity} \begin{split} \dot{V}_{i}(t) &{}= \frac{T_{i}(t) - D_i(t)}{m_i} - g \sin \gamma_{i}(t) + b_{ti}(t), \\ -\dot{\chi}_i(t) &{}= \frac{L_i(t) \sin \phi_i(t)}{m_i V_{i}(t) \cos \gamma_{i}(t)} + \frac{b_{\psi i}(t)}{V_{i}(t)\cos \gamma_{i}(t)},\\ +\dot{\chi}_i(t) &{}= \frac{L_i(t) \sin \phi_i(t)}{m_i V_{i}(t) \cos \gamma_{i}(t)} + \frac{b_{\psi i}(t)}{V_{i}(t)\cos \gamma_{i}(t)}, \\ \dot{\gamma}_{i}(t) &{}= \frac{L_i(t) \cos \phi_i(t)}{m_i V_{i}(t)} - \frac{g \cos \gamma_{i}(t)}{V_{i}(t)} + \frac{b_{\theta i}(t)}{V_{i}(t)}. \end{split} \end{equation} @@ -163,10 +163,10 @@ Normalmente não há problemas em usar caracteres acentuados em arquivos bibliog \caption{Tabela de conversão de acentuação} \label{tab:acentos} \begin{tabular}{ll} \toprule -acento & bibtex\\ \midrule\midrule -à á ã & \verb|\`a| \verb|\'a| \verb|\~a|\\ \midrule -à & \verb|{\'\i}|\\ \midrule -ç & \verb|{\c c}|\\ \bottomrule +acento & bibtex \\ \midrule +à á ã & \verb|\`a| \verb|\'a| \verb|\~a| \\ +à & \verb|{\'\i}| \\ +ç & \verb|{\c c}| \\ \bottomrule \end{tabular} \end{center} \end{table} @@ -290,6 +290,8 @@ Para incluir documentos sem quebra de páginas, utilize: \input{documento-a-ser-incluido} % sem a extensão .tex \end{verbatim} +No \cref{anx:coresunb} foi incluÃda uma página em \texttt{pdf} do manual de identidade visual da UnB utilizando-se o comando \verb|\includepdf| do pacote \textsf{pdfpages}. + % --- %\section{Ficha catalográfica com código Cutter-Sanborn} % --- diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex index af5f00ba52..be47541a1b 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex +++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo3.tex @@ -30,23 +30,23 @@ As \cref{tab:nivel,tab:fluxo,tab:ibge} são exemplos de tabelas construÃda em \begin{center}% \caption{Componentes curriculares do segundo nÃvel} \label{tab:fluxo} -{\renewcommand{\arraystretch}{1.2} % espaçamento entre as linhas da tabela +{\renewcommand{\arraystretch}{1.3} % espaçamento entre as linhas da tabela \begin{tabular}{|m{1.6cm}|m{4.3cm}|C{.7cm}|C{.7cm}|C{.7cm}|C{.75cm}|C{.7cm}|m{2.1cm}|} \hline% -\multicolumn{8}{|l|}{\textbf{2º NÃvel}} \\\hline% +\multicolumn{8}{|l|}{\textbf{2º NÃvel}} \\ \hline% \multirow{2}{*}{Código} & \multirow{2}{*}{Componente curricular} & \multicolumn{5}{c|}{Quantidade de horas} & \multirow{2}{*}{Pré-requisito} \\ -\cline{3-7} & & Teo. & Pr. & Ext. & EaD & Tot. & \\\hline\hline% -MAT0026 & Cálculo 2 & 60 & 30 & 0 & 0 & 90 & MAT0025 \\\hline% -IFD0171 & FÃsica 1 & 60 & 0 & 0 & 0 & 60 & \\\hline% -IFD0173 & FÃsica 1 Experimental & 0 & 30 & 0 & 0 & 30 & \\\hline% -EST0023 & Probabilidade e EstatÃstica & 30 & 30 & 0 & 0 & 60 & MAT0025 \\\hline% -ENM0190 & Desenho Mecânico para Engenharia & 30 & 30 & 0 & 0 & 60 & \\\hline% -CIC0090 & Estruturas de Dados & 30 & 30 & 0 & 0 & 60 & CIC0004 \\\hline% -\multicolumn{6}{|l|}{Componentes optativos ou eletivos} & 60 & \multicolumn{1}{r}{} \\\cline{1-7}% -\multicolumn{6}{|l|}{Total de horas do 2º NÃvel} & 420 & \multicolumn{1}{r}{} \\\cline{1-7}% +\cline{3-7} & & Teo. & Pr. & Ext. & EaD & Tot. & \\ \hline\hline% +MAT0026 & Cálculo 2 & 60 & 30 & 0 & 0 & 90 & MAT0025 \\ \hline% +IFD0171 & FÃsica 1 & 60 & 0 & 0 & 0 & 60 & \\ \hline% +IFD0173 & FÃsica 1 Experimental & 0 & 30 & 0 & 0 & 30 & \\ \hline% +EST0023 & Probabilidade e EstatÃstica & 30 & 30 & 0 & 0 & 60 & MAT0025 \\ \hline% +ENM0190 & Desenho Mecânico para Engenharia & 30 & 30 & 0 & 0 & 60 & \\ \hline% +CIC0090 & Estruturas de Dados & 30 & 30 & 0 & 0 & 60 & CIC0004 \\ \hline% +\multicolumn{6}{|l|}{Componentes optativos ou eletivos} & 60 & \multicolumn{1}{r}{} \\ \cline{1-7}% +\multicolumn{6}{|l|}{Total de horas do 2º NÃvel} & 420 & \multicolumn{1}{r}{} \\ \cline{1-7}% \end{tabular}} \end{center}% \end{table} @@ -58,9 +58,9 @@ CIC0090 & Estruturas de Dados & 30 & 30 & 0 & 0 & 60 & CIC0004 \\\hline% }{% \begin{tabular}{ccc} \toprule - \textbf{Nome} & \textbf{Nascimento} & \textbf{Documento} \\ \midrule \midrule - Maria da Silva & 11/11/1111 & 111.111.111-11 \\ \midrule - João Souza & 11/11/2111 & 211.111.111-11 \\ \midrule + \textbf{Nome} & \textbf{Nascimento} & \textbf{Documento} \\ \midrule + Maria da Silva & 11/11/1111 & 111.111.111-11 \\[3pt] + João Souza & 11/11/2111 & 211.111.111-11 \\[3pt] Laura Vicuña & 05/04/1891 & 3111.111.111-11 \\ \bottomrule \end{tabular}% }{% @@ -70,7 +70,7 @@ CIC0090 & Estruturas de Dados & 30 & 30 & 0 & 0 & 60 & CIC0004 \\\hline% } \end{table} -Para tabelas que ocupam mais de uma página, é possÃvel utilizar o pacote \textsf{longtable}. Para alterar a cor de linhas e de células de tabelas, o pacote \textsf{colortbl} pode ser utilizado. Também há pacotes que rotacionam tabelas, para que fiquem em uma página em formato paisagem. Faça as tabelas usando como base qualquer um dos exemplos aqui apresentados ou outros que considerar mais adequados e que podem ser facilmente encontrados na internet. +Para alterar a cor de linhas e de células de tabelas, o pacote \textsf{colortbl} foi utilizado. Para mesclar linhas e colunas, como na \cref{tab:fluxo}, utilize o pacote \textsf{multirow}. O pacote \textsf{longtable} pode ser usado para construir tabelas que ocupam mais de uma página e o pacote \textsf{rotating} pode ser usado para rotacionar tabelas. No \cref{anx:tabs} há exemplos de tabelas que os utilizam. Faça tabelas usando como base qualquer um dos exemplos apresentados neste documento ou outros que considerar mais adequados e que podem ser facilmente encontrados na internet. % --- \section{Figuras} @@ -100,8 +100,6 @@ De todo modo, caso não seja possÃvel utilizar arquivos de imagens como \texttt Note que de acordo com as normas da ABNT, numeração e tÃtulo das figuras e tabelas devem aparecer na parte superior. Na parte inferior deve ser informada a fonte. -Outros exemplos de inserção de figuras no texto podem ser encontrados nos \cref{anx:fig,anx:logo}. - % --- \subsection{Figuras em \emph{minipages}} % --- diff --git a/macros/latex/contrib/unbtex/unbtex-example/capitulo4.tex b/macros/latex/contrib/unbtex/unbtex-example/capitulo4.tex index d7e54d1611..cc499c7dae 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/capitulo4.tex +++ b/macros/latex/contrib/unbtex/unbtex-example/capitulo4.tex @@ -2,7 +2,7 @@ \chapter{Ambientes} % ---------------------------------------------------------- -Este modelo disponibiliza alguns ``ambientes'', ou seja, caixas de texto com formatação especial para certos tipos de elementos que são automaticamente numerados (e.g. \cref{prop:WYSIWYG}, \cref{thm:WYSIWYG}, etc.). Esses ambientes foram adaptados para o UnB\TeX\ a partir soluções utilizadas por \citeonline{Castro2019}. +Este modelo disponibiliza alguns ``ambientes'', ou seja, caixas de texto com formatação especial para certos tipos de elementos que são automaticamente numerados (por exemplo, \cref{prop:WYSIWYG}, \cref{thm:WYSIWYG}, etc.). Esses ambientes foram adaptados para o UnB\TeX\ a partir soluções utilizadas por \citeonline{Castro2019}. \section{Exemplos de ambientes disponÃveis} diff --git a/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl b/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl index d17d1b305f..5eeb6142e9 100644 --- a/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl +++ b/macros/latex/contrib/unbtex/unbtex-example/codigos/ModalReduction.jl @@ -6,26 +6,26 @@ export generateMATLABSimulationScript #Gera A, B, C to sistema completo function generateABC(n) - tau = 0.2426 # tau do barbante (1/s) para excursão de 30cm - taul = 0.1133 # tau da bolinha (1/s) para excursão de 30cm - ms = 0.0006 # massa linear do barbante (kg/m) - mb = 0.00015 # massa da bolinha (kg) - g = 9.80665 # aceleração da gravidade (m/s^2) - L = 0.82 # Comprimento total do barbante (m) - l = L/n # distância entre dois pontos de discretização (m) - T0 = mb*g # Tração no ponto 0 (logo acima da bolinha) - considerando peso da bolinha (N) + tau = 0.2426 # tau do barbante (1/s) para excursão de 30cm + taul = 0.1133 # tau da bolinha (1/s) para excursão de 30cm + ms = 0.0006 # massa linear do barbante (kg/m) + mb = 0.00015 # massa da bolinha (kg) + g = 9.80665 # aceleração da gravidade (m/s^2) + L = 0.82 # Comprimento total do barbante (m) + l = L/n # distância entre dois pontos de discretização (m) + T0 = mb*g # Tração no ponto 0 (logo acima da bolinha) - considerando peso da bolinha (N) - b = zeros(n) - c = g/(2l) - d = zeros(n) - e = zeros(n) + b = zeros(n) + c = g/(2l) + d = zeros(n) + e = zeros(n) - b[1] = g/l - for k = 2:n - b[k] = (T0 + ms*g*(k-1)*l)/(ms*l^2) - d[k] = b[k] - c - e[k] = b[k] + c - end + b[1] = g/l + for k = 2:n + b[k] = (T0 + ms*g*(k-1)*l)/(ms*l^2) + d[k] = b[k] - c + e[k] = b[k] + c + end A = generateA(n, b, d, e, tau, taul) B = generateB(n,e[n]) diff --git a/macros/latex/contrib/unbtex/unbtex-example/figuras/coresunb.pdf b/macros/latex/contrib/unbtex/unbtex-example/figuras/coresunb.pdf Binary files differnew file mode 100644 index 0000000000..2412be7078 --- /dev/null +++ b/macros/latex/contrib/unbtex/unbtex-example/figuras/coresunb.pdf diff --git a/macros/latex/contrib/unbtex/unbtex.cls b/macros/latex/contrib/unbtex/unbtex.cls index aec90b8169..07bb157750 100644 --- a/macros/latex/contrib/unbtex/unbtex.cls +++ b/macros/latex/contrib/unbtex/unbtex.cls @@ -1,7 +1,7 @@ %% %% UnBTeX: A class for bachelor, master, and doctoral thesis at the %% University of Brasilia (UnB), Brazil -%% Version 1.4.2 2023/12/15 +%% Version 1.4.3 2023/12/22 %% Copyright (C) 2021-2023 by Henrique C. Ferreira <hcferreira@unb.br> %% %% This class file may be distributed and/or modified under the conditions @@ -22,7 +22,7 @@ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesClass{unbtex}[2023/12/15 v1.4.2 Modelo da Universidade de BrasÃlia baseado em abnTeX2] +\ProvidesClass{unbtex}[2023/12/22 v1.4.3 Modelo da Universidade de BrasÃlia baseado em abnTeX2] % --- % Repassa todos os parâmetros a classe abntex2, @@ -45,18 +45,16 @@ \RequirePackage{amsmath} \RequirePackage{amsfonts} \RequirePackage{amsthm} -\RequirePackage{mathtools} % melhorias nas equações -% Fonte para fonte tipográfica mathscr -% https://sites.math.washington.edu/~lee/Writing/typesetting-script.pdf -\RequirePackage{mathrsfs} +\RequirePackage{mathtools} % Melhorias nas equações +\RequirePackage{mathrsfs} % Fonte tipográfica mathscr % --- % --- -% Pacotes de fontes +% Pacotes de fontes tipográficas % --- \RequirePackage{stickstootext} % Fonte principal (Stix2) \RequirePackage[stickstoo,vvarbb]{newtxmath} -\RequirePackage[scaled=0.88]{helvet} % Fonte sans serif +\RequirePackage[scale=0.88]{tgheros} % Fonte sans serif \RequirePackage[scaled=1.03]{inconsolata} % Fonte monoespaçada % --- @@ -127,7 +125,6 @@ % configuração do cabeçalho das páginas \pagestyle{myheadings} % cabeçalho com linha e numeração da página -%\setlength{\normalrulethickness}{0pt} % retira a linha do cabeçalho % Modifica o tamanho da fonte e espaçamento entre linhas no ambiente verbatim \RequirePackage{fvextra} @@ -431,6 +428,8 @@ \newcommand{\kwordiii}[1]{\def\kwordiiinome{#1}} \newcommand{\pchaveiv}[1]{\def\pchaveivnome{#1}} \newcommand{\kwordiv}[1]{\def\kwordivnome{#1}} +\newcommand{\pchavev}[1]{\def\pchavevnome{#1}} +\newcommand{\kwordv}[1]{\def\kwordvnome{#1}} % Código da ficha catalográfica %\newcommand{\numerocutter}[1]{\def\imprimircutter{#1}} @@ -532,10 +531,10 @@ % Imprime ficha catalográfica % --- % https://bce.unb.br/servicos/elaboracao-de-fichas-catalograficas/ -% Para imprimir o código Cutter, remova os comentários +% Para imprimir o código Cutter, remova os comentários (%) \renewcommand{\fichacatalografica}{ \thispagestyle{empty}{ -\setlength{\fboxsep}{18pt} +\setlength{\fboxsep}{18pt} % Se imprimir o código Cutter, altere para 10pt \vspace*{\fill} {\small {\SingleSpacing @@ -548,9 +547,10 @@ \hspace*{2em}\noindent \StrDel{\imprimirtitulo}{\\ } ~/ \autorinome\ \autorisobrenome; \ifthenelse{\equal{\autoriinome}{}}{}{\autoriinome\ \autoriisobrenome;} \MakeLowercase\orientadorname\ \orientnome\ \orientsobrenome \ifthenelse{\equal{\coorientnome}{}}{.}{;~\MakeLowercase\coorientadorname\ \coorientnome\ \coorientsobrenome.} \texttt{-{}-} \imprimirlocal, \imprimirano. \\ % & \hspace*{2em}\noindent \thelastpage~p. \\ % & \\ % & -\hspace*{2em}\noindent \imprimirtipotrabalho\ (\imprimircurso)\ \texttt{-{}-} \instituicaoi, \imprimirano. \\ % & +\hspace*{2em}\noindent\IfStrEq*{\languagename}{english}{\begin{otherlanguage*}{brazil}\imprimirtipotrabalho\ (\imprimircurso)\ \texttt{-{}-} \instituicaoi, \imprimirano.\end{otherlanguage*}}{\imprimirtipotrabalho\ (\imprimircurso)\ \texttt{-{}-} \instituicaoi, \imprimirano.}\\ % & \\ % & -\hspace*{2em}\noindent 1. \pchaveinome. 2. \pchaveiinome. 3. \pchaveiiinome. \ifthenelse{\equal{\pchaveivnome}{}}{}{4. \pchaveivnome.} \ifthenelse{\equal{\autoriinome}{}}{\ifthenelse{\equal{\coorientnome}{}}{I. \orientsobrenome, \orientnome, orient. II. TÃtulo}{I. \orientsobrenome, \orientnome, orient. II. \coorientsobrenome, \coorientnome, coorient. III. TÃtulo}}{\ifthenelse{\equal{\coorientnome}{}}{I. \autoriisobrenome, \autoriinome. II. \orientsobrenome, \orientnome, orient. III. TÃtulo}{I. \autoriisobrenome, \autoriinome. II. \orientsobrenome, \orientnome, orient. III. \coorientsobrenome, \coorientnome, coorient. IV. TÃtulo}} +\hspace*{2em}\noindent\IfStrEq*{\languagename}{english}{1. \kwordinome. 2. \kwordiinome. 3. \kwordiiinome. \ifthenelse{\equal{\kwordivnome}{}}{}{4. \kwordivnome. \ifthenelse{\equal{\kwordvnome}{}}{}{5. \kwordvnome.}}}{1. \pchaveinome. 2. \pchaveiinome. 3. \pchaveiiinome. \ifthenelse{\equal{\pchaveivnome}{}}{}{4. \pchaveivnome. \ifthenelse{\equal{\pchavevnome}{}}{}{5. \pchavevnome.}}} +\ifthenelse{\equal{\autoriinome}{}}{\ifthenelse{\equal{\coorientnome}{}}{I. \orientsobrenome, \orientnome, orient. II. TÃtulo}{I. \orientsobrenome, \orientnome, orient. II. \coorientsobrenome, \coorientnome, coorient. III. TÃtulo}}{\ifthenelse{\equal{\coorientnome}{}}{I. \autoriisobrenome, \autoriinome. II. \orientsobrenome, \orientnome, orient. III. TÃtulo}{I. \autoriisobrenome, \autoriinome. II. \orientsobrenome, \orientnome, orient. III. \coorientsobrenome, \coorientnome, coorient. IV. TÃtulo}} %\end{tabular} \end{minipage}} \end{center} |