From 1d2f86703b12cd7144620a2cbb2a8f54671fb2fa Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 11 Feb 2020 22:09:05 +0000 Subject: tikz-trackschematic (11feb20) git-svn-id: svn://tug.org/texlive/trunk@53754 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/tikz-trackschematic/README.md | 5 ++ .../tikz-trackschematic-documentation.sty | 10 ++- .../tikz-trackschematic-snippets.pdf | Bin 147916 -> 149835 bytes .../tikz-trackschematic-snippets.tex | 22 +++-- .../block_end_marker_backward.tikz | 13 --- .../block_end_marker_forward.tikz | 13 --- .../braking_point_backward.tikz | 13 +++ .../braking_point_forward.tikz | 13 +++ .../danger_point_backward.tikz | 13 +++ .../danger_point_forward.tikz | 13 +++ .../end_of_movement_authority_backward.tikz | 13 +++ .../end_of_movement_authority_forward.tikz | 13 +++ .../tikz-trackschematic/tikz-trackschematic.pdf | Bin 205165 -> 206717 bytes .../tikz-trackschematic/tikz-trackschematic.tex | 94 ++++++++++++++------- 14 files changed, 170 insertions(+), 65 deletions(-) delete mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_backward.tikz delete mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_forward.tikz create mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_backward.tikz create mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_forward.tikz create mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_backward.tikz create mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_forward.tikz create mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_backward.tikz create mode 100644 Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_forward.tikz (limited to 'Master/texmf-dist/doc') diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/README.md b/Master/texmf-dist/doc/latex/tikz-trackschematic/README.md index 9148aebef52..9cc86f18723 100644 --- a/Master/texmf-dist/doc/latex/tikz-trackschematic/README.md +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/README.md @@ -40,6 +40,11 @@ These files should be copied wherever TeX can find it, for example in your TEXMF # History +## Version 0.5.1 + + * modified symbol "end of movement authority" + * added symbols "braking point" and "danger point" + ## Version 0.5 * new improved syntax for topology diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-documentation.sty b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-documentation.sty index 46ddf742d0a..66bc2065a92 100644 --- a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-documentation.sty +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-documentation.sty @@ -81,7 +81,15 @@ \RequirePackage{longtable,tikz,siunitx,adjustbox,rotating} \sisetup{math-rm=\mathsf} -\usetikzlibrary{trackschematic} +\IfFileExists{tikzlibrarytrackschematic-dev.code.tex}{% + \usetikzlibrary{trackschematic-dev.topology}% + \usetikzlibrary{trackschematic-dev.trafficcontrol}% + \usetikzlibrary{trackschematic-dev.vehicles}% + \usetikzlibrary{trackschematic-dev.constructions}% + \usetikzlibrary{trackschematic-dev.messures}% +}{% + \usetikzlibrary{trackschematic}% +}% \def\rootTrackschematic{.} diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.pdf b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.pdf index 3b74c49bebe..1ad91341215 100644 Binary files a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.pdf and b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.tex b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.tex index 7ada4e00c30..7deb9f0c01e 100644 --- a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.tex +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets.tex @@ -179,10 +179,6 @@ & \symbol{train_drive_human.tikz} & \code{train_drive_human.tikz} & \texttt{vehicles} \\ \hline \No & train running over a junction & \symbol{bend_train.tikz} & \code{bend_train.tikz} & \texttt{vehicles} \\ - \hline - \No & view point (forward) & \symbol{view_point_forward.tikz} & \code{view_point_forward.tikz} & \texttt{trafficcontrol} \\ - \hline - \No & view point (backward) & \symbol{view_point_backward.tikz} & \code{view_point_backward.tikz} & \texttt{trafficcontrol} \\ \hline \No & distant signal (forward) & \symbol{distant_signal_forward.tikz} & \code{distant_signal_forward.tikz} & \texttt{trafficcontrol} \\ \hline @@ -221,9 +217,23 @@ \hline \No & shunt limit (backward) & \symbol{shunt_limit_backward.tikz} & \code{shunt_limit_backward.tikz} & \texttt{trafficcontrol} \\ \hline - \No & block end marker (forward) & \symbol{block_end_marker_forward.tikz} & \code{block_end_marker_forward.tikz} & \texttt{trafficcontrol} \\ + \No & view point (forward) & \symbol{view_point_forward.tikz} & \code{view_point_forward.tikz} & \texttt{trafficcontrol} \\ + \hline + \No & view point (backward) & \symbol{view_point_backward.tikz} & \code{view_point_backward.tikz} & \texttt{trafficcontrol} \\ + \hline + \No & braking point (forward) & \symbol{braking_point_forward.tikz} & \code{braking_point_forward.tikz} & \texttt{trafficcontrol} \\ + \hline + \No & braking point (backward) & \symbol{braking_point_backward.tikz} & \code{braking_point_backward.tikz} & \texttt{trafficcontrol} \\ + \hline + \No & end of movement authority (forward) + & \symbol{end_of_movement_authority_forward.tikz} & \code{end_of_movement_authority_forward.tikz} & \texttt{trafficcontrol} \\ + \hline + \No & end of movement authority (backward) + & \symbol{end_of_movement_authority_backward.tikz} & \code{end_of_movement_authority_backward.tikz} & \texttt{trafficcontrol} \\ + \hline + \No & danger point (forward) & \symbol{danger_point_forward.tikz} & \code{danger_point_forward.tikz} & \texttt{trafficcontrol} \\ \hline - \No & block end marker (backward) & \symbol{block_end_marker_backward.tikz} & \code{block_end_marker_backward.tikz} & \texttt{trafficcontrol} \\ + \No & danger point (backward) & \symbol{danger_point_backward.tikz} & \code{danger_point_backward.tikz} & \texttt{trafficcontrol} \\ \hline \No & route (forward \& backward) & \symbol{route.tikz} & \code{route.tikz} & \texttt{trafficcontrol} \\ \hline diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_backward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_backward.tikz deleted file mode 100644 index 9e36abeadbd..00000000000 --- a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_backward.tikz +++ /dev/null @@ -1,13 +0,0 @@ -%!TEX TS-program = pdflatexmk -%!TEX root = ../snippets.tex - -% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) -% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - -\coordinate (A) at (0,0); -\coordinate (B) at (6,0); -\coordinate (S) at (3,0); - -\maintrack (A) -- (B); - -\movementauthority[backward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_forward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_forward.tikz deleted file mode 100644 index 81ec5fd65aa..00000000000 --- a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/block_end_marker_forward.tikz +++ /dev/null @@ -1,13 +0,0 @@ -%!TEX TS-program = pdflatexmk -%!TEX root = ../snippets.tex - -% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) -% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - -\coordinate (A) at (0,0); -\coordinate (B) at (6,0); -\coordinate (S) at (3,0); - -\maintrack (A) -- (B); - -\movementauthority[forward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_backward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_backward.tikz new file mode 100644 index 00000000000..72803b2b455 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_backward.tikz @@ -0,0 +1,13 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../snippets.tex + +% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) +% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +\coordinate (A) at (0,0); +\coordinate (B) at (6,0); +\coordinate (S) at (3,0); + +\maintrack (A) -- (B); + +\brakingpoint[backward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_forward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_forward.tikz new file mode 100644 index 00000000000..da340269654 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/braking_point_forward.tikz @@ -0,0 +1,13 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../snippets.tex + +% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) +% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +\coordinate (A) at (0,0); +\coordinate (B) at (6,0); +\coordinate (S) at (3,0); + +\maintrack (A) -- (B); + +\brakingpoint[forward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_backward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_backward.tikz new file mode 100644 index 00000000000..a8a4905ac69 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_backward.tikz @@ -0,0 +1,13 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../snippets.tex + +% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) +% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +\coordinate (A) at (0,0); +\coordinate (B) at (6,0); +\coordinate (S) at (3,0); + +\maintrack (A) -- (B); + +\dangerpoint[backward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_forward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_forward.tikz new file mode 100644 index 00000000000..73d2bbaed84 --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/danger_point_forward.tikz @@ -0,0 +1,13 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../snippets.tex + +% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) +% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +\coordinate (A) at (0,0); +\coordinate (B) at (6,0); +\coordinate (S) at (3,0); + +\maintrack (A) -- (B); + +\dangerpoint[forward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_backward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_backward.tikz new file mode 100644 index 00000000000..9e36abeadbd --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_backward.tikz @@ -0,0 +1,13 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../snippets.tex + +% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) +% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +\coordinate (A) at (0,0); +\coordinate (B) at (6,0); +\coordinate (S) at (3,0); + +\maintrack (A) -- (B); + +\movementauthority[backward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_forward.tikz b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_forward.tikz new file mode 100644 index 00000000000..81ec5fd65aa --- /dev/null +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic-snippets/end_of_movement_authority_forward.tikz @@ -0,0 +1,13 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../snippets.tex + +% Copyright (c) 2018 - 2020, Martin Scheidt (ISC license) +% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. + +\coordinate (A) at (0,0); +\coordinate (B) at (6,0); +\coordinate (S) at (3,0); + +\maintrack (A) -- (B); + +\movementauthority[forward] at (S) label (); \ No newline at end of file diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.pdf b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.pdf index 53dda09131d..16260b16895 100644 Binary files a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.pdf and b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.pdf differ diff --git a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.tex b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.tex index 73d81f0b8a6..d0a49364050 100644 --- a/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.tex +++ b/Master/texmf-dist/doc/latex/tikz-trackschematic/tikz-trackschematic.tex @@ -519,7 +519,7 @@ An absolute \textit{(label-coord)} or \textit{(bend-coord)} can be specified with the Ti\emph{k}Z \textbackslash coordinate command. \subsection{Traffic control} - \subsubsection{Signals}\label{sec:signals} + \subsubsection{Stationary signals}\label{sec:signals} \symboldescription{Generic signal command} \begin{lstlisting}[gobble=10] @@ -679,6 +679,59 @@ \signal[berth,options] at (coord) label (name); \end{lstlisting} + \subsubsection{Non-stationary points}\label{sec:points} + + \symboldescription{View point} + \symbol{view_point_forward.tikz} + \begin{lstlisting}[gobble=10] + \viewpoint[options] at (coord); + \end{lstlisting} + values for \texttt{options} (comma seperated): + \begin{itemize}[label={}] + \item \texttt{forward} or \texttt{backward} (mandatory) + \item \texttt{position=left} or \texttt{position=right} (optional, default: \textit{traffic practice}) + \item \texttt{foreground=\textit{color}} (optional, default: \texttt{black}) + \end{itemize} + + \symboldescription{Braking point} + \symbol{braking_point_forward.tikz} + \begin{lstlisting}[gobble=10] + \brakingpoint[options] at (coord) label (name); + \end{lstlisting} + values for \texttt{options} (comma seperated): + \begin{itemize}[label={}] + \item \texttt{forward}, \texttt{backward} or \texttt{bidirectional} (mandatory) + \item \texttt{position=left} or \texttt{position=right} (optional, default: \textit{traffic practice}) + \item \texttt{shift label=\{\textit{(label-coord)}\}} (optional, default: (0,0)) + \item \texttt{foreground=\textit{color}} (optional, default: \texttt{black}) + \end{itemize} + + \symboldescription{End of movement authority} + \symbol{end_of_movement_authority_forward.tikz} + \begin{lstlisting}[gobble=10] + \movementauthority[options] at (coord) label (name); + \end{lstlisting} + values for \texttt{options} (comma seperated): + \begin{itemize}[label={}] + \item \texttt{forward}, \texttt{backward} or \texttt{bidirectional} (mandatory) + \item \texttt{position=left} or \texttt{position=right} (optional, default: \textit{traffic practice}) + \item \texttt{shift label=\{\textit{(label-coord)}\}} (optional, default: (0,0)) + \item \texttt{foreground=\textit{color}} (optional, default: \texttt{black}) + \end{itemize} + + \symboldescription{Danger point} + \symbol{danger_point_forward.tikz} + \begin{lstlisting}[gobble=10] + \dangerpoint[options] at (coord) label (name); + \end{lstlisting} + values for \texttt{options} (comma seperated): + \begin{itemize}[label={}] + \item \texttt{forward}, \texttt{backward} or \texttt{bidirectional} (mandatory) + \item \texttt{position=left} or \texttt{position=right} (optional, default: \textit{traffic practice}) + \item \texttt{shift label=\{\textit{(label-coord)}\}} (optional, default: (0,0)) + \item \texttt{foreground=\textit{color}} (optional, default: \texttt{black}) + \end{itemize} + \subsubsection{Clearing points}\label{sec:clearingpoints} \symboldescription{Generic clearing point} @@ -800,32 +853,6 @@ \subsubsection{Miscellaneous}\label{sec:misc} - \symboldescription{View point} - \symbol{view_point_forward.tikz} - \begin{lstlisting}[gobble=10] - \viewpoint[options] at (coord); - \end{lstlisting} - values for \texttt{options} (comma seperated): - \begin{itemize}[label={}] - \item \texttt{forward} or \texttt{backward} (mandatory) - \item \texttt{position=left} or \texttt{position=right} (optional, default: \textit{traffic practice}) - \item \texttt{foreground=\textit{color}} (optional, default: \texttt{black}) - \end{itemize} - - \symboldescription{End of movement authority} - \symbol{block_end_marker_forward.tikz} - \begin{lstlisting}[gobble=10] - \movementauthority[options] at (coord) label (name); - \end{lstlisting} - values for \texttt{options} (comma seperated): - \begin{itemize}[label={}] - \item \texttt{forward}, \texttt{backward} or \texttt{bidirectional} (mandatory) - \item \texttt{direction arrow=true} (default) or \texttt{direction arrow=false} (mandatory) - \item \texttt{position=left} or \texttt{position=right} (optional, default: \textit{traffic practice}) - \item \texttt{shift label=\{\textit{(label-coord)}\}} (optional, default: (0,0)) - \item \texttt{foreground=\textit{color}} (optional, default: \texttt{black}) - \end{itemize} - \symboldescription{Route} \symbol{route.tikz} \begin{lstlisting}[gobble=10] @@ -1034,6 +1061,14 @@ \No & shunt limit & \symbol{shunt_limit_forward.tikz} & \ref{sec:signals} \\ \hline \No & train berth sign & \symbol{train_berth_sign_forward.tikz} & \ref{sec:signals} \\ + \hline + \No & view point & \symbol{view_point_forward.tikz} & \ref{sec:points} \\ + \hline + \No & braking point & \symbol{braking_point_forward.tikz} & \ref{sec:points} \\ + \hline + \No & end of movement authority & \symbol{end_of_movement_authority_forward.tikz} & \ref{sec:points} \\ + \hline + \No & danger point & \symbol{danger_point_forward.tikz} & \ref{sec:points} \\ \hline \No & clearing point & \symbol{clearing_point.tikz} & \ref{sec:clearingpoints} \\ \hline @@ -1048,11 +1083,6 @@ \No & transmitter bidirectional & \symbol{transmitter_right_bidirectional.tikz} & \ref{sec:transmitters} \\ \hline \No & loop transmitter & \symbol{loop_transmitter.tikz} & \ref{sec:transmitters} \\ - \hline - \No & view point & \symbol{view_point_forward.tikz} & \ref{sec:misc} \\ - \hline - \No & \parbox[c]{4.5cm}{block end marker\\(end of movement authority)} - & \symbol{block_end_marker_forward.tikz} & \ref{sec:misc} \\ \hline \No & route & \symbol{route.tikz} & \ref{sec:misc} \\ \hline -- cgit v1.2.3