diff options
author | Norbert Preining <norbert@preining.info> | 2021-02-25 03:01:23 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2021-02-25 03:01:23 +0000 |
commit | 4004125ab2ced5a0714227aeb2c5f45970ee94b9 (patch) | |
tree | ca1cb23b3f01a33321b25fbdb7e7d2a64380b304 /macros/latex/contrib | |
parent | 55f834f428a0c05dedecc8d33a1c5300e58c91fc (diff) |
CTAN sync 202102250301
Diffstat (limited to 'macros/latex/contrib')
25 files changed, 74 insertions, 51 deletions
diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.pdf Binary files differindex 5ecab29373..c2ebe65a47 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.tex b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.tex index 5041207e9a..05c9f4c78a 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-acs.tex @@ -20,7 +20,7 @@ used in the journal \emph{Journal of the American Chemical Society}. \input{biblatex-chem-common.tex} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.pdf Binary files differindex b97d33fe73..3cdc887081 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.tex b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.tex index 705ff1feaf..0855d28829 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-angew.tex @@ -19,7 +19,7 @@ used in the journal. \input{biblatex-chem-common.tex} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.pdf Binary files differindex 3f8f25a6de..498355dacc 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.tex b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.tex index 760d0a4cb0..2214c71782 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-biochem.tex @@ -20,7 +20,7 @@ used in the journal \emph{Biochemistry}. \input{biblatex-chem-common.tex} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.pdf Binary files differindex 284a115e8f..53e4fbb847 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.tex b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.tex index 99094a50ee..84fab892cb 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem-rsc.tex @@ -19,7 +19,7 @@ used in the journal \emph{Chemical Communications}. \input{biblatex-chem-common.tex} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.bib b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.bib index 205fce4c3d..acaa02ecc0 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.bib +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.bib @@ -466,7 +466,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright at morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.pdf b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.pdf Binary files differindex c36dc44779..84928d6f4b 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.pdf +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.pdf diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.tex b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.tex index 5d91e6c829..f6308a82fd 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.tex +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/biblatex-chem.tex @@ -21,8 +21,8 @@ {\texttt{joseph.wright@morningstar2.co.uk}}}} \title{\pkg{biblatex-chem} -- A set of \pkg{biblatex} implementations of chemistry-related bibliography styles% - \footnote{This file describes v1.1y, last revised 2019/12/03.}} -\date{Released 2019/12/03} + \footnote{This file describes v1.1z, last revised 2021/02/24.}} +\date{Released 2021/02/24} \providecommand*{\opt}[1]{\texttt{#1}} \providecommand*{\pkg}[1]{\textsf{#1}} @@ -237,7 +237,7 @@ be sent by e-mail to \end{document} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.bbx index 47dfebd4b2..ede20ea3b8 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-acs.bbx}[2019/12/03 v1.1y biblatex bibliography style] +\ProvidesFile{chem-acs.bbx}[2021/02/24 v1.1z biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -733,7 +733,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.cbx index cc1625b50e..09d41e8942 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-acs.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-acs.cbx}[2019/12/03 v1.1y biblatex citation style] +\ProvidesFile{chem-acs.cbx}[2021/02/24 v1.1z biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.bbx index 666d420a07..7aef3faa85 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-angew.bbx}[2019/12/03 v1.1y biblatex bibliography style] +\ProvidesFile{chem-angew.bbx}[2021/02/24 v1.1z biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -374,7 +374,7 @@ {\printfield{issn}} {}% \newunit\newblock - \usebibmacro{doi+eprint+url} + \usebibmacro{doi+eprint+url}% \newunit\newblock \usebibmacro{addendum+pubstate}% \setunit{\bibpagerefpunct}\newblock @@ -703,7 +703,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.cbx index 1a93d1c099..2c6f2b86b9 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-angew.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-angew.cbx}[2019/12/03 v1.1y biblatex citation style] +\ProvidesFile{chem-angew.cbx}[2021/02/24 v1.1z biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -38,7 +38,7 @@ {\usebibmacro{cite:dump}} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.bbx index f729e852b4..fa84cbff56 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-biochem.bbx}[2019/12/03 v1.1y biblatex bibliography style] +\ProvidesFile{chem-biochem.bbx}[2021/02/24 v1.1z biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -705,7 +705,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.cbx index 05d832300c..534ab80bc2 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-biochem.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-biochem.cbx}[2019/12/03 v1.1y biblatex citation style] +\ProvidesFile{chem-biochem.cbx}[2021/02/24 v1.1z biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -19,7 +19,7 @@ \renewcommand*\bibrightbracket{)\midsentence} %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.bbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.bbx index 6d0983da08..42dee99235 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.bbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.bbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-rsc.bbx}[2019/12/03 v1.1y biblatex bibliography style] +\ProvidesFile{chem-rsc.bbx}[2021/02/24 v1.1z biblatex bibliography style] % Load the standard style to avoid copy-pasting unnecessary material \RequireBibliographyStyle{numeric-comp} @@ -636,7 +636,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.cbx b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.cbx index 202b6110fb..c8de0123b7 100644 --- a/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.cbx +++ b/macros/latex/contrib/biblatex-contrib/biblatex-chem/chem-rsc.cbx @@ -8,7 +8,7 @@ %% --------------------------------------------------------------- %% -\ProvidesFile{chem-rsc.cbx}[2019/12/03 v1.1y biblatex citation style] +\ProvidesFile{chem-rsc.cbx}[2021/02/24 v1.1z biblatex citation style] \RequireCitationStyle{numeric-comp} @@ -20,7 +20,7 @@ } %% -%% Copyright (C) 2010-2014,2016-2019 by +%% Copyright (C) 2010-2014,2016-2019,2021 by %% Joseph Wright <joseph.wright@morningstar2.co.uk> %% %% It may be distributed and/or modified under the conditions of diff --git a/macros/latex/contrib/langsci-affiliations/langsci-affiliations.dtx b/macros/latex/contrib/langsci-affiliations/langsci-affiliations.dtx index 1cbb13c3ec..7126f830cc 100644 --- a/macros/latex/contrib/langsci-affiliations/langsci-affiliations.dtx +++ b/macros/latex/contrib/langsci-affiliations/langsci-affiliations.dtx @@ -80,7 +80,7 @@ Please report any bugs or feature requests to % Please submit bug reports and feature requests to % \protect\url{https://github.com/langsci/langsci-affiliations/issues}. % }} -% \date{Version 1.0.0 -- \today} +% \date{Version 1.0.1 -- \today} % \maketitle % \frenchspacing % \begin{documentation} @@ -165,7 +165,7 @@ Please report any bugs or feature requests to % \begin{macrocode} \RequirePackage{xparse} \ProvidesExplPackage {langsci-affiliations} -{2021-02-17} {1.0.0} +{2021-02-24} {1.0.1} {A LaTeX3 package to collect and order authors and affiliations} % \end{macrocode} @@ -463,6 +463,7 @@ Please report any bugs or feature requests to \group_end: \medskip\\ } + \vspace*{-\baselineskip} } } { diff --git a/macros/latex/contrib/langsci-affiliations/langsci-affiliations.pdf b/macros/latex/contrib/langsci-affiliations/langsci-affiliations.pdf Binary files differindex 59c427bd18..c74e18a734 100644 --- a/macros/latex/contrib/langsci-affiliations/langsci-affiliations.pdf +++ b/macros/latex/contrib/langsci-affiliations/langsci-affiliations.pdf diff --git a/macros/latex/contrib/principia/README b/macros/latex/contrib/principia/README index 885761b586..05b3abc81d 100644 --- a/macros/latex/contrib/principia/README +++ b/macros/latex/contrib/principia/README @@ -1,8 +1,8 @@ principia.sty - a LaTeX2e package for typesetting the "Peanese" notation of Whitehead and Russell's 1910 "Principia Mathematica". -The file principia.sty is the original work of Landon D. C. Elkind (Copyright (c) 2020). It is released under the LaTeX Project Public License 1.3c. +The file principia.sty is the original work of Landon D. C. Elkind (Copyright (c) 2021). It is released under the LaTeX Project Public License 1.3c. -This is principia package Version 1.1 (25/10/2020). Like Version 1.0, it covers typesetting the notations through Volume I of "Principia Mathematica". Version 1.1 has some minor updates. See the file principia.pdf for information on these changes and for further information on how to typeset Peanese symbols in LaTeX with the principia package. +This is principia package Version 1.2 (23/02/2021). Like Versions 1.0-1.1, this version covers typesetting the notations through Volume I of "Principia Mathematica". Version 1.2 has some minor updates. See the file principia.pdf for information on these changes and for further information on how to typeset Peanese symbols in LaTeX with the principia package. Updates to include all notations throughout Volumes II and III are planned. Further information and updates can be found at https://logicalatomist.github.io/principia/ diff --git a/macros/latex/contrib/principia/principia.pdf b/macros/latex/contrib/principia/principia.pdf Binary files differindex c57ba8eab5..7a86501043 100644 --- a/macros/latex/contrib/principia/principia.pdf +++ b/macros/latex/contrib/principia/principia.pdf diff --git a/macros/latex/contrib/principia/principia.sty b/macros/latex/contrib/principia/principia.sty index f965b0ff66..14a99d9fa3 100644 --- a/macros/latex/contrib/principia/principia.sty +++ b/macros/latex/contrib/principia/principia.sty @@ -14,15 +14,29 @@ \RequirePackage{pifont} %This loads the symbols such as the eight-pointed asterisk. %Meta-logical symbols +\newcommand{\pmfd}{\begin{center} \rule{5cm}{.5pt} \end{center}} %Dividing line between introductory remarks in a starred number and the formal deductions. \newcommand{\pmdem}{\textit{Dem}.} %This notation begins a proof. +\newcommand{\pmdemi}{\indent \pmdem} %This idents the notation that begins a proof. +\newcommand{\pmhp}{\text{Hp}} %This typesets Hp (short for antecedent), which occurs at the beginning of a proof. +\newcommand{\pmprop}{\text{Prop}} %This occurs at the end of a proof. +\newcommand{\pmithm}{\pmimp\;\pmthm} %This occurs when a meta-theoretic implication is asserted. +\newcommand{\pmbr}[1]{\bigg \lbrack \normalsize #1 \bigg \rbrack} %These are larger brackets for substitution. \newcommand{\pmsub}[2]{\bigg \lbrack \small \begin{array}{c} #1 \\ \hline #2 \end{array} \bigg \rbrack} %This is the substitution command. -\newcommand{\pmSub}[3]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c} #2 \\ \hline #3 \end{array} \bigg \rbrack} %This is the substitution command. \newcommand{\pmsubb}[4]{\bigg \lbrack \small \begin{array}{c c} #1, & #3 \\ \hline #2, & #4 \end{array} \bigg \rbrack} %This is the substitution command. -\newcommand{\pmSubb}[5]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c c} #2, & #4 \\ \hline #3, & #5 \end{array} \bigg \rbrack} %This is the substitution command. \newcommand{\pmsubbb}[6]{\bigg \lbrack \small \begin{array}{c c c} #1, & #3, & #5 \\ \hline #2, & #4, & #6 \end{array} \bigg \rbrack} %This is the substitution command. -\newcommand{\pmSubbb}[7]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c c c} #2, & #4, & #6 \\ \hline #3, & #5, & #7 \end{array} \bigg \rbrack} %This is the substitution command. \newcommand{\pmsubbbb}[8]{\bigg \lbrack \small \begin{array}{c c c c} #1, & #3, & #5, & #7 \\ \hline #2, & #4, & #6, & #8 \end{array} \bigg \rbrack} %This is the substitution command. -\newcommand{\pmSubbbb}[9]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c c c c} #1, & #3, & #5, & #7 \\ \hline #2, & #4, & #6, & #8 \end{array} \bigg \rbrack} %This is the substitution command. +\newcommand{\pmSub}[3]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c} #2 \\ \hline #3 \end{array} \bigg \rbrack} %This is the substitution command. +\newcommand{\pmSubb}[5]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c c} #2, & #4 \\ \hline #3, & #5 \end{array} \bigg \rbrack} %This is the substitution command. +\newcommand{\pmSubbb}[7]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c c c} #2, & #4, & #6 \\ \hline #3, & #5, & #7 \end{array} \bigg \rbrack} %This is the substitution command. +\newcommand{\pmSubbbb}[9]{\bigg \lbrack \normalsize #1 \text{ } \small \begin{array}{c c c c} #1, & #3, & #5, & #7 \\ \hline #2, & #4, & #6, & #8 \end{array} \bigg \rbrack} %This is the substitution command. +\newcommand{\pmsUb}[2]{\small \begin{array}{c} #1 \\ \hline #2 \end{array}} %This is the substitution command. +\newcommand{\pmsUbb}[4]{\small \begin{array}{c c} #1, & #3 \\ \hline #2, & #4 \end{array}} %This is the substitution command. +\newcommand{\pmsUbbb}[6]{\small \begin{array}{c c c} #1, & #3, & #5 \\ \hline #2, & #4, & #6 \end{array}} %This is the substitution command. +\newcommand{\pmsUbbbb}[8]{\small \begin{array}{c c c c} #1, & #3, & #5, & #7 \\ \hline #2, & #4, & #6, & #8 \end{array}} %This is the substitution command. +\newcommand{\pmSUb}[3]{\normalsize #1 \text{ } \small \begin{array}{c} #2 \\ \hline #3 \end{array}} %This is the substitution command. +\newcommand{\pmSUbb}[5]{\normalsize #1 \text{ } \small \begin{array}{c c} #2, & #4 \\ \hline #3, & #5 \end{array}} %This is the substitution command. +\newcommand{\pmSUbbb}[7]{\normalsize #1 \text{ } \small \begin{array}{c c c} #2, & #4, & #6 \\ \hline #3, & #5, & #7 \end{array}} %This is the substitution command. +\newcommand{\pmSUbbbb}[9]{\normalsize #1 \text{ } \small \begin{array}{c c c c} #1, & #3, & #5, & #7 \\ \hline #2, & #4, & #6, & #8 \end{array}} %This is the substitution command. \newcommand{\pmthm}{\mathpunct{\text{\scalebox{.5}[1]{$\boldsymbol\vdash$}}}} %This is the theorem sign. \newcommand{\pmast}{\text{\resizebox{!}{.75\height}{\ding{107}}}} %This is the sign introducing a theorem number. \newcommand{\pmcdot}{\text{\raisebox{.05cm}{$\boldsymbol\cdot$}}} %This is a sign introducing a theorem sub-number. @@ -39,13 +53,14 @@ \newcommand{\pmdotttttt}{\pmdott\hspace{.1em}\pmdott\hspace{.1em}\pmdott} %Logical connectives -\newcommand{\pmnot}{\mathord{\sim}} -\newcommand{\pmimp}{\mathbin{\boldsymbol{\supset}}} -\newcommand{\pmiff}{\mathbin{\equiv}} -\newcommand{\pmor}{\mathbin{\boldsymbol{\vee}}} +\newcommand{\pmnot}{\mathord{\ooalign{$\boldsymbol{\sim}\mkern.5mu$\hidewidth\cr$\boldsymbol{\sim}$\cr\hidewidth$\mkern.5mu\boldsymbol{\sim}$}}} +\newcommand{\pmimp}{\mathbin{\ooalign{$\boldsymbol{\supset}\mkern.5mu$\hidewidth\cr$\boldsymbol{\supset}$\cr\hidewidth$\mkern.5mu\boldsymbol{\supset}$}}} +\newcommand{\pmiff}{\mathbin{\ooalign{$\boldsymbol{\equiv}\mkern.5mu$\hidewidth\cr$\boldsymbol{\equiv}$\cr\hidewidth$\mkern.5mu\boldsymbol{\equiv}$}}} +\newcommand{\pmor}{\mathbin{\ooalign{$\boldsymbol{\vee}\mkern.5mu$\hidewidth\cr$\boldsymbol{\vee}$\cr\hidewidth$\mkern.5mu\boldsymbol{\vee}$}}} +\newcommand{\pmprod}{\mathbin{\ooalign{$\boldsymbol{\wedge}\mkern.5mu$\hidewidth\cr$\boldsymbol{\wedge}$\cr\hidewidth$\mkern.5mu\boldsymbol{\wedge}$}}} \newcommand{\pmall}[1]{(#1)} -\newcommand{\pmsome}[1]{(\text{\raisebox{.5em}{\rotatebox{180}{E}}}#1)} -\newcommand{\pmSome}{\text{\raisebox{.5em}{\rotatebox{180}{E}}}} +\newcommand{\pmsome}[1]{(\text{\raisebox{.5em}{\rotatebox{180}{\textbf{E}}}}#1)} +\newcommand{\pmSome}{\text{\raisebox{.5em}{\rotatebox{180}{\textbf{E}}}}} \newcommand{\pmand}{\mathrel{\hbox{\rule{.3ex}{.3ex}}}} \newcommand{\pmandd}{\overset{\pmand}{\pmand}} \newcommand{\pmanddd}{\pmandd\hspace{.1em}\pmand} @@ -63,10 +78,10 @@ \newcommand{\pmpredd}[3]{#1\pmshr(#2, #3)} %for predicates (``predicative functions'') of two variables \newcommand{\pmpreddd}[4]{#1\pmshr(#2, #3, #4)} %for predicates (``predicative functions'') of three variables \newcommand{\pmnid}{\mathrel{\ooalign{$=$\cr\hidewidth\footnotesize\rotatebox[origin=c]{210}{\textbf{/}}\hidewidth\cr}}} %*13.01 -\newcommand{\pmiota}{\rotatebox[origin=c]{180}{$\iota$}} %the rotated Greek iota used in definite descriptions +\newcommand{\pmiota}{\ooalign{\rotatebox[origin=c]{180}{$\mathbf{\iota}$}\cr\hidewidth\raisebox{.0125em}{\rotatebox[origin=c]{180}{$\mathbf{\iota}$}}\cr\hidewidth\raisebox{.025em}{\rotatebox[origin=c]{180}{$\mathbf{\iota}$}}\cr\hidewidth\raisebox{.0375em}{\rotatebox[origin=c]{180}{$\mathbf{\iota}$}}\cr\hidewidth\raisebox{.05em}{\rotatebox[origin=c]{180}{$\mathbf{\iota}$}}}} %the rotated Greek iota used in definite descriptions \newcommand{\pmdsc}[1]{(\pmiota#1)} %*14.01 \newcommand{\pmDsc}{\pmiota} %*14.01 -\newcommand{\pmexists}{\text{E}\pmshr} %*14.02 +\newcommand{\pmexists}{\textbf{E}\hspace{.1em}\pmshr} %*14.02 %Class signs \newcommand{\pmcuni}{\text{\rotatebox[origin=c]{180}{$\Lambda$}}} @@ -74,13 +89,13 @@ \newcommand{\pmcls}[2]{\pmhat{#1}(#2)} \newcommand{\pmCls}{\text{Cls}} \newcommand{\pmClsn}[1]{\text{Cls}^{#1}} -\newcommand{\pmcexists}{\text{\raisebox{.5em}{\rotatebox{180}{E}}}\mathop{\pmshr}} +\newcommand{\pmcexists}{\text{\raisebox{.5em}{\rotatebox{180}{\textbf{E}}}}\hspace{-.1em}\mathop{\pmshr}} \newcommand{\pmccmp}[1]{\boldsymbol{-}#1} \newcommand{\pmcmin}[2]{#1\boldsymbol{-}#2} -\newcommand{\pmcin}{\mathop{\epsilon}} -\newcommand{\pmccup}{\mathop{\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}}} -\newcommand{\pmccap}{\mathop{\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}}} -\newcommand{\pmcinc}{\mathop{\boldsymbol{\subset}}} +\newcommand{\pmcin}{\mathop{\boldsymbol{\epsilon}}} +\newcommand{\pmccup}{\mathop{\ooalign{\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}\cr\hidewidth\hspace{.1em}\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}\cr\hidewidth\hspace{.2em}\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}\cr\hidewidth\hspace{.3em}\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}\cr\hidewidth\hspace{.4em}\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}\cr\hidewidth\hspace{.5em}\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}\cr\hidewidth\hspace{.6em}\scalebox{1.3}[1.75]{$\put(3, 2.5){\oval(4,4)[b]}\phantom{\circ}$}}}} +\newcommand{\pmccap}{\mathop{\ooalign{\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}\cr\hidewidth\hspace{.1em}\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}\cr\hidewidth\hspace{.2em}\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}\cr\hidewidth\hspace{.3em}\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}\cr\hidewidth\hspace{.4em}\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}\cr\hidewidth\hspace{.5em}\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}\cr\hidewidth\hspace{.6em}\scalebox{1.3}[1.75]{$\put(3, 2){\oval(4,1)[t]}\phantom{\circ}$}}}} +\newcommand{\pmcinc}{\mathop{\ooalign{$\boldsymbol{\subset}$\cr\hidewidth$\hspace{.1em}\boldsymbol{\subset}$\cr\hidewidth$\hspace{.15em}\boldsymbol{\subset}$\cr\hidewidth$\hspace{.2em}\boldsymbol{\subset}$}}} %Relation signs \newcommand{\pmruni}{\dot{\text{\rotatebox[origin=c]{180}{$\Lambda$}}}} @@ -167,7 +182,7 @@ \newcommand{\pmsrel}[1]{\text{Rel}\textbf{`}#1} \newcommand{\pmRel}{\text{Rel}} \newcommand{\pmReln}[1]{\text{Rel}^{#1}} -\newcommand{\pmrin}{\mathop{\epsilon}} +\newcommand{\pmrin}{\mathop{\boldsymbol{\epsilon}}} %Relative type symbols \newcommand{\pmrt}[1]{t\textbf{`}#1} @@ -198,9 +213,10 @@ \newcommand{\pmSele}{\pmcin_{\Delta}} \newcommand{\pmself}[1]{F_{\small\Delta}\mathbf{`}#1} \newcommand{\pmSelf}{F_{\Delta}} +\newcommand{\pmex}[1]{\text{Cls} \mathop{\text{excl}}\mathbf{`}#1} \newcommand{\pmexc}{\text{Cls}^2 \mathop{\text{excl}}} \newcommand{\pmexcc}[1]{\text{Cl} \mathop{\text{excl}}\textbf{`}#1} -\newcommand{\pmexcn}{\text{Cls} \mathop{\text{ex}}^2 \mathop{\text{excl}}} +\newcommand{\pmexcn}{\text{Cls} \mathop{\text{ex}^2} \mathop{\text{excl}}} \newcommand{\pmselc}[2]{#1 \mathrel{\rotatebox[origin=c]{270}{$\boldsymbol{\mapsto}$}} #2} \newcommand{\pmmultr}{\mathop{\text{Rel}} \mathop{\text{Mult}}} \newcommand{\pmmultc}{\mathop{\text{Cls}^2} \mathop{\text{Mult}}} @@ -231,4 +247,9 @@ \newcommand{\pmNc}{\text{Nc}} \newcommand{\pmNC}{\text{NC}} \newcommand{\pmnoc}[1]{\text{N}_0\text{c}\textbf{`}#1} -\newcommand{\pmNoc}{\text{N}_0\text{c}}
\ No newline at end of file +\newcommand{\pmNoc}{\text{N}_0\text{c}} +\newcommand{\pmnocind}[1]{\text{N}_0\text{Cinduct}\textbf{`}#1} +\newcommand{\pmNocind}{\text{N}_0\text{Cinduct}} + +\newcommand{\pmclsrefl}{\text{Cls} \mathop{\text{refl}}} +\newcommand{\pmncrefl}{\text{NC} \mathop{\text{refl}}}
\ No newline at end of file diff --git a/macros/latex/contrib/principia/principia.tex b/macros/latex/contrib/principia/principia.tex index 7e0bced115..76618c0b0b 100644 --- a/macros/latex/contrib/principia/principia.tex +++ b/macros/latex/contrib/principia/principia.tex @@ -3,6 +3,7 @@ \ProvidesPackage{principia}[2020/10/25 principia package version 1.1] %This package supports typesetting the Peanese notation in Volume I of Whitehead and Russell’s 1910 ``Principia Mathematica". %Version 1.0 (superseded by Version 1.1): Covers typesetting of notation through Volume I. 2020/10/24 %Version 1.1 (updates): fixed the spacing of scope dots around parentheses; fixed spacing of theorem sign; fixed spacing around primitive proposition and definition signs. 2020/10/25 +%Version 1.2 (updates): boldfaced (`thickened') the truth-functional connectives, existential quantifier, set and relation symbols; added numerous commands for typesetting brackets and substitutions into theorems. 2021/02/23 %Licensed under LaTeX Project Public License 1.3c. %Copyright Landon D. C. Elkind, 2020. (https://landondcelkind.com/contact/). @@ -19,7 +20,7 @@ \usepackage{marvosym} %This loads the male and female symbol. \usepackage{graphicx} %This loads commands that flip iota for definite descriptions, Lambda for the universal class, and so on. The (superseded) graphics package should also work here, but is not recommended. -\title{\texttt{principia.sty }\\ A \LaTeXe \space Package for Typesetting Whitehead and Russell's \textit{Principia Mathematica} (Version 1.1)} +\title{\texttt{principia.sty }\\ A \LaTeXe \space Package for Typesetting Whitehead and Russell's \textit{Principia Mathematica} (Version 1.2)} \author{Landon D. C. Elkind \texttt{elkind@ualberta.ca}} \date{\today} @@ -32,7 +33,7 @@ The \texttt{principia} package is designed for typesetting the Peanese notation In \textit{Principia Mathematica} some symbols occur with an argument and sometimes that same symbol occurs without an argument. For example, `$\pmsome{x}$' occurs in some formulas, but sometimes `$\pmSome$' occurs in the text when they talk about the symbol itself. \texttt{principia} is designed to accommodate these different occurrences of symbols. When a symbol is to occur without an argument, capitalize the first letter following the `\texttt{$\backslash$pm}' part of the command. E.g. \verb|\pmsome{x}| produces $\pmsome{x}$ and \verb|\pmSome| produces `$\pmSome$'. Note the former command requires an argument and the latter command does not. Not all commands in the \texttt{principia} package admit of such dual use because some symbols in \textit{Principia Mathematica} never occur without an argument or do not take an argument in the usual sense. For example, the propositional connectives do not take an `argument' in the way singular or plural descriptions do. -Version 1.1 of \texttt{principia}, like Version 1.0, is adequate to typeset all notations throughout Volume I of \textit{Principia} and includes some fixes to spacing, etc. See the package documentation for details. Updates to include all notations throughout Volumes II and III are planned. +Version 1.2 (and 1.0-1.1) of \texttt{principia} is adequate to typeset all notations throughout Volume I of \textit{Principia} and includes some fixes to spacing, etc. See the package documentation for details. Updates to include all notations throughout Volumes II and III are planned. \texttt{principia}'s dependencies are \texttt{amsmath}, \texttt{amssymb}, \texttt{pifont}, \texttt{marvosym}, and \texttt{graphicx}. Make sure to load these package by typing \texttt{$\backslash$usepackage\{graphicx\}}, etc., into the document preamble. To load \texttt{principia}, type \texttt{$\backslash$usepackage\{principia\}} in the document's preamble. |