summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-06-27 00:01:57 +0000
committerKarl Berry <karl@freefriends.org>2014-06-27 00:01:57 +0000
commitcb1aa3f3d4b4a433b414bf3f726163df5272e5ad (patch)
treea4984dd8707534f938fce1859b204077cff2c24c
parent112ac9ab798410f2e0fe5c5319df57376ad2144a (diff)
grundgesetze
git-svn-id: svn://tug.org/texlive/trunk@34439 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdfbin241060 -> 224805 bytes
-rw-r--r--Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx75
-rw-r--r--Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty41
3 files changed, 66 insertions, 50 deletions
diff --git a/Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdf b/Master/texmf-dist/doc/latex/grundgesetze/grundgesetze.pdf
index 7057dae03db..10f3cef32d8 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 13606455ada..84005cb1daa 100644
--- a/Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx
+++ b/Master/texmf-dist/source/latex/grundgesetze/grundgesetze.dtx
@@ -50,13 +50,13 @@
%
%<package>\NeedsTeXFormat{LaTeX2e}
%<package>\ProvidesPackage{grundgesetze}
-%<package> [2014/03/22 1.01 grundgesetze package]
+%<package> [2014/06/16 1.02 grundgesetze package]
%
%<*driver>
\documentclass[a4paper,10pt,draft]{ltxdoc}
\OnlyDescription % <- comment out to include style code listing at the end of the document
-%\usepackage[bguq]{grundgesetze}
-\usepackage{grundgesetze}
+\usepackage[bguq=5]{grundgesetze}
+% \usepackage{grundgesetze}
\usepackage{begriff}
\usepackage{fge}
\usepackage{amsfonts}
@@ -79,31 +79,31 @@
% \texttt{marcus.rossberg@uconn.edu}}
% \date{Version \fileversion{} \filedate}
% \maketitle
-%
% \setcounter{StandardModuleDepth}{1}
%
% \noindent
% \emph{Grundgesetze.sty} is a \LaTeX2e\ package for typesetting
% Gottlob Frege's \emph{begriffs\-schrift} [concept-script] formalism
-% in the style of his \emph{Grundgesetze der Arithmetik} (1893/1903).
-% \emph{Grundgesetze.sty} was developed for the 2013 English edition
-% of Frege's book.\footnote{Gottlob Frege: \emph{Basic Laws of Arithmetic}.
+% in the style of his \emph{Grundgesetze der Arithmetik}
+% (1893/1903). \emph{Grundgesetze.sty} 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.}
% 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~A.~Ebert for testing, comments, and suggestions. Note that Frege's
-% defined function symbols are not rendered by this package, but rather
+% Philip Ebert for testing and suggestions. Note that Frege's
+% defined function symbols are not rendered by this package, but
% 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). Of course, one must have the |bguq| font
-% installed to use this option, but it is included in recent versions
-% of the big \TeX\ distrubtions.
+% (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.
%
% \section{Basic Commands}
%
@@ -135,7 +135,7 @@
% \DescribeMacro{\GGsqbracket}
% Analogous square brackets, $\GGsqbracket{\ldots}$
%
-% A complete list of commands and compatibility synonymns in
+% A complete list of commands and synonymns in
% the package can be found in Table~\ref{table:allmacros}, and
% the lengths parameterising the appearance of the output in
% Table~\ref{table:lengths}.
@@ -473,7 +473,8 @@
% \midrule
% |\GGthickness| & 0.4pt & thickness of horizontal and vertical lines\\
% |\GGquantthickness| & {$0.75 \times$ |\GGthickness|} &
-% thickness of the line of the quantifier ``dish"\\
+% thickness of the line of the quantifier ``dish''. Note that
+% this value is unused if the |bguq| option has been selected\\
% |\beforelen| & 2.4pt &
% length of horizontal before quantifier, conditional, and negation\\
% |\GGafterlen| & 2pt &
@@ -567,26 +568,34 @@
% The |bguq| option causes the package to use the |bguq| font,
% providing an alternative universal quantification stroke. Of
% course, one must have the |bguq| font installed, but it is
-% included in recent versions of the big \TeX\ distrubtions.
+% included in recent versions of the big \TeX\ distributions.
% \begin{macrocode}
-\RequirePackage{ifthen}
-\newboolean{bguq}
-\setboolean{bguq}{false}
-\DeclareOption{bguq}{\setboolean{bguq}{true}}
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{family=grundgesetze,prefix=grundgesetze@}
+\DeclareStringOption{bguq}[5]
% \end{macrocode}
% \end{macro}
-% Process options
+% Process the key-value options
% \begin{macrocode}
-\ProcessOptions
+\ProcessKeyvalOptions{grundgesetze}
% \end{macrocode}
-% Package needed by options chosen
+% If the |bguq| option has been chosen the require the |bguq| package
+% and pass the option value (the size) as the package option
% \begin{macrocode}
-\ifthenelse{\boolean{bguq}}{\RequirePackage[5]{bguq}}{}%
+\ifx\grundgesetze@bguq\@empty
+\else
+ \RequirePackage[\grundgesetze@bguq]{bguq}
+\fi
% \end{macrocode}
%
% \subsection{The main part of the code}
% \begin{macrocode}
-\typeout{Grundgesetze Begriffsschrift: November 2013}
+\typeout{Grundgesetze Begriffsschrift: June 2014}
+\ifx\grundgesetze@bguq\@empty
+ \typeout{Universal quantifier by qbezier}
+\else
+ \typeout{Universal quantifier by bguq at size \grundgesetze@bguq}
+\fi
% \end{macrocode}
% \begin{macro}{\GGbracket}
% Variable-sized parenthesis
@@ -904,14 +913,7 @@
\hbox{%
\raisebox{\GGlift}{%
\vrule width \GGbeforelen height \GGthickness depth 0pt%
-\ifthenelse{\boolean{bguq}}{% using bguq
- \ensuremath\bguq
- \kern-\bguqwidth
- \vbox{%
- \hbox to \bguqwidth%
- {\hfill$\scriptstyle{#1}$\hfill}%
- \vskip1pt}%
-}{% using qbezier
+\ifx\grundgesetze@bguq\@empty% use qbezier
\setlength{\unitlength}{1pt}%
\kern-\GGthickness%
\begin{picture}(8,0)(0,0)%
@@ -924,7 +926,14 @@
\vbox{%
\hbox to 8pt {\hskip1pt\hskip\GGthickness\hss$_{#1}$\hss}\vskip1pt
}%
-}%
+\else% use the bguq font
+ \ensuremath\bguq
+ \kern-\bguqwidth
+ \vbox{%
+ \hbox to \bguqwidth%
+ {\hfill$\scriptstyle{#1}$\hfill}%
+ \vskip1pt}%
+\fi
\vrule width \GGafterlen height \GGthickness depth 0pt}%
}%
\hskip\GGspace%
diff --git a/Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty b/Master/texmf-dist/tex/latex/grundgesetze/grundgesetze.sty
index 1e72c1ad1ad..13eb68d4ca8 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/03/22 1.01 grundgesetze package]
+ [2014/06/16 1.02 grundgesetze package]
%% \end{itemize}
\newlength{\GGthickness}
\setlength{\GGthickness}{0.4pt}
@@ -39,13 +39,20 @@
\setlength{\GGlift}{2pt}
\newlength{\GGlinewidth}
\setlength{\GGlinewidth}{\linewidth}
-\RequirePackage{ifthen}
-\newboolean{bguq}
-\setboolean{bguq}{false}
-\DeclareOption{bguq}{\setboolean{bguq}{true}}
-\ProcessOptions
-\ifthenelse{\boolean{bguq}}{\RequirePackage[5]{bguq}}{}%
-\typeout{Grundgesetze Begriffsschrift: November 2013}
+\RequirePackage{kvoptions}
+\SetupKeyvalOptions{family=grundgesetze,prefix=grundgesetze@}
+\DeclareStringOption{bguq}[5]
+\ProcessKeyvalOptions{grundgesetze}
+\ifx\grundgesetze@bguq\@empty
+\else
+ \RequirePackage[\grundgesetze@bguq]{bguq}
+\fi
+\typeout{Grundgesetze Begriffsschrift: June 2014}
+\ifx\grundgesetze@bguq\@empty
+ \typeout{Universal quantifier by qbezier}
+\else
+ \typeout{Universal quantifier by bguq at size \grundgesetze@bguq}
+\fi
\newcommand{\GGbracket}[1]{%
\setbox0=\hbox{\ensuremath{#1}}%
\dimen0=0.5\dp0%
@@ -233,14 +240,7 @@
\hbox{%
\raisebox{\GGlift}{%
\vrule width \GGbeforelen height \GGthickness depth 0pt%
-\ifthenelse{\boolean{bguq}}{% using bguq
- \ensuremath\bguq
- \kern-\bguqwidth
- \vbox{%
- \hbox to \bguqwidth%
- {\hfill$\scriptstyle{#1}$\hfill}%
- \vskip1pt}%
-}{% using qbezier
+\ifx\grundgesetze@bguq\@empty% use qbezier
\setlength{\unitlength}{1pt}%
\kern-\GGthickness%
\begin{picture}(8,0)(0,0)%
@@ -253,7 +253,14 @@
\vbox{%
\hbox to 8pt {\hskip1pt\hskip\GGthickness\hss$_{#1}$\hss}\vskip1pt
}%
-}%
+\else% use the bguq font
+ \ensuremath\bguq
+ \kern-\bguqwidth
+ \vbox{%
+ \hbox to \bguqwidth%
+ {\hfill$\scriptstyle{#1}$\hfill}%
+ \vskip1pt}%
+\fi
\vrule width \GGafterlen height \GGthickness depth 0pt}%
}%
\hskip\GGspace%