summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/prooftrees
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-05-16 20:32:08 +0000
committerKarl Berry <karl@freefriends.org>2016-05-16 20:32:08 +0000
commitc2ffe27df1f02739921c26139f1973129fbd9130 (patch)
tree8bdb44d3f19b64fc99a1562bfc301e8daa9c1951 /Master/texmf-dist/tex/latex/prooftrees
parentc5232700da89fdca33b75e975c14c18128d0b656 (diff)
prooftrees (16may16)
git-svn-id: svn://tug.org/texlive/trunk@41196 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/prooftrees')
-rw-r--r--Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty22
1 files changed, 13 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty b/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty
index 5fbad137a5b..f4bfe810a73 100644
--- a/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty
+++ b/Master/texmf-dist/tex/latex/prooftrees/prooftrees.sty
@@ -16,7 +16,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{svn-prov}
-\ProvidesPackageSVN{$Id: prooftrees.sty 4688 2016-03-19 02:35:06Z cfrees $}[v0.3 \revinfo]
+\ProvidesPackageSVN{$Id: prooftrees.sty 4891 2016-05-08 01:08:29Z cfrees $}[v0.4 pgfmath branch \revinfo]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{forest}}
\ProcessOptions
\RequirePackage{forest}[2016/03/04]
@@ -204,12 +204,15 @@
process keylist register=line no format,
delay={%
proof tree lcount'+=1,
- content/.expanded/.wrap pgfmath arg={\linenumberstyle{##1}}{int(proof_tree_lcount+line_no_shift)},% content i.e. the line number
- name/.expanded={line no \foresteregister{proof tree lcount}},% name them so they can be moved later
+ tempcounta=int((proof_tree_lcount)+(line_no_shift)),
+ content/.wrap pgfmath arg={\linenumberstyle{##1}}{tempcounta},% content i.e. the line number
+ name/.expanded={line no \foresteregister{tempcounta}},% name them so they can be moved later
+% content/.expanded/.wrap pgfmath arg={\linenumberstyle{##1}}{int(proof_tree_lcount+line_no_shift)},% content i.e. the line number
+% name/.expanded={line no \foresteregister{proof tree lcount}},% name them so they can be moved later
typeset node,
if={proof_tree_lcount>2}{% the initial location of most line numbers is incorrect and they must be moved
for previous={% move the line number below the previous line number
- append/.expanded={line no \foresteregister{proof tree lcount}}
+ append/.expanded={line no \foresteregister{tempcounta}}
},
}{},
},
@@ -222,11 +225,12 @@
process keylist register=just format,
delay={%
proof tree jcount'+=1,
- name/.expanded={just \foresteregister{proof tree jcount}},% name them so they can be moved
+ tempcounta=int((proof_tree_jcount)+(line_no_shift)),
+ name/.expanded={just \foresteregister{tempcounta}},% name them so they can be moved
typeset node,% angen i osgoi broblemau 'da highlight just/line etc.
if={proof_tree_jcount>2}{% correct the location as for the line numbers (cf. line no style)
for previous={%
- append/.expanded={just \foresteregister{proof tree jcount}}
+ append/.expanded={just \foresteregister{tempcounta}}
},
}{},
},
@@ -315,7 +319,7 @@
[,
proof tree line no,
% () to group are required here - otherwise, the -1 (or -2 or whatever) is silently ignored
- repeat={(proof_tree_rhif_lefelau)-1}{% most are created in the wrong place but proof tree line no moves them later
+ repeat={((proof_tree_rhif_lefelau)-1)-(line_no_shift)}{% most are created in the wrong place but proof tree line no moves them later
delay n={proof_tree_lcount}{
append={[, proof tree line no]}
},
@@ -329,7 +333,7 @@
append={%
[,
proof tree line justification,
- repeat={(proof_tree_rhif_lefelau)-1}{% most are created in the wrong place but proof tree line justification moves them later
+ repeat={((proof_tree_rhif_lefelau)-1)-(line_no_shift)}{% most are created in the wrong place but proof tree line justification moves them later
delay n={proof_tree_jcount}{
append={[, proof tree line justification]}
},
@@ -423,7 +427,7 @@
tempcounta-/.option=level,
tempcounta'+=1,
move by/.register=tempcounta,
- }{},
+ }{no edge},
}{no edge},
},
proof tree aros'+=2,