summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/prooftrees
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/prooftrees')
-rw-r--r--Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty17
1 files changed, 14 insertions, 3 deletions
diff --git a/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty b/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty
index 56052313599..fbe1ca2af31 100644
--- a/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty
+++ b/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty
@@ -1,4 +1,4 @@
-%% Copyright 2016 Clea F. Rees
+%% Copyright 2017 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,8 +16,19 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{svn-prov}
-\ProvidesPackageSVN{$Id: prooftrees.sty 5575 2016-12-06 01:30:03Z cfrees $}[v0.5 \revinfo]
+\ProvidesPackageSVN{$Id: prooftrees.sty 5848 2017-02-09 02:15:38Z cfrees $}[v0.6 \revinfo]
+\RequirePackage{etoolbox}
+% define \prooftrees@enw to hold the name of the environment
+% default is to name the environment prooftree, this ensures backwards compatibility
+\newcommand*\prooftrees@enw{prooftree}
+% allow users to change the name to tableau using tableaux
+\DeclareOption{tableaux}{\renewcommand*\prooftrees@enw{tableau}}
+% just in case
+\DeclareOption{tableau}{\renewcommand*\prooftrees@enw{tableau}}
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{forest}}
+% if \prooftree is not yet defined, set the name to prooftree; otherwise, use tableau to avoid conflict with bussproofs (which uses 'prooftree' rather than 'bussproof' as one might expect)
+\ifundef\prooftree{\renewcommand*\prooftrees@enw{prooftree}}{\renewcommand*\prooftrees@enw{tableau}}
+% let users override the default prooftree in case they need to load bussproofs later
\ProcessOptions
\RequirePackage{forest}[2016/12/04]
\RequirePackage{amssymb}
@@ -752,7 +763,7 @@
}
\environbodyname\prooftreebody
\bracketset{action character=@}
-\NewEnviron{prooftree}[1]{% \forest/\endforest from egreg's answer at http://tex.stackexchange.com/a/229608/
+\NewEnviron{\prooftrees@enw}[1]{% \forest/\endforest from egreg's answer at http://tex.stackexchange.com/a/229608/
\forest
(%
stages={% customised definition of stages - we don't use any custom stages, but we do use several custom keylists, where the processing order of these is critical