diff options
Diffstat (limited to 'macros/latex')
19 files changed, 427 insertions, 324 deletions
diff --git a/macros/latex/contrib/breqn/CHANGES.md b/macros/latex/contrib/breqn/CHANGES.md index bad962a4b7..c3d8781a5d 100644 --- a/macros/latex/contrib/breqn/CHANGES.md +++ b/macros/latex/contrib/breqn/CHANGES.md @@ -1,5 +1,17 @@ # Release notes for the `breqn` packages + +## v0.98j (2020/04/19) + + * Remove `color` and `background` options from the documentation, as they have never done anything! + (Todo: make them do something...) + * Fix spacing bug in `dseries` with arbitrary fonts. + * Really fix `\\genfrac` this time, making it backwards compatible with amsmath definition. + * Revamp of `mathstyle` code for setting `\mathstyle` to ensure consistency between + LuaTeX and other engines. + (This was originally just a quick fix of the value of `\\mathstyle` within double + subscripts or superscripts) + ## v0.98i (2020/02/18) * Fix clash with new version of `babel` around use of the generic `\\@elt` command. diff --git a/macros/latex/contrib/breqn/breqn.dtx b/macros/latex/contrib/breqn/breqn.dtx index 9f344f3d1e..10b584bd83 100644 --- a/macros/latex/contrib/breqn/breqn.dtx +++ b/macros/latex/contrib/breqn/breqn.dtx @@ -150,8 +150,8 @@ % % % \title{The \pkg{breqn} package} -% \def\fileversion{0.98i} -% \def\filedate{2020/02/18} +% \def\fileversion{0.98j} +% \def\filedate{2020/04/19} % \date{\pkg{breqn} bundle: \filedate\space\fileversion} % \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}} % @@ -189,18 +189,29 @@ % % \section{Package loading} % +% The \pkg{breqn} package automatically loads \pkg{amsmath} to avoid loading order conflicts. +% It also automatically loads \pkg{flexisym} and \pkg{mathstyle}, but in some cases these +% packages need to be loaded separately. The canonical order for package loading is: +% \begin{verbatim} +% \usepackage{amsmath} +% \usepackage{flexisym} +% \usepackage{breqn} +% \end{verbatim} % % The recommended way of loading the \pkg{breqn} package is to load it -% \emph{after} other packages dealing with math, \ie, after -% \pkg{amsmath}, \pkg{amssymb}, or packages such as \pkg{mathpazo} or -% \pkg{mathptmx}. +% \emph{before} other packages dealing with math symbols, \ie, before +% \pkg{amssymb}, or packages such as \pkg{mathpazo} or \pkg{mathptmx}. +% However, this can sometimes lead to macro definition clashes, and in such cases +% you may need to juggle the loading order to make it work. +% +% \subsection{Options for \pkg{flexisym}} % % The \pkg{flexisym} package (described in section \vref{flexisym}) is % required by \pkg{breqn} and ensures the math symbols are set up % correctly. By default \pkg{breqn} loads it with support for Computer % Modern but if you use a different math package requiring slightly -% different definitions, it must be loaded before \pkg{breqn}. Below -% is an example of how you enable \pkg{breqn} to work with the widely +% different definitions, \pkg{flexisym} must be explicitly loaded before \pkg{breqn} as shown above. +% Below is an example of how you enable \pkg{breqn} to work with the widely % used \pkg{mathpazo} package. % \begin{verbatim} %\usepackage{mathpazo} @@ -214,11 +225,6 @@ % \fn{flexisym.dtx} for how to create a support file---it is easier % than one might think. Contributions welcome. % -% The documentation for the package was formerly found in -% \fn{breqndoc}. It has now been added to this implementation -% file. Below follows the contents of the original \pkg{breqn} -% documentation. Not all details hold anymore but I have prioritized -% fixing the package. % % \section{Introduction} % @@ -556,8 +562,6 @@ % \begin{dmath}[spread={1pt}] % \begin{dmath}[frame] % \begin{dmath}[frame={1pt},framesep={2pt}] -% \begin{dmath}[background={red}] -% \begin{dmath}[color={purple}] % \begin{dmath}[breakdepth={0}] % \end{verbatim} % @@ -603,15 +607,6 @@ % Use the \opt{framesep} option to change the amount of space separating % the frame from what it encloses. The default space is \cs{fboxsep}. % -% Use the \opt{background} option to produce a colored background for the -% equation body. The \pkg{breqn} package doesn't automatically load the -% \pkg{color} package, so this option won't work unless you remember -% to load the \pkg{color} package yourself. -% -% Use the \opt{color} option to specify a different color for the contents -% of the equation. Like the \opt{background} option, this doesn't work if -% you forgot to load the \pkg{color} package. -% % Use the \opt{breakdepth} option to change the level of delimiter nesting % to which line breaks are allowed. To prohibit line breaks within % delimiters, set this to 0: @@ -1381,7 +1376,7 @@ % Declare package name and date. % \begin{macrocode} \RequirePackage{expl3} -\ProvidesExplPackage{breqn}{2020/02/18}{0.98i}{Breaking equations} +\ProvidesExplPackage{breqn}{2020/04/19}{0.98j}{Breaking equations} % \end{macrocode} % Regrettably, \pkg{breqn} is internally a mess, so we have to take % some odd steps. @@ -6241,8 +6236,9 @@ \def\premath{% % \end{macrocode} % BRM: Tricky to cleanup space OR add space ONLY BETWEEN math! +% FMi: improvement to measure against current font. % \begin{macrocode} - \ifdim\lastskip<.3em \unskip + \ifdim\lastskip<\fontdimen2\font \unskip \else\ifnum\lastpenalty<\@M \dquad\fi\fi }% % \end{macrocode} diff --git a/macros/latex/contrib/breqn/breqn.pdf b/macros/latex/contrib/breqn/breqn.pdf Binary files differindex 900eee8636..7f4ccad37c 100644 --- a/macros/latex/contrib/breqn/breqn.pdf +++ b/macros/latex/contrib/breqn/breqn.pdf diff --git a/macros/latex/contrib/breqn/flexisym.dtx b/macros/latex/contrib/breqn/flexisym.dtx index cb9206c14e..571ec4a20d 100644 --- a/macros/latex/contrib/breqn/flexisym.dtx +++ b/macros/latex/contrib/breqn/flexisym.dtx @@ -78,8 +78,8 @@ % \fi % % \title{The \textsf{flexisym} package} -% \def\fileversion{0.98i} -% \def\filedate{2020/02/18} +% \def\fileversion{0.98j} +% \def\filedate{2020/04/19} % \date{\filedate\space\fileversion} % \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}} % @@ -97,7 +97,7 @@ % \begin{macrocode} %<*package> \RequirePackage{expl3}[2009/08/05] -\ProvidesExplPackage{flexisym}{2020/02/18}{0.98i}{Make math characters macros} +\ProvidesExplPackage{flexisym}{2020/04/19}{0.98j}{Make math characters macros} \edef\do{% \noexpand\AtEndOfPackage{% diff --git a/macros/latex/contrib/breqn/flexisym.pdf b/macros/latex/contrib/breqn/flexisym.pdf Binary files differindex 0fddf92710..69009a85d8 100644 --- a/macros/latex/contrib/breqn/flexisym.pdf +++ b/macros/latex/contrib/breqn/flexisym.pdf diff --git a/macros/latex/contrib/breqn/mathstyle.dtx b/macros/latex/contrib/breqn/mathstyle.dtx index 6df4e9426a..94aad71329 100644 --- a/macros/latex/contrib/breqn/mathstyle.dtx +++ b/macros/latex/contrib/breqn/mathstyle.dtx @@ -57,8 +57,8 @@ % \fi % % \title{The \textsf{mathstyle} package} -% \def\fileversion{0.98i} -% \def\filedate{2020/02/18} +% \def\fileversion{0.98j} +% \def\filedate{2020/04/19} % \date{\filedate\quad\fileversion} % \author{Authors: Michael J. Downes, Morten H\o gholm\\ Maintained by Morten H\o gholm, Will Robertson\\ Feedback: \texttt{https://github.com/wspr/breqn/issues}} % @@ -151,7 +151,7 @@ %<*package> \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} -\ProvidesExplPackage{mathstyle}{2020/02/18}{0.98i}{Tracking mathstyle implicitly} +\ProvidesExplPackage{mathstyle}{2020/04/19}{0.98j}{Tracking mathstyle implicitly} \ExplSyntaxOff % \end{macrocode} % @@ -215,6 +215,7 @@ % \end{macro} % % \begin{macro}{\mathstyle} +% \begin{macro}{\mathstyledenom} % A counter for the math style: 0--display, 2--text, 4--script, 6--scriptscript. % The logic is that display maths will explicitly % set \verb|\mathstyle| to zero (see above), so by default it is set to the @@ -224,12 +225,14 @@ % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname directlua\endcsname\relax - \chardef\mathstyle\@ne + \chardef\mathstyle=2\relax + \chardef\mathstyledenom=0\relax \else \directlua{tex.enableprimitives("", {"mathstyle"})} \fi % \end{macrocode} % \end{macro} +% \end{macro} % % Save the four style changing primitives, \cs{mathchoice} and the % fraction commands. @@ -247,18 +250,18 @@ \@saveprimitive\abovewithdelims\@@abovewithdelims % \end{macrocode} % Then we redeclare the four style changing primitives: set the value of -% \cs{mathstyle} if Lua\TeX{} is not in use.q +% \cs{mathstyle} if Lua\TeX{} is not in use. % \begin{macrocode} \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname directlua\endcsname\relax \DeclareRobustCommand{\displaystyle}{% - \@@displaystyle \chardef\mathstyle\z@} + \@@displaystyle \chardef\mathstyle0\relax} \DeclareRobustCommand{\textstyle}{% - \@@textstyle \chardef\mathstyle\tw@} + \@@textstyle \chardef\mathstyle2\relax} \DeclareRobustCommand{\scriptstyle}{% - \@@scriptstyle \chardef\mathstyle4 } + \@@scriptstyle \chardef\mathstyle4\relax} \DeclareRobustCommand{\scriptscriptstyle}{% - \@@scriptscriptstyle \chardef\mathstyle6 } + \@@scriptscriptstyle \chardef\mathstyle6\relax} \fi % \end{macrocode} % First we get the primitive operations. These should have been @@ -283,8 +286,10 @@ \begingroup\expandafter\expandafter\expandafter\endgroup \expandafter\ifx\csname directlua\endcsname\relax \def\subsupstyle{% - \ifnum\mathstyle<5 \chardef\mathstyle4 % - \else \chardef\mathstyle6 % + \ifnum\mathstyle<4\relax + \chardef\mathstyle\numexpr4+\mathstyledenom\relax + \else + \chardef\mathstyle\numexpr6+\mathstyledenom\relax \fi } \else @@ -338,17 +343,69 @@ % \end{macro} % % \begin{macro}{\genfrac} +% The amsmath definition: +% \begin{verbatim} +% \DeclareRobustCommand{\genfrac}[4]{% +% \def\@tempa{#1#2}% +% \edef\@tempb{\@nx\@genfrac\@mathstyle{#4}% +% \csname @@\ifx @#3@over\else above\fi +% \ifx\@tempa\@empty \else withdelims\fi\endcsname} +% \@tempb{#1#2#3}} +% \end{verbatim} +% with arguments: +% \begin{itemize} +% \item left-delim +% \item right-delim +% \item line thickness (default if empty) +% \item mathstyle override +% \item numerator +% \item denominator +% \end{itemize} % The fractions. Note that this uses the same names as in % \pkg{amsmath}. Much the same except here they call \cs{fracstyle}. % \begin{macrocode} \DeclareRobustCommand\genfrac[6]{% - {#1\fracstyle + {% + % emulate old amsmath syntax: + \if 0#4\relax\displaystyle\else + \if 1#4\relax\textstyle\else + \if 2#4\relax\scriptstyle\else + \if 3#4\relax\scriptscriptstyle\else + #4% + \fi\fi\fi\fi + \fracstyle {\begingroup #5\endgroup - \csname @@\ifx\maxdimen#4\maxdimen over\else above\fi - \if @#2@\else withdelims\fi\endcsname #2#3\relax - #6}% + \csname @@\ifx\maxdimen#3\maxdimen over\else above\fi + \if @#1@\else withdelims\fi\endcsname #1 #2 #3\relax + \ifnum\mathstyledenom=0\relax + \chardef\mathstyledenom=1\relax + \edef\mathstyle@tempa{\number\mathstyle}% + \chardef\mathstyle=\numexpr\mathstyle@tempa+1\relax + \fi + #6% + \chardef\mathstyledenom=0\relax}% }% } +\begingroup\expandafter\expandafter\expandafter\endgroup +\expandafter\ifx\csname directlua\endcsname\relax\else +\DeclareRobustCommand\genfrac[6]{% + {% + % emulate old amsmath syntax: + \if 0#4\relax\displaystyle\else + \if 1#4\relax\textstyle\else + \if 2#4\relax\scriptstyle\else + \if 3#4\relax\scriptscriptstyle\else + #4% + \fi\fi\fi\fi + \fracstyle + {\begingroup #5\endgroup + \csname @@\ifx\maxdimen#3\maxdimen over\else above\fi + \if @#1@\else withdelims\fi\endcsname #1 #2 #3\relax + #6% + }% + }% +} +\fi % \end{macrocode} % \changes{v0.90}{2011/08/03}{\cs{fracstyle} must be called \emph{after} % changing to the required style} @@ -360,14 +417,14 @@ \renewcommand{\frac}{\genfrac{}{}{}{}} \providecommand{\dfrac}{} \providecommand{\tfrac}{} -\renewcommand{\dfrac}{\genfrac\displaystyle{}{}{}} -\renewcommand{\tfrac}{\genfrac\textstyle{}{}{}} +\renewcommand{\dfrac}{\genfrac{}{}{}\displaystyle} +\renewcommand{\tfrac}{\genfrac{}{}{}\displaystyle} \providecommand{\binom}{} \providecommand{\tbinom}{} \providecommand{\dbinom}{} -\renewcommand{\binom}{\genfrac{}(){0pt}} -\renewcommand{\dbinom}{\genfrac\displaystyle(){0pt}} -\renewcommand{\tbinom}{\genfrac\textstyle(){0pt}} +\renewcommand{\binom}{\genfrac(){0pt}{}} +\renewcommand{\dbinom}{\genfrac(){0pt}\displaystyle} +\renewcommand{\tbinom}{\genfrac(){0pt}\textstyle} % \end{macrocode} % The \cs{fracstyle} command is a switch to go one level down but no @@ -377,15 +434,11 @@ \expandafter\ifx\csname directlua\endcsname\relax \def\fracstyle{% \ifcase\numexpr\mathstyle\relax - \chardef\mathstyle=\@ne - \or - \chardef\mathstyle=\@ne - \or - \chardef\mathstyle=\tw@ - \or - \chardef\mathstyle=\tw@ - \else - \chardef\mathstyle=\thr@@ + \chardef\mathstyle=0\relax % 0 + \or \chardef\mathstyle=1\relax % 1 + \or \chardef\mathstyle=2\relax % 2 + \or \chardef\mathstyle=3\relax % 3 + \else \chardef\mathstyle=3\relax % 4 or more \fi } \else diff --git a/macros/latex/contrib/breqn/mathstyle.pdf b/macros/latex/contrib/breqn/mathstyle.pdf Binary files differindex c9d84aee9a..3400c7a99c 100644 --- a/macros/latex/contrib/breqn/mathstyle.pdf +++ b/macros/latex/contrib/breqn/mathstyle.pdf diff --git a/macros/latex/contrib/bxpdfver/LICENSE b/macros/latex/contrib/bxpdfver/LICENSE index 8ada757fbc..6464d05972 100644 --- a/macros/latex/contrib/bxpdfver/LICENSE +++ b/macros/latex/contrib/bxpdfver/LICENSE @@ -1,6 +1,6 @@ The MIT License -Copyright (c) 2017 Takayuki YATO (aka. "ZR") +Copyright (c) 2014-2020 Takayuki YATO (aka. "ZR") Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/macros/latex/contrib/bxpdfver/README-ja.md b/macros/latex/contrib/bxpdfver/README-ja.md index dc466aa98b..78b35c6da6 100644 --- a/macros/latex/contrib/bxpdfver/README-ja.md +++ b/macros/latex/contrib/bxpdfver/README-ja.md @@ -35,7 +35,7 @@ bxpdfver パッケージ 利用可能なオプションは以下の通り。 - * `1.4`、`1.5`、`1.6`、`1.7`: PDF バージョンを指定する。 + * `1.4`、`1.5`、`1.6`、`1.7`、`2.0`: PDF バージョンを指定する。 * `nocompress`: ストリームの圧縮を抑止する。 * `compress`(既定): ストリームの圧縮を抑止しない。 * `noobjcompress`: オブジェクトストリームの使用を抑止する。 @@ -47,6 +47,8 @@ bxpdfver パッケージ + `dvipdfmx`: dvipdfmx 用のドライバを指定する。 + `disabled`/`nodvidriver`: 全ての機能を無効化する。 * `lenient`: サポートしない機能に対するエラーを警告に格下げする。 + * `new-dvipdfmx`: dvipdfmx に対するバージョン検査を省略し、常に最新の + バージョンであると仮定する。 `compress`、`objcompress` はこのパッケージによる抑止を行わないという意味 であり、既に抑止されている場合にそれを再び有効化するものではない。 @@ -55,7 +57,7 @@ bxpdfver パッケージ * `\setpdfversion{<バージョン>}`: 出力 PDF バージョンを指定する。 `<バージョン>` には以下の何れかを指定する。 - + `1.4`、`1.5`、`1.6`、`1.7` の何れか。その値に設定する。 + + `1.4`、`1.5`、`1.6`、`1.7`、`2.0` の何れか。その値に設定する。 + PDF ファイルの名前。そのファイルのバージョンと同じ値に設定する。 * `\suppresspdfcompression`: ストリームの圧縮を抑止する。 * `\suppresspdfobjcompression`: オブジェクトストリームの使用を抑止 @@ -101,6 +103,8 @@ bxpdfver パッケージ 更新履歴 -------- + * Version 0.5 ‹2020/04/19› + - PDF バージョンの値として `2.0` をサポートする。 * Version 0.4 ‹2017/02/11› - `\setpdfdecimaldigits`、`\preservepdfdestinations` を追加。 * Version 0.3 ‹2016/08/11› diff --git a/macros/latex/contrib/bxpdfver/README.md b/macros/latex/contrib/bxpdfver/README.md index e577a74252..ec17bff09a 100644 --- a/macros/latex/contrib/bxpdfver/README.md +++ b/macros/latex/contrib/bxpdfver/README.md @@ -37,7 +37,7 @@ bxpdfver package The available options are: - * `1.4`, `1.5`, `1.6`, or `1.7`: Sets PDF version. + * `1.4`, `1.5`, `1.6`, `1.7` or `2.0`: Sets PDF version. * `nocompress`: Suppresses stream compression. * `compress` (default): Does not suppress stream compression. * `noobjcompress`: Suppresses use of object streams. @@ -57,7 +57,7 @@ when it is already suppressed by other means. * `\setpdfversion{<version>}`: Sets PDF version. Here `<version>` is either one of the following: - + `1.4`, `1.5`, `1.6`, or `1.7`; the version itself. + + `1.4`, `1.5`, `1.6`, `1.7` or `2.0`; the version itself. + the name of a PDF file; the version is set equal to that of the given file. * `\suppresspdfcompression`: Suppresses stream compression. @@ -101,6 +101,8 @@ More notices: REVISION HISTORY ---------------- + * Version 0.5 ‹2020/04/19› + - Suuport PDF version value `2.0`. * Version 0.4 ‹2017/02/11› - Add `\setpdfdecimaldigits` and `\preservepdfdestinations`. * Version 0.3 ‹2016/08/11› diff --git a/macros/latex/contrib/bxpdfver/bxpdfver.sty b/macros/latex/contrib/bxpdfver/bxpdfver.sty index 213871f7bf..ad472da1b4 100644 --- a/macros/latex/contrib/bxpdfver/bxpdfver.sty +++ b/macros/latex/contrib/bxpdfver/bxpdfver.sty @@ -1,8 +1,16 @@ -% bxpdfver.sty +%% +%% This is file 'bxpdfver.sty'. +%% +%% Copyright (c) 2014-2020 Takayuki YATO (aka. "ZR") +%% GitHub: https://github.com/zr-tex8r +%% Twitter: @zr_tex8r +%% +%% This package is distributed under the MIT License. +%% %% package declaration \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{bxpdfver}[2017/02/11 v0.4] +\ProvidesPackage{bxpdfver}[2020/04/19 v0.5] \def\bxpv@pkgname{bxpdfver} %% preparations @@ -20,26 +28,17 @@ \let\bxpv@compress=t % use compression? \let\bxpv@obj@compress=t % use object stream? \chardef\bxpv@infolevel=2 % info-log level +\let\bxpv@new@dvipdfmx=f % assume new dvipdfmx? + +%% \bxpv@valid@versions +\def\bxpv@valid@versions{1.4,1.5,1.6,1.7,2.0} %% options % (PDF version) -\DeclareOption{1.4}{% - \edef\bxpv@version{\CurrentOption}% -} -\DeclareOption{1.5}{% - \edef\bxpv@version{\CurrentOption}% -} -\DeclareOption{1.6}{% - \edef\bxpv@version{\CurrentOption}% -} -\DeclareOption{1.7}{% - \edef\bxpv@version{\CurrentOption}% -} -\DeclareOption{1.8}{% - \edef\bxpv@version{\CurrentOption}% -} -\DeclareOption{1.9}{% - \edef\bxpv@version{\CurrentOption}% +\@for\bxpv@tmpa:=\bxpv@valid@versions\do{% + \DeclareOption{\bxpv@tmpa}{% + \edef\bxpv@version{\CurrentOption}% + }% } % (compression) \DeclareOption{nocompress}{% @@ -83,6 +82,11 @@ \let\bxpv@drv@type=0% \def\bxpv@drv@name{nodvidriver}% } +\DeclareOption{new-dvipdfmx}{% + \let\bxpv@drv@type=d% + \let\bxpv@new@dvipdfmx=t% + \def\bxpv@drv@name{dvipdfmx}% +} % (other) \DeclareOption{lenient}{% \chardef\bxpv@infolevel=1 @@ -130,6 +134,12 @@ the engine/driver does not support the feature}% } +%% \ifbxpv@defined +\let\ifbxpv@defined\ifdefined +\ifx\ifbxpv@defined\@undefined \expandafter\@firstofone +\else \expandafter\@gobble +\fi{\let\ifbxpv@defined\iffalse} + %--------------------------------------- internal dispatchers %% \bxpv@suppress@compress @@ -142,6 +152,9 @@ \def\bxpv@suppress@obj@compress{% \bxpv@fail@nafea{Cannot suppress object compression}% } +%% \bxpv@check@version +\@onlypreamble\bxpv@check@version +\let\bxpv@check@version\bxpv@okfalse %% \bxpv@set@version \@onlypreamble\bxpv@set@version \def\bxpv@set@version{% @@ -206,30 +219,59 @@ \global\let\bxpv@@minorversion\pdfminorversion \global\let\bxpv@@decimaldigits\pdfdecimaldigits \global\let\bxpv@@pkresolution\pdfpkresolution + \global\let\bxpv@@majorversion\pdfmajorversion \bxpv@check@prim\pdfvariable{% \protected\xdef\bxpv@@compresslevel{\pdfvariable compresslevel}% \protected\xdef\bxpv@@objcompresslevel{\pdfvariable objcompresslevel}% \protected\xdef\bxpv@@minorversion{\pdfvariable minorversion}% \protected\xdef\bxpv@@decimaldigits{\pdfvariable decimaldigits}% \protected\xdef\bxpv@@pkresolution{\pdfvariable pkresolution}% + \ifnum 0\directlua{% + if pdf.getmajorversion then tex.write('1') end}>\z@ + \protected\xdef\bxpv@@majorversion{\pdfvariable majorversion}% + \fi }% % If \pdfcompresslevel is available, use it. - \ifx\bxpv@@compresslevel\@undefined\else + \ifbxpv@defined\bxpv@@compresslevel \gdef\bxpv@suppress@compress{% \global\bxpv@@compresslevel\z@ }% \fi % If \pdfobjcompresslevel is available, use it. - \ifx\bxpv@@objcompresslevel\@undefined\else + \ifbxpv@defined\bxpv@@objcompresslevel \global\chardef\bxpv@org@objcompresslevel\bxpv@@objcompresslevel \gdef\bxpv@suppress@obj@compress{% \global\bxpv@@objcompresslevel\z@ }% \global\let\bxpv@cancel@obj@compress\bxpv@suppress@obj@compress \fi - % If \pdfminorversion is available, use it. - \ifx\bxpv@@minorversion\@undefined\else + % If \pdfmajorversion/\pdfminorversion is available, use it. + \ifbxpv@defined\bxpv@@majorversion \global\chardef\bxpv@org@minorversion\bxpv@@minorversion + \global\chardef\bxpv@org@majorversion\bxpv@@majorversion + \global\let\bxpv@check@version\bxpv@oktrue + \gdef\bxpv@set@version{% + \ifx\bxpdfverMinorVersion\relax + \global\bxpv@@minorversion\bxpv@org@minorversion + \global\bxpv@@majorversion\bxpv@org@majorversion + \else + \global\bxpv@@minorversion\bxpdfverMinorVersion + \global\bxpv@@majorversion\bxpdfverMajorVersion + \fi + }% + \g@addto@macro\bxpv@begin@document@hook{% + \ifnum\bxpv@@majorversion<2 \ifnum\bxpv@@minorversion<5 + \bxpv@cancel@obj@compress + \fi\fi + }% + \else\ifbxpv@defined\bxpv@@minorversion + \global\chardef\bxpv@org@minorversion\bxpv@@minorversion + \gdef\bxpv@check@version{% + \bxpv@oktrue + \ifx\bxpdfverMajorVersion\tw@ + \bxpv@okfalse % cannot set major version 2 + \fi + } \gdef\bxpv@set@version{% \ifx\bxpdfverMinorVersion\relax \global\bxpv@@minorversion\bxpv@org@minorversion @@ -242,9 +284,9 @@ \bxpv@cancel@obj@compress \fi }% - \fi + \fi\fi % If \pdfdecimaldigits is available, use it. - \ifx\bxpv@@decimaldigits\@undefined\else + \ifbxpv@defined\bxpv@@decimaldigits \global\chardef\bxpv@org@decimaldigits\bxpv@@decimaldigits \gdef\bxpv@set@decimaldigits{% \ifx\bxpdfverDecimalDigits\relax @@ -255,7 +297,7 @@ }% \fi % If \pdfpkresolution is available, use it. - \ifx\bxpv@@pkresolution\@undefined\else + \ifbxpv@defined\bxpv@@pkresolution \global\mathchardef\bxpv@org@pkresolution\bxpv@@pkresolution \gdef\bxpv@set@pkresolution{% \ifx\bxpdfverPkResolution\relax @@ -285,6 +327,7 @@ \else\if d\bxpv@drv@type % 'dvipdfmx' \global\let\bxpv@suppress@compress\relax \global\let\bxpv@suppress@obj@compress\relax + \global\let\bxpv@check@version\relax \global\let\bxpv@set@version\relax \global\let\bxpv@set@decimaldigits\relax %\global\let\bxpv@set@pkresolution\relax @@ -324,8 +367,13 @@ \@onlypreamble\setpdfversion \newcommand*\setpdfversion[1]{% \edef\bxpv@version{#1}% - \bxpv@get@mversion - \bxpv@set@version + \bxpv@set@version@values + \bxpv@check@version + \ifbxpv@ok + \bxpv@set@version + \else + \bxpv@fail@nafea{Cannot set PDF version to '\bxpv@version'}% + \fi } %%<*> \setpdfdecimaldigits{<number>} @@ -362,6 +410,13 @@ \let\bxpdfverMinorVersion\relax } +%%<+> \bxpdfverMajorVersion +% The PDF major version (eg. '1' for 1.4) that this package +% will impose. It is a number constant, or \relax. +\@ifdefinable{\bxpdfverMajorVersion}{% + \let\bxpdfverMajorVersion\relax +} + %%<+> \bxpdfverDecimalDigits % The PDF decimal-digits value that this package % will impose. It is a number constant, or \relax. @@ -418,90 +473,100 @@ %% variables \let\bxpv@mversion\relax % minor version (temporary) -%% \bxpv@get@mversion -% Sets \bxpdfverMinorVersion. -\@onlypreamble\bxpv@get@mversion -\def\bxpv@get@mversion{% +%% \bxpv@set@version@values +% Sets \bxpdfverMinorVersion/\bxpdfverMajorVersion. +\@onlypreamble\bxpv@set@version@values +\def\bxpv@set@version@values{% \edef\bxpv@version{\bxpv@version}% + \let\bxpv@tmpc\bxpv@version \ifx\bxpv@version\@empty \global\let\bxpdfverMinorVersion\relax % unset + \global\let\bxpdfverMajorVersion\relax % unset \else - \let\bxpv@mversion\relax - \@tfor\bxpv@x:=456789\do{% - \edef\bxpv@tmpa{1.\bxpv@x}% + \bxpv@okfalse + \@for\bxpv@tmpa:=\bxpv@valid@versions\do{% \ifx\bxpv@version\bxpv@tmpa - \chardef\bxpv@mversion=\bxpv@x\relax + \bxpv@oktrue \fi }% - \ifx\bxpv@mversion\relax - \bxpv@file@mversion + \ifbxpv@ok\else + \bxpv@check@file@version + \ifx\bxpv@version\relax + \bxpv@okfalse + \else + \bxpv@oktrue + \PackageInfo\bxpv@pkgname + {Output PDF version is set to \bxpv@version\MessageBreak}% + \fi \fi - \ifx\bxpv@mversion\relax + \ifbxpv@ok + \expandafter\bxpv@set@version@values@a\bxpv@version\relax + \else \PackageError\bxpv@pkgname {Invalid value given for PDF version\MessageBreak - (value=\bxpv@version)}{% - PDF version must be either 1.4, 1.5, ..., 1.9, or\MessageBreak + (value=\bxpv@tmpc)}{% + PDF version must be either one of the following:\MessageBreak + \@spaces \bxpv@valid@versions;\MessageBreak or the name of a PDF file from which the version is pulled.% \MessageBreak\@ehc}% - \else - \PackageInfo\bxpv@pkgname - {Output PDF version is set to 1.\the\bxpv@mversion - \MessageBreak}% - \global\let\bxpdfverMinorVersion\bxpv@mversion \fi \fi } +\def\bxpv@set@version@values@a#1.#2\relax{% + \global\chardef\bxpdfverMinorVersion=#2\relax + \global\chardef\bxpdfverMajorVersion=#1\relax +} -%% \bxpv@file@mversion -\@onlypreamble\bxpv@file@mversion -\def\bxpv@file@mversion{% - \let\bxpv@mversion\relax - \expandafter\bxpv@file@mversion@a\bxpv@version\bxpv@end +%% \bxpv@check@file@version +\@onlypreamble\bxpv@check@file@version +\def\bxpv@check@file@version{% + \expandafter\bxpv@check@file@version@a\bxpv@version\bxpv@end } -\@onlypreamble\bxpv@file@mversion@a -\def\bxpv@file@mversion@a#1\bxpv@end{% +\@onlypreamble\bxpv@check@file@version@a +\def\bxpv@check@file@version@a#1\bxpv@end{% \filename@parse{#1}% \edef\bxpv@next{% \lowercase{\def\noexpand\filename@ext{\filename@ext}}% }\bxpv@next \def\bxpv@tmpb{pdf}% + \let\bxpv@version\relax \ifx\filename@ext\bxpv@tmpb \global\let\bxpv@gtmpa\relax \bxpv@read@file{#1}{% - \bxpv@file@mversion@xa{##1 }% + \bxpv@check@file@version@xa{##1 }% \bxpv@read@file@finish }% \ifbxpv@read@file@ok\else \PackageWarning\bxpv@pkgname {File '#1' not found}% \fi - \@tfor\bxpv@x:=456789\do{% - \ifx\bxpv@x\bxpv@gtmpa - \chardef\bxpv@mversion=\bxpv@x\relax + \@for\bxpv@tmpa:=\bxpv@valid@versions\do{% + \ifx\bxpv@gtmpa\bxpv@tmpa + \let\bxpv@version\bxpv@tmpa \fi }% \fi } % some more subprocedures -\@onlypreamble\bxpv@file@mversion@xa -\@onlypreamble\bxpv@file@mversion@xb -\@onlypreamble\bxpv@file@mversion@xc +\@onlypreamble\bxpv@check@file@version@xa +\@onlypreamble\bxpv@check@file@version@xb +\@onlypreamble\bxpv@check@file@version@xc \begingroup \escapechar\m@ne \def\bxpv@tmpa#1\bxpv@end{% - \gdef\bxpv@file@mversion@xa##1{% - \bxpv@file@mversion@xb##1#1\bxpv@end + \gdef\bxpv@check@file@version@xa##1{% + \bxpv@check@file@version@xb##1#1\bxpv@end }% - \gdef\bxpv@file@mversion@xb##1#1##2\bxpv@end{% + \gdef\bxpv@check@file@version@xb##1#1##2\bxpv@end{% \ifx\bxpv@mt##1\bxpv@mt - \bxpv@file@mversion@xc##2\bxpv@end + \bxpv@check@file@version@xc##2\bxpv@end \fi }% - \gdef\bxpv@file@mversion@xc##1 ##2\bxpv@end{% + \gdef\bxpv@check@file@version@xc##1 ##2\bxpv@end{% \gdef\bxpv@gtmpa{##1}% }% } - \edef\bxpv@tmpb{{\expandafter\string\csname\string\%PDF-1.\endcsname}}% + \edef\bxpv@tmpb{{\expandafter\string\csname\string\%PDF-\endcsname}}% \expandafter\bxpv@tmpa\bxpv@tmpb\bxpv@end \endgroup @@ -531,10 +596,26 @@ \@onlypreamble\bxpv@begin@document@dvipdfmx \def\bxpv@begin@document@dvipdfmx{% % PDF version - \ifx\bxpdfverMinorVersion\relax\else - \g@addto@macro\bxpv@page@specials{% - \special{pdf:minorversion \the\bxpdfverMinorVersion}% - }% + \ifx\bxpdfverMajorVersion\tw@ + \bxpv@check@dvipdfmx@version{20180217}% + {Cannot set PDF major version}% + \else + \bxpv@oktrue + \fi + \ifbxpv@ok + \ifx\bxpdfverMinorVersion\relax\else + \g@addto@macro\bxpv@page@specials{% + \special{pdf:minorversion \the\bxpdfverMinorVersion}% + }% + \fi + \ifx\bxpdfverMinorVersion\relax\else + \bxpv@cache@fetch{dvipdfmxver}% + \ifnum\bxpv@cache@@dvipdfmxver<20180217 \else + \g@addto@macro\bxpv@page@specials{% + \special{pdf:majorversion \the\bxpdfverMajorVersion}% + }% + \fi + \fi \fi % compression \ifbxpdfverCompressionSuppressed @@ -806,6 +887,7 @@ \chardef\bxpv@rf@cont\@ne \bxpv@read@file@b \fi + \closein\@inputcheck \endgroup } \@onlypreamble\bxpv@read@file@b @@ -888,11 +970,13 @@ \def\next#1{\expandafter\meaning\csname if#1\endcsname}% \typeout{**bxpdfver-----------% ^^JMinorVersion=\meaning\bxpdfverMinorVersion + ^^JMajorVersion=\meaning\bxpdfverMajorVersion ^^JCompressionSuppressed=\next{bxpdfverCompressionSuppressed}% ^^JObjCompressionSuppressed=\next{bxpdfverObjCompressionSuppressed}% ^^JDecimalDigits=\meaning\bxpdfverDecimalDigits ^^JPkResolution=\meaning\bxpdfverPkResolution \do minorversion=\bxpv@@minorversion + \do majorversion=\bxpv@@majorversion \do compresslevel=\bxpv@@compresslevel \do objcompresslevel=\bxpv@@objcompresslevel \do decimaldigits=\bxpv@@decimaldigits @@ -912,6 +996,9 @@ \if t\bxpv@obj@compress\else \suppresspdfobjcompression \fi +\if t\bxpv@new@dvipdfmx + \bxpv@cache@store{dvipdfmxver}{99999999} +\fi %--------------------------------------- all done \endinput diff --git a/macros/latex/contrib/pm-isomath/README b/macros/latex/contrib/pm-isomath/README deleted file mode 100644 index 75dc8b8a73..0000000000 --- a/macros/latex/contrib/pm-isomath/README +++ /dev/null @@ -1,63 +0,0 @@ -The PM-ISOmath package, version 1.0.04 of 2018 -Original author: Claudio Beccari, 2017 -LaTeX Project Public Licence LPPL v.1.3c (or later) - -The PM-ISOmath name stands for "Poor Man ISO Math". In substance - this package is a poor man solution to the task of typesetting - math fulfilling the ISO regulations "for physical sciences and - technology" (formerly regulations ISO 31/XI, now ISO\,80000). - These regulations refer mostly to the family, series and shape - of fonts to be used with symbols of various nature. - -This package gets inspiration from the ISOmath package by Günter - Milde, but tries to get the same results without using any math - [font] groups (or families). As pdfLaTeX users may recall, this - typesetting program may see at maximum 16 math [font] groups (or - math font families); sometimes this number results in an error - that forbids the user to use the symbols s/he needs. - -The trick used in this package consists in employing text fonts - within the \text command (defined by the amsmath package that, - therefore, is a dependence to which pm-isomath is subjected) and - chose text font families, series, and shapes to be used within - that command argument. - -The commands are such as to fulfil some math requirements; for - example while in the scope of the \boldmath declaration, the - series is automatically set to bold without any user intervention. - The font size is automatically taken care by \text, so that fonts - have the correct size also while typesetting exponents or subscripts. - -Nevertheless, through proper advanced command options, the user - remains the person principally responsible of using the right - font for the right symbol in a document that must fulfil the - ISO regulations. - -This package is usable only with pdfLaTeX; LuaLaTeX and XeLaTeX - can access OpenType math fonts through the package unicode-math, - and with the "math-style=ISO" option they have the math switching - commands agree with the ISO regulations. - -pdfLATeX users have available some packages to fulfil the ISO - requirements; principally the ISOmath package that is subject - to a number of limitations due the the particular math environment - of the user, and libertinust1math that produces a complete set-up - with math fonts that match very well text fonts that are darker - than the standard default Computer Modern ones (including the - CM-super and the Latin Modern ones). - -This package works very well with the Latin Modern fonts; in - practice in math mode it uses the same Latin text fonts, and - the corresponding families, series, and shapes of the LGR - encoded CBfonts; it may work also with the CM and the CM-super - fonts, but the original author never uses them, therefore he - cannot guarantee any suitable result. - -For installation of this package, simply run the pm-isomath.dtx - through pdfLaTeX (and only pdfLaTeX); move the produced sty file - to the .../tex/latex/pm-isomath/ folder; if it does not exist, - create it; similarly move pm-isomath.dtx to .../source/latex/pm-isomath/ - and pm-isomath.pdf to .../doc/latex/pm-isomath/. - - - diff --git a/macros/latex/contrib/pm-isomath/README.txt b/macros/latex/contrib/pm-isomath/README.txt new file mode 100644 index 0000000000..2b1f69bd14 --- /dev/null +++ b/macros/latex/contrib/pm-isomath/README.txt @@ -0,0 +1,31 @@ +%% +%% This is file `README.txt', +%% generated with the docstrip utility. +%% +%% The original source files were: +%% +%% pm-isomath.dtx (with options: `txt') +%% ______________________________________________________ +%% The PM-ISOmath bundle +%% Copyright (C) 2017-2020 Claudio Beccari +%% All rights reserved +%% +%% License information appended +%% +\ProvidesFile{README.txt}[% + + +%% +%% +%% Distributable under the LaTeX Project Public License, +%% version 1.3c or higher (your choice). The latest version of +%% this license is at: http://www.latex-project.org/lppl.txt +%% +%% This work is "maintained" +%% +%% This work consists of this file pm-isomath.dtx, a README.txt file +%% and the derived files: +%% pm-isomath.sty, pm-isomath.pdf. +%% +%% +%% End of file `README.txt'. diff --git a/macros/latex/contrib/pm-isomath/manifest.txt b/macros/latex/contrib/pm-isomath/manifest.txt deleted file mode 100644 index 438cf0496c..0000000000 --- a/macros/latex/contrib/pm-isomath/manifest.txt +++ /dev/null @@ -1,34 +0,0 @@ -This is the manifest.txt file that accompanies the package PM-ISOmath, -version 1.0.04 of 2018 - -Original author: Claudio Beccari, 2017-2018 - -This work may be distributed and/or modified under the conditions -of the LaTeX Project Public License, either version 1.3 of this -license or (at your option) any later version. The latest version -of this license is in http://www.latex-project.org/lppl.txt and -version 1.3 or later is part of all distributions of LaTeX version -2003/12/01 or later. - -This work itself and every derived work are subject to the above -licence. - -This work has the LPPL maintenance status "author-maintained". - -The actual maintainer (2018) is Claudio Beccari: -claudio dot beccari at gmail dot com - -This work consists of the files listed in manifest.txt, that is: - manifest.txt - README - pm-isomath.dtx - -The derived files are - pm-isomath.pdf - pm-isomath.sty - -The pm-isomath.dtx file is a self extracting and self documenting -one; if you run pdflatex (and only pdflatex) on it you get at the -same time the English documentation and the package file. - -The derived file pm-isomath.sty may be used only with pdflatex. diff --git a/macros/latex/contrib/pm-isomath/pm-isomath.dtx b/macros/latex/contrib/pm-isomath/pm-isomath.dtx index 1db0734bd7..e72d09d24b 100644 --- a/macros/latex/contrib/pm-isomath/pm-isomath.dtx +++ b/macros/latex/contrib/pm-isomath/pm-isomath.dtx @@ -8,7 +8,7 @@ \preamble ______________________________________________________ The PM-ISOmath bundle - Copyright (C) 2017 Claudio Beccari + Copyright (C) 2017-2020 Claudio Beccari All rights reserved License information appended @@ -16,16 +16,15 @@ \endpreamble \postamble -Copyright 2017 Claudio Beccari Distributable under the LaTeX Project Public License, version 1.3c or higher (your choice). The latest version of this license is at: http://www.latex-project.org/lppl.txt -This work is "author-maintained" +This work is "maintained" -This work consists of this file pm-isomath.dtx, a README file -the manifest.txt file, and the derived files: +This work consists of this file pm-isomath.dtx, a README.txt file + and the derived files: pm-isomath.sty, pm-isomath.pdf. \endpostamble @@ -33,6 +32,7 @@ the manifest.txt file, and the derived files: \askforoverwritefalse \generate{\file{pm-isomath.sty}{\from{pm-isomath.dtx}{style}} + \file{README.txt}{\from{pm-isomath.dtx}{txt}} } \def\tmpa{plain} @@ -40,27 +40,11 @@ the manifest.txt file, and the derived files: \endgroup %</internal> % -% Copyright 2017 Claudio Beccari +% Copyright 2017-2020 Claudio Beccari % % This file is part of the PM-ISOmath bundle % ------------------------------------------- % -% It may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3c or later is part of all distributions of LaTeX -% version 2003/12/01 or later. -% -% This file has the LPPL maintenance status "author-maintained". -% -% The list of all files belonging to the PM-ISOmath bundle is -% given in the file `manifest.txt'. -% -% The set of derived (unpacked) files belonging to the distribution -% and covered by LPPL is created by the self unpacking file -% pm-isomath.dtx which is the principal part of the distribution. % % \fi % @@ -71,8 +55,10 @@ the manifest.txt file, and the derived files: \ProvidesFile{pm-isomath.dtx}[% %</driver> %<style>\ProvidesPackage{pm-isomath}[% +%<txt>\ProvidesFile{README.txt}[% %<*driver,style> -2018/01/12 v.1.0.04 +2020/04/18 v.1.0.05 +%<txt>Readme file for pm-isomath.sty] %<style>Poor man package for typesetting ISO compliant math when using pdfLaTeX] %</driver,style> %<*driver> @@ -117,7 +103,7 @@ the manifest.txt file, and the derived files: %</driver> % \fi % -% ^^A \CheckSum{}% +% \CheckSum{436}% % \begin{abstract} % The ISO regulations for typesetting math in the field of physics % and technology are pretty stringent and imply legal questions @@ -142,10 +128,10 @@ the manifest.txt file, and the derived files: % \section{Introduction} % The ISO regulations (formerly ISO\,31/XI, now ISO\,80000) are % stringent rules to typeset mathematics in the domains of physics -% and applied sciences; their title explicitly mentions ``physics -% and technology'', but their careful reading lets understand that -% they apply to all sciences that use the ``mathematics of -% quantities''. Such entities form a special group or space, +% and applied sciences; their title explicitly mentions “physics +% and technology”, but their careful reading lets understand that +% they apply to all sciences that use the “mathematics of +% quantities”. Such entities form a special group or space, % where the elements are couples of two ordered entities $(x, y)$, % where $y$ represents the unit of measure and $x$ represents the % ratio of the quantity to the unit of measure. Such paired @@ -168,9 +154,9 @@ the manifest.txt file, and the derived files: % explain which symbol is used for which quantity. This is % where the ISO regulations set some order and establish % a long list of named quantities with their preferred symbols -% and their ``normal'' units according to the prescriptions +% and their “normal” units according to the prescriptions % of the Comité International des Pois et Mésures, that -% established the the International System of measures +% established the International System of measures % (Systhème International, SI). % % This ISO nomenclature is used uniformly by most, if not all, @@ -210,7 +196,7 @@ the manifest.txt file, and the derived files: % rules for writing text about mathematics and metrology. It % is extremely valuable for anglophones, but, with the due % differences concerning the mother languages, it is extremely -% useful also for people using other languages than English. +% useful also for people using languages different from English. % % \section{The \pdfLaTeX\ handicaps} % Users of \pdfLaTeX, on the opposite are in trouble. In facts @@ -271,7 +257,7 @@ the manifest.txt file, and the derived files: % Several authors provided packages to help users produce % perfect documents that fulfil the ISO regulations; I would % like to cite the excellent Package |ISOmath| by Günter Milde, -% entitled ``Mathematical style for science and technology''. +% entitled “Mathematical style for science and technology”. % It should be the perfect package to use in order to fulfil % the ISO regulations; sometimes it succeeds with excellent % results, but more often than not the results are just partial, @@ -314,13 +300,13 @@ the manifest.txt file, and the derived files: % is allowed, but serifed italics should be preferred unless % the ISO rules prescribe a sans serif font. This implies that % the differential symbol be in upright font to avoid confusion -% with the physical quantity $d$; the Napier number `e' must be +% with the physical quantity $d$; the Napier number ‘e’ must be % set in upright font to avoid confusion with the elementary % electric charge $e$; the imaginary unit j in electrical % engineering, (i in other applied sciences) must be set in % upright font in order to avoid confusion with the electric % current density $j$ or the electric current $i$; more -% difficult: the transcendental number $\ISOpi=3.14159\dots$ +% difficult: the transcendental number $\ISOpi=3.14159\dots$ % should be distinguished from the plane angle $\pi$; and similar % other numerical constants represented by Latin or Greek letters. % \item @@ -334,7 +320,7 @@ the manifest.txt file, and the derived files: % subscript $i$ is a variable because it represents the $i$-th % element in a sequence, such as $V_0, V_1, V_2, \dots$; on % the opposite $V_{\mathrm{i}}$ the subscript is an apposition -% because `i' means, say, `input'. +% because `i' means, say, ‘input’. % \item % Upright bold roman or black board bold symbols represent sets. % \item @@ -345,7 +331,7 @@ the manifest.txt file, and the derived files: % ones are reserved for vectors; but in some sciences also vectors % may have uppercase letters. Geometrical vectors that might be % typeset with a medium series upper o lowercase italic letter -% with an arrow on top of it are nor treated by the ISO +% with an arrow on top of it are not treated by the ISO % regulations that speak of vectors irrespective if they are % considered as one column matrices or oriented segments; % apparently oriented segments should be treated the same as @@ -390,7 +376,7 @@ the manifest.txt file, and the derived files: % Greek letters, especially those packages for French typography, % where the national rules (in contrast with the ISO regulations) % require that all math entities typeset with Greek letters be -% upright. Among these the |fourier| and the |kpfonts|. Other +% upright. Among such packages therenare |fourier| and |kpfonts|. Other % packages such as |newpxmath| and |newtxmath| are intended for % general use, but with suitable options and extra math groups % let the user employ upright lowercase Greek letters as well as @@ -428,7 +414,7 @@ the manifest.txt file, and the derived files: % are the Latin Modern ones that allow a piecewise continuous % scaling of any available particular font of the collection. % -% Needless to say, this poor man solution has advantages and +% It goes without saying that this poor man solution has advantages and % disadvantages over the other indicated solutions. % % The main advantage is that no math groups are involved, @@ -436,7 +422,7 @@ the manifest.txt file, and the derived files: % series and shape that family allows; the default % family for Greek fonts are the Latin Modern compliant % LGR encoded collection of CBfonts; they are always -% available with any updated and complete \TeX\ system +% available with any up to date and complete \TeX\ system % installation. % % This is also a disadvantage, in the sense that Latin Modern @@ -448,7 +434,7 @@ the manifest.txt file, and the derived files: % % Nevertheless they work very well with the ISO regulations % and in spite of the disadvantages listed above, they are -% usable without problems. 'This very documentation is typeset +% usable without problems. This very documentation is typeset % with Latin Modern fonts. The examples shown in a following % section show the ease with which the ISO regulations may be % fulfilled. @@ -492,7 +478,7 @@ the manifest.txt file, and the derived files: % specified with \marg{family}\oarg{series}\parg{shape} are all % optional, including the first one in spite of being surrounded % by curly braces. In both cases the default values for each -% argument are respectively |lmr|, |m|, and |n| (normal upright). +% argument are respectively |lmr|, |m|, and |n| (normal, upright). % % Such default values, after loading |pm-isomath|, may be globally % redefined by using in the preamble: @@ -511,8 +497,8 @@ the manifest.txt file, and the derived files: % For Latin letters to use in the |\MathLatin| command mandatory % argument there are no problems. % -% For Greek letters you might use |\MathGreek| and the math lette -%r commands |\alpha|, |\beta|,\dots, |\Omega| commands, but it is +% For Greek letters you might use |\MathGreek| and the math letter +% commands |\alpha|, |\beta|,\dots, |\Omega| commands, but it is % much simpler to avoid|\MathGreek| and % use the package commands |\ISOalpha|, |\ISObeta|,\dots, % |\ISOOmega|. All these commands follow the syntax: @@ -567,25 +553,25 @@ the manifest.txt file, and the derived files: %\begin{table}[!tb] %\def\T#1{\cs{ISO#1} & \csuse{ISO#1}[bx]} %\[\begin{array}{lclclclc} -%\T{alpha} & \T{beta} & -%\T{gamma} & \T{delta} \\ -%\T{epsilon} & \T{zeta} & -%\T{eta} & \T{theta} \\ -%\T{iota} & \T{kappa} & -%\T{lambda} & \T{mu} \\ -%\T{nu} & \T{xi} & -%\T{omicron}& \T{pi} \\ -%\T{rho} & \T{sigma} & -%\T{tau} & \T{upsilon} \\ -%\T{phi} & \T{chi} & -%\T{psi} & \T{omega} \\ -%\T{Gamma} & \T{Delta} & -%\T{Eta} & \T{Theta} \\ -%\T{Lambda} & \T{Xi} & -%\T{Pi} & \T{Rho} \\ -%\T{Sigma} & \T{Upsilon} & -%\T{Phi} & \T{Chi} \\ -%&&\T{Psi} & \T{Omega} +%\T{alpha} & \T{beta} & +%\T{gamma} & \T{delta} \\ +%\T{epsilon} & \T{zeta} & +%\T{eta} & \T{theta} \\ +%\T{iota} & \T{kappa} & +%\T{lambda} & \T{mu} \\ +%\T{nu} & \T{xi} & +%\T{omicron} & \T{pi} \\ +%\T{rho} & \T{sigma} & +%\T{tau} & \T{upsilon} \\ +%\T{phi} & \T{chi} & +%\T{psi} & \T{omega} \\ +%\T{Gamma} & \T{Delta} & +%\T{Eta} & \T{Theta} \\ +%\T{Lambda} & \T{Xi} & +%\T{Pi} & \T{Rho} \\ +%\T{Sigma} & \T{Upsilon} & +%\T{Phi} & \T{Chi} \\ +%&&\T{Psi} & \T{Omega} %\end{array}\] %\caption{The \cs{ISO}\meta{letter} macros and their rendering in bold style} %\label{tab:isoletters} @@ -697,8 +683,8 @@ the manifest.txt file, and the derived files: % loading mechanism assures avoiding conflicts if packages are % loaded without options; this is why if one of the three packages % is loaded after this one but with some option specified, an -% ``Option clash"" error flag is raised; this is where the -% ``weak'' loading error becomes a very ``strong'' one. +% “Option clash” error flag is raised; this is where the +% “weak” loading error becomes a very “strong” one. %\iffalse %<*style> @@ -735,12 +721,12 @@ the manifest.txt file, and the derived files: % \end{macrocode} % Actually this package accepts an option: |engineer|. This % option is for deciding if the imaginary unit should be -% defined as `i' or `j'. As we have remarked in the previous +% defined as ‘i’ or ‘j’. As we have remarked in the previous % documentation, engineers, especially those who deal with % electricity and electrical quantities, but also electronics, control -% and telecommunications engineers, use only `j'; all these +% and telecommunications engineers, use ‘j’; all these % varieties of engineers could not do anything in their profession -% if they don't use complex numbers and quantities (the latter +% if they don't use complex numbers and quantities (the latter % called phasors). Possibly they are the applied scientists % who use complex numbers more than any other scientist. % Note: this option has \emph{not} been used to prepare this @@ -817,7 +803,7 @@ the manifest.txt file, and the derived files: % We should not care for the font names, but in order to use % different font families, series, and shapes the user should % know their codes. this is generally a difficult task, but -% not impossible; it ``suffices'' to open the packages that +% not impossible; it “suffices” to open the packages that % allow to use the desired fonts, read the code and find out % the names of the |.fd| files; then search these files on the % trees of the \TeX\ system, and eventually find out the @@ -843,18 +829,18 @@ the manifest.txt file, and the derived files: % & & upright italics & ui & upright italics& ui \\ % & & small caps & sc & small caps & sc \\ %\midrule -% bold & b & & & lipsian & li \\ -% & & normal & n & & \\ -% & & slanted & sl & & \\ +% bold & b & & & lipsian & li \\ +% & & normal & n & & \\ +% & & slanted & sl & & \\ %\midrule -% bold extended& bx & normal & n & normal & n \\ -% & & italics & it & italics & it \\ -% & & slanted & sl & slanted & sl \\ -% & & & & lipsian & li \\ -% & & & & serif & rs \\ -% & & & & serif oblique & rs \\ -% & & & & upright italics & ui \\ -% & & & & small caps & sc \\ +% bold extended& bx & normal & n & normal & n \\ +% & & italics & it & italics & it \\ +% & & slanted & sl & slanted & sl \\ +% & & & & lipsian & li \\ +% & & & & serif & rs \\ +% & & & & serif oblique & rs \\ +% & & & & upright italics & ui \\ +% & & & & small caps & sc \\ %\bottomrule %\end{tabular} %\caption{Seres and shapes available with the Latin Modern regular family with Latin and Greek fonts} @@ -982,17 +968,19 @@ the manifest.txt file, and the derived files: % any math group), and sans serif in both normal and bold % slanted shape. % \begin{macrocode} -\newcommand\mathbfit[1]{\MathLatin{#1}{lmr}[bx](it)} -\newcommand\mathsfit[1]{\MathLatin{#1}{lmss}[m](sl)} -\newcommand\mathsfbfit[1]{\MathLatin{#1}{lmss}[bx](sl)} +\AtBeginDocument{% +\providecommand\mathbfit[1]{\MathLatin{#1}{lmr}[bx](it)} +\providecommand\mathsfit[1]{\MathLatin{#1}{lmss}[m](sl)} +\providecommand\mathsfbfit[1]{\MathLatin{#1}{lmss}[bx](sl)}} % \end{macrocode} % Package |ISOmath| defines macros for typesetting vectors, % matrices and tensors; we do the same, but avoid the % abbreviation |sym| in place of |symbol|. % \begin{macrocode} +\AtBeginDocument{% \let\vectorsymbol\mathbfit \let\matrixsymbol\mathbfit -\let\tensorsymbol\mathsfbfit +\let\tensorsymbol\mathsfbfit} % \end{macrocode} % % We now define some macros for setting some elements in the @@ -1009,10 +997,10 @@ the manifest.txt file, and the derived files: % commands |\iunit| and |\junit| are still available to the % user. % -% The Napier number `e' is defined in roman type, but as an +% The Napier number ‘e’ is defined in roman type, but as an % operator; this number is not an operator in the mathematical % sense, but it is most often used as the base of an exponential; -% therefore such math ``atom'' must be treated as an +% therefore such math “atom” must be treated as an % operator as well as when the official operator macro |\exp| % is used. % @@ -1028,7 +1016,7 @@ the manifest.txt file, and the derived files: % % The differential symbol is not an operator, but it requires % a special treatment; a macro |\diff| for the differential -% symbol uses an empty`operator' and a negative shift to typeset +% symbol uses an empty `operator' and a negative shift to typeset % an upright letter `d' with an operator spacing on its left, % so that proper spacing is used in math typesetting; notice % that the given definition does not perform as the direct @@ -1040,7 +1028,7 @@ the manifest.txt file, and the derived files: % The command |\unit| for appending the units of measure to % the numerical value of the measure is added if no packages % have already defined it; package |siunitx| is a particularly -% recommended one. Similar considerations hold true for the +% recommended one. Similar considerations hold true for the % |\ap| and |\ped| (apex and pedex, respectively; i.e\ % superscript and subscript); therefore such command definitions % are deferred to the start of the document so as to be sure @@ -1076,8 +1064,8 @@ the manifest.txt file, and the derived files: \renewcommand*\diff{\ensuremath{\mathop{}\!\MathLatin{d}(n)}} % \providecommand*\micro{} -\renewcommand*\micro{\textormath{\ifcsdef{textmicro}% -{\textmicro}{\ISOmu(rs)}}{\ISOmu(rs)}} +\renewcommand*\micro{% +\textormath{\ifcsdef{textmicro}{\textmicro}{\ISOmu(rs)}}{\ISOmu(rs)}} % \providecommand*\ohm{} \AtBeginDocument{\@ifpackageloaded{textcomp}{% @@ -1112,6 +1100,30 @@ the manifest.txt file, and the derived files: %\iffalse %</style> %\fi +%\iffalse +%<*txt> +%\fi +% \begin{macrocode} + + This bundle has the LPPL maintenance status "author-maintained". + + The list of all files belonging to the PM-ISOmath bundle is + pm-isomath.dtx, a README.txt file + with the derived files: pm-isomath.sty, pm-isomath.pdf. + + The set of derived (unpacked) files belonging to the distribution + and covered by LPPL is created by the self unpacking file + pm-isomath.dtx which is the principal part of the distribution. + + In the TDS composed of various branches they should be in the + following folders: + .../tex/latex/pm-isomath/ contains pm-isomath.sty + .../doc/latex/pm-isomath/ contains pm-isomath.pdf and README.txt + .../source/latex/pm-isomath contians pm-isomath.dtx +% \end{macrocode} +%\iffalse +%</txt> +%\fi %\Finale % \endinput
\ No newline at end of file diff --git a/macros/latex/contrib/pm-isomath/pm-isomath.pdf b/macros/latex/contrib/pm-isomath/pm-isomath.pdf Binary files differindex 8d6f3edc8d..64c03f00b7 100644 --- a/macros/latex/contrib/pm-isomath/pm-isomath.pdf +++ b/macros/latex/contrib/pm-isomath/pm-isomath.pdf diff --git a/macros/latex/contrib/tasks/README b/macros/latex/contrib/tasks/README index 76abb73d31..5b7fce5020 100644 --- a/macros/latex/contrib/tasks/README +++ b/macros/latex/contrib/tasks/README @@ -1,5 +1,5 @@ -------------------------------------------------------------------------- -the TASKS package v1.2 2020/03/21 +the TASKS package v1.2a 2020/04/19 lists with columns filled horizontally diff --git a/macros/latex/contrib/tasks/tasks-manual.pdf b/macros/latex/contrib/tasks/tasks-manual.pdf Binary files differindex e16f2d755b..415cd6178b 100644 --- a/macros/latex/contrib/tasks/tasks-manual.pdf +++ b/macros/latex/contrib/tasks/tasks-manual.pdf diff --git a/macros/latex/contrib/tasks/tasks.sty b/macros/latex/contrib/tasks/tasks.sty index 3a0e23cb7a..31db9fe1ea 100644 --- a/macros/latex/contrib/tasks/tasks.sty +++ b/macros/latex/contrib/tasks/tasks.sty @@ -28,10 +28,10 @@ \RequirePackage {expl3,xparse,xtemplate} \ExplSyntaxOn -\tl_const:Nn \c_tasks_date_tl {2020/03/21} +\tl_const:Nn \c_tasks_date_tl {2020/04/19} \tl_const:Nn \c_tasks_version_major_number_tl {1} \tl_const:Nn \c_tasks_version_minor_number_tl {2} -\tl_const:Nn \c_tasks_version_subrelease_tl {} +\tl_const:Nn \c_tasks_version_subrelease_tl {a} \tl_const:Nx \c_tasks_version_number_tl { \c_tasks_version_major_number_tl . @@ -303,8 +303,8 @@ \vcoffin_set:Nnn \l__tasks_tmpa_coffin { \l__tasks_item_width_dim } { - \__tasks_setup: - #2 { #3 \mode_if_horizontal:T { \strut } } + \__tasks_setup: #2 {#3} + \mode_if_horizontal:T { \strut } } \__tasks_debug:n { @@ -777,7 +777,10 @@ \AtBeginDocument { \@ifpackageloaded {hyperref} - { \tl_set:Nn \theHtask { \int_use:N \g__tasks_env_int . \thetask } } + { + \tl_set:Nn \theHtask + { \int_use:N \g__tasks_env_int . \arabic { \l__tasks_counter_tl } } + } {} } |