prooftrees (30sep19)

git-svn-id: svn://tug.org/texlive/trunk@52221 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 76 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/latex/prooftrees/README b/Master/texmf-dist/doc/latex/prooftrees/README
index 94b50f64ae3..687eddf510f 100644
--- a/Master/texmf-dist/doc/latex/prooftrees/README
+++ b/Master/texmf-dist/doc/latex/prooftrees/README
@@ -1,4 +1,4 @@
-%% Copyright 2017 Clea F. Rees
+%% Copyright 2019 Clea F. Rees
 %
 % This work may be distributed and/or modified under the
 % conditions of the LaTeX Project Public License, either version 1.3
@@ -14,7 +14,7 @@
 %
 % This work consists of all files listed in manifest.txt.
 
-This package supports drawing proof trees of the kind often used in
+This package supports drawing tableaux (proof trees) of the kind often used in
 introductory logic classes, especially those aimed at students without strong
 mathemtical backgrounds. Hodges (1991) is one example of a text which uses
 this system. When teaching such a system it is especially useful to annotate
@@ -27,13 +27,13 @@ system is provided for trees which cite line numbers in justifications for
 proof lines or branch closures.
 
 prooftrees is based on Forest and, hence, TikZ. The package requires version
-2.0.3 of Forest for expected results and will not work with version 1.
+2.1+ of Forest for expected results and will not work with version 1.
 
 The author is certain  that some of her beliefs are false, but sure that her
 belief that prooftrees has bugs is not among them.  
 
 Clea F. Rees
 ReesC21 <at> cardiff <dot> ac <dot> uk
-2017/02/08
+2019/09/30
 
 vim: set nospell: 
diff --git a/Master/texmf-dist/doc/latex/prooftrees/manifest.txt b/Master/texmf-dist/doc/latex/prooftrees/manifest.txt
index 8b50e4118f8..6d7b0c4628a 100644
--- a/Master/texmf-dist/doc/latex/prooftrees/manifest.txt
+++ b/Master/texmf-dist/doc/latex/prooftrees/manifest.txt
@@ -1,4 +1,4 @@
-Copyright 2016 Clea F. Rees
+Copyright 2019 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/Master/texmf-dist/doc/latex/prooftrees/prooftrees.pdf b/Master/texmf-dist/doc/latex/prooftrees/prooftrees.pdf
index 5ab39f88c1d..65c57dc0b39 100644
--- a/Master/texmf-dist/doc/latex/prooftrees/prooftrees.pdf
+++ b/Master/texmf-dist/doc/latex/prooftrees/prooftrees.pdf
diff --git a/Master/texmf-dist/doc/latex/prooftrees/prooftrees.tex b/Master/texmf-dist/doc/latex/prooftrees/prooftrees.tex
index bf00703e2f1..57f9dc05c5d 100644
--- a/Master/texmf-dist/doc/latex/prooftrees/prooftrees.tex
+++ b/Master/texmf-dist/doc/latex/prooftrees/prooftrees.tex
@@ -1,4 +1,4 @@
-%% Copyright 2017 Clea F. Rees
+%% Copyright 2019 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,7 +20,7 @@
 %%
 \pdfminorversion=7
 \RequirePackage{svn-prov}
-\ProvidesFileSVN{$Id: prooftrees.tex 5848 2017-02-09 02:15:38Z cfrees $}[v0.6 \revinfo]
+\ProvidesFileSVN{$Id: prooftrees.tex 8642 2019-09-30 00:20:55Z cfrees $}[v0.7 \revinfo]
 \GetFileInfoSVN*
 \let\prooftreesdocversion\fileversion
 \let\prooftreesdocbase\filebase
@@ -291,7 +291,7 @@
 % It could at least do us the favour of holding some of its much less defensible and much more inconvenient design decisions in equal contempt!!
 \defbibheading{bibliography}[\refname]{%
   \section*{#1}%
-  \markboth{#1}{#1}}
+  \markboth{#1}{}}
 
 \makeindex
 
@@ -315,7 +315,7 @@
 \bigskip
 
 \begin{figure}[!b]
-\begin{adjustwidth}{-2em}{-2em}
+\begin{adjustwidth}{-3em}{-5em}
   \centering
   \begin{minipage}[t]{.475\linewidth}
     \begin{prooftree}
@@ -387,7 +387,7 @@
           ]
         ]
       ]
-    \end{prooftree}
+    \end{prooftree}%
   \end{minipage}\hfill
   \begin{minipage}[t]{.525\linewidth}
     \begin{prooftree}
@@ -441,8 +441,8 @@
           ]
         ]
       ]
-    \end{prooftree}
-  \end{minipage}
+    \end{prooftree}%
+  \end{minipage}%
 \end{adjustwidth}
 \end{figure}
 
@@ -1488,6 +1488,22 @@ The following options affect the global style of the tree and should typically b
 The default values for the document can be set outside the \env{prooftree} environment using \cs{forestset}\marg{settings}.
 If \emph{only} proof trees will be typeset, a default style can be configured using \pkg{forest}'s \keyname*[fkeylist]{default preamble}.
 
+\DescribeKeys[fregbool]{auto move, not auto move}\vals{true,false}\AfterLastParam
+\Default{true}
+Determines whether \pkg{prooftrees} will move lines automatically, where possible, to avoid combining different justifications when different branches are treated differently.
+The default is to avoid conflicts automatically where possible.
+Turning this off permits finer-grained control of what gets moved using \keyname[fstyle]{move by}.
+The following are equivalent to the default setting:
+\begin{latexcode}
+  auto move
+  auto move=true
+\end{latexcode}
+Either of the following will turn auto move off:
+\begin{latexcode}
+  not auto move
+  auto move=false
+\end{latexcode}
+
 \DescribeKeys[fregbool]{line numbering, not line numbering}\vals{true,false}\AfterLastParam
 \Default{true}
 This determines whether lines should be numbered.
