summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/lt3graph
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-04-09 22:37:41 +0000
committerKarl Berry <karl@freefriends.org>2016-04-09 22:37:41 +0000
commit98ce05a45b8e9828ed278745b2cedb41229dbda9 (patch)
treeb234e01166f1a60771314b95e758641fa37500ca /Master/texmf-dist/tex/latex/lt3graph
parent375669e355bbc43b4650577c1a3d97ea26da6eb2 (diff)
lt3graph (9apr16)
git-svn-id: svn://tug.org/texlive/trunk@40368 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/lt3graph')
-rw-r--r--Master/texmf-dist/tex/latex/lt3graph/lt3graph-packagedoc.cls5
-rw-r--r--Master/texmf-dist/tex/latex/lt3graph/lt3graph.sty20
2 files changed, 13 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/latex/lt3graph/lt3graph-packagedoc.cls b/Master/texmf-dist/tex/latex/lt3graph/lt3graph-packagedoc.cls
index ffabe9aec75..055d6b8401a 100644
--- a/Master/texmf-dist/tex/latex/lt3graph/lt3graph-packagedoc.cls
+++ b/Master/texmf-dist/tex/latex/lt3graph/lt3graph-packagedoc.cls
@@ -110,6 +110,7 @@
alsoletter={_,:},
moretexcs={ExplSyntaxOn,ExplSyntaxOff,lstinputlisting,detokenize,#1}
}
+ \lstMakeShortInline[style=examplecode]|
}
%%% Code formatting
@@ -265,7 +266,7 @@
\vskip-1.05\abovedisplayskip%
}
-\BeforeBeginEnvironment{macrocode}{\vskip.2\abovedisplayskip}
+\BeforeBeginEnvironment{macrocode}{\lstDeleteShortInline|\vskip.2\abovedisplayskip}
%%% Actually surround 'macrocode' with the frame
%
@@ -284,7 +285,7 @@
%%% always go back to it after one code block
%
\interesting
-\AfterEndEnvironment{macrocode}{\vskip\belowdisplayskip\interesting\NoIndentAfterThis}
+\AfterEndEnvironment{macrocode}{\lstMakeShortInline[style=examplecode]|\vskip\belowdisplayskip\interesting\NoIndentAfterThis}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Argument Specifiers and such %
diff --git a/Master/texmf-dist/tex/latex/lt3graph/lt3graph.sty b/Master/texmf-dist/tex/latex/lt3graph/lt3graph.sty
index fea93df9070..5122b60b4f3 100644
--- a/Master/texmf-dist/tex/latex/lt3graph/lt3graph.sty
+++ b/Master/texmf-dist/tex/latex/lt3graph/lt3graph.sty
@@ -1,6 +1,6 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \iffalse %%%%
% %
-% Copyright (c) 2014 - Michiel Helvensteijn (www.mhelvens.net) %
+% Copyright (c) 2016 - Michiel Helvensteijn (www.mhelvens.net) %
% %
% https://github.com/mhelvens/latex-lt3graph %
% %
@@ -48,7 +48,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{lt3graph}{2014/08/31}{0.1.4}
+\ProvidesExplPackage{lt3graph}{2016/03/30}{0.1.5}
{a LaTeX3 datastructure for representing directed graphs with data}
% \end{macrocode}
%
@@ -386,14 +386,14 @@
%
\use:c{prop_#5put:cnf} {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2}
{\int_eval:n {
- \prop_get:cn {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2} + 1
+ \prop_item:cn {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2} + 1
}}
%%% increment incoming degree of vertex #3
%
\use:c{prop_#5put:cnf} {\__graph_tl:nnn{graph}{#1}{indegree}} {#3}
{\int_eval:n {
- \prop_get:cn {\__graph_tl:nnn{graph}{#1}{indegree}} {#3} + 1
+ \prop_item:cn {\__graph_tl:nnn{graph}{#1}{indegree}} {#3} + 1
}}
}
@@ -496,14 +496,14 @@
%
\use:c{prop_#4put:cnf} {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2}
{\int_eval:n {
- \prop_get:cn {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2} - 1
+ \prop_item:cn {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2} - 1
}}
%%% decrement indegree of vertex #3
%
\use:c{prop_#4put:cnf} {\__graph_tl:nnn{graph}{#1}{indegree}} {#3}
{\int_eval:n {
- \prop_get:cn {\__graph_tl:nnn{graph}{#1}{indegree}} {#3} - 1
+ \prop_item:cn {\__graph_tl:nnn{graph}{#1}{indegree}} {#3} - 1
}}
%%% actually remove edge
@@ -831,7 +831,7 @@
%
% \begin{macrocode}
\cs_new:Nn \graph_get_outdegree:Nn {
- \prop_get:cn {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2}
+ \prop_item:cn {\__graph_tl:nnn{graph}{#1}{outdegree}} {#2}
}
% \end{macrocode}
%
@@ -845,7 +845,7 @@
%
% \begin{macrocode}
\cs_new:Nn \graph_get_indegree:Nn {
- \prop_get:cn {\__graph_tl:nnn{graph}{#1}{indegree}} {#2}
+ \prop_item:cn {\__graph_tl:nnn{graph}{#1}{indegree}} {#2}
}
% \end{macrocode}
%
@@ -1357,8 +1357,8 @@
%
\graph_map_outgoing_edges_inline:NVn #1 \l__graph_topo_key_tl {
\prop_put:cnf {l__graph_tmp_indeg_(\int_use:N\g__graph_nesting_depth_int)_prop} {##2}
- {\int_eval:n {\prop_get:cn {l__graph_tmp_indeg_(\int_use:N\g__graph_nesting_depth_int)_prop} {##2} - 1}}
- \int_compare:nT {\prop_get:cn {l__graph_tmp_indeg_(\int_use:N\g__graph_nesting_depth_int)_prop} {##2} = 0} {
+ {\int_eval:n {\prop_item:cn {l__graph_tmp_indeg_(\int_use:N\g__graph_nesting_depth_int)_prop} {##2} - 1}}
+ \int_compare:nT {\prop_item:cn {l__graph_tmp_indeg_(\int_use:N\g__graph_nesting_depth_int)_prop} {##2} = 0} {
\prop_put:cnn {l__graph_source_vertices_(\int_use:N\g__graph_nesting_depth_int)_prop} {##2} {}
} }