summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2023-06-19 03:02:28 +0000
committerNorbert Preining <norbert@preining.info>2023-06-19 03:02:28 +0000
commit0622b5d465a30f417f9c5372cd05a931a407380c (patch)
tree0007872c586bbdf271937367d23bb2396bf60a1a /graphics
parent560cff4babb98ab81103bfe3f966c4111f31b0b0 (diff)
CTAN sync 202306190302
Diffstat (limited to 'graphics')
-rw-r--r--graphics/pgf/contrib/prooftrees/manifest.txt2
-rw-r--r--graphics/pgf/contrib/prooftrees/prooftrees.pdfbin858384 -> 911388 bytes
-rw-r--r--graphics/pgf/contrib/prooftrees/prooftrees.sty7
-rw-r--r--graphics/pgf/contrib/prooftrees/prooftrees.tex30
-rw-r--r--graphics/pgf/contrib/prooftrees/prooftrees_biber.bib16
-rwxr-xr-xgraphics/tpic2pdftex/configure.texk2
6 files changed, 35 insertions, 22 deletions
diff --git a/graphics/pgf/contrib/prooftrees/manifest.txt b/graphics/pgf/contrib/prooftrees/manifest.txt
index 6d7b0c4628..e6116e22a9 100644
--- a/graphics/pgf/contrib/prooftrees/manifest.txt
+++ b/graphics/pgf/contrib/prooftrees/manifest.txt
@@ -1,4 +1,4 @@
-Copyright 2019 Clea F. Rees
+Copyright 2023 Clea F. Rees
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 2005/12/01 or later.
diff --git a/graphics/pgf/contrib/prooftrees/prooftrees.pdf b/graphics/pgf/contrib/prooftrees/prooftrees.pdf
index 65c57dc0b3..6535d91236 100644
--- a/graphics/pgf/contrib/prooftrees/prooftrees.pdf
+++ b/graphics/pgf/contrib/prooftrees/prooftrees.pdf
Binary files differ
diff --git a/graphics/pgf/contrib/prooftrees/prooftrees.sty b/graphics/pgf/contrib/prooftrees/prooftrees.sty
index 2f0e2a2a26..c28a6c9688 100644
--- a/graphics/pgf/contrib/prooftrees/prooftrees.sty
+++ b/graphics/pgf/contrib/prooftrees/prooftrees.sty
@@ -1,4 +1,4 @@
-%% Copyright 2019 Clea F. Rees
+%% Copyright 2020 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{svn-prov}
-\ProvidesPackageSVN{$Id: prooftrees.sty 8641 2019-09-29 23:57:27Z cfrees $}[v0.7 \revinfo]
+\ProvidesPackageSVN{$Id: prooftrees.sty 9103 2022-04-02 04:28:09Z cfrees $}[v0.8 \revinfo]
\RequirePackage{etoolbox}
% define \prooftrees@enw to hold the name of the environment
% default is to name the environment prooftree, this ensures backwards compatibility
@@ -31,7 +31,7 @@
% let users override the default prooftree in case they need to load bussproofs later
\ProcessOptions
\RequirePackage{forest}[2016/12/04]
-\RequirePackage{amssymb}
+\RequirePackage{amssymb,amstext}
\newcommand*\linenumberstyle[1]{#1.}
% currently, keys starting 'proof tree' and macros starting 'prooftree' or 'prooftree@' are intended for internal use only
% this does not apply to the environment prooftree
@@ -195,6 +195,7 @@
process keylist register=close with format,
before computing xy={% adjust the distance between the closure symbol and any annotation
delay={%
+ l'=\baselineskip,% cywiro? fel arall, bydda'r peth byth yn cael ei wneud achos proof tree phantom? dim yn siwr o gwbl
for children={%
l/.register=close sep,
},
diff --git a/graphics/pgf/contrib/prooftrees/prooftrees.tex b/graphics/pgf/contrib/prooftrees/prooftrees.tex
index 57f9dc05c5..0b479838f9 100644
--- a/graphics/pgf/contrib/prooftrees/prooftrees.tex
+++ b/graphics/pgf/contrib/prooftrees/prooftrees.tex
@@ -1,4 +1,4 @@
-%% Copyright 2019 Clea F. Rees
+%% Copyright 2023 Clea F. Rees
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,15 +20,15 @@
%%
\pdfminorversion=7
\RequirePackage{svn-prov}
-\ProvidesFileSVN{$Id: prooftrees.tex 8642 2019-09-30 00:20:55Z cfrees $}[v0.7 \revinfo]
+\ProvidesFileSVN{$Id: prooftrees.tex 9582 2023-06-18 01:00:05Z cfrees $}[v0.8 \revinfo]
\GetFileInfoSVN*
\let\prooftreesdocversion\fileversion
\let\prooftreesdocbase\filebase
\let\prooftreesdocinfo\fileinfo
\let\prooftreesdocdate\filedate
% BEGIN preamble
-\documentclass[10pt,british,a4paper]{ltxdoc}
-\usepackage{babel,geometry,pageslts,fancyhdr}
+\documentclass[10pt,british,a4paper,doc2]{ltxdoc}
+\usepackage{babel,geometry,pageslts,fancyhdr,enumitem}
\usepackage[utf8]{inputenc}
\usepackage{csquotes}
\MakeAutoQuote{‘}{’}
@@ -936,7 +936,7 @@ Again, we use \keyname*[fopttoks]{name} so that we can refer to the line later a
Turning to tree \nyth*{}, we again note that its \bocsnyth{} is nested within the previous two, so the square brackets for its \wff{} need to be nested within those for the previous \wff{}s.
This time, we want to mark the line as discharged without substitution, so we simply use \keyname[fstyle]{checked} without a value.
-Since the justification for this line includes mathematics, we need to ensure that the relevant part of the justification is surrounded by \verb|$|\dots\verb|$| or \verb|\(|\dots\verb|\)|.
+Since the justification for this line includes mathematics, we need to ensure that the relevant part of the justification is surrounded by \verb|$|\dots \verb|$| or \verb|\(|\dots\verb|\)|.
This justification also refers to an earlier line in the proof.
We could write this as \verb|just=1 $\exists\elim$|, but instead we use the name we assigned earlier with the referencing feature provided by \pkg{prooftrees}.
To do this, we put the reference, \verb|pr| \emph{after} the rest of the justification, separating the two parts by a colon i.e.~\verb|$\exists\elim$:pr| and allow \pkg{prooftrees} to figure out the correct number.
@@ -982,7 +982,7 @@ For example, in the next line we add, we specify the justification as \verb|just
\end{prooftree}
\end{latexcode}
-Reaching \nyth*{}, things get a little more complex since we how have not one, but \emph{two} \bocsnyth{} nested within \nyth[7].
+Reaching \nyth*{}, things get a little more complex since we now have not one, but \emph{two} \bocsnyth{} nested within \nyth[7].
This means that we need \emph{two} sets of square brackets for \nyth{} --- one for each of its two trees.
Again, both of these should be nested within the square brackets for \nyth[7] but neither should be nested within the other because the trees for the two branches at \nyth{} are distinct.
\begin{latexcode}
@@ -1933,7 +1933,13 @@ This allows you to use \env{tableau} for \pkg{prooftrees} trees and \env{prooftr
\section{Version History}\label{sec:hanes}
% BEGIN sec:hanes
-\subsection*{0.7}\label{subsec:v0.7}
+\subsection{0.8}
+Add previously unnoticed dependency on \pkg{amstext}.
+Attempt to fix straying closure symbols evident in documentation and a \TeX\ SE question\footnote{\url{https://tex.stackexchange.com/q/619314/}.}
+
+Documentation now loads \pkg{enumitem}, since it depended on it already anyway and specifies \verb|doc2| in options for \cls{ltxdoc} as the code is incompatible with the current version.
+
+\subsection{0.7}\label{subsec:v0.7}
% BEGIN subsec:v0.7
@@ -1949,7 +1955,7 @@ Fix bug reported at \href{https://tex.stackexchange.com/q/479263/39222}{tex.stac
% END subsec:v0.7
-\subsection*{0.6}\label{subsec:v0.6}
+\subsection{0.6}\label{subsec:v0.6}
% BEGIN subsec:v0.6
@@ -1959,7 +1965,7 @@ Thanks to Peter Smith for suggesting this.
% END subsec:v0.6
-\subsection*{0.5}\label{subsec:v0.5}
+\subsection{0.5}\label{subsec:v0.5}
% BEGIN subsec:v0.5
Significant re-implementation leveraging the new argument processing facilities in \pkg{forest} 2.1.
@@ -1967,14 +1973,14 @@ This significantly improves performance as the code is executed much faster than
% END subsec:v0.5
-\subsection*{0.41}\label{subsec:v0.41}
+\subsection{0.41}\label{subsec:v0.41}
% BEGIN subsec:v0.41
Update for compatibility with \pkg{forest} 2.1.
% END subsec:v0.41
-\subsection*{0.4}\label{subsec:v0.4}
+\subsection{0.4}\label{subsec:v0.4}
% BEGIN subsec:v0.4
Bug fix release:
@@ -1985,7 +1991,7 @@ Bug fix release:
% END subsec:v0.4
-\subsection*{0.3}\label{subsec:v0.3}
+\subsection{0.3}\label{subsec:v0.3}
% BEGIN subsec:v0.3
First CTAN release.
diff --git a/graphics/pgf/contrib/prooftrees/prooftrees_biber.bib b/graphics/pgf/contrib/prooftrees/prooftrees_biber.bib
index 6d21cca4df..021c9d1cfd 100644
--- a/graphics/pgf/contrib/prooftrees/prooftrees_biber.bib
+++ b/graphics/pgf/contrib/prooftrees/prooftrees_biber.bib
@@ -1,13 +1,19 @@
+@STRING{HODGES = "Hodges, Wilfred"}
+@STRING{PENGUIN = "Penguin"}
+@STRING{TANTAU-TILL = "Tantau, Till"}
+@STRING{ZIVANOVIC-SASO = "Živanović, Sašo"}
+
@BOOK{hodges-logic,
- AUTHOR = {Hodges, Wilfred},
- PUBLISHER = {Penguin},
- DATE = {1977, 1991},
+ AUTHOR = HODGES,
+ PUBLISHER = PENGUIN,
+ DATE = {1991},
ISBN = {0140136363},
+ ORIGDATE = {1977},
TITLE = {Logic: An Introduction to Elementary Logic},
}
@MANUAL{tantau-tikz-pgf-manual,
- AUTHOR = {Tantau, Till},
+ AUTHOR = TANTAU-TILL,
URL = {http://sourceforge.net/projects/pgf},
DATE = {2015-08-29},
EDITION = {3.0.1a},
@@ -17,7 +23,7 @@
}
@MANUAL{saso-forest-manual,
- AUTHOR = {Živanović, Sašo},
+ AUTHOR = ZIVANOVIC-SASO,
URL = {http://spj.ff.uni-lj.si/zivanovic/},
DATE = {2016-03-04},
EDITION = {2.0.2},
diff --git a/graphics/tpic2pdftex/configure.texk b/graphics/tpic2pdftex/configure.texk
index ebb0728a0a..219f9bf4e3 100755
--- a/graphics/tpic2pdftex/configure.texk
+++ b/graphics/tpic2pdftex/configure.texk
@@ -4074,7 +4074,7 @@ else $as_nop
fi ;;
esac
-##tldbg KPSE_BASIC: Remember tpic2pdftex () as Kpse_Package (for future messages).
+echo 'tldbg:KPSE_BASIC called (pkg=tpic2pdftex, amopt=)' >&5
if test "`cd $srcdir && pwd`" != "`pwd`"; then
# Use -I$(srcdir) only when $(srcdir) != ., so that make's output