@@ -1558,6 +1574,12 @@ Distance between the symbol marking branch closure and any following annotation.
 If the format of such annotations is changed with \keyname[fregkeylist]{close format}, this dimension may require adjustment.
 \Example{close sep=\cs{baselineskip}}
 
+\DescribeKey[fregdim]{proof tree inner proof width}\val{dimension}\AfterLastParam
+\Default{0pt}
+
+\DescribeKey[fregdim]{proof tree inner proof midpoint}\val{dimension}\AfterLastParam
+\Default{0pt}
+
 \DescribeKey[fregcount]{line no shift}\val{integer}\AfterLastParam
 \Default{0}
 This value increments or decrements the number used for the first line of the proof.
@@ -1862,6 +1884,18 @@ Unless \keyname[fregkeylist]{wff format} is set to a non-default value, the foll
 Additional \TikZ{} keys to apply to this proof line.
 \Example{line options=\arg{draw, rounded corners}}
 
+\DescribeKey[fstyle]{line no override}\val{text}\AfterLastParam
+Substitute \meta{text} for the programmatically-assigned line number.
+\meta{text} will be wrapped by \keyname[macro]{\cs{linenumberstyle}}, so should not be anything which would not make sense in that context.
+\Example{line no override=\arg{n}}
+
+\DescribeKey[fstyle]{no line no}\AfterLastParam
+Do not typeset a line number for this line.
+Intended for use in trees where \keyname[foptbool]{line numbering} is activated, but some particular line should not have its number typeset.
+Note that the number for the line is still assigned and the node which would otherwise contain that number is still typeset.
+If the next line is automatically numbered, the line numbering will, therefore, ‘jump’, skipping the omitted number.
+\Example{no line no}
+
 % END subsec:lo
 % END sec:ops
 
@@ -1899,7 +1933,24 @@ 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}
+
+% BEGIN subsec:v0.7
+
+Implement \keyname[fregbool]{auto move}.
+See \cref{subsec:go}.
+The main point of this option is to allow automatic moves to be switched off if one teaches students to first apply  all available non-branching rules for the tableau as a whole, as opposed to all non-branching rules for the sub-tree.
+The automatic algorithm is consistent with the latter, but not former, approach.
+The algorithm favours compact trees, which are more likely to fit on \pkg{beamer} slides.
+Switching the algorithm off permits users to specify exactly how things should or should not be move.
+Thanks to Peter Smith for prompting this.
+
+Fix bug reported at \href{https://tex.stackexchange.com/q/479263/39222}{tex.stackexchange.com/q/479263/39222}.
+
+% END subsec:v0.7
+
 \subsection*{0.6}\label{subsec:v0.6}
+
 % BEGIN subsec:v0.6
 
 Add compatibility option for use with \pkg{bussproofs}.
diff --git a/Master/texmf-dist/doc/latex/prooftrees/prooftrees_biber.bib b/Master/texmf-dist/doc/latex/prooftrees/prooftrees_biber.bib
index c2c6dba09b1..6d21cca4df9 100644
--- a/Master/texmf-dist/doc/latex/prooftrees/prooftrees_biber.bib
+++ b/Master/texmf-dist/doc/latex/prooftrees/prooftrees_biber.bib
@@ -1,27 +1,27 @@
 @BOOK{hodges-logic,
   AUTHOR = {Hodges, Wilfred},
-  ISBN = {0140136363},
   PUBLISHER = {Penguin},
+  DATE = {1977, 1991},
+  ISBN = {0140136363},
   TITLE = {Logic: An Introduction to Elementary Logic},
-  YEAR = {1977, 1991},
-}
-
-@MANUAL{saso-forest-manual,
-  AUTHOR = {Živanović, Sašo},
-  DATE = {2016-03-04},
-  EDITION = {2.0.2},
-  KEYWORDS = {TeX, LaTeX, PGF, TikZ, Forest},
-  TITLE = {Forest: A {PGF}/Ti\mkbibemph{k}{Z}-Based Package for Drawing Linguistic Trees},
-  URL = {http://spj.ff.uni-lj.si/zivanovic/},
 }
 
 @MANUAL{tantau-tikz-pgf-manual,
   AUTHOR = {Tantau, Till},
+  URL = {http://sourceforge.net/projects/pgf},
   DATE = {2015-08-29},
   EDITION = {3.0.1a},
-  KEYWORDS = {TeX, LaTeX, PGF, TikZ},
+  KEYWORDS = {TeX,LaTeX,PGF,TikZ},
   SUBTITLE = {Manual for Version 3.0.1a},
   TITLE = {The {T}i\mkbibemph{k}{Z} and {PGF} Packages},
-  URL = {http://sourceforge.net/projects/pgf},
+}
+
+@MANUAL{saso-forest-manual,
+  AUTHOR = {Živanović, Sašo},
+  URL = {http://spj.ff.uni-lj.si/zivanovic/},
+  DATE = {2016-03-04},
+  EDITION = {2.0.2},
+  KEYWORDS = {TeX,LaTeX,PGF,TikZ,Forest},
+  TITLE = {Forest: A {PGF}/Ti\mkbibemph{k}{Z}-Based Package for Drawing Linguistic Trees},
 }