prftree (1nov15)

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

3 files changed, 172 insertions, 186 deletions

diff --git a/Master/texmf-dist/doc/latex/prftree/prftreedoc.pdf b/Master/texmf-dist/doc/latex/prftree/prftreedoc.pdf
index ce700a53cce..87e9d490d6a 100644
--- a/Master/texmf-dist/doc/latex/prftree/prftreedoc.pdf
+++ b/Master/texmf-dist/doc/latex/prftree/prftreedoc.pdf
diff --git a/Master/texmf-dist/doc/latex/prftree/prftreedoc.tex b/Master/texmf-dist/doc/latex/prftree/prftreedoc.tex
index 8af679ea760..b28e254b1d5 100644
--- a/Master/texmf-dist/doc/latex/prftree/prftreedoc.tex
+++ b/Master/texmf-dist/doc/latex/prftree/prftreedoc.tex
@@ -80,9 +80,9 @@ later. The basic command to build a proof tree is \verb|\prftree|.
 For example, the proof of $A \supset \neg\neg A$ in natural deduction
 is:
 \begin{displaymath}
-  \prftree[r]{$\supset$I}
-    {\prftree[r]{$\supset$I}
-      {\prftree[r]{$\supset$E}
+  \prftree[r]{$\scriptstyle\supset\mathrm{I}$}
+    {\prftree[r]{$\scriptstyle\supset\mathrm{I}$}
+      {\prftree[r]{$\scriptstyle\supset\mathrm{E}$}
         {\prfboundedassumption{A}}
         {\prfboundedassumption{\neg A}}
         {\bot}}
@@ -92,14 +92,14 @@ is:
 This proof is generated by the following \LaTeX{} code:
 \begin{verbatim}
   \begin{displaymath}
-    \prftree[r]{$\supset$I}
-      {\prftree[r]{$\supset$I}
-        {\prftree[r]{$\supset$E}
-          {\prfboundedassumption{A}}
-          {\prfboundedassumption{\neg A}}
-          {\bot}}
-        {\neg\neg A}}
-      {A \supset \neg\neg A}
+    \prftree[r]{$\scriptstyle\supset\mathrm{I}$}
+    {\prftree[r]{$\scriptstyle\supset\mathrm{I}$}
+      {\prftree[r]{$\scriptstyle\supset\mathrm{E}$}
+        {\prfboundedassumption{A}}
+        {\prfboundedassumption{\neg A}}
+        {\bot}}
+      {\neg\neg A}}
+    {A \supset \neg\neg A}
   \end{displaymath}
 \end{verbatim}
 
@@ -110,8 +110,9 @@ In general, the syntax of the \verb|\prftree| command is:
   \{\mbox{assumption}_n\}\{\mbox{conclusion}\}
 \end{displaymath}
 Assumptions are optional and there may be any number of them. Each
-assumption may contain a proof tree, which is typeset
-independently. The conclusion is mandatory, and it is supposed to be a
+assumption may contain a proof tree, which is typeset independently:
+the order allows to use indentation to help reading the source. The
+conclusion is mandatory, and it is supposed to be a
 formula. Assumptions and the conclusion are typeset in a display style
 math environment. Options control the way the proof is generated: in
 the example, the \verb|r| option has been used to signal that the
@@ -158,39 +159,48 @@ options\footnote{The reader is invited to look at the source code of
   \begin{array}{lcc@{\qquad}l}
     \mbox{default (single straight)} &
     \prftree{A}{B}{A \wedge B} &
-    \prftree[r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[straight]} \\
     \mbox{double straight} &
     \prftree[d]{A}{B}{A \wedge B} &
-    \prftree[d,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[d,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[double,straight]} \\
     \mbox{single dotted} &
     \prftree[dotted]{A}{B}{A \wedge B} &
-    \prftree[dotted,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[dotted,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[dotted]} \\
     \mbox{double dotted} &
     \prftree[dotted,d]{A}{B}{A \wedge B} &
-    \prftree[dotted,d,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[dotted,d,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[double,dotted]} \\
     \mbox{single dashed} &
     \prftree[dashed]{A}{B}{A \wedge B} &
-    \prftree[dashed,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[dashed,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[dashed]} \\
     \mbox{double dashed} &
     \prftree[dashed,d]{A}{B}{A \wedge B} &
-    \prftree[dashed,d,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[dashed,d,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[double,dashed]} \\
     \mbox{single fancy} &
     \prftree[f]{A}{B}{A \wedge B} &
-    \prftree[f,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[f,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[fancy]} \\
     \mbox{double fancy} &
     \prftree[f,d]{A}{B}{A \wedge B} &
-    \prftree[f,d,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[f,d,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[double,fancy]} \\
     \mbox{noline} &
     \prftree[noline]{A}{B}{A \wedge B} &
-    \prftree[noline,r]{$\wedge$I}{A}{B}{A \wedge B} &
+    \prftree[noline,r]{$\scriptstyle\wedge\mathrm{I}$}
+    {A}{B}{A \wedge B} &
     \texttt{[noline]}
   \end{array}
 \end{displaymath}\vspace{1ex}
@@ -229,8 +239,8 @@ For example, the axiom stating that equality is reflexive, is
 \end{displaymath}
 and they are generated by the \LaTeX{} code
 \begin{displaymath}
-  \begin{array}{cc}
-    \verb|\prfaxiom{\forall x\, x = x}|& 
+  \begin{array}{l}
+    \verb|\prfaxiom{\forall x\, x = x}|\\
     \verb|\prfbyaxiom{refl}{\forall x\, x = x}|
   \end{array}
 \end{displaymath}\vspace{-.2ex}
@@ -249,7 +259,9 @@ For example, \verb|\prfsummary{\forall x\, x = x}| produces
 \begin{displaymath}
   \prfsummary{\forall x\, x = x}
 \end{displaymath}
-while \verb|\prfsummary[name]{A(x)}{B(y)}{B(y) \wedge A(x)}| gives
+while
+\verb|\prfsummary[name]{A(x)}{B(y)}{B(y) \wedge A(x)}|
+gives
 \begin{displaymath}
   \prfsummary[name]{A(x)}{B(y)}{B(y) \wedge A(x)}
 \end{displaymath}\vspace{-.2ex}
@@ -700,7 +712,7 @@ may indicate that a label is reused when it should not.
 
 The same example can be used to show how the other options work:
 \begin{displaymath}
-  \begin{array}{ccc}
+  \begin{array}{@{}ccc@{}}
     \begin{prooftree}
       \prfsummarystyle=2
       \prftree[r]{$\vee\mathrm{E}_{\prfref<assum:orEn>}$}
@@ -802,7 +814,7 @@ are:
       {C}
     \end{prooftree}
   \end{array}
-\end{displaymath}\vspace{.2ex}
+\end{displaymath}
 
 The \verb|prfassumptioncounter| is the \LaTeX{} counter used to
 generate the assumption values. It contains the last used value, and
@@ -820,7 +832,7 @@ initially, it is set to $0$. By modifying its value, e.g., to
         \prfboundedassumption<[l]assum:orEff>{B}}{C}}
     {C}
   \end{prooftree}
-\end{displaymath}\vspace{.2ex}
+\end{displaymath}
 
 A labelled assumption box is graphically constructed by the package
 command \verb|\prflabelledassumptionbox| which can be redefined if
@@ -933,27 +945,33 @@ calculi:
 \item \verb|\NDANDER|: conjunction elimination, right;
 \item \verb|\NDANDEL|: conjunction elimination, left;
 \item \verb|\NDANDE|: conjunction elimination, unspecified;
-\item \verb|\NDIMPI|: implication introduction;
-\item \verb|\NDIMPIL|: implication introduction with the label of the
-  discharged assumption;
-\item \verb|\NDIMPE|: implication elimination;
 \item \verb|\NDORIR|: disjunction introduction, right;
 \item \verb|\NDORIL|: disjunction introduction, left;
 \item \verb|\NDORI|: disjunction introduction, unspecified;
 \item \verb|\NDORE|: disjunction elimination;
-\item \verb|\NDOREL|: disjunction elimination with the label of the
-  discharged assumptions;
+\item \verb|\NDOREL|: labelled disjunction elimination;
+\item \verb|\NDIMPI|: implication introduction;
+\item \verb|\NDIMPIL|: labelled implication introduction;
+\item \verb|\NDIMPE|: implication elimination;
+\item \verb|\NDNOTI|: negation introduction;
+\item \verb|\NDNOTIL|: labelled negation introduction;
+\item \verb|\NDNOTE|: negation elimination;
 \item \verb|\NDALLI|: universal quantifier introduction;
 \item \verb|\NDALLE|: universal quantifier elimination;
 \item \verb|\NDEXI|: existential quantifier introduction;
 \item \verb|\NDEXE|: existential quantifier elimination;
-\item \verb|\NDEXE|: existential quantifier elimination with the label
-  of the discharged assumption;
+\item \verb|\NDEXE|: labelled existential quantifier elimination;
 \item \verb|\NDTI|: truth introduction;
 \item \verb|\NDFE|: falsity elimination;
-\item \verb|\NDLEM|: Law of Excluded Middle.
+\item \verb|\NDLEM|: law of Excluded Middle;
+\item \verb|\NDAX|: a generic axiom rule.
 \end{itemize}
 
+The labels, when present, are the first argument, the rest being the
+assumptions and, finally, the conclusion. The rules do not have a
+fixed format, so extensions are allowed, e.g., on conjunction
+elimination or disjunction introduction.
+
 For example, the proof
 \begin{displaymath}
   \begin{prooftree}
@@ -1228,15 +1246,15 @@ we may consider to define
   \setcounter{prfsummarycounter}{0}
   \setcounter{prfassumptioncounter}{0}
   \mbox{Let }
-  \vcenter{\vbox{\prfsummary<s:abbrev>
+  \vcenter{\prfsummary<[f]s:abbrev>
       {\NDDL{s:notnotA}{\neg\neg A}}
       {\NDAL{s:notA}{\neg A}}
-      {\neg\neg A \supset A}}}
+      {\neg\neg A \supset A}}
   \equiv
-  \vcenter{\hbox{$\NDIMPIL{s:notnotA}
+  \vcenter{\NDIMPIL{s:notnotA}
       {\NDFE{\NDIMPE{\NDDL{[l]s:notnotA}{\neg\neg A}}
           {\NDAL{[l]s:notA}{\neg A}}{\bot}}{A}} 
-      {\neg\neg A \supset A}$}}
+      {\neg\neg A \supset A}}
 \end{displaymath}
 allowing to abbreviate the whole proof as
 \begin{displaymath}
@@ -1254,21 +1272,21 @@ The corresponding \LaTeX{} code is
   \setcounter{prfsummarycounter}{0}
   \setcounter{prfassumptioncounter}{0}
   \mbox{Let }
-  \vcenter{\vbox{\prfsummary<s:abbrev>
+  \vcenter{\prfsummary<[f]s:abbrev>
       {\NDDL{s:notnotA}{\neg\neg A}}
       {\NDAL{s:notA}{\neg A}}
-      {\neg\neg A \supset A}}}
+      {\neg\neg A \supset A}}
   \equiv
-  \vcenter{\hbox{$\NDIMPIL{s:notnotA}
+  \vcenter{\NDIMPIL{s:notnotA}
       {\NDFE{\NDIMPE{\NDDL{[l]s:notnotA}{\neg\neg A}}
           {\NDAL{[l]s:notA}{\neg A}}{\bot}}{A}} 
-      {\neg\neg A \supset A}$}}
+      {\neg\neg A \supset A}}
 \end{verbatim}
 for the definition of the proof summary, and
 \begin{verbatim}
   \NDOREL{s:notA}{\NDLEM{A \vee \neg A}}
   {\NDIMPI{\NDDL{[l]s:notA}{A}}{\neg\neg A \supset A}}
-  {\prfsummary<s:abbrev>
+  {\prfsummary<[l]s:abbrev>
     {\NDDL{[l]s:notnotA}{\neg\neg A}}
     {\NDDL{[l]s:notA}{\neg A}}
       {\neg\neg A \supset A}}
@@ -1627,8 +1645,7 @@ occurrence of a reference, which can be resolved.
 Most difficulties in the implementation of references lie in the way
 to construct the boxes to be used in the proof tree. But, the tricky
 part is the interaction with the \LaTeX{} and \TeX{} kernel for error
-reporting. Actually, it is in this part that the bugs signalled in the
-next section have their origin. 
+reporting.
 
 % -------------------------------------
 \clearpage
@@ -1655,66 +1672,7 @@ It is not simple to code such an algorithm in \TeX{}, but the real
 difficulty is how to represent skylines and how to store them, since
 \TeX{} provides no abstract data structures. Hence, the implementation
 of this feature has been postponed to a remote future, or to the will
-of a real \TeX{} magician.\vspace{2ex}
-
-There are three bugs in the packages. 
-
-The first one is that \verb|\mathrm| and similar may break a proof
-tree when used in the rule name. I have not been able to track down
-why this happens. The effect is that the proof tree is correctly
-constructed but it cannot be used as a box, e.g., it cannot be put
-inside a \verb|\fbox| or used in normal text. Although disappointing
-this bug can be easily circumvented by typesetting the proof tree in a
-math environment, e.g., by putting it into a math display or by
-enclosing it in a pair of dollar signs.\vspace{2ex}
-
-The second bug is minimal and in a future version it could be
-solved. If one considers the following proof:
-\begin{displaymath}
-  \begin{prooftree}
-    \fbox{%
-      \prflineextra=0pt
-      \prftree
-      {\prftree
-        {\prftree
-          {\prfboundedassumption{\neg\neg A}}
-          {\prfboundedassumption<bug:1>{\neg A}}
-          {\bot}}
-        {A}}
-      {\neg\neg A \supset A}}
-  \end{prooftree}
-\end{displaymath}
-the anchor of assumption (\prfref<bug:1>) is out of the bounding
-box. Usually, this is not a problem and, in case, it can be manually
-corrected
-\begin{displaymath}
-  \begin{prooftree}
-    \fbox{%
-      \prflineextra=0pt
-      \hbox{\prftree
-      {\prftree
-        {\prftree
-          {\prfboundedassumption{\neg\neg A}}
-          {\prfboundedassumption<[l]bug:1>{\neg A}}
-          {\bot}}
-        {A}}
-      {\neg\neg A \supset A}\hspace{.34em}}}
-  \end{prooftree}
-\end{displaymath}
-as in the following code:
-\begin{verbatim}
-  \prfassumption{\prftree{\prftree{\prftree
-        {\prfboundedassumption{\neg\neg A}}
-        {\prfboundedassumption<bug:1>{\neg A}}{\bot}}
-      {A}}{\neg\neg A \supset A}\hspace{.34em}}}
-\end{verbatim}\vspace{2ex}
-
-The third bug happens the first time a reference is created: if it is
-referred by \verb|\prfref| in the rule name, a strange ``immediate''
-follows it. This is not a problem, since the code has to be recompiled
-anyway to complete the definition of references, and this is enough to
-make the problem to disappear. Since it is a transient problem, I have
-not investigated any further.  
+of a real \TeX{} magician.
 
 \vfill
 
diff --git a/Master/texmf-dist/tex/latex/prftree/prftree.sty b/Master/texmf-dist/tex/latex/prftree/prftree.sty
index 8396b7b9cf5..2bec5c8f07a 100644
--- a/Master/texmf-dist/tex/latex/prftree/prftree.sty
+++ b/Master/texmf-dist/tex/latex/prftree/prftree.sty
@@ -1,6 +1,7 @@
 %
 % prftree.sty
-% by Marco Benini - 30th November 2014
+% by Marco Benini - 31st October 2015
+% v1.2
 %
 % A package to typeset natural deduction proofs, or sequent proofs, or
 % tableau proofs
@@ -9,16 +10,16 @@
 %
 
 \NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{prftree}[2014/11/30 Natural Deduction Proofs]
+\ProvidesPackage{prftree}[2015/10/31 Natural Deduction Proofs]
 
-% Package options
+% Package options: deactivated by default
 \newif\ifprf@NDOption\prf@NDOptionfalse
 \newif\ifprf@SEQOption\prf@SEQOptionfalse
 \newif\ifprfIMPOption\prfIMPOptionfalse
 
 \DeclareOption{ND}{\prf@NDOptiontrue}
 \DeclareOption{SEQ}{\prf@SEQOptiontrue}
-\DeclareOption{IMP}{\prf@IMPOptiontrue}
+\DeclareOption{IMP}{\prfIMPOptiontrue}
 \ProcessOptions\relax
 
 %--------------------------------------------------------------------
@@ -272,7 +273,7 @@
 \def\prf@@top\prf@cons#1#2\prf@eos{#1}
 \def\prf@top{\expandafter\prf@@top\prf@stack}
 
-%% Pop discard the topmost value in the stack
+%% Pop discards the topmost value in the stack
 \def\prf@@pop\prf@cons#1#2\prf@eos{%
   \expandafter\edef\expandafter\prf@stack{#2\prf@eos}}
 \def\prf@pop{\expandafter\prf@@pop\prf@stack}
@@ -340,10 +341,10 @@
   \expandafter\ifx\csname prf@w@ref@#1\endcsname\relax}
 
 % Write a reference
-\def\prfref<#1>{%
-  \ifprf@undefref<#1>{??}%
-    \PackageWarningNoLine{prooftree}{Undefined reference <#1>}%
-  \else\csname prf@ref@@#1\endcsname\relax\fi} 
+\protected\def\prfref<#1>{%
+  \ifprf@undefref<#1>\relax\mbox{??}%
+    \PackageWarningNoLine{prftree}{Undefined reference <#1>}\relax%
+  \else\csname prf@ref@@#1\endcsname\relax\fi\relax} 
 
 % Create the anchor from what stored in the .aux file
 \def\prfauxlabel#1#2{%
@@ -409,9 +410,9 @@
 % How a labelled assumption is graphically rendered
 \def\prflabelledassumptionbox#1#2{%
   \setbox\prf@fancybox\hbox{${#1}$}%
-  \prf@tmp\wd\prf@fancybox%
+  % \prf@tmp\wd\prf@fancybox% CHANGED FROM v1.0
   \setbox\prf@fancybox\hbox{$\box\prf@fancybox^{#2}$}%
-  \wd\prf@fancybox\prf@tmp%
+  % \wd\prf@fancybox\prf@tmp% CHANGED FROM v1.0
   \prf@assumption{\box\prf@fancybox}}
 
 % How a discharged fancy labelled assumption is graphically rendered
@@ -526,29 +527,29 @@
 \def\prf@@summarystyle{%
   \ifnum3=\prfsummarystyle\relax%
     \setbox\prf@summarybox\hbox{$\mathcal{D}$}%
-    \prf@tmp\wd\prf@summarybox%
+    %\prf@tmp\wd\prf@summarybox%
     \setbox\prf@summarybox\hbox{$\mathcal{D}%
       \hbox{\box\prf@summary@label}\mathstrut$}%
-    \wd\prf@summarybox\prf@tmp%
+    %\wd\prf@summarybox\prf@tmp%
   \else\ifnum2=\prfsummarystyle\relax%
     \setbox\prf@summarybox\hbox{$\prod$}%
-    \prf@tmp\wd\prf@summarybox%
+    %\prf@tmp\wd\prf@summarybox%
     \setbox\prf@summarybox\hbox{$\prod\hbox{\box\prf@summary@label}$}% 
-    \wd\prf@summarybox\prf@tmp%
+    %\wd\prf@summarybox\prf@tmp%
   \else\ifnum1=\prfsummarystyle\relax%
     \setbox\prf@summarybox\hbox{\hbox{\Huge$\Pi$}}%
-    \prf@tmp\wd\prf@summarybox%
+    %\prf@tmp\wd\prf@summarybox%
     \setbox\prf@summarybox\hbox{\hbox{\Huge$\Pi$}%
       \hbox{\box\prf@summary@label}}%
-    \wd\prf@summarybox\prf@tmp%
+    %\wd\prf@summarybox\prf@tmp%
   \else\ifnum0=\prfsummarystyle\relax%
     \setbox\prf@summarybox\hbox{$\cdot$}%
-    \prf@tmp\wd\prf@summarybox%
+    %\prf@tmp\wd\prf@summarybox%
     \setbox\prf@summarybox%
       \vbox to5.2ex{\cleaders\hbox{$\cdot$}\vfill}%
     \setbox\prf@summarybox\hbox{\usebox{\prf@summarybox}%
       \hbox{\ \box\prf@summary@label}}%
-    \wd\prf@summarybox\prf@tmp%
+    %\wd\prf@summarybox\prf@tmp%
   \else\setbox\prf@summarybox\hbox{\prffancysummarybox}\fi\fi\fi\fi% 
   \prf@tmp.5\ht\prf@summarybox%
   \advance\prf@tmp-.5\dp\prf@summarybox%
@@ -935,9 +936,9 @@
     \advance\prf@temp.5\dp\prf@fancybox\fi\fi%
   \setbox\prf@conclusionbox%
     \vbox{\vskip\prf@temp\box\prf@conclusionbox}%
-  % And, finally, at the very end, we can prepare the proof box and we
-  % can calculate the right value from Rassum. At the very end, we can
-  % output the result (!!)
+  % And, finally, we can prepare the proof box and we can calculate
+  % the right value from Rassum. At the very end, we can output the
+  % result (!!) 
   \setbox\prf@rulenamebox%
     \vbox{\box\prf@assumptionsbox\nointerlineskip%
       \box\prf@linebox\nointerlineskip%
@@ -960,51 +961,68 @@
 % Package option [ND]
 % -------------------------------------------------------------------
 
-\newbox\prf@charbox
-\def\prfscript#1{\setbox\prf@charbox%
-  \hbox{$\scriptstyle\mathrm{#1}$}\copy\prf@charbox}
 \ifprf@NDOption%
   \def\NDA{\prfassumption}
   \def\NDD{\prfboundedassumption}
   \def\NDAL#1{\prfassumption<#1>}
   \def\NDDL#1{\prfboundedassumption<#1>}
   \def\NDP{\prftree}
-  \def\NDANDI{\prftree[by]{$\scriptstyle\wedge\prfscript{I}$}}
-  \def\NDANDER{\prftree[by]{%
-      $\scriptstyle\wedge\prfscript{E}_{\prfscript{R}}$}} 
-  \def\NDANDEL{\prftree[by]{%
-      $\scriptstyle\wedge\prfscript{E}_{\prfscript{L}}$}}
-  \def\NDANDE{\prftree[by]{$\scriptstyle\wedge\prfscript{E}$}}
+  \def\NDANDI{\prftree[by]{$\scriptstyle\mathord{\wedge}%
+      \noexpand\textup{I}$}}
+  \def\NDANDEL{\prftree[by]{$\scriptstyle\mathord{\wedge}%
+      \noexpand\textup{E}_1$}}
+  \def\NDANDER{\prftree[by]{$\scriptstyle\mathord{\wedge}%
+      \noexpand\textup{E}_2$}}
+  \def\NDANDE{\prftree[by]{$\scriptstyle\mathord{\wedge}%
+      \noexpand\textup{E}$}}
+  \def\NDORIL{\prftree[by]{$\scriptstyle\mathord{\vee}%
+      \noexpand\textup{I}_1$}}
+  \def\NDORIR{\prftree[by]{$\scriptstyle\mathord{\vee}%
+      \noexpand\textup{I}_2$}}
+  \def\NDORI{\prftree[by]{$\scriptstyle\mathord{\vee}%
+      \noexpand\textup{I}$}}
+  \def\NDORE{\prftree[by]{$\scriptstyle\mathord{\vee}%
+      \noexpand\textup{E}$}}
+  \def\NDOREL#1{\prftree[by]{$\scriptstyle{\vee}%
+      {\noexpand\textup{E}}^{\noexpand\prfref<#1>}$}}
   \ifprfIMPOption
-    \def\NDIMPI{\prftree[by]{$\scriptstyle\supset\prfscript{I}$}}
-    \def\NDIMPE{\prftree[by]{$\scriptstyle\supset\prfscript{E}$}}
-    \def\NDIMPIL#1{\prftree[by]{$\scriptstyle\supset%
-        \prfscript{I}_{\prfref<#1>}$}}
+    \def\NDIMPI{\prftree[by]{$\scriptstyle\mathord{\supset}%
+        \noexpand\textup{I}$}}
+    \def\NDIMPE{\prftree[by]{$\scriptstyle\mathord{\supset}%
+        \noexpand\textup{E}$}}
+    \def\NDIMPIL#1{\prftree[by]{$\scriptstyle\mathord{\supset}%
+        \noexpand\textup{I}^{\noexpand\prfref<#1>}$}}
   \else
-    \def\NDIMPI{\prftree[by]{$\scriptstyle\rightarrow%
-        \prfscript{I}$}}
-    \def\NDIMPE{\prftree[by]{$\scriptstyle\rightarrow%
-        \prfscript{E}$}}
+    \def\NDIMPI{\prftree[by]{$\scriptstyle\mathord{\rightarrow}%
+        \noexpand\textup{I}$}}
+    \def\NDIMPE{\prftree[by]{$\scriptstyle\mathord{\rightarrow}%
+        \noexpand\textup{E}$}}
     \def\NDIMPIL#1{%
-      \prftree[by]{$\scriptstyle\rightarrow%
-        \prfscript{I}_{\prfref<#1>}$}}\fi
-  \def\NDORIR{\prftree[by]{$\scriptstyle\vee%
-      \prfscript{I}_{\prfscript{R}}$}}
-  \def\NDORIL{\prftree[by]{$\scriptstyle\vee%
-      \prfscript{I}_{\prfscript{L}}$}}
-  \def\NDORI{\prftree[by]{$\scriptstyle\vee\prfscript{I}$}}
-  \def\NDORE{\prftree[by]{$\scriptstyle\vee\prfscript{E}$}}
-  \def\NDOREL#1{\prftree[by]{$\scriptstyle\vee%
-      \prfscript{I}_{\prfref<#1>}$}}
-  \def\NDALLI{\prftree[by]{$\scriptstyle\forall\prfscript{I}$}}
-  \def\NDALLE{\prftree[by]{$\scriptstyle\forall\prfscript{E}$}}
-  \def\NDEXI{\prftree[by]{$\scriptstyle\exists\prfscript{I}$}}
-  \def\NDEXE{\prftree[by]{$\scriptstyle\exists\prfscript{E}$}}
+      \prftree[by]{$\scriptstyle\mathord{\rightarrow}%
+        \noexpand\textup{I}^{\noexpand\prfref<#1>}$}}\fi
+  \def\NDNOTI{\prftree[by]{$\scriptstyle\mathord{\neg}%
+      \noexpand\textup{I}$}}
+  \def\NDNOTIL#1{\prftree[by]{$\scriptstyle{\neg}%
+      \noexpand\textup{I}^{\noexpand\prfref<#1>}$}}
+  \def\NDNOTE{\prftree[by]{$\scriptstyle\mathord{\neg}%
+      \noexpand\textup{E}$}}
+  \def\NDALLI{\prftree[by]{$\scriptstyle\mathord{\forall}%
+      \noexpand\textup{I}$}}
+  \def\NDALLE{\prftree[by]{$\scriptstyle\mathord{\forall}%
+      \noexpand\textup{E}$}}
+  \def\NDEXI{\prftree[by]{$\scriptstyle\mathord{\exists}%
+      \noexpand\textup{I}$}}
+  \def\NDEXE{\prftree[by]{$\scriptstyle\mathord{\exists}%
+      \noexpand\textup{E}$}}
   \def\NDEXEL#1{%
-    \prftree[by]{$\scriptstyle\exists\prfscript{E}_{\prfref<#1>}$}}
-  \def\NDTI{\prftree[by]{$\scriptstyle\top\prfscript{I}$}}
-  \def\NDFE{\prftree[by]{$\scriptstyle\bot\prfscript{E}$}}
-  \def\NDLEM{\prftree[by]{$\scriptstyle\prfscript{lem}$}}
+    \prftree[by]{$\scriptstyle\mathord{\exists}%
+      \noexpand\textup{E}^{\noexpand\prfref<#1>}$}}
+  \def\NDTI{\prftree[by]{$\scriptstyle\mathord{\top}%
+      \noexpand\textup{I}$}}
+  \def\NDFE{\prftree[by]{$\scriptstyle\mathord{\bot}%
+      \noexpand\textup{E}$}}
+  \def\NDLEM{\prftree[by]{$\scriptstyle\noexpand\textup{lem}$}}
+  \def\NDAX{\prftree[by]{$\scriptstyle\noexpand\textup{ax}$}}
 \fi
 
 % -------------------------------------------------------------------
@@ -1017,30 +1035,40 @@
   \def\SEQA{\prfassumption}
   \def\SEQD{\prfboundedassumption}
   \def\SEQP{\prftree}
-  \def\SEQAX{\prftree[by]{$\scriptstyle\prfscript{Ax}$}}
-  \def\SEQLF{\prftree[by]{$\scriptstyle\prfscript{L}\bot$}}
-  \def\SEQLW{\prftree[by]{$\scriptstyle\prfscript{LW}$}}
-  \def\SEQRW{\prftree[by]{$\scriptstyle\prfscript{RW}$}}
-  \def\SEQLC{\prftree[by]{$\scriptstyle\prfscript{LC}$}}
-  \def\SEQRC{\prftree[by]{$\scriptstyle\prfscript{RC}$}}
-  \def\SEQLAND{\prftree[by]{$\scriptstyle\prfscript{L}\wedge$}}
-  \def\SEQRAND{\prftree[by]{$\scriptstyle\prfscript{R}\wedge$}}
-  \def\SEQLOR{\prftree[by]{$\scriptstyle\prfscript{L}\vee$}}
-  \def\SEQROR{\prftree[by]{$\scriptstyle\prfscript{R}\vee$}}
+  \def\SEQAX{\prftree[by]{$\scriptstyle\noexpand\textup{Ax}$}}
+  \def\SEQLF{\prftree[by]{$\scriptstyle\noexpand\textup{L}\bot$}}
+  \def\SEQLW{\prftree[by]{$\scriptstyle\noexpand\textup{LW}$}}
+  \def\SEQRW{\prftree[by]{$\scriptstyle\noexpand\textup{RW}$}}
+  \def\SEQLC{\prftree[by]{$\scriptstyle\noexpand\textup{LC}$}}
+  \def\SEQRC{\prftree[by]{$\scriptstyle\noexpand\textup{RC}$}}
+  \def\SEQLAND{\prftree[by]{$\scriptstyle\noexpand\textup{L}%
+      \mathord{\wedge}$}}
+  \def\SEQRAND{\prftree[by]{$\scriptstyle\noexpand\textup{R}%
+      \mathord{\wedge}$}}
+  \def\SEQLOR{\prftree[by]{$\scriptstyle\noexpand\textup{L}%
+      \mathord{\vee}$}}
+  \def\SEQROR{\prftree[by]{$\scriptstyle\noexpand\textup{R}%
+      \mathord{\vee}$}}
   \ifprfIMPOption
-    \def\SEQLIMP{\prftree[by]{$\scriptstyle\prfscript{L}\supset$}}
-    \def\SEQRIMP{\prftree[by]{$\scriptstyle\prfscript{R}\supset$}}
+    \def\SEQLIMP{\prftree[by]{$\scriptstyle\noexpand\textup{L}%
+        \mathord{\supset}$}}
+    \def\SEQRIMP{\prftree[by]{$\scriptstyle\noexpand\textup{R}%
+        \mathord{\supset}$}}
   \else
-    \def\SEQLIMP{\prftree[by]{$\scriptstyle\prfscript{L}%
-        \rightarrow$}}
-    \def\SEQRIMP{\prftree[by]{$\scriptstyle\prfscript{R}%
-        \rightarrow$}}
+    \def\SEQLIMP{\prftree[by]{$\scriptstyle\noexpand\textup{L}%
+        \mathord{\rightarrow}$}}
+    \def\SEQRIMP{\prftree[by]{$\scriptstyle\noexpand\textup{R}%
+        \mathord{\rightarrow}$}}
   \fi
-  \def\SEQLALL{\prftree[by]{$\scriptstyle\prfscript{L}\forall$}}
-  \def\SEQRALL{\prftree[by]{$\scriptstyle\prfscript{R}\forall$}}
-  \def\SEQLEX{\prftree[by]{$\scriptstyle\prfscript{L}\exists$}}
-  \def\SEQREX{\prftree[by]{$\scriptstyle\prfscript{R}\exists$}}
-  \def\SEQCUT{\prftree[by]{$\scriptstyle\prfscript{Cut}$}}
+  \def\SEQLALL{\prftree[by]{$\scriptstyle\noexpand\textup{L}%
+      \mathord{\forall}$}} 
+  \def\SEQRALL{\prftree[by]{$\scriptstyle\noexpand\textup{R}%
+      \mathord{\forall}$}}
+  \def\SEQLEX{\prftree[by]{$\scriptstyle\noexpand\textup{L}%
+      \mathord{\exists}$}}
+  \def\SEQREX{\prftree[by]{$\scriptstyle\noexpand\textup{R}%
+      \mathord{\exists}$}}
+  \def\SEQCUT{\prftree[by]{$\scriptstyle\noexpand\textup{Cut}$}}
 \fi
 
 % -------------------------------------------------------------------