summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-04-27 13:31:57 +0000
committerKarl Berry <karl@freefriends.org>2021-04-27 13:31:57 +0000
commitae0a6d178b5d23d8223da76cef8e2fa305772028 (patch)
treed399f9fa5b9bd739836172a75e0c035a11dc68a5 /Master
parent7c16c26a1bf8f0a8cf17672a295595204d7e821c (diff)
grundgesetze (26apr21)
git-svn-id: svn://tug.org/texlive/trunk@58997 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/grundgesetze/README4
-rw-r--r--Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdfbin224805 -> 226629 bytes
-rw-r--r--Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx73
-rw-r--r--Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty8
4 files changed, 44 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/latex/grundgesetze/README b/Master/texmf-dist/doc/latex/grundgesetze/README
index 52a2479823e..b887187f8e0 100644
--- a/Master/texmf-dist/doc/latex/grundgesetze/README
+++ b/Master/texmf-dist/doc/latex/grundgesetze/README
@@ -9,11 +9,11 @@ The file grundgesetze.sty is a derivative work of begriff.sty
(Copyright (c) 2005 Josh Parsons, Richard G. Heck Jr.) and so,
like it, is released under the GNU General Public License
(version 2).
-The remainder of this work is Copyright (c) 2008-2014 Richard
+The remainder of this work is Copyright (c) 2008-2021 Richard
G. Heck Jr., J.J. Green, Agustin Rayo, and Marcus Rossberg.
Further information can be found at
http://www.frege.info/
-Marcus Rossberg 2014 \ No newline at end of file
+Marcus Rossberg 2021 \ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdf b/Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdf
index 10f3cef32d8..6d521d73cd5 100644
--- a/Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdf
+++ b/Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx b/Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx
index 84005cb1daa..f1b7b86e9a7 100644
--- a/Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx
+++ b/Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx
@@ -3,14 +3,18 @@
% grundgesetze: LaTeX2e package for typesetting begriffsschrift
% in the of Gottlob Frege's _Grundgesetze der Arithmetik_ (Jena 1893/1903)
%
-% Copyright (C) 2003-2014 by Josh Parsons <josh.parsons@ccc.ox.ac.uk>,
+% Copyright (C) 2003-2021 by Josh Parsons <josh.parsons@ccc.ox.ac.uk>,
% Marcus Rossberg <marcus.rossberg@uconn.edu>,
% J.J. Green <j.j.green@gmx.co.uk>,
-% Richard G. Heck, Jr. <richard_heck@brown.edu>,
+% Richard Kimberly Heck <richard_heck@brown.edu>,
% and Agust’n Rayo <arayo@mit.edu>
%
% This package is based on begriff.sty, originally written by
% Josh Parsons in 2003, 2005.
+%
+% New in this update (Marcus Rossberg, 2021-04-26):
+% \baselineskip in \GGconditional replaced by \normalbaselineskip
+% to allow use in tabular and array environments
%
% This program is free software; you can redistribute it and/or modify
% it under the terms of the GNU General Public License as published by
@@ -50,15 +54,16 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{grundgesetze}
-%<package> [2014/06/16 1.02 grundgesetze package]
+%<package>[2021/04/26 v1.03 grundgesetze package]
%
%<*driver>
-\documentclass[a4paper,10pt,draft]{ltxdoc}
+\documentclass[a4paper,10pt]{ltxdoc}
\OnlyDescription % <- comment out to include style code listing at the end of the document
\usepackage[bguq=5]{grundgesetze}
% \usepackage{grundgesetze}
\usepackage{begriff}
\usepackage{fge}
+\usepackage{hyperref}
\usepackage{amsfonts}
\usepackage{amstext}
\usepackage{amsmath}
@@ -82,28 +87,27 @@
% \setcounter{StandardModuleDepth}{1}
%
% \noindent
-% \emph{Grundgesetze.sty} is a \LaTeX2e\ package for typesetting
-% Gottlob Frege's \emph{begriffs\-schrift} [concept-script] formalism
+% \emph{grundgesetze.sty} is a \LaTeX2e\ package for typesetting
+% formulae in Gottlob Frege's \emph{begriffsschrift} [concept-script]
% in the style of his \emph{Grundgesetze der Arithmetik}
-% (1893/1903). \emph{Grundgesetze.sty} was developed for the 2013 English
+% (Jena 1893/1903). The package was developed for the 2013 English
% edition.\footnote{Gottlob Frege: \emph{Basic Laws of Arithmetic}.
-% Translated and edited by Philip A. Ebert and Marcus Rossberg. Oxford 2013.}
+% Translated and edited by Philip A.\ Ebert and Marcus Rossberg. Oxford 2013.}
% The package is based on Josh Parsons's \emph{begriff.sty} which renders
% the formalism in the style of Frege's earlier work,
-% \emph{Begriffsschrift} (1879). It was amended by Richard~G.~Heck~Jr.,
-% J.\,J.~Green, Agust\'in~Rayo, and Marcus~Rossberg. Thanks to
-% Philip Ebert for testing and suggestions. Note that Frege's
+% \emph{Begriffsschrift} (Halle a.S.\ 1879). It was amended by Richard Kimberly Heck,
+% J.J.\ Green, Agust\'in Rayo, and Marcus Rossberg. Thanks to
+% Philip Ebert and Sanford Shieh for testing and suggestions. Frege's
% defined function symbols are not rendered by this package, but
-% by J.\,J.~Green's \emph{fge.sty}.
+% by J.J.\ Green's \emph{fge.sty}.
%
% \section{Options}
%
% At present the only package option is |bguq|, which causes the package
-% to use the |bguq| font for an alternative universal quantifier
-% (concavity), and this option accepts a value (being the size to be used,
-% as in |bguq=6|, the default being 5). Of course, one must have the
-% |bguq| font installed to use this option, but it is included in recent
-% versions of the big \TeX\ distributions.
+% to use the |bguq| font for an alternative universal quantifier (concavity),
+% and this option accepts a value (corresponding to the size to be used,
+% as in |bguq=6|; default is 5). The |bguq| font is required for this
+% option. It is included in recent versions of the big \TeX\ distributions.
%
% \section{Basic Commands}
%
@@ -114,13 +118,12 @@
% The negation-stroke, $\GGnot$
%
% \DescribeMacro{\GGconditional}
-% Conditional-stroke: called as |\GGconditional{p}{q}}| yields
-% $\GGconditional{p}{q}$ (i.e., `$p\supset q$')
+% Conditional-stroke: called as |\GGconditional{p}{q}| yields
+% $\GGconditional{p}{q}$
%
% \DescribeMacro{\GGquant}
% Concavity: called as |\GGquant{\mathfrak a}| gives
-% $\GGquant{\mathfrak a}$ (i.e., universal quantifier,
-% `$\mathfrak{a}$' is the quantified variable)
+% $\GGquant{\mathfrak a}$
%
% \DescribeMacro{\GGjudge}
% Judgement-stroke, $\GGjudge$
@@ -130,7 +133,7 @@
%
% \DescribeMacro{\GGbracket}
% Automatically scaling brackets, |\GGbracket{\ldots}| yields
-% $\GGbracket{\ldots}$ (see examples)
+% $\GGbracket{\ldots}$ (see examples below)
%
% \DescribeMacro{\GGsqbracket}
% Analogous square brackets, $\GGsqbracket{\ldots}$
@@ -187,8 +190,8 @@
%
% \end{itemize}
%
-% There are further examples, including Frege's basic laws of logic,
-% available for download on \texttt{www.frege.info}.
+% There are further examples, including Frege's six basic laws of logic,
+% available for download on \url{http://www.frege.info/}.
%
%
% \section{Advanced Typesetting}
@@ -283,16 +286,16 @@
% determined by adding up the lengths
% of the embedded symbols, as given in Table~\ref{table:embedded},
% or by using a GUI that allows producing \LaTeX\ and XML code for
-% \emph{begriffsschrift} formulae via mouse-click and that will
-% calculate and output the correct values. The GUI is available for
-% download on \texttt{www.frege.info}.
+% \emph{begriffsschrift} formulae by mouse-click. The GUI will
+% calculate and output the correct values. It is available for
+% download on \url{http://www.frege.info/}.
%
% \subsection{Adding horizontal lengths manually:
% \texttt{\textbackslash GGnonot}, etc.}
%
% Readability is sometimes aided by moving, e.g., negations to the
% right end of the horizontal in a complex formula. For instance,
-% Frege nearly always preferred the rendering displayed on the right
+% Frege nearly always prefers the rendering displayed on the right
% in these types of formulae:
%
% \begin{center}
@@ -322,7 +325,7 @@
% The right-hand formulae are produced by inserting commands
% for horizontals of the appropriate length directly at the
% position where the ``space'' should appear. The three
-% right-hand formulae above are created in this way:
+% right-hand formulae above are created thus, respectively:
% \begin{itemize}
% \item[(a)] \begin{verbatim}\GGjudge \GGconditional
% {\GGquant{\mathfrak a} \GGnot f(\mathfrak a)}
@@ -340,7 +343,7 @@
%
% Josh Parsons's \emph{begriff.sty}, on which \emph{grundgesetze.sty}
% is based, is closer in appearance to Frege's formalism as it is
-% presented in Frege's first book, \emph{Begriffs\-schrift} (1879).
+% presented in Frege's first book, \emph{Begriffs\-schrift} (Halle a.S.\ 1879).
% The corresponing commands were given different names so that both
% pack\-ages can be used in the same \TeX~document; see Table~\ref{table:compat}.
%
@@ -414,8 +417,8 @@
%
% A straightforward way to convert the a \LaTeX\ document that uses
% \emph{begriff.sty} into one that uses \emph{grundgesetze.sty} without
-% manually exchanging the commands is to find and replace (using wrap
-% search) ``|\BG|" by ``|\GG|". Synonyms have been added to
+% manually exchanging the commands is to find and replace
+% ``|\BG|" by ``|\GG|". Synonyms have been added to
% \emph{grundgesetze.sty} to allow the use of all \emph{begriff.sty}
% commands ``translated" in this way (see Table~\ref{table:allmacros}).
%
@@ -590,7 +593,7 @@
%
% \subsection{The main part of the code}
% \begin{macrocode}
-\typeout{Grundgesetze Begriffsschrift: June 2014}
+\typeout{Grundgesetze Begriffsschrift: April 2021}
\ifx\grundgesetze@bguq\@empty
\typeout{Universal quantifier by qbezier}
\else
@@ -648,7 +651,7 @@
\setbox0=\hbox{%
\addtolength{\GGlinewidth}{-\GGafterlen}%
\raisebox{\GGlift}{%
-\vrule height 0.49\baselineskip depth 0.425\baselineskip width 0pt
+\vrule height 0.49\normalbaselineskip depth 0.425\normalbaselineskip width 0pt
\vrule height \GGthickness width \GGafterlen depth 0pt
}%
\ensuremath{\hskip\GGspace #1}%
@@ -657,7 +660,7 @@
\addtolength{\GGlinewidth}{-\GGafterlen}%
% strut -- depth of conditional here!
\raisebox{\GGlift}{%
-\vrule height 0pt depth 0.425\baselineskip width 0pt%
+\vrule height 0pt depth 0.425\normalbaselineskip width 0pt%
\vrule height \GGthickness width \GGafterlen depth 0pt}%
\ensuremath{\hskip\GGspace #2}%
}%
diff --git a/Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty b/Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty
index 13eb68d4ca8..b754fcd9cc6 100644
--- a/Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty
+++ b/Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty
@@ -23,7 +23,7 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{grundgesetze}
- [2014/06/16 1.02 grundgesetze package]
+[2021/04/26 v1.03 grundgesetze package]
%% \end{itemize}
\newlength{\GGthickness}
\setlength{\GGthickness}{0.4pt}
@@ -47,7 +47,7 @@
\else
\RequirePackage[\grundgesetze@bguq]{bguq}
\fi
-\typeout{Grundgesetze Begriffsschrift: June 2014}
+\typeout{Grundgesetze Begriffsschrift: April 2021}
\ifx\grundgesetze@bguq\@empty
\typeout{Universal quantifier by qbezier}
\else
@@ -86,7 +86,7 @@
\setbox0=\hbox{%
\addtolength{\GGlinewidth}{-\GGafterlen}%
\raisebox{\GGlift}{%
-\vrule height 0.49\baselineskip depth 0.425\baselineskip width 0pt
+\vrule height 0.49\normalbaselineskip depth 0.425\normalbaselineskip width 0pt
\vrule height \GGthickness width \GGafterlen depth 0pt
}%
\ensuremath{\hskip\GGspace #1}%
@@ -94,7 +94,7 @@
\setbox1=\hbox{%
\addtolength{\GGlinewidth}{-\GGafterlen}%
\raisebox{\GGlift}{%
-\vrule height 0pt depth 0.425\baselineskip width 0pt%
+\vrule height 0pt depth 0.425\normalbaselineskip width 0pt%
\vrule height \GGthickness width \GGafterlen depth 0pt}%
\ensuremath{\hskip\GGspace #2}%
}%