diff options
author | Karl Berry <karl@freefriends.org> | 2018-03-11 20:26:48 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2018-03-11 20:26:48 +0000 |
commit | ecd38b6aed911b2332d01f45bb01dee5d0a9bde7 (patch) | |
tree | fdcd5d4d96b0041ae1e02b4e80293d7051bbee2a /Master/texmf-dist/doc | |
parent | 031e05223ac38bfc9129c658004d4222f4a26209 (diff) |
adigraph (10mar18)
git-svn-id: svn://tug.org/texlive/trunk@46922 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/doc')
-rw-r--r-- | Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.pdf | bin | 0 -> 87660 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.tex (renamed from Master/texmf-dist/doc/latex/adigraph/documentation.tex) | 174 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.pdf | bin | 0 -> 16456 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.tex (renamed from Master/texmf-dist/doc/latex/adigraph/test.tex) | 35 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/adigraph/documentation.pdf | bin | 83820 -> 0 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/adigraph/test.pdf | bin | 13329 -> 0 bytes |
6 files changed, 159 insertions, 50 deletions
diff --git a/Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.pdf b/Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.pdf Binary files differnew file mode 100644 index 00000000000..4123dc6ead7 --- /dev/null +++ b/Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.pdf diff --git a/Master/texmf-dist/doc/latex/adigraph/documentation.tex b/Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.tex index d572758fe75..5ec01003f68 100644 --- a/Master/texmf-dist/doc/latex/adigraph/documentation.tex +++ b/Master/texmf-dist/doc/latex/adigraph/adigraph_documentation.tex @@ -1,6 +1,6 @@ \documentclass{report} -\title{Adigraph, V1.2} +\title{Adigraph, V1.3} \author{Luca Cappelletti} \date{March 2018} @@ -118,8 +118,21 @@ Here we create a new Adigraph object, called \textit{myAdigraph}. } \end{minted} +\section{Changing an existing graph} +You can renovate an older graph by calling \textbackslash RenewAdigraph + +\begin{minted}{latex} +\RenewAdigraph{myAdigraph}{ + <nodes here, separated by semicolon> +}{ + <edges here, separated by semicolon> +}{ + <cuts here, separated by semicolon> +} +\end{minted} + \section{Adding nodes} -We set its nodes with the following syntax: \textit{<node name: \(x\) coordinate, \(y\) coordinate, color: label>}. +We set its nodes with the following syntax: \textit{<node name, color: \(x\) coordinate, \(y\) coordinate: label>}. \begin{figure} \begin{subfigure}{0.49\textwidth} @@ -140,24 +153,23 @@ We set its nodes with the following syntax: \textit{<node name: \(x\) coordinate \end{subfigure} \end{figure} - \subsection{Custom node colors} -To color a node you can use the following syntax: \textit{<node name: \(x\) coordinate, \(y\) coordinate, textual color>}. For example, to draw s in red and t in blue we would write: +To color a node you can use the following syntax: \textit{<node name, textual color: \(x\) coordinate, \(y\) coordinate>}. For example, to draw s in red and t in blue we would write: \begin{figure} \begin{subfigure}{0.49\textwidth} \begin{minted}{latex} \NewAdigraph{myAdigraph}{ - s:0,0,red; - t:4,0,blue; + s,red:0,0; + t,blue:4,0; } \myAdigraph{} \end{minted} \end{subfigure} \begin{subfigure}{0.49\textwidth} \NewAdigraph{myAdigraph}{ - s:0,0,red; - t:4,0,blue; + s,red:0,0; + t,blue:4,0; } \myAdigraph{} \end{subfigure} @@ -166,13 +178,13 @@ To color a node you can use the following syntax: \textit{<node name: \(x\) coor Tested available colors are: red, blue, black, green. You may extend the possible colors with LaTex libraries such as xcolor. \subsection{Custom node labels} -To add a custom label you can use the following syntax: either \textit{<node name: \(x\) coordinate, \(y\) coordinate: node label>} or \textit{<node name: \(x\) coordinate, \(y\) coordinate, textual color: node label>} will work: +To add a custom label you can use the following syntax: either \textit{<node name: \(x\) coordinate, \(y\) coordinate: node label>} or \textit{<node name,textual color: \(x\) coordinate, \(y\) coordinate: node label>} will work: \begin{figure} \begin{subfigure}{0.49\textwidth} \begin{minted}{latex} \NewAdigraph{myAdigraph}{ - s:0,0,red:start; + s,red:0,0:start; t:4,0:end; } \myAdigraph{} @@ -180,13 +192,81 @@ To add a custom label you can use the following syntax: either \textit{<node nam \end{subfigure} \begin{subfigure}{0.49\textwidth} \NewAdigraph{myAdigraph}{ - s:0,0,red:start; + s,red:0,0:start; t:4,0:end; } \myAdigraph{} \end{subfigure} \end{figure} +\section{Automatically position nodes} +When no coordinates are given or you just don't have time to think abount where to put those nodes, just choose a radius and Adigraph will position them on the circle of that radius. + +\begin{figure} + \begin{subfigure}{0.49\textwidth} + \begin{minted}{latex} +\NewAdigraph{myAdigraph}{ + 1:0,0; + 2:2; + 3:2; + 4:2; + 5:2; + 6:2; + 7:2; + 8:2; +} +\myAdigraph{} +\end{minted} + \end{subfigure} + \begin{subfigure}{0.49\textwidth} + \NewAdigraph{myAdigraph}{ + 1:0,0; + 2:2; + 3:2; + 4:2; + 5:2; + 6:2; + 7:2; + 8:2; + } + \myAdigraph{} + \end{subfigure} +\end{figure} + +\subsection{Colored automatically positioned nodes} + +\begin{figure} + \begin{subfigure}{0.49\textwidth} + \begin{minted}{latex} +\NewAdigraph{myAdigraph}{ + 1:0,0; + 2,purple:2; + 3,brown:2; + 4,gray:2; + 5,blue:2; + 6,red:2; + 7,green:2; + 8,pink:2; +} +\myAdigraph{} +\end{minted} + \end{subfigure} + \begin{subfigure}{0.49\textwidth} + \NewAdigraph{myAdigraph}{ + 1:0,0; + 2,purple:2; + 3,brown:2; + 4,gray:2; + 5,blue:2; + 6,red:2; + 7,green:2; + 8,pink:2; + } + \myAdigraph{} + \end{subfigure} +\end{figure} + + \section{Adding edges} We set its nodes with the following syntax: \textit{<node name: \(x\) coordinate, \(y\) coordinate, color : label>}. @@ -620,50 +700,46 @@ If you'd like to color the cuts you just have to add the color as follows: \text \end{subfigure} \end{figure} + \chapter{Warnings} \section{Reserved words} I reserve to use for the package the following tokens: \begin{multicols}{2} \begin{enumerate} - \item Adigraph - \item AdigraphAugmentingPaths - \item AdigraphBuildEdge - \item AdigraphBuildEdgeWrapper - \item AdigraphBuildNode - \item AdigraphBuildPath - \item AdigraphCalculateOrientation - \item AdigraphCounter - \item AdigraphCountPaths - \item AdigraphCurrentPathNumber - \item AdigraphCutBuilder - \item AdigraphDrawEdge - \item AdigraphDrawNode - \item AdigraphEdgeBuilder - \item AdigraphEdgeDrawer - \item AdigraphEdgeList - \item AdigraphEdgeName - \item AdigraphElaboratePath - \item AdigraphElaboratePath - \item AdigraphExecuteCutBuilder - \item AdigraphFirstNode - \item AdigraphMemorizeEdge - \item AdigraphMemorizeNode - \item AdigraphNodeBuilder - \item AdigraphNodeList - \item AdigraphNodeName - \item AdigraphNumberOfPaths - \item AdigraphPathBuilder - \item AdigraphProcessAugmentingPaths - \item AdigraphProcessCuts - \item AdigraphProcessEdges - \item AdigraphProcessNodes - \item AdigraphProcessPaths - \item AdigraphRom - \item AdigraphSecondNode - \item AdigraphSimpleSum - \item AdigraphTwinEdgeWeight - \item NewAdigraph + \item \textbackslash Adigraph + \item \textbackslash AdigraphBuildEdge + \item \textbackslash AdigraphBuildEdgeWrapper + \item \textbackslash AdigraphBuildNode + \item \textbackslash AdigraphBuildNodeWrapper + \item \textbackslash AdigraphBuildPath + \item \textbackslash AdigraphCalculateOrientation + \item \textbackslash AdigraphCountPaths + \item \textbackslash AdigraphCutBuilder + \item \textbackslash AdigraphDrawEdge + \item \textbackslash AdigraphDrawNode + \item \textbackslash AdigraphEdgeBuilder + \item \textbackslash AdigraphEdgeDrawer + \item \textbackslash AdigraphElaboratePath + \item \textbackslash AdigraphExecuteCutBuilder + \item \textbackslash AdigraphGenerateNodeName + \item \textbackslash AdigraphMemorizeEdge + \item \textbackslash AdigraphMemorizeNode + \item \textbackslash AdigraphNodeBuilder + \item \textbackslash AdigraphNodeCounter + \item \textbackslash AdigraphNodeCounterSecondWrapper + \item \textbackslash AdigraphNodeCounterWrapper + \item \textbackslash AdigraphNodesCounter + \item \textbackslash AdigraphPathBuilder + \item \textbackslash AdigraphProcessAugmentingPaths + \item \textbackslash AdigraphProcessAugmentingPathsList + \item \textbackslash AdigraphProcessCuts + \item \textbackslash AdigraphProcessEdges + \item \textbackslash AdigraphProcessNodes + \item \textbackslash AdigraphProcessPaths + \item \textbackslash AdigraphSimpleSum + \item \textbackslash NewAdigraph + \item \textbackslash RenewAdigraph \end{enumerate} \end{multicols} diff --git a/Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.pdf b/Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.pdf Binary files differnew file mode 100644 index 00000000000..f9d1eb94f6e --- /dev/null +++ b/Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.pdf diff --git a/Master/texmf-dist/doc/latex/adigraph/test.tex b/Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.tex index ba12098a92a..ac4c40406e9 100644 --- a/Master/texmf-dist/doc/latex/adigraph/test.tex +++ b/Master/texmf-dist/doc/latex/adigraph/adigraph_working_test.tex @@ -2,7 +2,7 @@ \usepackage{adigraph} -\title{Adigraph, V1.2, small working test} +\title{Adigraph, V1.3, small working test} \author{Luca Cappelletti} \date{March 2018} @@ -39,4 +39,37 @@ 2,t,red; 3,4,blue; } + +\NewAdigraph{mySecondAdigraph}{ + s:3; + 1:3; + 3:3; + 2:3; + 4:3; + t:3; +}{ + s,1:25; + s,3:25; + 3,4:25; + 1,2:35; + 2,t:20; + 4,t:30; + 3,1:10; + 4,2:10; + 2,3:15::near start; + 4,1:5::near start; +} + +\mySecondAdigraph{} + + +\mySecondAdigraph{ + s,3,4,2,t:5; +} + +\mySecondAdigraph{}{ + 2,t,red; + 3,4,blue; +} + \end{document}
\ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/adigraph/documentation.pdf b/Master/texmf-dist/doc/latex/adigraph/documentation.pdf Binary files differdeleted file mode 100644 index 911e38550ad..00000000000 --- a/Master/texmf-dist/doc/latex/adigraph/documentation.pdf +++ /dev/null diff --git a/Master/texmf-dist/doc/latex/adigraph/test.pdf b/Master/texmf-dist/doc/latex/adigraph/test.pdf Binary files differdeleted file mode 100644 index bd969940ca7..00000000000 --- a/Master/texmf-dist/doc/latex/adigraph/test.pdf +++ /dev/null |