From 25b22d051f604243eafddac4e9e54e56f80f0f66 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Sep 2016 21:36:10 +0000 Subject: prftree (3sep16) git-svn-id: svn://tug.org/texlive/trunk@41985 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/prftree/prftree.sty | 35 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 13 deletions(-) (limited to 'Master/texmf-dist/tex/latex/prftree') diff --git a/Master/texmf-dist/tex/latex/prftree/prftree.sty b/Master/texmf-dist/tex/latex/prftree/prftree.sty index 425c1493d71..8f77541c058 100644 --- a/Master/texmf-dist/tex/latex/prftree/prftree.sty +++ b/Master/texmf-dist/tex/latex/prftree/prftree.sty @@ -1,7 +1,7 @@ % % prftree.sty -% by Marco Benini - 11th January 2016 -% v1.4 +% by Marco Benini - 3rd September 2016 +% v1.5 % % A package to typeset natural deduction proofs, or sequent proofs, or % tableau proofs @@ -10,7 +10,7 @@ % \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{prftree}[2016/01/11 Natural Deduction Proofs] +\ProvidesPackage{prftree}[2016/09/03 Natural Deduction Proofs] % Package options: deactivated by default \newif\ifprf@NDOption\prf@NDOptionfalse @@ -139,9 +139,9 @@ % conclusion and the list of (direct) assumptions \newdimen\prflineextra\prflineextra.3em -% \prflinethickness default 0.2pt +% \prflinethickness default 0.12ex % the thickness of the proof line -\newdimen\prflinethickness\prflinethickness.2pt +\newdimen\prflinethickness\prflinethickness.12ex % \prfemptylinethickness default 4 times the linethickness % the thickness of the proof line which has to be drawn but it is empty @@ -155,13 +155,13 @@ % the space between the label and the proof line \newdimen\prflabelskip\prflabelskip.2em -% \prfinterspace default .6em +% \prfinterspace default .8em % the space between two subsequent assumptions -\newdimen\prfinterspace\prfinterspace.6em +\newdimen\prfinterspace\prfinterspace.8em % \prfdoublelineinterspace default 1.2pt % the space between a double line -\newdimen\prfdoublelineinterspace\prfdoublelineinterspace1.2pt +\newdimen\prfdoublelineinterspace\prfdoublelineinterspace0.06ex % \prfboundedstyle default 0 % defines the style of bounded (discharged) assumptions: @@ -183,7 +183,7 @@ % \prffancyline % the command to draw "fancy" lines \def\prffancyline{\cleaders\hbox to .63em% - {\hss\raisebox{-.5ex}[.2ex][0pt]{$\sim$}\hss}\hfill} + {\hss\raisebox{-.4ex}[.2ex][0pt]{$\sim$}\hss}\hfill} % \prfConclusionBox % the command to draw the conclusion box @@ -565,7 +565,7 @@ \setbox\prf@summarybox\hbox{$\cdot$}% %\prf@tmp\wd\prf@summarybox% \setbox\prf@summarybox% - \vbox to5.2ex{\cleaders\hbox{$\cdot$}\vfill}% + \vbox to4.2ex{\cleaders\hbox{$\cdot$}\vfill}% \setbox\prf@summarybox\hbox{\usebox{\prf@summarybox}% \hbox{\ \box\prf@summary@label}}% %\wd\prf@summarybox\prf@tmp% @@ -854,13 +854,22 @@ \setbox\prf@fancybox\hbox to2\prf@linewd{\prffancyline}\else% \ifprf@dashedline% \setbox\prf@fancybox% - \hbox to2\prf@linewd{\cleaders\hbox to.5em{\hss\_\hss}\hfill}\else% +% \hbox to2\prf@linewd{\cleaders\hbox +% to.5em{\hss\_\hss}\hfill}\else% + \hbox to2\prf@linewd{\cleaders\hbox to.5em{% + \hss\vrule height\prflinethickness% + width.3em depth0pt\hss}\hfill}% + \setbox\prf@fancybox\hbox to2\prf@linewd{% + \raise.4ex\box\prf@fancybox}\else% \ifprf@dottedline% \setbox\prf@fancybox% - \hbox to2\prf@linewd{\cleaders\hbox to.33em{\hss.\hss}\hfill}\else% + \hbox to2\prf@linewd{\cleaders\hbox% + to.33em{\hss$\cdot$\hss}\hfill}\else% % it must be a straight line! \setbox\prf@fancybox\hbox{\vrule width2\prf@linewd% - height\prflinethickness}\fi\fi\fi% + height\prflinethickness}% + \setbox\prf@fancybox\hbox{\raise.4ex% + \box\prf@fancybox}\fi\fi\fi% % If the line is double, we draw it twice with enough % (doublelineinterspace) space between the two copies. \ifprf@doubleline% -- cgit v1.2.3