diff options
author | Karl Berry <karl@freefriends.org> | 2022-02-04 22:19:22 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-02-04 22:19:22 +0000 |
commit | 04a585df0c1efc659651ea6535edbb43558c83ca (patch) | |
tree | 3b3fda67fb21339528700d9479444459184318ad /Master/texmf-dist/tex | |
parent | 791a232caa9b4caf8f61713ddd320d9305a2270b (diff) |
sankey (4feb22)
git-svn-id: svn://tug.org/texlive/trunk@61874 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
3 files changed, 52 insertions, 30 deletions
diff --git a/Master/texmf-dist/tex/latex/sankey/sankey-doc-preamble.sty b/Master/texmf-dist/tex/latex/sankey/sankey-doc-preamble.sty index 9bfa992cf80..b48fa927ffc 100644 --- a/Master/texmf-dist/tex/latex/sankey/sankey-doc-preamble.sty +++ b/Master/texmf-dist/tex/latex/sankey/sankey-doc-preamble.sty @@ -1,4 +1,4 @@ -\usepackage[paper=a4paper,vmargin=1.5cm,left=4.5cm,right=3.5cm]{geometry} +\usepackage[paper=a4paper,vmargin=1.5cm,left=4.5cm,right=3.5cm,marginparwidth=3.5cm]{geometry} \usepackage[utf8]{inputenc} \usepackage{cmap} \usepackage[T1]{fontenc} @@ -6,6 +6,7 @@ \usepackage[final,protrusion=true,expansion=true]{microtype} \usepackage{xcolor} \PassOptionsToPackage{final,colorlinks,linkcolor=red!60!orange!85!black}{hyperref} +\usepackage{dtxdescribe} \usepackage[numbered]{hypdoc} \usepackage{fancyvrb} \usepackage[final]{listings} @@ -24,7 +25,7 @@ \embedfile[mimetype=text/plain]{sankey.ins} \usepackage{sankey} -\colorlet{bgcode}{yellow!50!gray!5} +\colorlet{bgcode}{yellow!50!gray!10} \colorlet{keyword}{blue!50!cyan!50!black} \colorlet{comment}{red!75!black} @@ -81,6 +82,14 @@ \lstdefinestyle{textscriptsize}{basicstyle=\color{black}\scriptsize\mdseries\ttfamily} \lstdefinestyle{texttiny}{basicstyle=\color{black}\tiny\mdseries\ttfamily} +\lstdefinestyle{bash}{ + language=bash, + backgroundcolor=\color{gray!10}, +} +\lstdefinestyle{bashsmall}{style=bash,style=textsmall} +\lstdefinestyle{bashfootnotesize}{style=bash,style=footnotesize} +\lstdefinestyle{bashscriptsize}{style=bash,style=scriptsize} + \lstdefinestyle{LaTeX}{ language=[LaTeX]TeX, moretexcs={ @@ -152,6 +161,7 @@ \begingroup % \def\keypath{#1}% + \ifdefempty{\keypath}{\def\keypath{\sankeykeysprefix}}{}% \def\key{#2}% \def\val{#3}% \def\default{#4}% @@ -160,9 +170,10 @@ % \vspace{.25\baselineskip plus .25\baselineskip minus 0mm} \parfillskip 0pt plus 1fil% \leavevmode% + \DescribeKey{\key}% \ttfamily% - \hspace*{-1cm}% - \textcolor{red!75!black}{\texttt{\docprefix{\ifdefempty{\keypath}{\sankeykeysprefix/}{\keypath/}}\key}}% + %\hspace*{-1cm}% + \textcolor{red!75!black}{\texttt{\docprefix{\keypath/}\key}}% \ifdefempty{\val}{}{=\val}% \hfill% \ifdefempty{\default}{\null}{(default:\,\constant{\default})}% @@ -176,7 +187,7 @@ \enditemize% } -\newcommand\MACRO{\hspace*{-1cm}} +\newcommand\MACRO{\hspace*{0cm}} \newlist{sankeyconstantsdesc}{description}{1} \setlist[sankeyconstantsdesc]{align=right,labelindent=1.5em,labelsep=.5em,leftmargin=!,font=\normalfont} @@ -221,6 +232,37 @@ \fontencoding\encodingdefault \fontfamily\ttdefault \fontseries\mddefault - \fontshape\shapedefault - \footnotesize% + \fontshape\updefault + \footnotesize } + +\renewcommand*{\DescribeMacro}[2][]{% + \@bsphack% + \@ifundefined{@captype}{% not float? + \leavevmode% + \marginpar{% + \hbadness=10000% + \hfuzz=5em% + \raggedleft% + \ifblank{#1}{}{{\scriptsize\textsf{[#1]}} }% class + \MacroFont\cmd{#2}% name + }% marginpar + }{}% not float? + \begingroup% + \DTXD@origwrindex{% + \DTXD@macroname{#2}\actualchar\DTXD@verbatimcmd{#2}% name + \ifblank{#1}{}{\levelchar[#1]}% class + \encapchar usage}% + \ifblank{#1}% + {}% no class + {% class given + \begingroup% + \DTXD@origwrindex{% + #1\actualchar[#1]:\levelchar% + \DTXD@macroname{#2}\actualchar\DTXD@verbatimcmd{#2}% + \encapchar usage}% + }% class given + \@esphack% + \ignorespaces% +} + diff --git a/Master/texmf-dist/tex/latex/sankey/sankey.sty b/Master/texmf-dist/tex/latex/sankey/sankey.sty index b6734004f77..502a13be5e3 100644 --- a/Master/texmf-dist/tex/latex/sankey/sankey.sty +++ b/Master/texmf-dist/tex/latex/sankey/sankey.sty @@ -31,7 +31,7 @@ %% sankey-example-energy.tex %% \NeedsTeXFormat{LaTeX2e}[2015/10/01] -\ProvidesPackage{sankey}[2021/03/14 v3.0 to draw Sankey diagrams] +\ProvidesPackage{sankey}[2022/02/04 v3.0.1 to draw Sankey diagrams] \RequirePackage{xparse} \RequirePackage{etoolbox} \RequirePackage{xfp} diff --git a/Master/texmf-dist/tex/latex/sankey/tikzlibrarydubins.code.tex b/Master/texmf-dist/tex/latex/sankey/tikzlibrarydubins.code.tex index 291bcd771fe..4526f1b937d 100644 --- a/Master/texmf-dist/tex/latex/sankey/tikzlibrarydubins.code.tex +++ b/Master/texmf-dist/tex/latex/sankey/tikzlibrarydubins.code.tex @@ -30,32 +30,27 @@ %% sankey-example3-variation.tex, sankey-example4.tex, %% sankey-example-energy.tex %% -\def\tikzlibrarydubins@version{v3.0} -\def\tikzlibrarydubins@date{2021/03/14} - +\def\tikzlibrarydubins@version{v3.0.1} +\def\tikzlibrarydubins@date{2022/02/04} \usetikzlibrary{calc} \RequirePackage{etoolbox} \RequirePackage{xfp} \newbool{dubinspathreverse} - \def\ifpgfmathcond#1{% \pgfmathparse{(#1)?1:0}% \ifnumequal{\pgfmathresult}{1}% } - \def\dbp@getxy#1#2#3{% \tikz@scan@one@point\pgfutil@firstofone(#3)\relax% \edef#1{\the\pgf@x}% \edef#2{\the\pgf@y}% } - \def\dbp@anglebetween#1#2#3{%macro, s, t \dbp@getxy\dbp@ax\dbp@ay{#2} \dbp@getxy\dbp@bx\dbp@by{#3} \pgfmathsetmacro#1{atan2(\dbp@by-\dbp@ay,\dbp@bx-\dbp@ax)} } - \def\dbp@distancebetween#1#2#3{%macro, s, t \dbp@getxy\dbp@ax\dbp@ay{#2} \dbp@getxy\dbp@bx\dbp@by{#3} @@ -64,7 +59,6 @@ +(\dbp@by-\dbp@ay)*(\dbp@by-\dbp@ay)% )}}% } - \newcommand\dbp@rsr{% s, sa, t, ta, as, len, at, r let \p{tr}=([shift={(\dbp@angb-90:\dbp@radius pt)}]\dbp@b), @@ -76,7 +70,6 @@ -- ([shift={(\p{tr})}]\n3:\dbp@rradius pt) arc(\n3:\n2:\dbp@rradius pt) } - \newcommand\dbp@lsl{% s, sa, t, ta, as, len, at, r let \p{tl}=([shift={(\dbp@angb+90:\dbp@radius pt)}]\dbp@b), @@ -87,7 +80,6 @@ -- ([shift={(\p{tl})}]\n4:\dbp@lradius pt) arc(\n4:\n3:\dbp@lradius pt) } - \newcommand\dbp@rsl{% s, sa, t, ta, as, len, at, r let \p{tl}=([shift={(\dbp@angb+90:\dbp@radius pt)}]\dbp@b), @@ -98,7 +90,6 @@ -- ([shift={(\p{tl})}]\n4:\dbp@lradius pt) arc(\n4:\n3:\dbp@lradius pt) } - \newcommand\dbp@lsr{% s, sa, t, ta, as, len, at, r let \p{tr}=([shift={(\dbp@angb-90:\dbp@radius pt)}]\dbp@b), @@ -109,7 +100,6 @@ -- ([shift={(\p{tr})}]\n4:\dbp@rradius pt) arc(\n4:\n3:\dbp@rradius pt) } - \newcommand\dbp@lrl{% s, sa, t, ta, as, ai, at, r let \n1={\dbp@anga-90},\n2={\n1+\dbp@firstangle}, @@ -119,7 +109,6 @@ arc(\n2+180:\n2+180-\dbp@midparam:\dbp@rradius pt) arc(\n4:\n3:\dbp@lradius pt) } - \newcommand\dbp@rlr{% s, sa, t, ta, as, ai, at, r let \n1={\dbp@anga+90},\n2={\n1-\dbp@firstangle}, @@ -135,7 +124,6 @@ \newcommand\dbp@rev@rsl{\dbp@rsl} \newcommand\dbp@rev@lrl{\dbp@rlr} \newcommand\dbp@rev@rlr{\dbp@lrl} - \newcommand\dubinspath[1]{% \pgfextra{ \dubinspathset{#1} @@ -163,9 +151,6 @@ } \csname dbp@\dbp@method\endcsname% } - -%% solution - \def\dbp@store#1#2{% \expandafter\xdef\csname dbp@store@#1@#2\endcsname% {\csname dbp@#2\endcsname}% @@ -173,7 +158,6 @@ \def\dbp@get#1#2{% \csname dbp@store@#1@#2\endcsname% } - \def\dbp@setparams#1#2#3#4#5{% % method, length, fisrt angle, middle param, last angle \edef\dbp@method{#1} @@ -187,13 +171,11 @@ } }{} } - \def\dbp@updateparams#1#2#3#4#5{ \ifpgfmathcond{#2<\dbp@length}{ \dbp@setparams{#1}{#2}{#3}{#4}{#5} }{} } - \tikzset{ dubins path/.is family, dubins path, @@ -224,9 +206,7 @@ middle param/.store in=\dbp@midparam, reverse/.is if=dubinspathreverse, } - \newcommand\dubinspathset[1]{\tikzset{dubins path,#1}} - \newcommand\dubinspathcalc[1]{% \begingroup \dubinspathset{#1} |