summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/principia/README2
-rw-r--r--Master/texmf-dist/doc/latex/principia/principia.pdfbin368370 -> 366457 bytes
-rw-r--r--Master/texmf-dist/doc/latex/principia/principia.tex27
-rw-r--r--Master/texmf-dist/tex/latex/principia/principia.sty37
4 files changed, 35 insertions, 31 deletions
diff --git a/Master/texmf-dist/doc/latex/principia/README b/Master/texmf-dist/doc/latex/principia/README
index ceed875d85a..885761b5866 100644
--- a/Master/texmf-dist/doc/latex/principia/README
+++ b/Master/texmf-dist/doc/latex/principia/README
@@ -2,7 +2,7 @@ principia.sty - a LaTeX2e package for typesetting the "Peanese" notation of Whit
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.
-This is principia package Version 1.0. It covers typesetting the notations through Volume I of "Principia Mathematica". See the file principia.pdf for information on how to typeset these symbols in LaTeX.
+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.
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/Master/texmf-dist/doc/latex/principia/principia.pdf b/Master/texmf-dist/doc/latex/principia/principia.pdf
index 6d4b5432289..c57ba8eab54 100644
--- a/Master/texmf-dist/doc/latex/principia/principia.pdf
+++ b/Master/texmf-dist/doc/latex/principia/principia.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/principia/principia.tex b/Master/texmf-dist/doc/latex/principia/principia.tex
index 47db6119081..7e0bced1154 100644
--- a/Master/texmf-dist/doc/latex/principia/principia.tex
+++ b/Master/texmf-dist/doc/latex/principia/principia.tex
@@ -1,11 +1,11 @@
\documentclass[12pt]{article}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{principia}[2020/10/20 principia package version 1.0] %Covers typesetting of notation through Volume I
+\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
%Licensed under LaTeX Project Public License 1.3c.
-%Copyright Landon D. C. Elkind, 2020.
+%Copyright Landon D. C. Elkind, 2020. (https://landondcelkind.com/contact/).
-\usepackage{amssymb}
-\usepackage{amsmath}
\usepackage{fullpage}
\usepackage[T1]{fontenc}
\usepackage[utf8]{inputenc}
@@ -13,11 +13,13 @@
%Principia package requirements
\usepackage{principia} %The package itself, and its dependencies:
+\usepackage{amssymb} %This loads the relation domain and converse domain limitation symbols.
+\usepackage{amsmath} %This loads the circumflex, substitution into theorems, \text{}, \mathbf{}, \boldsymbol{}, \overleftarrow{}, \overrightarrow{}, etc.
\usepackage{pifont} %This loads the eight-pointed asterisk.
\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.0)}
+\title{\texttt{principia.sty }\\ A \LaTeXe \space Package for Typesetting Whitehead and Russell's \textit{Principia Mathematica} (Version 1.1)}
\author{Landon D. C. Elkind \texttt{elkind@ualberta.ca}}
\date{\today}
@@ -30,22 +32,21 @@ 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.0 of \texttt{principia} is adequate to typeset all notations throughout Volume I of \textit{Principia}. Updates to include all notations throughout Volumes II and III are planned.
+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.
-\texttt{principia}'s dependencies are \texttt{pifont} (for the eight-pointed asterisk), \texttt{marvosym} (for the `$\pmop$' symbol), and \texttt{graphicx} (for singular descriptions, universal classes, and existential quantifiers). Make sure to load these package by typing \texttt{$\backslash$usepackage\{graphicx\}}, etc.
-
-To load \texttt{principia}, type \texttt{$\backslash$usepackage\{principia\}} in the preamble to the document.
+\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.
\noindent \begin{tabular}{@{}p{3cm} | p{5cm} | p{8.25cm}}
\textbf{Symbol} & \textbf{\LaTeX command} & \textbf{Notes} \\ \hline
$\pmthm$ & \verb|\pmthm| & Theorem. \\
$\pmast$ & \verb|\pmast| & As in $\pmast1$. \\
$\pmcdot$ & \verb|\pmcdot| & As in, $\pmast1\pmcdot1$. \\
- $\pmpp$ & \verb|\pmpp| & Primitive proposition. \\
- $\pmdf$ & \verb|\pmdf| & Definition. \\
- $\pmdem$ & \verb|\pmdem| & This begins a proof. \\
+ $\pmpp$ & \verb|\pmpp| & Primitive proposition. Note the indentation. \\
+ $\pmiddf$ & \verb|\pmiddf| & Identity for definitions (`$=$' differs in spacing). \\
+ $\pmdf$ & \verb|\pmdf| & Definition. Note the indentation. \\
+ $\pmdem$ & \verb|\pmdem| & This symbol begins a proof. \\
$\pmsub{p}{q}$, $\pmsubb{p}{q}{r}{s}$, $\pmsubbb{p}{q}{r}{s}{t}{u}$, ... $\pmSub{\text{Add}}{p}{q}$, ... & \verb|\pmsub{p}{q}|, \verb|\pmsubb{p}{q}{r}{s}|, \verb|\pmsubbb{p}{q}| \par \hfill \verb|{r}{s}{t}{u}|, ... \verb|\pmSub{\text{Add}{p}{q}| & Substitution into theorems. Add `b's to the end of \verb|\pmsub| to increase the number of substitutions (up to four `b's). Each extra `b' adds two arguments. To substitute and specify the theorem as well, capitalize the `s' in \verb|\pmsub|. \\
- $\pmdot$, $\pmdott$, $\pmdottt$, $\pmdotttt$, $\pmdottttt$, $\pmdotttttt$ & \verb|\pmdot|, \verb|\pmdott|, \verb|\pmdottt|, ... & Add `t's to the end of \verb|\pmdot| to increase the number of dots (up to six `t's). Note that the spacing of \verb|\pmand| and \verb|\pmdot| differ. \\
+ $\pmdot$, $\pmdott$, $\pmdottt$, $\pmdotttt$, $\pmdottttt$, $\pmdotttttt$ & \verb|\pmdot|, \verb|\pmdott|, \verb|\pmdottt|, ... & Add `t's to the end of \verb|\pmdot| to increase the number of dots (up to six `t's). \\
$\pmand$, $\pmandd$, $\pmanddd$, $\pmandddd$, $\pmanddddd$, $\pmandddddd$ & \verb|\pmand|, \verb|\pmandd|, \verb|\pmanddd|, ...& Add `d's to the end of \verb|\pmand| command to increase the number of dots (up to six `d's). \\
$\pmor$ & \verb|\pmor| & Disjunction. \\
$\pmnot$ & \verb|\pmnot| & Negation. Note its spacing differs from \verb|\sim|. \\
diff --git a/Master/texmf-dist/tex/latex/principia/principia.sty b/Master/texmf-dist/tex/latex/principia/principia.sty
index 3a1fd3b2714..f965b0ff66d 100644
--- a/Master/texmf-dist/tex/latex/principia/principia.sty
+++ b/Master/texmf-dist/tex/latex/principia/principia.sty
@@ -1,12 +1,14 @@
-%This is the principia package is for representing notations in Whitehead and Russell's ``Principia Mathematica" close to their appearance in the original.
-%Copyright (C) 2020 by Landon D. C. Elkind (https://landondcelkind.com/contact/).
-%This program is free software. It may be redistributed and/or modified under the terms of the GNU General Public License as published by the Free Software Foundation, Version 3 or any later version.
-
%Package Identification
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{principia}[2020/10/20 principia package version 1.0] %Covers typesetting of notation through Volume I
+\ProvidesPackage{principia}[2020/10/25 principia package version 1.1] %This is the principia package is for representing notations in Whitehead and Russell's ``Principia Mathematica" close to their appearance in the original.
+%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
+%Licensed under LaTeX Project Public License 1.3c.
+%Copyright Landon D. C. Elkind, 2020. (https://landondcelkind.com/contact/).
%Principia package requirements
+\RequirePackage{amssymb} %This loads the relation domain and converse domain limitation symbols.
+\RequirePackage{amsmath} %This loads the circumflex, substitution into theorems, \text{}, \mathbf{}, \boldsymbol{}, \overleftarrow{}, \overrightarrow{}, etc.
\RequirePackage{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.
\RequirePackage{marvosym} %This loads the male and female symbol.
\RequirePackage{pifont} %This loads the symbols such as the eight-pointed asterisk.
@@ -21,25 +23,26 @@
\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{\pmthm}{\text{\scalebox{.5}[1]{$\boldsymbol\vdash$}}} %This is the theorem sign.
+\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.
-\newcommand{\pmdf}{=_\text{Df}}
-\newcommand{\pmpp}{\text{Pp}}
+\newcommand{\pmiddf}{\mathbin{=}}
+\newcommand{\pmdf}{\quad \text{Df}}
+\newcommand{\pmpp}{\quad \text{Pp}}
%Square dots for scope, defined for up to six dots
-\newcommand{\pmdot}{\mathop{\hbox{\rule{.3ex}{.3ex}}}}
-\newcommand{\pmdott}{\mathop{\overset{\pmdot}{\pmdot}}}
-\newcommand{\pmdottt}{\pmdott \pmdot}
-\newcommand{\pmdotttt}{\pmdott\pmdott}
-\newcommand{\pmdottttt}{\pmdott\pmdott\pmdot}
-\newcommand{\pmdotttttt}{\pmdott\pmdott\pmdott}
+\newcommand{\pmdot}{\mathrel{\hbox{\rule{.3ex}{.3ex}}}}
+\newcommand{\pmdott}{\mathrel{\overset{\pmdot}{\pmdot}}}
+\newcommand{\pmdottt}{\pmdott\hspace{.1em}\pmdot}
+\newcommand{\pmdotttt}{\pmdott\hspace{.1em}\pmdott}
+\newcommand{\pmdottttt}{\pmdott\hspace{.1em}\pmdott\hspace{.1em}\pmdot}
+\newcommand{\pmdotttttt}{\pmdott\hspace{.1em}\pmdott\hspace{.1em}\pmdott}
%Logical connectives
\newcommand{\pmnot}{\mathord{\sim}}
-\newcommand{\pmimp}{\boldsymbol{\supset}}
-\newcommand{\pmiff}{\equiv}
-\newcommand{\pmor}{\boldsymbol{\vee}}
+\newcommand{\pmimp}{\mathbin{\boldsymbol{\supset}}}
+\newcommand{\pmiff}{\mathbin{\equiv}}
+\newcommand{\pmor}{\mathbin{\boldsymbol{\vee}}}
\newcommand{\pmall}[1]{(#1)}
\newcommand{\pmsome}[1]{(\text{\raisebox{.5em}{\rotatebox{180}{E}}}#1)}
\newcommand{\pmSome}{\text{\raisebox{.5em}{\rotatebox{180}{E}}}}