From a1dbe25ca836f3794522ca0094c0f4c4ea1ecf2e Mon Sep 17 00:00:00 2001 From: kaat0 Date: Sat, 20 Jul 2019 16:38:49 +0200 Subject: [PATCH] * moved snippet folder to root folder * added shunting movements * added points to turnouts * added moving trains * defined and used color foreground and background --- .gitignore | 1 + LICENSE | 2 +- README.md | 10 + overview.pdf | Bin 67179 -> 72826 bytes overview.tex | 90 ++++-- .../block_clearing_point_backward.tikz | 2 +- .../block_clearing_point_forward.tikz | 2 +- .../block_end_marker_backward.tikz | 2 +- .../block_end_marker_forward.tikz | 2 +- .../block_signal_backward.tikz | 2 +- .../block_signal_forward.tikz | 2 +- {examples/snippets => snippets}/bridge.tikz | 2 +- .../bridge_track_beneath.tikz | 2 +- .../bufferstop_backward.tikz | 2 +- .../bufferstop_forward.tikz | 2 +- .../snippets => snippets}/clearing_point.tikz | 2 +- .../combined_signal_forward.tikz | 2 +- .../derailer_left_backward.tikz | 2 +- .../derailer_left_forward.tikz | 2 +- .../derailer_right_backward.tikz | 2 +- .../derailer_right_forward.tikz | 2 +- .../diamond_crossing_left.tikz | 2 +- .../diamond_crossing_right.tikz | 2 +- .../distant_signal_backward.tikz | 2 +- .../distant_signal_forward.tikz | 2 +- .../distant_speed_signal_backward.tikz | 2 +- .../distant_speed_signal_forward.tikz | 2 +- .../double-slip_turnout_left.tikz | 2 +- .../double-slip_turnout_right.tikz | 2 +- .../ghost_train_direction_backward.tikz | 2 +- .../ghost_train_direction_forward.tikz | 2 +- {examples/snippets => snippets}/hump.tikz | 2 +- .../snippets => snippets}/interlocking.tikz | 2 +- .../level_crossing_double.tikz | 2 +- .../level_crossing_double_full_closure.tikz | 2 +- .../level_crossing_single.tikz | 2 +- .../snippets => snippets}/main_line.tikz | 2 +- .../snippets => snippets}/main_track.tikz | 2 +- .../snippets => snippets}/platform_left.tikz | 2 +- .../platform_middle.tikz | 2 +- .../snippets => snippets}/platform_right.tikz | 2 +- .../route_clearing_point_backward.tikz | 2 +- .../route_clearing_point_forward.tikz | 2 +- .../route_signal_backward.tikz | 2 +- .../route_signal_forward.tikz | 2 +- .../shunt_limit_backward.tikz | 2 +- .../shunt_limit_forward.tikz | 2 +- .../shunt_signal_backward.tikz | 2 +- .../shunt_signal_backward_locked.tikz | 5 +- .../shunt_signal_forward.tikz | 2 +- .../shunt_signal_forward_locked.tikz | 5 +- .../snippets => snippets}/side_track.tikz | 2 +- .../speed_signal_backward.tikz | 2 +- .../speed_signal_forward.tikz | 2 +- .../snippets => snippets}/track_distance.tikz | 2 +- .../snippets => snippets}/track_number.tikz | 2 +- .../snippets => snippets}/train_berth.tikz | 2 +- .../train_berth_shape.tikz | 2 +- .../train_berth_shape_bidirectional.tikz | 2 +- .../train_berth_sign_backward.tikz | 2 +- .../train_berth_sign_forward.tikz | 2 +- .../train_direction_backward.tikz | 2 +- .../train_direction_forward.tikz | 2 +- .../train_drive_automatic.tikz | 2 +- .../train_drive_human.tikz | 2 +- .../train_moving_backward.tikz | 2 +- snippets/train_moving_fast_backward.tikz | 8 + snippets/train_moving_fast_forward.tikz | 8 + .../train_moving_forward.tikz | 2 +- snippets/train_moving_slow_backward.tikz | 8 + snippets/train_moving_slow_forward.tikz | 8 + snippets/train_shunt_mode_backward.tikz | 8 + snippets/train_shunt_mode_forward.tikz | 8 + snippets/train_shunting_backward.tikz | 8 + snippets/train_shunting_forward.tikz | 8 + .../snippets => snippets}/transmitter.tikz | 2 +- .../transmitter_backward.tikz | 2 +- .../transmitter_below_with_signal.tikz | 2 +- .../transmitter_bidirectional.tikz | 2 +- .../transmitter_forward.tikz | 2 +- .../turnout_left_backward.tikz | 2 +- .../turnout_left_backward_left_position.tikz | 10 + .../turnout_left_backward_moving_points.tikz | 10 + .../turnout_left_backward_right_position.tikz | 10 + .../turnout_left_forward.tikz | 2 +- .../turnout_left_forward_left_position.tikz | 10 + .../turnout_left_forward_moving_points.tikz | 10 + .../turnout_left_forward_right_position.tikz | 10 + .../turnout_right_backward.tikz | 2 +- .../turnout_right_backward_left_position.tikz | 10 + .../turnout_right_backward_moving_points.tikz | 10 + ...turnout_right_backward_right_position.tikz | 10 + .../turnout_right_forward.tikz | 2 +- .../turnout_right_forward_left_position.tikz | 10 + .../turnout_right_forward_moving_points.tikz | 10 + .../turnout_right_forward_right_position.tikz | 10 + .../turnout_with_fouling_left_backward.tikz | 2 +- .../turnout_with_fouling_left_forward.tikz | 2 +- .../turnout_with_fouling_right_backward.tikz | 2 +- .../turnout_with_fouling_right_forward.tikz | 2 +- snippets/vehicle.tikz | 9 + snippets/vehicles.tikz | 9 + .../view_point_backward.tikz | 2 +- .../view_point_forward.tikz | 2 +- src/constructions.tikz | 66 ++--- src/layoutSymbols_DE.tikz | 278 ++++++++++++++---- src/topology.tikz | 140 ++++++--- src/trafficControl.tikz | 185 ++++++------ src/vehicles.tikz | 135 +++++++-- 109 files changed, 936 insertions(+), 333 deletions(-) rename {examples/snippets => snippets}/block_clearing_point_backward.tikz (80%) rename {examples/snippets => snippets}/block_clearing_point_forward.tikz (80%) rename {examples/snippets => snippets}/block_end_marker_backward.tikz (81%) rename {examples/snippets => snippets}/block_end_marker_forward.tikz (81%) rename {examples/snippets => snippets}/block_signal_backward.tikz (82%) rename {examples/snippets => snippets}/block_signal_forward.tikz (82%) rename {examples/snippets => snippets}/bridge.tikz (84%) rename {examples/snippets => snippets}/bridge_track_beneath.tikz (87%) rename {examples/snippets => snippets}/bufferstop_backward.tikz (82%) rename {examples/snippets => snippets}/bufferstop_forward.tikz (82%) rename {examples/snippets => snippets}/clearing_point.tikz (83%) rename {examples/snippets => snippets}/combined_signal_forward.tikz (83%) rename {examples/snippets => snippets}/derailer_left_backward.tikz (82%) rename {examples/snippets => snippets}/derailer_left_forward.tikz (82%) rename {examples/snippets => snippets}/derailer_right_backward.tikz (81%) rename {examples/snippets => snippets}/derailer_right_forward.tikz (82%) rename {examples/snippets => snippets}/diamond_crossing_left.tikz (84%) rename {examples/snippets => snippets}/diamond_crossing_right.tikz (84%) rename {examples/snippets => snippets}/distant_signal_backward.tikz (81%) rename {examples/snippets => snippets}/distant_signal_forward.tikz (82%) rename {examples/snippets => snippets}/distant_speed_signal_backward.tikz (82%) rename {examples/snippets => snippets}/distant_speed_signal_forward.tikz (82%) rename {examples/snippets => snippets}/double-slip_turnout_left.tikz (87%) rename {examples/snippets => snippets}/double-slip_turnout_right.tikz (87%) rename {examples/snippets => snippets}/ghost_train_direction_backward.tikz (80%) rename {examples/snippets => snippets}/ghost_train_direction_forward.tikz (80%) rename {examples/snippets => snippets}/hump.tikz (85%) mode change 100644 => 100755 rename {examples/snippets => snippets}/interlocking.tikz (82%) mode change 100644 => 100755 rename {examples/snippets => snippets}/level_crossing_double.tikz (84%) rename {examples/snippets => snippets}/level_crossing_double_full_closure.tikz (87%) rename {examples/snippets => snippets}/level_crossing_single.tikz (82%) rename {examples/snippets => snippets}/main_line.tikz (81%) rename {examples/snippets => snippets}/main_track.tikz (80%) rename {examples/snippets => snippets}/platform_left.tikz (84%) rename {examples/snippets => snippets}/platform_middle.tikz (85%) rename {examples/snippets => snippets}/platform_right.tikz (84%) rename {examples/snippets => snippets}/route_clearing_point_backward.tikz (80%) rename {examples/snippets => snippets}/route_clearing_point_forward.tikz (80%) rename {examples/snippets => snippets}/route_signal_backward.tikz (82%) rename {examples/snippets => snippets}/route_signal_forward.tikz (82%) rename {examples/snippets => snippets}/shunt_limit_backward.tikz (82%) rename {examples/snippets => snippets}/shunt_limit_forward.tikz (82%) rename {examples/snippets => snippets}/shunt_signal_backward.tikz (82%) rename examples/snippets/short_train.tikz => snippets/shunt_signal_backward_locked.tikz (77%) rename {examples/snippets => snippets}/shunt_signal_forward.tikz (82%) rename examples/snippets/train.tikz => snippets/shunt_signal_forward_locked.tikz (77%) rename {examples/snippets => snippets}/side_track.tikz (80%) rename {examples/snippets => snippets}/speed_signal_backward.tikz (82%) rename {examples/snippets => snippets}/speed_signal_forward.tikz (82%) rename {examples/snippets => snippets}/track_distance.tikz (83%) mode change 100644 => 100755 rename {examples/snippets => snippets}/track_number.tikz (82%) mode change 100644 => 100755 rename {examples/snippets => snippets}/train_berth.tikz (84%) rename {examples/snippets => snippets}/train_berth_shape.tikz (82%) rename {examples/snippets => snippets}/train_berth_shape_bidirectional.tikz (84%) rename {examples/snippets => snippets}/train_berth_sign_backward.tikz (81%) rename {examples/snippets => snippets}/train_berth_sign_forward.tikz (81%) rename {examples/snippets => snippets}/train_direction_backward.tikz (81%) rename {examples/snippets => snippets}/train_direction_forward.tikz (81%) rename {examples/snippets => snippets}/train_drive_automatic.tikz (81%) rename {examples/snippets => snippets}/train_drive_human.tikz (83%) rename {examples/snippets => snippets}/train_moving_backward.tikz (82%) create mode 100644 snippets/train_moving_fast_backward.tikz create mode 100644 snippets/train_moving_fast_forward.tikz rename {examples/snippets => snippets}/train_moving_forward.tikz (82%) create mode 100644 snippets/train_moving_slow_backward.tikz create mode 100644 snippets/train_moving_slow_forward.tikz create mode 100644 snippets/train_shunt_mode_backward.tikz create mode 100644 snippets/train_shunt_mode_forward.tikz create mode 100644 snippets/train_shunting_backward.tikz create mode 100644 snippets/train_shunting_forward.tikz rename {examples/snippets => snippets}/transmitter.tikz (84%) rename {examples/snippets => snippets}/transmitter_backward.tikz (82%) rename {examples/snippets => snippets}/transmitter_below_with_signal.tikz (84%) rename {examples/snippets => snippets}/transmitter_bidirectional.tikz (82%) rename {examples/snippets => snippets}/transmitter_forward.tikz (83%) rename {examples/snippets => snippets}/turnout_left_backward.tikz (83%) create mode 100644 snippets/turnout_left_backward_left_position.tikz create mode 100644 snippets/turnout_left_backward_moving_points.tikz create mode 100644 snippets/turnout_left_backward_right_position.tikz rename {examples/snippets => snippets}/turnout_left_forward.tikz (83%) create mode 100644 snippets/turnout_left_forward_left_position.tikz create mode 100644 snippets/turnout_left_forward_moving_points.tikz create mode 100644 snippets/turnout_left_forward_right_position.tikz rename {examples/snippets => snippets}/turnout_right_backward.tikz (83%) create mode 100644 snippets/turnout_right_backward_left_position.tikz create mode 100644 snippets/turnout_right_backward_moving_points.tikz create mode 100644 snippets/turnout_right_backward_right_position.tikz rename {examples/snippets => snippets}/turnout_right_forward.tikz (83%) create mode 100644 snippets/turnout_right_forward_left_position.tikz create mode 100644 snippets/turnout_right_forward_moving_points.tikz create mode 100644 snippets/turnout_right_forward_right_position.tikz rename {examples/snippets => snippets}/turnout_with_fouling_left_backward.tikz (84%) rename {examples/snippets => snippets}/turnout_with_fouling_left_forward.tikz (84%) rename {examples/snippets => snippets}/turnout_with_fouling_right_backward.tikz (83%) rename {examples/snippets => snippets}/turnout_with_fouling_right_forward.tikz (84%) create mode 100644 snippets/vehicle.tikz create mode 100644 snippets/vehicles.tikz rename {examples/snippets => snippets}/view_point_backward.tikz (82%) rename {examples/snippets => snippets}/view_point_forward.tikz (82%) diff --git a/.gitignore b/.gitignore index 59ed3d6..3d6b98a 100644 --- a/.gitignore +++ b/.gitignore @@ -242,6 +242,7 @@ TSWLatexianTemp* # LaTeXing & Sublime Text Output +.tex ## -- macOS ignore # General diff --git a/LICENSE b/LICENSE index ae830cb..80ed141 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ ISC License -Copyright (c) 2018, Martin Scheidt \ +Copyright (c) 2019, Martin Scheidt \ Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. diff --git a/README.md b/README.md index d0a577d..1ea09aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,16 @@ tikz-trackschematic ====== +Version 0.3 +------ + + * moved snippet folder to root folder + * added shunting movements + * added points to turnouts + * added moving trains + * defined and used color foreground and background + + Version 0.2 ------ diff --git a/overview.pdf b/overview.pdf index 69eea4e8f8690725afdb8efa67cfe73335d6239d..482ccbc4b1a1215aa159cc17afd0bd811e5b1246 100644 GIT binary patch delta 24826 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 diff --git a/overview.tex b/overview.tex index 99de305..60aeb9f 100644 --- a/overview.tex +++ b/overview.tex @@ -1,15 +1,14 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 Martin Scheidt (ISC license) +% Copyright 2019 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. \documentclass[a4paper,landscape]{article} \usepackage[margin=0pt]{geometry} \pagestyle{empty} -\usepackage{tabu,longtable} +\usepackage{longtable,siunitx} \usepackage{tikz,adjustbox} -\usepackage{siunitx} \usepackage{listings} \lstset{ language=TeX, @@ -21,19 +20,13 @@ \def\rootTrackschematic{../tikz-trackschematic} \def\srcTrackschematic{\rootTrackschematic/src} - \renewcommand{\symbol}[1]{ \adjustbox{valign=c}{\begin{tikzpicture}[scale=1.0,transform shape] - \input{examples/snippets/#1} + \input{\rootTrackschematic/snippets/#1} \path (-3,-1.1) rectangle (3,1.1); % background rectangle to unify every cell containing a symbol \end{tikzpicture}} } -\newcommand{\code}[1]{\lstinputlisting[firstline=7]{\rootTrackschematic/examples/snippets/#1}} -\newcommand{\colorsquare}[1]{ - \begin{tikzpicture}[anchor=base,baseline=-3] - \filldraw [#1] (-0.3,-0.3) rectangle (0.3,0.3); - \end{tikzpicture} -} +\newcommand{\code}[1]{\lstinputlisting[firstline=7]{\rootTrackschematic/snippets/#1}} \newcounter{symbolNo} \def\No{\stepcounter{symbolNo}\arabic{symbolNo}} @@ -44,9 +37,9 @@ \begin{document} \centering - \begin{longtabu}{|r|l|c|l|c|} + \begin{longtable}{|r|l|c|l|c|} \hline - No. & Name & Symbol & Code & File \\ + No. & Name & Symbol & Code & File \\ \endhead \hline \No & main track & \symbol{main_track.tikz} & \code{main_track.tikz} & \texttt{topology.tikz} \\ @@ -57,8 +50,7 @@ \hline \No & side track & \symbol{side_track.tikz} & \code{side_track.tikz} & \texttt{topology.tikz} \\ \hline - \No & track number & \symbol{track_number.tikz} & \code{track_number.tikz} - & \texttt{topology.tikz} \\ + \No & track number & \symbol{track_number.tikz} & \code{track_number.tikz} & \texttt{topology.tikz} \\ \hline \No & turnout left (forward) & \symbol{turnout_left_forward.tikz} & \code{turnout_left_forward.tikz} & \texttt{topology.tikz} \\ \hline @@ -87,6 +79,42 @@ \No & diamond crossing left & \symbol{diamond_crossing_left.tikz} & \code{diamond_crossing_left.tikz} & \texttt{topology.tikz} \\ \hline \No & diamond crossing right & \symbol{diamond_crossing_right.tikz} & \code{diamond_crossing_right.tikz} & \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout left (forward)\\with points in right position} + & \symbol{turnout_left_forward_right_position.tikz}& \code{turnout_left_forward_right_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout left (forward)\\with points in left position} + & \symbol{turnout_left_forward_left_position.tikz} & \code{turnout_left_forward_left_position.tikz} & \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout left (forward)\\with moving points} + & \symbol{turnout_left_forward_moving_points.tikz} & \code{turnout_left_forward_moving_points.tikz} & \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout left (backward)\\with points in right position} + &\symbol{turnout_left_backward_right_position.tikz}&\code{turnout_left_backward_right_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout left (backward)\\with points in left position} + & \symbol{turnout_left_backward_left_position.tikz}& \code{turnout_left_backward_left_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout left (backward)\\with moving points} + & \symbol{turnout_left_backward_moving_points.tikz}& \code{turnout_left_backward_moving_points.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout right (forward)\\with points in right position} + &\symbol{turnout_right_forward_right_position.tikz}&\code{turnout_right_forward_right_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout right (forward)\\with points in left position} + & \symbol{turnout_right_forward_left_position.tikz}& \code{turnout_right_forward_left_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout right (forward)\\with moving points} + & \symbol{turnout_right_forward_moving_points.tikz}& \code{turnout_right_forward_moving_points.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout right (backward)\\with points in right position} + &\symbol{turnout_right_backward_right_position.tikz}&\code{turnout_right_backward_right_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout right (backward)\\with points in left position} + &\symbol{turnout_right_backward_left_position.tikz}&\code{turnout_right_backward_left_position.tikz}& \texttt{topology.tikz} \\ + \hline + \No & \parbox[c]{5cm}{turnout right (backward)\\with moving points} + &\symbol{turnout_right_backward_moving_points.tikz}&\code{turnout_right_backward_moving_points.tikz}& \texttt{topology.tikz} \\ \hline \No & derailer left (forward) & \symbol{derailer_left_forward.tikz} & \code{derailer_left_forward.tikz} & \texttt{topology.tikz} \\ \hline @@ -100,9 +128,9 @@ \hline \No & bufferstop (backward) & \symbol{bufferstop_backward.tikz} & \code{bufferstop_backward.tikz} & \texttt{topology.tikz} \\ \hline - \No & train (parked) & \symbol{train.tikz} & \code{train.tikz} & \texttt{vehicles.tikz} \\ + \No & vehicles (parked) & \symbol{vehicles.tikz} & \code{vehicles.tikz} & \texttt{vehicles.tikz} \\ \hline - \No & short train (parked) & \symbol{short_train.tikz} & \code{short_train.tikz} & \texttt{vehicles.tikz} \\ + \No & vehicle (parked) & \symbol{vehicle.tikz} & \code{vehicle.tikz} & \texttt{vehicles.tikz} \\ \hline \No & train (direction forward) & \symbol{train_direction_forward.tikz} & \code{train_direction_forward.tikz} & \texttt{vehicles.tikz} \\ \hline @@ -116,10 +144,28 @@ \hline \No & train moving (backward) & \symbol{train_moving_backward.tikz} & \code{train_moving_backward.tikz} & \texttt{vehicles.tikz} \\ \hline - \No & \parbox[c]{4cm}{train drives automatic\\(direction forward)} + \No & train moving slow (forward) & \symbol{train_moving_slow_forward.tikz} & \code{train_moving_slow_forward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & train moving slow (backward) & \symbol{train_moving_slow_backward.tikz} & \code{train_moving_slow_backward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & train moving fast (forward) & \symbol{train_moving_fast_forward.tikz} & \code{train_moving_fast_forward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & train moving fast (backward) & \symbol{train_moving_fast_backward.tikz} & \code{train_moving_fast_backward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & \parbox[c]{4cm}{train in shunting mode\\(direction forward)} + & \symbol{train_shunt_mode_forward.tikz} & \code{train_shunt_mode_forward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & \parbox[c]{4cm}{train in shunting mode\\(direction backward)} + & \symbol{train_shunt_mode_backward.tikz} & \code{train_shunt_mode_backward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & train shunting (forward) & \symbol{train_shunting_forward.tikz} & \code{train_shunting_forward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & train shunting (backward) & \symbol{train_shunting_backward.tikz} & \code{train_shunting_backward.tikz} & \texttt{vehicles.tikz} \\ + \hline + \No & \parbox[c]{4cm}{train operated automatic\\(direction forward)} & \symbol{train_drive_automatic.tikz} & \code{train_drive_automatic.tikz} & \texttt{vehicles.tikz} \\ \hline - \No & \parbox[c]{4cm}{train drives by human\\(direction forward)} + \No & \parbox[c]{4cm}{train operated by human\\(direction forward)} & \symbol{train_drive_human.tikz} & \code{train_drive_human.tikz} & \texttt{vehicles.tikz} \\ \hline \No & train berth sign (forward) & \symbol{train_berth_sign_forward.tikz} & \code{train_berth_sign_forward.tikz} & \texttt{trafficControl.tikz} \\ @@ -164,6 +210,10 @@ \No & shunt signal (forward) & \symbol{shunt_signal_forward.tikz} & \code{shunt_signal_forward.tikz} & \texttt{trafficControl.tikz} \\ \hline \No & shunt signal (backward) & \symbol{shunt_signal_backward.tikz} & \code{shunt_signal_backward.tikz} & \texttt{trafficControl.tikz} \\ + \hline + \No & shunt signal locked (forward) & \symbol{shunt_signal_forward_locked.tikz} & \code{shunt_signal_forward_locked.tikz} & \texttt{trafficControl.tikz} \\ + \hline + \No & shunt signal locked (backward) & \symbol{shunt_signal_backward_locked.tikz} & \code{shunt_signal_backward_locked.tikz} & \texttt{trafficControl.tikz} \\ \hline \No & shunt limit (forward) & \symbol{shunt_limit_forward.tikz} & \code{shunt_limit_forward.tikz} & \texttt{trafficControl.tikz} \\ \hline @@ -219,5 +269,5 @@ \hline \No & interlocking & \symbol{interlocking.tikz} & \code{interlocking.tikz} & \texttt{constructions.tikz} \\ \hline - \end{longtabu} + \end{longtable} \end{document} \ No newline at end of file diff --git a/examples/snippets/block_clearing_point_backward.tikz b/snippets/block_clearing_point_backward.tikz similarity index 80% rename from examples/snippets/block_clearing_point_backward.tikz rename to snippets/block_clearing_point_backward.tikz index 397345a..2a7d39a 100644 --- a/examples/snippets/block_clearing_point_backward.tikz +++ b/snippets/block_clearing_point_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/block_clearing_point_forward.tikz b/snippets/block_clearing_point_forward.tikz similarity index 80% rename from examples/snippets/block_clearing_point_forward.tikz rename to snippets/block_clearing_point_forward.tikz index d8c25da..afb507a 100644 --- a/examples/snippets/block_clearing_point_forward.tikz +++ b/snippets/block_clearing_point_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/block_end_marker_backward.tikz b/snippets/block_end_marker_backward.tikz similarity index 81% rename from examples/snippets/block_end_marker_backward.tikz rename to snippets/block_end_marker_backward.tikz index 41a7b67..f074a31 100644 --- a/examples/snippets/block_end_marker_backward.tikz +++ b/snippets/block_end_marker_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/block_end_marker_forward.tikz b/snippets/block_end_marker_forward.tikz similarity index 81% rename from examples/snippets/block_end_marker_forward.tikz rename to snippets/block_end_marker_forward.tikz index e9bb754..8baa09d 100644 --- a/examples/snippets/block_end_marker_forward.tikz +++ b/snippets/block_end_marker_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/block_signal_backward.tikz b/snippets/block_signal_backward.tikz similarity index 82% rename from examples/snippets/block_signal_backward.tikz rename to snippets/block_signal_backward.tikz index 31b59c8..f369b4d 100644 --- a/examples/snippets/block_signal_backward.tikz +++ b/snippets/block_signal_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/block_signal_forward.tikz b/snippets/block_signal_forward.tikz similarity index 82% rename from examples/snippets/block_signal_forward.tikz rename to snippets/block_signal_forward.tikz index 2310213..a193700 100644 --- a/examples/snippets/block_signal_forward.tikz +++ b/snippets/block_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/bridge.tikz b/snippets/bridge.tikz similarity index 84% rename from examples/snippets/bridge.tikz rename to snippets/bridge.tikz index 7c5f1b9..a871762 100644 --- a/examples/snippets/bridge.tikz +++ b/snippets/bridge.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/bridge_track_beneath.tikz b/snippets/bridge_track_beneath.tikz similarity index 87% rename from examples/snippets/bridge_track_beneath.tikz rename to snippets/bridge_track_beneath.tikz index 84cb951..5b898c8 100644 --- a/examples/snippets/bridge_track_beneath.tikz +++ b/snippets/bridge_track_beneath.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/bufferstop_backward.tikz b/snippets/bufferstop_backward.tikz similarity index 82% rename from examples/snippets/bufferstop_backward.tikz rename to snippets/bufferstop_backward.tikz index 0b6f66c..831c51f 100644 --- a/examples/snippets/bufferstop_backward.tikz +++ b/snippets/bufferstop_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/bufferstop_forward.tikz b/snippets/bufferstop_forward.tikz similarity index 82% rename from examples/snippets/bufferstop_forward.tikz rename to snippets/bufferstop_forward.tikz index f42eb43..542a915 100644 --- a/examples/snippets/bufferstop_forward.tikz +++ b/snippets/bufferstop_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/clearing_point.tikz b/snippets/clearing_point.tikz similarity index 83% rename from examples/snippets/clearing_point.tikz rename to snippets/clearing_point.tikz index b1f83ec..b82f02c 100644 --- a/examples/snippets/clearing_point.tikz +++ b/snippets/clearing_point.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/combined_signal_forward.tikz b/snippets/combined_signal_forward.tikz similarity index 83% rename from examples/snippets/combined_signal_forward.tikz rename to snippets/combined_signal_forward.tikz index 2b2b240..0c7fca5 100644 --- a/examples/snippets/combined_signal_forward.tikz +++ b/snippets/combined_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/derailer_left_backward.tikz b/snippets/derailer_left_backward.tikz similarity index 82% rename from examples/snippets/derailer_left_backward.tikz rename to snippets/derailer_left_backward.tikz index ddff6df..21b2602 100644 --- a/examples/snippets/derailer_left_backward.tikz +++ b/snippets/derailer_left_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/derailer_left_forward.tikz b/snippets/derailer_left_forward.tikz similarity index 82% rename from examples/snippets/derailer_left_forward.tikz rename to snippets/derailer_left_forward.tikz index a677e27..309a916 100644 --- a/examples/snippets/derailer_left_forward.tikz +++ b/snippets/derailer_left_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/derailer_right_backward.tikz b/snippets/derailer_right_backward.tikz similarity index 81% rename from examples/snippets/derailer_right_backward.tikz rename to snippets/derailer_right_backward.tikz index 2013cb6..899dcb8 100644 --- a/examples/snippets/derailer_right_backward.tikz +++ b/snippets/derailer_right_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/derailer_right_forward.tikz b/snippets/derailer_right_forward.tikz similarity index 82% rename from examples/snippets/derailer_right_forward.tikz rename to snippets/derailer_right_forward.tikz index 4f48540..0075ff9 100644 --- a/examples/snippets/derailer_right_forward.tikz +++ b/snippets/derailer_right_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/diamond_crossing_left.tikz b/snippets/diamond_crossing_left.tikz similarity index 84% rename from examples/snippets/diamond_crossing_left.tikz rename to snippets/diamond_crossing_left.tikz index 4655973..7a63e31 100644 --- a/examples/snippets/diamond_crossing_left.tikz +++ b/snippets/diamond_crossing_left.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/diamond_crossing_right.tikz b/snippets/diamond_crossing_right.tikz similarity index 84% rename from examples/snippets/diamond_crossing_right.tikz rename to snippets/diamond_crossing_right.tikz index 4bee29c..e20f988 100644 --- a/examples/snippets/diamond_crossing_right.tikz +++ b/snippets/diamond_crossing_right.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/distant_signal_backward.tikz b/snippets/distant_signal_backward.tikz similarity index 81% rename from examples/snippets/distant_signal_backward.tikz rename to snippets/distant_signal_backward.tikz index dff77aa..7034649 100644 --- a/examples/snippets/distant_signal_backward.tikz +++ b/snippets/distant_signal_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/distant_signal_forward.tikz b/snippets/distant_signal_forward.tikz similarity index 82% rename from examples/snippets/distant_signal_forward.tikz rename to snippets/distant_signal_forward.tikz index b329556..717ac34 100644 --- a/examples/snippets/distant_signal_forward.tikz +++ b/snippets/distant_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/distant_speed_signal_backward.tikz b/snippets/distant_speed_signal_backward.tikz similarity index 82% rename from examples/snippets/distant_speed_signal_backward.tikz rename to snippets/distant_speed_signal_backward.tikz index 18527d0..9650c91 100644 --- a/examples/snippets/distant_speed_signal_backward.tikz +++ b/snippets/distant_speed_signal_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/distant_speed_signal_forward.tikz b/snippets/distant_speed_signal_forward.tikz similarity index 82% rename from examples/snippets/distant_speed_signal_forward.tikz rename to snippets/distant_speed_signal_forward.tikz index 18a4e4c..6b6dc04 100644 --- a/examples/snippets/distant_speed_signal_forward.tikz +++ b/snippets/distant_speed_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/double-slip_turnout_left.tikz b/snippets/double-slip_turnout_left.tikz similarity index 87% rename from examples/snippets/double-slip_turnout_left.tikz rename to snippets/double-slip_turnout_left.tikz index 11317bd..6f21ec4 100644 --- a/examples/snippets/double-slip_turnout_left.tikz +++ b/snippets/double-slip_turnout_left.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/double-slip_turnout_right.tikz b/snippets/double-slip_turnout_right.tikz similarity index 87% rename from examples/snippets/double-slip_turnout_right.tikz rename to snippets/double-slip_turnout_right.tikz index 27d713c..9cb4b63 100644 --- a/examples/snippets/double-slip_turnout_right.tikz +++ b/snippets/double-slip_turnout_right.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/ghost_train_direction_backward.tikz b/snippets/ghost_train_direction_backward.tikz similarity index 80% rename from examples/snippets/ghost_train_direction_backward.tikz rename to snippets/ghost_train_direction_backward.tikz index b8f4c9a..3f6f397 100644 --- a/examples/snippets/ghost_train_direction_backward.tikz +++ b/snippets/ghost_train_direction_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/ghost_train_direction_forward.tikz b/snippets/ghost_train_direction_forward.tikz similarity index 80% rename from examples/snippets/ghost_train_direction_forward.tikz rename to snippets/ghost_train_direction_forward.tikz index 3ca275c..5ab7add 100644 --- a/examples/snippets/ghost_train_direction_forward.tikz +++ b/snippets/ghost_train_direction_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/hump.tikz b/snippets/hump.tikz old mode 100644 new mode 100755 similarity index 85% rename from examples/snippets/hump.tikz rename to snippets/hump.tikz index e749d78..84adf0d --- a/examples/snippets/hump.tikz +++ b/snippets/hump.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/interlocking.tikz b/snippets/interlocking.tikz old mode 100644 new mode 100755 similarity index 82% rename from examples/snippets/interlocking.tikz rename to snippets/interlocking.tikz index 10da08e..e52880e --- a/examples/snippets/interlocking.tikz +++ b/snippets/interlocking.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/level_crossing_double.tikz b/snippets/level_crossing_double.tikz similarity index 84% rename from examples/snippets/level_crossing_double.tikz rename to snippets/level_crossing_double.tikz index 86680a0..fa7dcc0 100644 --- a/examples/snippets/level_crossing_double.tikz +++ b/snippets/level_crossing_double.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/level_crossing_double_full_closure.tikz b/snippets/level_crossing_double_full_closure.tikz similarity index 87% rename from examples/snippets/level_crossing_double_full_closure.tikz rename to snippets/level_crossing_double_full_closure.tikz index 580b49a..d45e7d6 100644 --- a/examples/snippets/level_crossing_double_full_closure.tikz +++ b/snippets/level_crossing_double_full_closure.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/level_crossing_single.tikz b/snippets/level_crossing_single.tikz similarity index 82% rename from examples/snippets/level_crossing_single.tikz rename to snippets/level_crossing_single.tikz index 96e7090..952e5c5 100644 --- a/examples/snippets/level_crossing_single.tikz +++ b/snippets/level_crossing_single.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/main_line.tikz b/snippets/main_line.tikz similarity index 81% rename from examples/snippets/main_line.tikz rename to snippets/main_line.tikz index 2f49a34..6a9d738 100644 --- a/examples/snippets/main_line.tikz +++ b/snippets/main_line.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/main_track.tikz b/snippets/main_track.tikz similarity index 80% rename from examples/snippets/main_track.tikz rename to snippets/main_track.tikz index 8714069..19cf9a0 100644 --- a/examples/snippets/main_track.tikz +++ b/snippets/main_track.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/platform_left.tikz b/snippets/platform_left.tikz similarity index 84% rename from examples/snippets/platform_left.tikz rename to snippets/platform_left.tikz index 1946c36..78bbdf7 100644 --- a/examples/snippets/platform_left.tikz +++ b/snippets/platform_left.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/platform_middle.tikz b/snippets/platform_middle.tikz similarity index 85% rename from examples/snippets/platform_middle.tikz rename to snippets/platform_middle.tikz index 3a617ff..192e752 100644 --- a/examples/snippets/platform_middle.tikz +++ b/snippets/platform_middle.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/platform_right.tikz b/snippets/platform_right.tikz similarity index 84% rename from examples/snippets/platform_right.tikz rename to snippets/platform_right.tikz index 2fe0e53..08c1041 100644 --- a/examples/snippets/platform_right.tikz +++ b/snippets/platform_right.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/route_clearing_point_backward.tikz b/snippets/route_clearing_point_backward.tikz similarity index 80% rename from examples/snippets/route_clearing_point_backward.tikz rename to snippets/route_clearing_point_backward.tikz index 49dc122..06b0df7 100644 --- a/examples/snippets/route_clearing_point_backward.tikz +++ b/snippets/route_clearing_point_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/route_clearing_point_forward.tikz b/snippets/route_clearing_point_forward.tikz similarity index 80% rename from examples/snippets/route_clearing_point_forward.tikz rename to snippets/route_clearing_point_forward.tikz index 356b770..29804af 100644 --- a/examples/snippets/route_clearing_point_forward.tikz +++ b/snippets/route_clearing_point_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/route_signal_backward.tikz b/snippets/route_signal_backward.tikz similarity index 82% rename from examples/snippets/route_signal_backward.tikz rename to snippets/route_signal_backward.tikz index 9893645..1a96ab3 100644 --- a/examples/snippets/route_signal_backward.tikz +++ b/snippets/route_signal_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/route_signal_forward.tikz b/snippets/route_signal_forward.tikz similarity index 82% rename from examples/snippets/route_signal_forward.tikz rename to snippets/route_signal_forward.tikz index 50f2437..0c6d2e4 100644 --- a/examples/snippets/route_signal_forward.tikz +++ b/snippets/route_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/shunt_limit_backward.tikz b/snippets/shunt_limit_backward.tikz similarity index 82% rename from examples/snippets/shunt_limit_backward.tikz rename to snippets/shunt_limit_backward.tikz index 8a77b7c..5a3d375 100644 --- a/examples/snippets/shunt_limit_backward.tikz +++ b/snippets/shunt_limit_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/shunt_limit_forward.tikz b/snippets/shunt_limit_forward.tikz similarity index 82% rename from examples/snippets/shunt_limit_forward.tikz rename to snippets/shunt_limit_forward.tikz index 3a838b5..9172289 100644 --- a/examples/snippets/shunt_limit_forward.tikz +++ b/snippets/shunt_limit_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/shunt_signal_backward.tikz b/snippets/shunt_signal_backward.tikz similarity index 82% rename from examples/snippets/shunt_signal_backward.tikz rename to snippets/shunt_signal_backward.tikz index f74c690..75cfa58 100644 --- a/examples/snippets/shunt_signal_backward.tikz +++ b/snippets/shunt_signal_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/short_train.tikz b/snippets/shunt_signal_backward_locked.tikz similarity index 77% rename from examples/snippets/short_train.tikz rename to snippets/shunt_signal_backward_locked.tikz index cd29b37..a03fc35 100644 --- a/examples/snippets/short_train.tikz +++ b/snippets/shunt_signal_backward_locked.tikz @@ -1,9 +1,8 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. \draw[MainTrack] (-2.5,0) -- ++(5,0); -\pic at (-0.5,0) {train=1}; -% change the 1 to desired length \ No newline at end of file +\pic at (0,0) {shunt_signal_backward_locked}; \ No newline at end of file diff --git a/examples/snippets/shunt_signal_forward.tikz b/snippets/shunt_signal_forward.tikz similarity index 82% rename from examples/snippets/shunt_signal_forward.tikz rename to snippets/shunt_signal_forward.tikz index 3924771..3bd749f 100644 --- a/examples/snippets/shunt_signal_forward.tikz +++ b/snippets/shunt_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train.tikz b/snippets/shunt_signal_forward_locked.tikz similarity index 77% rename from examples/snippets/train.tikz rename to snippets/shunt_signal_forward_locked.tikz index 85587f6..4ca94de 100644 --- a/examples/snippets/train.tikz +++ b/snippets/shunt_signal_forward_locked.tikz @@ -1,9 +1,8 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. \draw[MainTrack] (-2.5,0) -- ++(5,0); -\pic at (-2,0) {train}; -\node[font=\sffamily] at (0,0) {label}; \ No newline at end of file +\pic at (0,0) {shunt_signal_forward_locked}; \ No newline at end of file diff --git a/examples/snippets/side_track.tikz b/snippets/side_track.tikz similarity index 80% rename from examples/snippets/side_track.tikz rename to snippets/side_track.tikz index 5bc152e..582e7b9 100644 --- a/examples/snippets/side_track.tikz +++ b/snippets/side_track.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/speed_signal_backward.tikz b/snippets/speed_signal_backward.tikz similarity index 82% rename from examples/snippets/speed_signal_backward.tikz rename to snippets/speed_signal_backward.tikz index eeb6f7d..b890063 100644 --- a/examples/snippets/speed_signal_backward.tikz +++ b/snippets/speed_signal_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/speed_signal_forward.tikz b/snippets/speed_signal_forward.tikz similarity index 82% rename from examples/snippets/speed_signal_forward.tikz rename to snippets/speed_signal_forward.tikz index 49086e9..0c4df15 100644 --- a/examples/snippets/speed_signal_forward.tikz +++ b/snippets/speed_signal_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/track_distance.tikz b/snippets/track_distance.tikz old mode 100644 new mode 100755 similarity index 83% rename from examples/snippets/track_distance.tikz rename to snippets/track_distance.tikz index 853ac04..1f0ae48 --- a/examples/snippets/track_distance.tikz +++ b/snippets/track_distance.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/track_number.tikz b/snippets/track_number.tikz old mode 100644 new mode 100755 similarity index 82% rename from examples/snippets/track_number.tikz rename to snippets/track_number.tikz index c623369..4f1b8a9 --- a/examples/snippets/track_number.tikz +++ b/snippets/track_number.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_berth.tikz b/snippets/train_berth.tikz similarity index 84% rename from examples/snippets/train_berth.tikz rename to snippets/train_berth.tikz index 6d480cd..3cf1cdc 100644 --- a/examples/snippets/train_berth.tikz +++ b/snippets/train_berth.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_berth_shape.tikz b/snippets/train_berth_shape.tikz similarity index 82% rename from examples/snippets/train_berth_shape.tikz rename to snippets/train_berth_shape.tikz index 8531fe7..69bea76 100644 --- a/examples/snippets/train_berth_shape.tikz +++ b/snippets/train_berth_shape.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_berth_shape_bidirectional.tikz b/snippets/train_berth_shape_bidirectional.tikz similarity index 84% rename from examples/snippets/train_berth_shape_bidirectional.tikz rename to snippets/train_berth_shape_bidirectional.tikz index 3f2b392..d62a977 100644 --- a/examples/snippets/train_berth_shape_bidirectional.tikz +++ b/snippets/train_berth_shape_bidirectional.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_berth_sign_backward.tikz b/snippets/train_berth_sign_backward.tikz similarity index 81% rename from examples/snippets/train_berth_sign_backward.tikz rename to snippets/train_berth_sign_backward.tikz index 3b18d12..ad7592c 100644 --- a/examples/snippets/train_berth_sign_backward.tikz +++ b/snippets/train_berth_sign_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_berth_sign_forward.tikz b/snippets/train_berth_sign_forward.tikz similarity index 81% rename from examples/snippets/train_berth_sign_forward.tikz rename to snippets/train_berth_sign_forward.tikz index f266e14..7968688 100644 --- a/examples/snippets/train_berth_sign_forward.tikz +++ b/snippets/train_berth_sign_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_direction_backward.tikz b/snippets/train_direction_backward.tikz similarity index 81% rename from examples/snippets/train_direction_backward.tikz rename to snippets/train_direction_backward.tikz index 8d03e03..f1af0b0 100644 --- a/examples/snippets/train_direction_backward.tikz +++ b/snippets/train_direction_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_direction_forward.tikz b/snippets/train_direction_forward.tikz similarity index 81% rename from examples/snippets/train_direction_forward.tikz rename to snippets/train_direction_forward.tikz index ccb6feb..976e225 100644 --- a/examples/snippets/train_direction_forward.tikz +++ b/snippets/train_direction_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_drive_automatic.tikz b/snippets/train_drive_automatic.tikz similarity index 81% rename from examples/snippets/train_drive_automatic.tikz rename to snippets/train_drive_automatic.tikz index 5b18fba..5c62e4e 100644 --- a/examples/snippets/train_drive_automatic.tikz +++ b/snippets/train_drive_automatic.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_drive_human.tikz b/snippets/train_drive_human.tikz similarity index 83% rename from examples/snippets/train_drive_human.tikz rename to snippets/train_drive_human.tikz index e33b884..7bb9de1 100644 --- a/examples/snippets/train_drive_human.tikz +++ b/snippets/train_drive_human.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/train_moving_backward.tikz b/snippets/train_moving_backward.tikz similarity index 82% rename from examples/snippets/train_moving_backward.tikz rename to snippets/train_moving_backward.tikz index 197b6b5..484d182 100644 --- a/examples/snippets/train_moving_backward.tikz +++ b/snippets/train_moving_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/train_moving_fast_backward.tikz b/snippets/train_moving_fast_backward.tikz new file mode 100644 index 0000000..c0b43a9 --- /dev/null +++ b/snippets/train_moving_fast_backward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (-2,0) {train_moving_fast_backward}; \ No newline at end of file diff --git a/snippets/train_moving_fast_forward.tikz b/snippets/train_moving_fast_forward.tikz new file mode 100644 index 0000000..c8a8af0 --- /dev/null +++ b/snippets/train_moving_fast_forward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (2,0) {train_moving_fast_forward}; \ No newline at end of file diff --git a/examples/snippets/train_moving_forward.tikz b/snippets/train_moving_forward.tikz similarity index 82% rename from examples/snippets/train_moving_forward.tikz rename to snippets/train_moving_forward.tikz index f8f57c4..b34144e 100644 --- a/examples/snippets/train_moving_forward.tikz +++ b/snippets/train_moving_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/train_moving_slow_backward.tikz b/snippets/train_moving_slow_backward.tikz new file mode 100644 index 0000000..b92d2b1 --- /dev/null +++ b/snippets/train_moving_slow_backward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (-2,0) {train_moving_slow_backward}; \ No newline at end of file diff --git a/snippets/train_moving_slow_forward.tikz b/snippets/train_moving_slow_forward.tikz new file mode 100644 index 0000000..0116ea9 --- /dev/null +++ b/snippets/train_moving_slow_forward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (2,0) {train_moving_slow_forward}; \ No newline at end of file diff --git a/snippets/train_shunt_mode_backward.tikz b/snippets/train_shunt_mode_backward.tikz new file mode 100644 index 0000000..7d77936 --- /dev/null +++ b/snippets/train_shunt_mode_backward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (-2,0) {train_shunt_mode_backward}; \ No newline at end of file diff --git a/snippets/train_shunt_mode_forward.tikz b/snippets/train_shunt_mode_forward.tikz new file mode 100644 index 0000000..70a9695 --- /dev/null +++ b/snippets/train_shunt_mode_forward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (2,0) {train_shunt_mode_forward}; \ No newline at end of file diff --git a/snippets/train_shunting_backward.tikz b/snippets/train_shunting_backward.tikz new file mode 100644 index 0000000..35f2318 --- /dev/null +++ b/snippets/train_shunting_backward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (-2,0) {train_shunting_backward}; \ No newline at end of file diff --git a/snippets/train_shunting_forward.tikz b/snippets/train_shunting_forward.tikz new file mode 100644 index 0000000..bc3cb8b --- /dev/null +++ b/snippets/train_shunting_forward.tikz @@ -0,0 +1,8 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\pic at (2,0) {train_shunting_forward}; \ No newline at end of file diff --git a/examples/snippets/transmitter.tikz b/snippets/transmitter.tikz similarity index 84% rename from examples/snippets/transmitter.tikz rename to snippets/transmitter.tikz index f4831c1..2cfe287 100644 --- a/examples/snippets/transmitter.tikz +++ b/snippets/transmitter.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/transmitter_backward.tikz b/snippets/transmitter_backward.tikz similarity index 82% rename from examples/snippets/transmitter_backward.tikz rename to snippets/transmitter_backward.tikz index 696703d..d247680 100644 --- a/examples/snippets/transmitter_backward.tikz +++ b/snippets/transmitter_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/transmitter_below_with_signal.tikz b/snippets/transmitter_below_with_signal.tikz similarity index 84% rename from examples/snippets/transmitter_below_with_signal.tikz rename to snippets/transmitter_below_with_signal.tikz index 9847bcf..6da406d 100644 --- a/examples/snippets/transmitter_below_with_signal.tikz +++ b/snippets/transmitter_below_with_signal.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/transmitter_bidirectional.tikz b/snippets/transmitter_bidirectional.tikz similarity index 82% rename from examples/snippets/transmitter_bidirectional.tikz rename to snippets/transmitter_bidirectional.tikz index 260554c..88bb10d 100644 --- a/examples/snippets/transmitter_bidirectional.tikz +++ b/snippets/transmitter_bidirectional.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/transmitter_forward.tikz b/snippets/transmitter_forward.tikz similarity index 83% rename from examples/snippets/transmitter_forward.tikz rename to snippets/transmitter_forward.tikz index 196b182..c557c3d 100644 --- a/examples/snippets/transmitter_forward.tikz +++ b/snippets/transmitter_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/turnout_left_backward.tikz b/snippets/turnout_left_backward.tikz similarity index 83% rename from examples/snippets/turnout_left_backward.tikz rename to snippets/turnout_left_backward.tikz index 3a9253a..ac559d5 100644 --- a/examples/snippets/turnout_left_backward.tikz +++ b/snippets/turnout_left_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/turnout_left_backward_left_position.tikz b/snippets/turnout_left_backward_left_position.tikz new file mode 100644 index 0000000..ccf4810 --- /dev/null +++ b/snippets/turnout_left_backward_left_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++( 5, 0); +\draw[MainTrack] ( 0,0) -- ++(-1,-1); +\pic at (0,0) {turnout_left_backward}; +\pic at (0,0) {turnout_left_backward_points_left}; \ No newline at end of file diff --git a/snippets/turnout_left_backward_moving_points.tikz b/snippets/turnout_left_backward_moving_points.tikz new file mode 100644 index 0000000..f6ab4f7 --- /dev/null +++ b/snippets/turnout_left_backward_moving_points.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++( 5, 0); +\draw[MainTrack] ( 0,0) -- ++(-1,-1); +\pic at (0,0) {turnout_left_backward}; +\pic at (0,0) {turnout_left_backward_points_moving}; \ No newline at end of file diff --git a/snippets/turnout_left_backward_right_position.tikz b/snippets/turnout_left_backward_right_position.tikz new file mode 100644 index 0000000..27ca36f --- /dev/null +++ b/snippets/turnout_left_backward_right_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++( 5, 0); +\draw[MainTrack] ( 0,0) -- ++(-1,-1); +\pic at (0,0) {turnout_left_backward}; +\pic at (0,0) {turnout_left_backward_points_right}; \ No newline at end of file diff --git a/examples/snippets/turnout_left_forward.tikz b/snippets/turnout_left_forward.tikz similarity index 83% rename from examples/snippets/turnout_left_forward.tikz rename to snippets/turnout_left_forward.tikz index 7cc1fcd..91786ad 100644 --- a/examples/snippets/turnout_left_forward.tikz +++ b/snippets/turnout_left_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/turnout_left_forward_left_position.tikz b/snippets/turnout_left_forward_left_position.tikz new file mode 100644 index 0000000..6e9fbc3 --- /dev/null +++ b/snippets/turnout_left_forward_left_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\draw[MainTrack] ( 0,0) -- ++(1,1); +\pic at (0,0) {turnout_left_forward}; +\pic at (0,0) {turnout_left_forward_points_left}; \ No newline at end of file diff --git a/snippets/turnout_left_forward_moving_points.tikz b/snippets/turnout_left_forward_moving_points.tikz new file mode 100644 index 0000000..6fad9d4 --- /dev/null +++ b/snippets/turnout_left_forward_moving_points.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\draw[MainTrack] ( 0,0) -- ++(1,1); +\pic at (0,0) {turnout_left_forward}; +\pic at (0,0) {turnout_left_forward_points_moving}; \ No newline at end of file diff --git a/snippets/turnout_left_forward_right_position.tikz b/snippets/turnout_left_forward_right_position.tikz new file mode 100644 index 0000000..b8988fe --- /dev/null +++ b/snippets/turnout_left_forward_right_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5,0); +\draw[MainTrack] ( 0,0) -- ++(1,1); +\pic at (0,0) {turnout_left_forward}; +\pic at (0,0) {turnout_left_forward_points_right}; \ No newline at end of file diff --git a/examples/snippets/turnout_right_backward.tikz b/snippets/turnout_right_backward.tikz similarity index 83% rename from examples/snippets/turnout_right_backward.tikz rename to snippets/turnout_right_backward.tikz index 7579b30..1890da3 100644 --- a/examples/snippets/turnout_right_backward.tikz +++ b/snippets/turnout_right_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/turnout_right_backward_left_position.tikz b/snippets/turnout_right_backward_left_position.tikz new file mode 100644 index 0000000..a495eb3 --- /dev/null +++ b/snippets/turnout_right_backward_left_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++( 5,0); +\draw[MainTrack] ( 0,0) -- ++(-1,1); +\pic at (0,0) {turnout_right_backward}; +\pic at (0,0) {turnout_right_backward_points_left}; \ No newline at end of file diff --git a/snippets/turnout_right_backward_moving_points.tikz b/snippets/turnout_right_backward_moving_points.tikz new file mode 100644 index 0000000..7a3e53c --- /dev/null +++ b/snippets/turnout_right_backward_moving_points.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++( 5,0); +\draw[MainTrack] ( 0,0) -- ++(-1,1); +\pic at (0,0) {turnout_right_backward}; +\pic at (0,0) {turnout_right_backward_points_moving}; \ No newline at end of file diff --git a/snippets/turnout_right_backward_right_position.tikz b/snippets/turnout_right_backward_right_position.tikz new file mode 100644 index 0000000..6056a84 --- /dev/null +++ b/snippets/turnout_right_backward_right_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++( 5,0); +\draw[MainTrack] ( 0,0) -- ++(-1,1); +\pic at (0,0) {turnout_right_backward}; +\pic at (0,0) {turnout_right_backward_points_right}; \ No newline at end of file diff --git a/examples/snippets/turnout_right_forward.tikz b/snippets/turnout_right_forward.tikz similarity index 83% rename from examples/snippets/turnout_right_forward.tikz rename to snippets/turnout_right_forward.tikz index 5bdb73d..449d587 100644 --- a/examples/snippets/turnout_right_forward.tikz +++ b/snippets/turnout_right_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/turnout_right_forward_left_position.tikz b/snippets/turnout_right_forward_left_position.tikz new file mode 100644 index 0000000..9ae47b3 --- /dev/null +++ b/snippets/turnout_right_forward_left_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5, 0); +\draw[MainTrack] ( 0,0) -- ++(1,-1); +\pic at (0,0) {turnout_right_forward}; +\pic at (0,0) {turnout_right_forward_points_left}; \ No newline at end of file diff --git a/snippets/turnout_right_forward_moving_points.tikz b/snippets/turnout_right_forward_moving_points.tikz new file mode 100644 index 0000000..ee35057 --- /dev/null +++ b/snippets/turnout_right_forward_moving_points.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5, 0); +\draw[MainTrack] ( 0,0) -- ++(1,-1); +\pic at (0,0) {turnout_right_forward}; +\pic at (0,0) {turnout_right_forward_points_moving}; \ No newline at end of file diff --git a/snippets/turnout_right_forward_right_position.tikz b/snippets/turnout_right_forward_right_position.tikz new file mode 100644 index 0000000..b3ea6fe --- /dev/null +++ b/snippets/turnout_right_forward_right_position.tikz @@ -0,0 +1,10 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[MainTrack] (-2.5,0) -- ++(5, 0); +\draw[MainTrack] ( 0,0) -- ++(1,-1); +\pic at (0,0) {turnout_right_forward}; +\pic at (0,0) {turnout_right_forward_points_right}; \ No newline at end of file diff --git a/examples/snippets/turnout_with_fouling_left_backward.tikz b/snippets/turnout_with_fouling_left_backward.tikz similarity index 84% rename from examples/snippets/turnout_with_fouling_left_backward.tikz rename to snippets/turnout_with_fouling_left_backward.tikz index 1f40e43..3836f99 100644 --- a/examples/snippets/turnout_with_fouling_left_backward.tikz +++ b/snippets/turnout_with_fouling_left_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/turnout_with_fouling_left_forward.tikz b/snippets/turnout_with_fouling_left_forward.tikz similarity index 84% rename from examples/snippets/turnout_with_fouling_left_forward.tikz rename to snippets/turnout_with_fouling_left_forward.tikz index e35da2c..cdf17ab 100644 --- a/examples/snippets/turnout_with_fouling_left_forward.tikz +++ b/snippets/turnout_with_fouling_left_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/turnout_with_fouling_right_backward.tikz b/snippets/turnout_with_fouling_right_backward.tikz similarity index 83% rename from examples/snippets/turnout_with_fouling_right_backward.tikz rename to snippets/turnout_with_fouling_right_backward.tikz index 1beeb54..408c657 100644 --- a/examples/snippets/turnout_with_fouling_right_backward.tikz +++ b/snippets/turnout_with_fouling_right_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/turnout_with_fouling_right_forward.tikz b/snippets/turnout_with_fouling_right_forward.tikz similarity index 84% rename from examples/snippets/turnout_with_fouling_right_forward.tikz rename to snippets/turnout_with_fouling_right_forward.tikz index 376e8ca..4fd177b 100644 --- a/examples/snippets/turnout_with_fouling_right_forward.tikz +++ b/snippets/turnout_with_fouling_right_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/snippets/vehicle.tikz b/snippets/vehicle.tikz new file mode 100644 index 0000000..3a79660 --- /dev/null +++ b/snippets/vehicle.tikz @@ -0,0 +1,9 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[SideTrack] (-2.5,0) -- ++(5,0); +\pic at (-0.5,0) {vehicles=1}; +% change the 1 to desired length \ No newline at end of file diff --git a/snippets/vehicles.tikz b/snippets/vehicles.tikz new file mode 100644 index 0000000..8aa5f4b --- /dev/null +++ b/snippets/vehicles.tikz @@ -0,0 +1,9 @@ +%!TEX TS-program = pdflatexmk +%!TEX root = ../overview.tex + +% Copyright 2018 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. + +\draw[SideTrack] (-2.5,0) -- ++(5,0); +\pic at (-2,0) {vehicles}; +\node[font=\sffamily] at (0,0) {label}; \ No newline at end of file diff --git a/examples/snippets/view_point_backward.tikz b/snippets/view_point_backward.tikz similarity index 82% rename from examples/snippets/view_point_backward.tikz rename to snippets/view_point_backward.tikz index 3a41c4a..58b3de7 100644 --- a/examples/snippets/view_point_backward.tikz +++ b/snippets/view_point_backward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/examples/snippets/view_point_forward.tikz b/snippets/view_point_forward.tikz similarity index 82% rename from examples/snippets/view_point_forward.tikz rename to snippets/view_point_forward.tikz index a7bca53..310a673 100644 --- a/examples/snippets/view_point_forward.tikz +++ b/snippets/view_point_forward.tikz @@ -1,5 +1,5 @@ %!TEX TS-program = pdflatexmk -%!TEX root = ../../overview.tex +%!TEX root = ../overview.tex % Copyright 2018 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. diff --git a/src/constructions.tikz b/src/constructions.tikz index b9d4fed..f99122d 100644 --- a/src/constructions.tikz +++ b/src/constructions.tikz @@ -7,8 +7,8 @@ \tikzset{ pics/platform_left/.style n args={1}{ code={ - \path[draw, line width=0.75pt] (0,0.5) -- ++(0,-0.3) -- ++(#1,0) -- ++(0,0.3); - \path[draw, line width=0.75pt] (0,0.3) -- ++(#1,0); + \path[draw, line width=0.75pt,foreground] (0,0.5) -- ++(0,-0.3) -- ++(#1,0) -- ++(0,0.3); + \path[draw, line width=0.75pt,foreground] (0,0.3) -- ++(#1,0); } }, pics/platform_left/.default=4, @@ -16,8 +16,8 @@ \tikzset{ pics/platform_right/.style n args={1}{ code={ - \path[draw, line width=0.75pt] (0,-0.5) -- ++(0,0.3) -- ++(#1,0) -- ++(0,-0.3); - \path[draw, line width=0.75pt] (0,-0.3) -- ++(#1,0); + \path[draw, line width=0.75pt,foreground] (0,-0.5) -- ++(0,0.3) -- ++(#1,0) -- ++(0,-0.3); + \path[draw, line width=0.75pt,foreground] (0,-0.3) -- ++(#1,0); } }, pics/platform_right/.default=4, @@ -25,39 +25,39 @@ \tikzset{ level_crossing_barrier_left/.pic={ { % road - \path[draw, line width=1pt] (-0.2, 0.8) -- ++(0,-0.6); - \path[draw, line width=1pt] ( 0.2, 0.8) -- ++(0,-0.6); + \path[draw, line width=1pt,foreground] (-0.2, 0.8) -- ++(0,-0.6); + \path[draw, line width=1pt,foreground] ( 0.2, 0.8) -- ++(0,-0.6); } { % barrier - \filldraw (-0.4,0.5) circle (0.05); - \path[draw, line width=1pt] (-0.4,0.5) -- ++(0.39,0); + \filldraw[foreground] (-0.4,0.5) circle (0.05); + \path[draw, line width=1pt,foreground] (-0.4,0.5) -- ++(0.39,0); } }; } \tikzset{ level_crossing_barrier_right/.pic={ { % road - \path[draw, line width=1pt] (-0.2,-0.8) -- ++(0, 0.6); - \path[draw, line width=1pt] ( 0.2,-0.8) -- ++(0, 0.6); + \path[draw, line width=1pt,foreground] (-0.2,-0.8) -- ++(0, 0.6); + \path[draw, line width=1pt,foreground] ( 0.2,-0.8) -- ++(0, 0.6); } { % barrier - \filldraw (0.4,-0.5) circle (0.05); - \path[draw, line width=1pt] (0.4,-0.5) -- ++(-0.39,0); + \filldraw[foreground] (0.4,-0.5) circle (0.05); + \path[draw, line width=1pt,foreground] (0.4,-0.5) -- ++(-0.39,0); } }; } \tikzset{ level_crossing/.pic={ { % road - \path[draw, line width=1pt] (-0.2,-0.8) -- ++(0, 0.6); - \path[draw, line width=1pt] ( 0.2,-0.8) -- ++(0, 0.6); + \path[draw, line width=1pt,foreground] (-0.2,-0.8) -- ++(0, 0.6); + \path[draw, line width=1pt,foreground] ( 0.2,-0.8) -- ++(0, 0.6); } }; } \tikzset{ pics/bridge_left/.style n args={1}{ code={ - \path[draw, line width=0.75pt] (-0.1,0.48) -- ++(0.08,-0.08) -- ++(#1,0) -- ++(0.08,0.08); + \path[draw, line width=0.75pt,foreground] (-0.1,0.48) -- ++(0.08,-0.08) -- ++(#1,0) -- ++(0.08,0.08); } }, pics/bridge_left/.default=3, @@ -65,7 +65,7 @@ \tikzset{ pics/bridge_right/.style n args={1}{ code={ - \path[draw, line width=0.75pt] (-0.1,-0.48) -- ++(0.08,0.08) -- ++(#1,0) -- ++(0.08,-0.08); + \path[draw, line width=0.75pt,foreground] (-0.1,-0.48) -- ++(0.08,0.08) -- ++(#1,0) -- ++(0.08,-0.08); } }, pics/bridge_right/.default=3, @@ -73,30 +73,30 @@ \tikzset{ interlocking/.pic={ { - \path[draw, line width=1pt] (-0.6,-0.4 ) rectangle ++(1.2,0.8); % building - \path[draw, fill] (-0.5,-0.3 ) rectangle ++(1.0,0.2); % table - \path[draw, fill] ( 0 , 0.15) circle (0.15); % human dot + \path[draw, line width=1pt,foreground] (-0.6,-0.4 ) rectangle ++(1.2,0.8); % building + \path[draw, fill,foreground] (-0.5,-0.3 ) rectangle ++(1.0,0.2); % table + \path[draw, fill,foreground] ( 0 , 0.15) circle (0.15); % human dot } }; } \tikzset{ hump/.pic={ { % upper side - \path[draw, line width=0.75pt] (-0.3, 0.1) -- ++(0,0.05); - \path[draw, line width=0.75pt] (-0.2, 0.1) -- ++(0,0.15); - \path[draw, line width=0.75pt] (-0.1, 0.1) -- ++(0,0.25); - \path[draw, line width=0.75pt] ( 0.0, 0.1) -- ++(0,0.35); - \path[draw, line width=0.75pt] ( 0.1, 0.1) -- ++(0,0.25); - \path[draw, line width=0.75pt] ( 0.2, 0.1) -- ++(0,0.15); - \path[draw, line width=0.75pt] ( 0.3, 0.1) -- ++(0,0.05); + \path[draw, line width=0.75pt,foreground] (-0.3, 0.1) -- ++(0,0.05); + \path[draw, line width=0.75pt,foreground] (-0.2, 0.1) -- ++(0,0.15); + \path[draw, line width=0.75pt,foreground] (-0.1, 0.1) -- ++(0,0.25); + \path[draw, line width=0.75pt,foreground] ( 0.0, 0.1) -- ++(0,0.35); + \path[draw, line width=0.75pt,foreground] ( 0.1, 0.1) -- ++(0,0.25); + \path[draw, line width=0.75pt,foreground] ( 0.2, 0.1) -- ++(0,0.15); + \path[draw, line width=0.75pt,foreground] ( 0.3, 0.1) -- ++(0,0.05); % lower side - \path[draw, line width=0.75pt] (-0.3,-0.1) -- ++(0,-0.05); - \path[draw, line width=0.75pt] (-0.2,-0.1) -- ++(0,-0.15); - \path[draw, line width=0.75pt] (-0.1,-0.1) -- ++(0,-0.25); - \path[draw, line width=0.75pt] ( 0.0,-0.1) -- ++(0,-0.35); - \path[draw, line width=0.75pt] ( 0.1,-0.1) -- ++(0,-0.25); - \path[draw, line width=0.75pt] ( 0.2,-0.1) -- ++(0,-0.15); - \path[draw, line width=0.75pt] ( 0.3,-0.1) -- ++(0,-0.05); + \path[draw, line width=0.75pt,foreground] (-0.3,-0.1) -- ++(0,-0.05); + \path[draw, line width=0.75pt,foreground] (-0.2,-0.1) -- ++(0,-0.15); + \path[draw, line width=0.75pt,foreground] (-0.1,-0.1) -- ++(0,-0.25); + \path[draw, line width=0.75pt,foreground] ( 0.0,-0.1) -- ++(0,-0.35); + \path[draw, line width=0.75pt,foreground] ( 0.1,-0.1) -- ++(0,-0.25); + \path[draw, line width=0.75pt,foreground] ( 0.2,-0.1) -- ++(0,-0.15); + \path[draw, line width=0.75pt,foreground] ( 0.3,-0.1) -- ++(0,-0.05); } }; } diff --git a/src/layoutSymbols_DE.tikz b/src/layoutSymbols_DE.tikz index f1f104a..b5f0cae 100644 --- a/src/layoutSymbols_DE.tikz +++ b/src/layoutSymbols_DE.tikz @@ -1,6 +1,6 @@ %% symbol library for TikZ track schematics % -% Copyright 2018 Martin Scheidt (ISC license) +% Copyright 2019 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. @@ -9,120 +9,272 @@ \tikzset{ distant_signal_forward/.pic={ { % signal pole - \path[draw, line width=1pt] (0,-0.3) -- ++(0,-0.2); - \path[draw, line width=1pt] (0,-0.4) -- ++(0.5,0); + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.5,0); } { % signal marker - \path[draw, fill] (0.7,-0.6) rectangle ++(0.2,0.4); - \path[draw, fill] (0.7,-0.2) arc (90:270:0.2); + \path[draw, fill,foreground] (0.7,-0.6) rectangle ++(0.2,0.4); + \path[draw, fill,foreground] (0.7,-0.2) arc (90:270:0.2); } }; } \tikzset{ distant_signal_backward/.pic={ { % signal pole - \path[draw, line width=1pt] (0,0.3) -- ++(0,0.2); - \path[draw, line width=1pt] (0,0.4) -- ++(-0.5,0); + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.5,0); } { % signal marker - \path[draw, fill] (-0.7,0.6) rectangle ++(-0.2,-0.4); - \path[draw, fill] (-0.7,0.2) arc (90:270:-0.2); + \path[draw, fill,foreground] (-0.7,0.6) rectangle ++(-0.2,-0.4); + \path[draw, fill,foreground] (-0.7,0.2) arc (90:270:-0.2); } }; } \tikzset{ route_signal_forward/.pic={ { % signal pole - \path[draw, line width=1pt] (0,-0.3) -- ++(0,-0.2); - \path[draw, line width=1pt] (0,-0.4) -- ++(0.7,0); + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.7,0); } { % signal marker - \path[draw, fill] (0.7,-0.6) rectangle ++(0.3,0.4); - \path[draw, fill] (1.0,-0.6) arc (90:270:-0.2); + \path[draw, fill,foreground] (0.7,-0.6) rectangle ++(0.3,0.4); + \path[draw, fill,foreground] (1.0,-0.6) arc (90:270:-0.2); } }; } \tikzset{ route_signal_backward/.pic={ { % signal pole - \path[draw, line width=1pt] (0,0.3) -- ++(0,0.2); - \path[draw, line width=1pt] (0,0.4) -- ++(-0.7,0); + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.7,0); } { % signal marker - \path[draw, fill] (-0.7,0.6) rectangle ++(-0.3,-0.4); - \path[draw, fill] (-1.0,0.6) arc (90:270:0.2); + \path[draw, fill,foreground] (-0.7,0.6) rectangle ++(-0.3,-0.4); + \path[draw, fill,foreground] (-1.0,0.6) arc (90:270:0.2); } }; } \tikzset{ - route_passanger_forward/.pic={ - \fill (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + block_signal_forward/.pic={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.7,0); + } + { % signal marker + \path[draw, fill,foreground] (0.7,-0.6) rectangle ++(0.3,0.4); + \path[draw, fill,foreground] (1.0,-0.6) arc (90:270:-0.2); + } }; } \tikzset{ - route_passanger_backward/.pic={ - \fill (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + block_signal_backward/.pic={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.7,0); + } + { % signal marker + \path[draw, fill,foreground] (-0.7,0.6) rectangle ++(-0.3,-0.4); + \path[draw, fill,foreground] (-1.0,0.6) arc (90:270:0.2); + } }; } \tikzset{ - route_freight_forward/.pic={ - \fill (-0.35,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; - \fill ( 0 ,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + main_route_forward/.pic={ + \draw[foreground] (-0.06,0) circle (0.19); + \fill[foreground] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; }; } \tikzset{ - route_freight_backward/.pic={ - \fill (0.35,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; - \fill (0 ,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; - }; -} -% \tikzset{ -% speed_signal_forward/.pic={ -% \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.4,0); % signal pole -% \path[draw, line width=1pt] (0.4,-0.2) -- ++(0,-0.4) -- ++ (0.35,0.2) -- cycle; % signal marker -% }; -% } -% \tikzset{ -% speed_signal_backward/.pic={ -% \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.4,0); % signal pole -% \path[draw, line width=1pt] (-0.4,0.2) -- ++(0,0.4) -- ++ (-0.35,-0.2) -- cycle; % signal marker -% }; -% } -% \tikzset{ -% shunt_signal_forward/.pic={ -% \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole -% \path[draw, line width=1pt] (0.6,-0.3) circle (0.1); % signal marker -% }; -% } -\tikzset{ - clearing_point/.pic={ - \path[draw, line width=1pt] (0,-0.1) -- ++(0,0.2); % signal pole - \path[draw, line width=1pt] (0.1,0.1) -- ++(-0.2,0); % signal marker + main_route_backward/.pic={ + \draw[foreground] (0.06,0) circle (0.19); + \fill[foreground] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; }; } \tikzset{ - axle_counter_left/.pic={ - \path[draw, line width=1pt] (-0.25,0.16) -- ++(0.5,0); - \path[draw, line width=1pt, fill] (-0.1,0.16) circle (0.07); - \path[draw, line width=1pt, fill] ( 0.1,0.16) circle (0.07); + passanger_route_forward/.pic={ + \fill[foreground] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; }; } \tikzset{ - axle_counter_right/.pic={ - \path[draw, line width=1pt] (-0.25,-0.16) -- ++(0.5,0); - \path[draw, line width=1pt, fill] (-0.1,-0.16) circle (0.07); - \path[draw, line width=1pt, fill] ( 0.1,-0.16) circle (0.07); + passanger_route_backward/.pic={ + \fill[foreground] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; }; } +\tikzset{ + commuter_route_forward/.pic={ + \fill[foreground] (-0.2,0) circle (0.15); + \fill[foreground] ( 0 ,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + }; +} +\tikzset{ + commuter_route_backward/.pic={ + \fill[foreground] (0.2,0) circle (-0.15); + \fill[foreground] (0 ,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + }; +} +\tikzset{ + freight_route_forward/.pic={ + \fill[foreground] (-0.35,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + \fill[foreground] ( 0 ,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + }; +} +\tikzset{ + freight_route_backward/.pic={ + \fill[foreground] (0.35,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + \fill[foreground] (0 ,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + }; +} +\tikzset{ + shunting_route_forward/.pic={ + \fill[foreground] ( 0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + \fill[foreground] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + \fill[foreground] (-0.525,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + }; +} +\tikzset{ + shunting_route_backward/.pic={ + \fill[foreground] ( 0.525,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + \fill[foreground] ( 0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + \fill[foreground] (-0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + }; +} +\tikzset{ + pics/speed_signal_forward/.style args={#1}{ + code={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.4,0); + } + \path[draw, line width=1pt,foreground] (0.4,-0.2) -- ++(0,-0.4) -- ++ (0.35,0.2) -- cycle; % signal marker + \node[rotate=-90,font=\sffamily,text=foreground] at (1.0,-0.4) {#1}; % speed indicator + } + }, + pics/speed_signal_forward/.default=, +} +\tikzset{ + pics/speed_signal_backward/.style args={#1}{ + code={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.4,0); + } + \path[draw, line width=1pt,foreground] (-0.4,0.2) -- ++(0,0.4) -- ++ (-0.35,-0.2) -- cycle; % signal marker + \node[rotate=90,font=\sffamily,text=foreground] at (-1.0,0.4) {#1}; % speed indicator + } + }, + pics/speed_signal_backward/.default=, +} +\tikzset{ + pics/speed_distant_signal_forward/.style args={#1}{ + code={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.4,0); + } + \path[draw, line width=1pt,foreground] (0.75,-0.2) -- ++(0,-0.4) -- ++ (-0.35,0.2) -- cycle; % signal marker + \node[rotate=-90,font=\sffamily,text=foreground] at (1.0,-0.4) {#1}; % speed indicator + } + }, + pics/speed_distant_signal_forward/.default=, +} +\tikzset{ + pics/speed_distant_signal_backward/.style args={#1}{ + code={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.4,0); + } + \path[draw, line width=1pt,foreground] (-0.75,0.2) -- ++(0,0.4) -- ++ (0.35,-0.2) -- cycle; % signal marker + \node[rotate=90,font=\sffamily,text=foreground] at (-1.0,0.4) {#1}; % speed indicator + } + }, + pics/speed_distant_signal_backward/.default=, +} +\tikzset{ + shunt_signal_forward/.pic={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.6,0); + } + { % signal marker + \path[draw, line width=1pt, fill=background,foreground] (0.6,-0.55) rectangle ++(0.3,0.3); + \path[draw, line width=1pt,foreground] (0.75,-0.55) -- ++(0,0.3); + } + }; +} +\tikzset{ + shunt_signal_backward/.pic={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.6,0); + } + { % signal marker + \path[draw, line width=1pt, fill=background,foreground] (-0.6,0.55) rectangle ++(-0.3,-0.3); + \path[draw, line width=1pt,foreground] (-0.75,0.55) -- ++(0,-0.3); + } + }; +} +\tikzset{ + shunt_limit_forward/.pic={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,-0.3) -- ++(0,-0.2); + \path[draw, line width=1pt,foreground] (0,-0.4) -- ++(0.5,0); + } + \path[draw, line width=1pt,foreground] (0.5,-0.25) arc (270:90:-0.15) -- cycle;; % signal marker + }; +} +\tikzset{ + shunt_limit_backward/.pic={ + { % signal pole + \path[draw, line width=1pt,foreground] (0,0.3) -- ++(0,0.2); + \path[draw, line width=1pt,foreground] (0,0.4) -- ++(-0.5,0); + } + \path[draw, line width=1pt,foreground] (-0.5,0.55) arc (90:270:0.15) -- cycle;; % signal marker + }; +} +\tikzset{ + pics/axle_counter_left/.style args={#1}{ + code={ + \path[draw, line width=1pt,foreground] (-0.25,0.16) -- ++(0.5,0); + \path[draw, line width=1pt, fill,foreground] (-0.1,0.16) circle (0.07); + \path[draw, line width=1pt, fill,foreground] ( 0.1,0.16) circle (0.07); + \node[font=\sffamily,text=foreground] at (0,0.4) {#1}; % indicator + } + }, + pics/axle_counter_left/.default=, +} +\tikzset{ + pics/axle_counter_right/.style args={#1}{ + code={ + \path[draw, line width=1pt,foreground] (-0.25,-0.16) -- ++(0.5,0); + \path[draw, line width=1pt, fill,foreground] (-0.1,-0.16) circle (0.07); + \path[draw, line width=1pt, fill,foreground] ( 0.1,-0.16) circle (0.07); + \node[font=\sffamily,text=foreground] at (0,-0.4) {#1}; % indicator + } + }, + pics/axle_counter_right/.default=, +} \tikzset{ derailer_right_forward/.pic={ - \fill (-0.1,0.2) -- ++(0,-0.4) -- ++(0.2,0) -- ++(0,0.4) -- cycle; % signal pole - \path[draw,->,>=latex,line width=1pt] (-0.2,0.2) -- (0.4,-0.4); % derailer marker + \fill[foreground] (-0.1,0.2) -- ++(0,-0.4) -- ++(0.2,0) -- ++(0,0.4) -- cycle; % signal pole + \path[draw,->,>=latex,line width=1pt,foreground] (-0.2,0.2) -- (0.4,-0.4); % derailer marker }; } \tikzset{ derailer_left_forward/.pic={ - \fill (-0.1,0.2) -- ++(0,-0.4) -- ++(0.2,0) -- ++(0,0.4) -- cycle; % signal pole - \path[draw,->,>=latex,line width=1pt] (-0.2,-0.2) -- (0.4,0.4); % derailer marker + \fill[foreground] (-0.1,0.2) -- ++(0,-0.4) -- ++(0.2,0) -- ++(0,0.4) -- cycle; % signal pole + \path[draw,->,>=latex,line width=1pt,foreground] (-0.2,-0.2) -- (0.4,0.4); % derailer marker + }; +} +\tikzset{ + derailer_right_backward/.pic={ + \fill[foreground] (-0.1,0.2) -- ++(0,-0.4) -- ++(0.2,0) -- ++(0,0.4) -- cycle; % signal pole + \path[draw,->,>=latex,line width=1pt,foreground] (0.2,-0.2) -- (-0.4,0.4); % derailer marker + }; +} +\tikzset{ + derailer_left_backward/.pic={ + \fill[foreground] (-0.1,0.2) -- ++(0,-0.4) -- ++(0.2,0) -- ++(0,0.4) -- cycle; % signal pole + \path[draw,->,>=latex,line width=1pt,foreground] (0.2,0.2) -- (-0.4,-0.4); % derailer marker }; } diff --git a/src/topology.tikz b/src/topology.tikz index 9974c75..9eed9c1 100644 --- a/src/topology.tikz +++ b/src/topology.tikz @@ -1,17 +1,19 @@ %% symbol library for TikZ track schematics % -% Copyright 2018 Martin Scheidt (ISC license) +% Copyright 2019 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. -\tikzset{MainTrack/.style={line width=2pt}} -\tikzset{SideTrack/.style={line width=0.7pt}} \colorlet{background}{white} +\colorlet{foreground}{black} + +\tikzset{MainTrack/.style={line width=2pt,foreground}} +\tikzset{SideTrack/.style={line width=0.7pt,foreground}} \tikzset{ pics/track_number/.style args={#1}{ code={ - \node[fill=background,font=\sffamily] at (0,0) {#1}; % speed indicator + \node[fill=background,font=\sffamily,text=foreground] at (0,0) {#1}; % speed indicator } }, pics/track_number/.default=, @@ -19,9 +21,9 @@ \tikzset{ pics/track_distance/.style args={#1}{ code={ - \fill (0,0.96) -- ++(-0.1,-0.15) -- ++(0.2,0) -- cycle; % upper triangle - \node[baseline=(current bounding box.center),font=\sffamily] at (0,0.5) {#1}; % distance indicator - \fill (0,0.04) -- ++(-0.1,0.15) -- ++(0.2,0) -- cycle; % lower triangle + \fill[foreground] (0,0.96) -- ++(-0.1,-0.15) -- ++(0.2,0) -- cycle; % upper triangle + \node[baseline=(current bounding box.center),font=\sffamily,text=foreground] at (0,0.5) {#1}; % distance indicator + \fill[foreground] (0,0.04) -- ++(-0.1,0.15) -- ++(0.2,0) -- cycle; % lower triangle } }, pics/track_distance/.default=, @@ -29,106 +31,178 @@ \tikzset{ pics/turnout_left_forward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (0,0) -- ++(0.4,0.4) -- ++(0,-0.4); % turnout marker + \path[draw=foreground,line width=1pt,fill=#1] (0,0) -- ++(0.4,0.4) -- ++(0,-0.4); % turnout marker } }, - pics/turnout_left_forward/.default=black, + pics/turnout_left_forward/.default=foreground, } \tikzset{ pics/turnout_left_backward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (0,0) -- ++(-0.4,-0.4) -- ++(0,0.4); % turnout marker + \path[draw=foreground,line width=1pt,fill=#1] (0,0) -- ++(-0.4,-0.4) -- ++(0,0.4); % turnout marker } }, - pics/turnout_left_forward/.default=black, + pics/turnout_left_backward/.default=foreground, } \tikzset{ pics/turnout_right_forward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (0,0) -- ++(0.4,-0.4) -- ++(0,0.4); % turnout marker + \path[draw=foreground,line width=1pt,fill=#1] (0,0) -- ++(0.4,-0.4) -- ++(0,0.4); % turnout marker } }, - pics/turnout_left_forward/.default=black, + pics/turnout_right_forward/.default=foreground, } \tikzset{ pics/turnout_right_backward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (0,0) -- ++(-0.4,0.4) -- ++(0,-0.4); % turnout marker + \path[draw=foreground,line width=1pt,fill=#1] (0,0) -- ++(-0.4,0.4) -- ++(0,-0.4); % turnout marker } }, - pics/turnout_left_forward/.default=black, + pics/turnout_right_backward/.default=foreground, } \tikzset{ fouling_point_right_backward/.pic={ - \path[draw,line width=0.75pt] (-0.7,0) -- ++(0,0.7); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (-0.7,0) -- ++(0,0.7); % fouling point indicator }; } \tikzset{ fouling_point_left_backward/.pic={ - \path[draw,line width=0.75pt] (-0.7,0) -- ++(0,-0.7); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (-0.7,0) -- ++(0,-0.7); % fouling point indicator }; } \tikzset{ fouling_point_right_forward/.pic={ - \path[draw,line width=0.75pt] (0.7,0) -- ++(0,-0.7); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (0.7,0) -- ++(0,-0.7); % fouling point indicator }; } \tikzset{ fouling_point_left_forward/.pic={ - \path[draw,line width=0.75pt] (0.7,0) -- ++(0,0.7); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (0.7,0) -- ++(0,0.7); % fouling point indicator }; } \tikzset{ slip_left_forward/.pic={ - \path[draw,line width=0.75pt] (-0.4,0.1) -- (0.3,0.4); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (-0.4,0.1) -- (0.3,0.4); % fouling point indicator }; } \tikzset{ slip_left_backward/.pic={ - \path[draw,line width=0.75pt] (-0.3,-0.4) -- (0.4,-0.1); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (-0.3,-0.4) -- (0.4,-0.1); % fouling point indicator }; } \tikzset{ slip_right_forward/.pic={ - \path[draw,line width=0.75pt] (-0.4,-0.1) -- (0.3,-0.4); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (-0.4,-0.1) -- (0.3,-0.4); % fouling point indicator }; } \tikzset{ slip_right_backward/.pic={ - \path[draw,line width=0.75pt] (0.4,0.1) -- (-0.3,0.4); % fouling point indicator + \path[draw=foreground,line width=0.75pt] (0.4,0.1) -- (-0.3,0.4); % fouling point indicator + }; +} +\tikzset{ + turnout_left_forward_points_right/.pic={ + \path[draw=foreground,line width=1.5pt] (0,-0.1) -- ++(0.3,0); % points indicator + }; +} +\tikzset{ + turnout_left_forward_points_left/.pic={ + \path[draw=foreground,line width=1.5pt] (-0.035, 0.1) -- ++(0.2,0.2); % points indicator + }; +} +\tikzset{ + turnout_left_forward_points_moving/.pic={ + \fill[foreground] (0.075,-0.1) circle (0.05); % points indicator left + \fill[foreground] (0.225,-0.1) circle (0.05); + \fill[foreground] (0.015, 0.15) circle (0.05); % points indicator right + \fill[foreground] (0.115, 0.25) circle (0.05); + }; +} +\tikzset{ + turnout_left_backward_points_right/.pic={ + \path[draw=foreground,line width=1.5pt] (0,0.1) -- ++(-0.3,0); % points indicator + }; +} +\tikzset{ + turnout_left_backward_points_left/.pic={ + \path[draw=foreground,line width=1.5pt] (0.035,-0.1) -- ++(-0.2,-0.2); % points indicator + }; +} +\tikzset{ + turnout_left_backward_points_moving/.pic={ + \fill[foreground] (-0.075,0.1) circle (0.05); % points indicator left + \fill[foreground] (-0.225,0.1) circle (0.05); + \fill[foreground] (-0.015,-0.15) circle (0.05); % points indicator right + \fill[foreground] (-0.115,-0.25) circle (0.05); + }; +} +\tikzset{ + turnout_right_forward_points_right/.pic={ + \path[draw=foreground,line width=1.5pt] (-0.035,-0.1) -- ++(0.2,-0.2); % points indicator + }; +} +\tikzset{ + turnout_right_forward_points_left/.pic={ + \path[draw=foreground,line width=1.5pt] (0,0.1) -- ++(0.3,0); % points indicator + }; +} +\tikzset{ + turnout_right_forward_points_moving/.pic={ + \fill[foreground] (0.075, 0.1) circle (0.05); % points indicator left + \fill[foreground] (0.225, 0.1) circle (0.05); + \fill[foreground] (0.015,-0.15) circle (0.05); % points indicator right + \fill[foreground] (0.115,-0.25) circle (0.05); + }; +} +\tikzset{ + turnout_right_backward_points_right/.pic={ + \path[draw=foreground,line width=1.5pt] (0.035,0.1) -- ++(-0.2,0.2); % points indicator + }; +} +\tikzset{ + turnout_right_backward_points_left/.pic={ + \path[draw=foreground,line width=1.5pt] (0,-0.1) -- ++(-0.3,0); % points indicator + }; +} +\tikzset{ + turnout_right_backward_points_moving/.pic={ + \fill[foreground] (-0.075,-0.1) circle (0.05); % points indicator left + \fill[foreground] (-0.225,-0.1) circle (0.05); + \fill[foreground] (-0.015,0.15) circle (0.05); % points indicator right + \fill[foreground] (-0.115,0.25) circle (0.05); }; } \tikzset{ derailer_right_forward/.pic={ - \path[draw, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker - \path[draw,->,>=latex,line width=1pt,dashed] (0,0) -- ++(0.4,-0.4); % derailer arrow + \path[draw=foreground, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker + \path[draw=foreground,->,>=latex,line width=1pt,dashed] (0,0) -- ++(0.4,-0.4); % derailer arrow }; } \tikzset{ derailer_right_backward/.pic={ - \path[draw, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker - \path[draw,->,>=latex,line width=1pt,dashed] (0,0) -- ++(-0.4,0.4); % derailer arrow + \path[draw=foreground, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker + \path[draw=foreground,->,>=latex,line width=1pt,dashed] (0,0) -- ++(-0.4,0.4); % derailer arrow }; } \tikzset{ derailer_left_forward/.pic={ - \path[draw, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker - \path[draw,->,>=latex,line width=1pt,dashed] (0,0) -- ++(0.4,0.4); % derailer arrow + \path[draw=foreground, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker + \path[draw=foreground,->,>=latex,line width=1pt,dashed] (0,0) -- ++(0.4,0.4); % derailer arrow }; } \tikzset{ derailer_left_backward/.pic={ - \path[draw, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker - \path[draw,->,>=latex,line width=1pt,dashed] (0,0) -- ++(-0.4,-0.4); % derailer arrow + \path[draw=foreground, line width=1pt] (0,0.2) -- ++(0,-0.4); % derailer marker + \path[draw=foreground,->,>=latex,line width=1pt,dashed] (0,0) -- ++(-0.4,-0.4); % derailer arrow }; } \tikzset{ bufferstop_forward/.pic={ - \path[draw, line width=1pt] (-0.1,0.2) -- ++(0.1,0) -- ++(0,-0.4) -- ++ (-0.1,0); % bufferstop marker + \path[draw=foreground, line width=1pt] (-0.1,0.2) -- ++(0.1,0) -- ++(0,-0.4) -- ++ (-0.1,0); % bufferstop marker }; } \tikzset{ bufferstop_backward/.pic={ - \path[draw, line width=1pt] (0.1,0.2) -- ++(-0.1,0) -- ++(0,-0.4) -- ++ (0.1,0); % bufferstop marker + \path[draw=foreground, line width=1pt] (0.1,0.2) -- ++(-0.1,0) -- ++(0,-0.4) -- ++ (0.1,0); % bufferstop marker }; } diff --git a/src/trafficControl.tikz b/src/trafficControl.tikz index 93741e5..15a9e44 100644 --- a/src/trafficControl.tikz +++ b/src/trafficControl.tikz @@ -1,36 +1,36 @@ %% symbol library for TikZ track schematics % -% Copyright 2018 Martin Scheidt (ISC license) +% Copyright 2019 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. \tikzset{ train_berth_sign_forward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.3,0); % signal pole + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.3,0); % signal pole { % signal marker - \path[draw, line width=1pt] (0.3,-0.575) rectangle ++(0.5,0.35); - \path[draw, line width=0.75pt] (0.375,-0.3) -- ++(0.35,0); - \path[draw, line width=0.75pt] (0.55,-0.5) -- ++(0,0.2); - \path[draw, line width=0.75pt] (0.375,-0.5) -- ++(0.35,0); + \path[draw=foreground,line width=1pt] (0.3,-0.575) rectangle ++(0.5,0.35); + \path[draw=foreground,line width=0.75pt] (0.375,-0.3) -- ++(0.35,0); + \path[draw=foreground,line width=0.75pt] (0.55,-0.5) -- ++(0,0.2); + \path[draw=foreground,line width=0.75pt] (0.375,-0.5) -- ++(0.35,0); } }; } \tikzset{ train_berth_sign_backward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.3,0); % signal pole + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.3,0); % signal pole { % signal marker - \path[draw, line width=1pt] (-0.3,0.575) rectangle ++(-0.5,-0.35); - \path[draw, line width=0.75pt] (-0.375,0.3) -- ++(-0.35,0); - \path[draw, line width=0.75pt] (-0.55,0.5) -- ++(0,-0.2); - \path[draw, line width=0.75pt] (-0.375,0.5) -- ++(-0.35,0); + \path[draw=foreground,line width=1pt] (-0.3,0.575) rectangle ++(-0.5,-0.35); + \path[draw=foreground,line width=0.75pt] (-0.375,0.3) -- ++(-0.35,0); + \path[draw=foreground,line width=0.75pt] (-0.55,0.5) -- ++(0,-0.2); + \path[draw=foreground,line width=0.75pt] (-0.375,0.5) -- ++(-0.35,0); } }; } \tikzset{ pics/train_berth_shape/.style n args={1}{ code={ - \path[draw,line width=0.75pt,densely dotted] (0, 0.25) -- (0, 0.35) -- (#1, 0.35) -- ++(0,-0.1); % berth shape - \path[draw,line width=0.75pt,densely dotted] (0,-0.25) -- (0,-0.35) -- (#1,-0.35) -- ++(0, 0.1); % berth shape + \path[draw=foreground,line width=0.75pt,densely dotted] (0, 0.25) -- (0, 0.35) -- (#1, 0.35) -- ++(0,-0.1); % berth shape + \path[draw=foreground,line width=0.75pt,densely dotted] (0,-0.25) -- (0,-0.35) -- (#1,-0.35) -- ++(0, 0.1); % berth shape } }, pics/train_berth_shape/.default=4, @@ -38,7 +38,7 @@ \tikzset{ pics/train_berth_shape_forward/.style n args={1}{ code={ - \path[draw,line width=0.75pt,densely dotted] (0,-0.25) -- (0,-0.35) -- (#1,-0.35) -- ++(0, 0.1); % berth shape + \path[draw=foreground,line width=0.75pt,densely dotted] (0,-0.25) -- (0,-0.35) -- (#1,-0.35) -- ++(0, 0.1); % berth shape } }, pics/train_berth_shape/.default=4, @@ -46,28 +46,27 @@ \tikzset{ pics/train_berth_shape_backward/.style n args={1}{ code={ - \path[draw,line width=0.75pt,densely dotted] (0, 0.25) -- (0, 0.35) -- (#1, 0.35) -- ++(0,-0.1); % berth shape + \path[draw=foreground,line width=0.75pt,densely dotted] (0, 0.25) -- (0, 0.35) -- (#1, 0.35) -- ++(0,-0.1); % berth shape } }, pics/train_berth_shape/.default=4, } \tikzset{ view_point_forward/.pic={ - \path[draw,<-,>=latex,line width=1pt] (0,-0.1) -- ++(0,-0.3) -- ++(0.2,0); % arrow + \path[draw=foreground,<-,>=latex,line width=1pt] (0,-0.1) -- ++(0,-0.3) -- ++(0.2,0); % arrow { % eye - \filldraw (0.4,-0.4) circle (0.1); - \path[draw, line width=1pt] + \filldraw[foreground] (0.4,-0.4) circle (0.1); + \path[draw=foreground, line width=1pt] (0.4,-0.15) .. controls (0.25,-0.25) and (0.25,-0.55) .. (0.4,-0.65) .. controls (0.55,-0.55) and (0.55,-0.25) .. (0.4,-0.15)--cycle; } }; } \tikzset{ view_point_backward/.pic={ - \tikzset{>=latex} - \path[draw,<-,>=latex,line width=1pt] (0,0.1) -- ++(0,0.3) -- ++(-0.2,0); % arrow + \path[draw=foreground,<-,>=latex,line width=1pt] (0,0.1) -- ++(0,0.3) -- ++(-0.2,0); % arrow { % eye - \filldraw (-0.4,0.4) circle (0.1); - \path[draw, line width=1pt] + \filldraw[foreground] (-0.4,0.4) circle (0.1); + \path[draw=foreground, line width=1pt] (-0.4,0.15) .. controls (-0.25,0.25) and (-0.25,0.55) .. (-0.4,0.65) .. controls (-0.55,0.55) and (-0.55,0.25) .. (-0.4,0.15)--cycle; } }; @@ -75,9 +74,9 @@ \tikzset{ pics/distant_signal_forward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.4,0); % signal pole - \path[draw, fill=background, line width=1pt] (0.7,-0.6) -- ++(0,0.4) -- ++ (-0.35,-0.2) -- cycle; % signal marker - \node[rotate=-90,font=\sffamily] at (0.9,-0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.4,0); % signal pole + \path[draw=foreground,fill=background,line width=1pt] (0.7,-0.6) -- ++(0,0.4) -- ++ (-0.35,-0.2) -- cycle; % signal marker + \node[rotate=-90,font=\sffamily,text=foreground] at (0.9,-0.4) {#1}; % speed indicator } }, pics/distant_signal_forward/.default=, @@ -85,9 +84,9 @@ \tikzset{ pics/distant_signal_backward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.4,0); % signal pole - \path[draw, fill=background, line width=1pt] (-0.7,0.6) -- ++(0,-0.4) -- ++ (0.35,0.2) -- cycle; % signal marker - \node[rotate=90,font=\sffamily] at (-0.9,0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.4,0); % signal pole + \path[draw=foreground,fill=background,line width=1pt] (-0.7,0.6) -- ++(0,-0.4) -- ++ (0.35,0.2) -- cycle; % signal marker + \node[rotate=90,font=\sffamily,text=foreground] at (-0.9,0.4) {#1}; % speed indicator } }, pics/distant_signal_backward/.default=, @@ -95,9 +94,9 @@ \tikzset{ pics/speed_signal_forward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.4,0); % signal pole - \path[draw, line width=1pt] (0.4,-0.2) -- ++(0,-0.4) -- ++ (0.35,0.2) -- cycle; % signal marker - \node[rotate=-90,font=\sffamily] at (1.0,-0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.4,0); % signal pole + \path[draw=foreground,line width=1pt] (0.4,-0.2) -- ++(0,-0.4) -- ++ (0.35,0.2) -- cycle; % signal marker + \node[rotate=-90,font=\sffamily,text=foreground] at (1.0,-0.4) {#1}; % speed indicator } }, pics/speed_signal_forward/.default=, @@ -105,9 +104,9 @@ \tikzset{ pics/speed_signal_backward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.4,0); % signal pole - \path[draw, line width=1pt] (-0.4,0.2) -- ++(0,0.4) -- ++ (-0.35,-0.2) -- cycle; % signal marker - \node[rotate=90,font=\sffamily] at (-1.0,0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.4,0); % signal pole + \path[draw=foreground,line width=1pt] (-0.4,0.2) -- ++(0,0.4) -- ++ (-0.35,-0.2) -- cycle; % signal marker + \node[rotate=90,font=\sffamily,text=foreground] at (-1.0,0.4) {#1}; % speed indicator } }, pics/speed_signal_backward/.default=, @@ -115,9 +114,9 @@ \tikzset{ pics/block_signal_forward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole - \path[draw, line width=1pt] (0.7,-0.6) rectangle ++(0.4,0.4); % signal marker - \node[rotate=-90,font=\sffamily] at (1.3,-0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (0.7,-0.6) rectangle ++(0.4,0.4); % signal marker + \node[rotate=-90,font=\sffamily,text=foreground] at (1.3,-0.4) {#1}; % speed indicator } }, pics/block_signal_forward/.default=, @@ -125,9 +124,9 @@ \tikzset{ pics/block_signal_backward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole - \path[draw, line width=1pt] (-0.7,0.6) rectangle ++(-0.4,-0.4); % signal marker - \node[rotate=90,font=\sffamily] at (-1.3,0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (-0.7,0.6) rectangle ++(-0.4,-0.4); % signal marker + \node[rotate=90,font=\sffamily,text=foreground] at (-1.3,0.4) {#1}; % speed indicator } }, pics/block_signal_backward/.default=, @@ -135,9 +134,9 @@ \tikzset{ pics/route_signal_forward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole - \path[draw, line width=1pt] (0.9,-0.4) circle (0.2); % signal marker - \node[rotate=-90,font=\sffamily] at (1.3,-0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (0.9,-0.4) circle (0.2); % signal marker + \node[rotate=-90,font=\sffamily,text=foreground] at (1.3,-0.4) {#1}; % speed indicator } }, pics/route_signal_forward/.default=, @@ -145,79 +144,95 @@ \tikzset{ pics/route_signal_backward/.style args={#1}{ code={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole - \path[draw, line width=1pt] (-0.9,0.4) circle (0.2); % signal marker - \node[rotate=90,font=\sffamily] at (-1.3,0.4) {#1}; % speed indicator + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (-0.9,0.4) circle (0.2); % signal marker + \node[rotate=90,font=\sffamily,text=foreground] at (-1.3,0.4) {#1}; % speed indicator } }, pics/route_signal_backward/.default=, } \tikzset{ shunt_signal_forward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole - \path[draw, line width=1pt] (0.6,-0.3) circle (0.1); % signal marker + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (0.6,-0.3) circle (0.1); % signal marker + }; +} +\tikzset{ + shunt_signal_forward_locked/.pic={ + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole + % \path[fill=red] (0.6,-0.3) circle (0.1); % signal aspect + \path[draw=foreground, line width=1pt] (0.6,-0.2) -- ++(0,-0.2); % signal aspect + \path[draw=foreground,line width=1pt] (0.6,-0.3) circle (0.1); % signal marker }; } \tikzset{ shunt_signal_backward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole - \path[draw, line width=1pt] (-0.6,0.3) circle (0.1); % signal marker + \path[draw=foreground, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole + \path[draw=foreground, line width=1pt] (-0.6,0.3) circle (0.1); % signal marker + }; +} +\tikzset{ + shunt_signal_backward_locked/.pic={ + \path[draw=foreground, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole + % \path[fill=red] (-0.6,0.3) circle (0.1); % signal aspect + \path[draw=foreground, line width=1pt] (-0.6,0.2) -- ++(0,0.2); % signal aspect + \path[draw=foreground, line width=1pt] (-0.6,0.3) circle (0.1); % signal marker }; } \tikzset{ shunt_limit_forward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.5,0); % signal pole - \path[draw, line width=1pt] (0.5,-0.25) arc (270:90:-0.15) -- cycle;; % signal marker + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.4) -- ++(0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (0.6,-0.2) arc (270:90:-0.1) -- cycle;; % signal marker }; } \tikzset{ shunt_limit_backward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.5,0); % signal pole - \path[draw, line width=1pt] (-0.5,0.55) arc (90:270:0.15) -- cycle;; % signal marker + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.4) -- ++(-0.7,0); % signal pole + \path[draw=foreground,line width=1pt] (-0.6,0.4) arc (90:270:0.1) -- cycle;; % signal marker }; } \tikzset{ block_end_marker_forward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,-0.5); % marker - \path[draw, line width=1pt] (-0.1,-0.7) rectangle ++(0.2,0.2); % sign + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,-0.5); % marker + \path[draw=foreground,line width=1pt] (-0.1,-0.7) rectangle ++(0.2,0.2); % sign }; } \tikzset{ block_end_marker_backward/.pic={ - \path[draw, line width=1pt] (0,0) -- ++(0,0.5); % marker - \path[draw, line width=1pt] (0.1,0.7) rectangle ++(-0.2,-0.2); % sign + \path[draw=foreground,line width=1pt] (0,0) -- ++(0,0.5); % marker + \path[draw=foreground,line width=1pt] (0.1,0.7) rectangle ++(-0.2,-0.2); % sign }; } \tikzset{ block_clearing_point_forward/.pic={ - \path[draw, line width=1pt] (0,0.1) -- ++(0,-0.2); % marker - \path[draw, line width=1pt] (0,-0.1) -- ++(-0.1,-0.1) -- ++(0.1,-0.1) -- ++(0.1,0.1) -- cycle; % sign + \path[draw=foreground,line width=1pt] (0,0.1) -- ++(0,-0.2); % marker + \path[draw=foreground,line width=1pt] (0,-0.1) -- ++(-0.1,-0.1) -- ++(0.1,-0.1) -- ++(0.1,0.1) -- cycle; % sign }; } \tikzset{ block_clearing_point_backward/.pic={ - \path[draw, line width=1pt] (0,-0.1) -- ++(0,0.2); % marker - \path[draw, line width=1pt] (0,0.1) -- ++(0.1,0.1) -- ++(-0.1,0.1) -- ++(-0.1,-0.1) -- cycle; % sign + \path[draw=foreground, line width=1pt] (0,-0.1) -- ++(0,0.2); % marker + \path[draw=foreground, line width=1pt] (0,0.1) -- ++(0.1,0.1) -- ++(-0.1,0.1) -- ++(-0.1,-0.1) -- cycle; % sign }; } \tikzset{ route_clearing_point_forward/.pic={ - \path[draw, line width=1pt] (0,0.1) -- ++(0,-0.2); % marker - \path[draw, line width=1pt] (0,-0.2) circle (0.1); % sign + \path[draw=foreground, line width=1pt] (0,0.1) -- ++(0,-0.2); % marker + \path[draw=foreground, line width=1pt] (0,-0.2) circle (0.1); % sign }; } \tikzset{ route_clearing_point_backward/.pic={ - \path[draw, line width=1pt] (0,-0.1) -- ++(0,0.2); % marker - \path[draw, line width=1pt] (0, 0.2) circle (0.1); % sign + \path[draw=foreground, line width=1pt] (0,-0.1) -- ++(0,0.2); % marker + \path[draw=foreground, line width=1pt] (0, 0.2) circle (0.1); % sign }; } \tikzset{ pics/clearing_point/.style args={#1}{ code={ - \path[draw, line width=1pt] (0 ,-0.1) -- ++( 0 ,0.2); % marker - \path[draw, line width=1pt] (0.1, 0.1) -- ++(-0.2,0 ); % sign - \node[font=\sffamily] at (0,0.45) {#1}; % indicator + \path[draw=foreground, line width=1pt] (0 ,-0.1) -- ++( 0 ,0.2); % marker + \path[draw=foreground, line width=1pt] (0.1, 0.1) -- ++(-0.2,0 ); % sign + \node[font=\sffamily,text=foreground] at (0,0.45) {#1}; % indicator } }, pics/clearing_point/.default=, @@ -225,7 +240,7 @@ \tikzset{ pics/transmitter_below/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker } }, pics/transmitter_below/.default=background, @@ -233,8 +248,8 @@ \tikzset{ pics/transmitter_below_forward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker - \path[draw] (0.1,-0.05) -- (0.2,-0.125) -- (0.1,-0.2) -- cycle; + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker + \path[draw=foreground] (0.1,-0.05) -- (0.2,-0.125) -- (0.1,-0.2) -- cycle; } }, pics/transmitter_below_forward/.default=background, @@ -242,8 +257,8 @@ \tikzset{ pics/transmitter_below_backward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker - \path[draw] (-0.1,-0.05) -- (-0.2,-0.125) -- (-0.1,-0.2) -- cycle; + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker + \path[draw=foreground] (-0.1,-0.05) -- (-0.2,-0.125) -- (-0.1,-0.2) -- cycle; } }, pics/transmitter_below_backward/.default=background, @@ -251,9 +266,9 @@ \tikzset{ pics/transmitter_below_bidirectional/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker - \path[draw] ( 0.1,-0.05) -- ( 0.2,-0.125) -- ( 0.1,-0.2) -- cycle; - \path[draw] (-0.1,-0.05) -- (-0.2,-0.125) -- (-0.1,-0.2) -- cycle; + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,-0.25); % turnout marker + \path[draw=foreground] ( 0.1,-0.05) -- ( 0.2,-0.125) -- ( 0.1,-0.2) -- cycle; + \path[draw=foreground] (-0.1,-0.05) -- (-0.2,-0.125) -- (-0.1,-0.2) -- cycle; } }, pics/transmitter_below_bidirectional/.default=background, @@ -261,7 +276,7 @@ \tikzset{ pics/transmitter_above/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker } }, pics/transmitter_above/.default=background, @@ -269,8 +284,8 @@ \tikzset{ pics/transmitter_above_forward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker - \path[draw] (0.1,0.05) -- (0.2,0.125) -- (0.1,0.2) -- cycle; + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker + \path[draw=foreground] (0.1,0.05) -- (0.2,0.125) -- (0.1,0.2) -- cycle; } }, pics/transmitter_above_forward/.default=background, @@ -278,8 +293,8 @@ \tikzset{ pics/transmitter_above_backward/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker - \path[draw] (-0.1,0.05) -- (-0.2,0.125) -- (-0.1,0.2) -- cycle; + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker + \path[draw=foreground] (-0.1,0.05) -- (-0.2,0.125) -- (-0.1,0.2) -- cycle; } }, pics/transmitter_above_backward/.default=background, @@ -287,9 +302,9 @@ \tikzset{ pics/transmitter_above_bidirectional/.style args={#1}{ code={ - \path[draw,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker - \path[draw] ( 0.1,0.05) -- ( 0.2,0.125) -- ( 0.1,0.2) -- cycle; - \path[draw] (-0.1,0.05) -- (-0.2,0.125) -- (-0.1,0.2) -- cycle; + \path[draw=foreground,line width=1pt,fill=#1] (-0.25,0) rectangle (0.25,0.25); % turnout marker + \path[draw=foreground] ( 0.1,0.05) -- ( 0.2,0.125) -- ( 0.1,0.2) -- cycle; + \path[draw=foreground] (-0.1,0.05) -- (-0.2,0.125) -- (-0.1,0.2) -- cycle; } }, pics/transmitter_above_bidirectional/.default=background, diff --git a/src/vehicles.tikz b/src/vehicles.tikz index 5b6b816..ebbd1cf 100644 --- a/src/vehicles.tikz +++ b/src/vehicles.tikz @@ -4,21 +4,26 @@ % 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. +\colorlet{background}{white} +\colorlet{foreground}{black} + \tikzset{ - pics/train/.style args={#1}{ + pics/vehicles/.style args={#1}{ code={ - \path[draw, line width=1pt, fill=background] (0,-0.3) -- ++(#1,0) -- ++(0,0.6) -- ++(-#1,0) -- cycle; % train shape + \path[draw=foreground, double, line width=0.3pt, fill=background] (0,-0.3) -- ++(#1,0) -- ++(0,0.6) -- ++(-#1,0) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, - pics/train/.default=4, + pics/vehicles/.default=4, } \tikzset{ pics/train_moving_forward/.style args={#1}{ code={ - \path[draw, line width=1pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape - \path[draw, line width=1pt] (-0.13,0.23) -- (0.1,0) -- (-0.13,-0.23); % arrow shape part 1 - \path[draw, line width=1pt] (-0.03,0.23) -- (0.2,0) -- (-0.03,-0.23); % arrow shape part 2 + \fill[fill=background] (-0.3,0.3) -- ( 0.1,0.3) -- (0.4,0) -- ( 0.1,-0.3) -- (-0.3,-0.3) -- cycle; + \path[draw=foreground, line width=1pt] (-0.15,0.3) -- (-0.1,0.3) -- (0.2,0) -- (-0.1,-0.3) -- (-0.15,-0.3); % arrow shape part 1 + \path[draw=foreground, line width=1pt] ( 0.05,0.3) -- ( 0.1,0.3) -- (0.4,0) -- ( 0.1,-0.3) -- ( 0.05,-0.3); % arrow shape part 2 + % + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, @@ -27,18 +32,72 @@ \tikzset{ pics/train_moving_backward/.style args={#1}{ code={ - \path[draw, line width=1pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape - \path[draw, line width=1pt] (0.13,0.23) -- (-0.1,0) -- (0.13,-0.23); % arrow shape part 1 - \path[draw, line width=1pt] (0.03,0.23) -- (-0.2,0) -- (0.03,-0.23); % arrow shape part 2 + \fill[fill=background] ( 0.3 ,0.3) -- (-0.1,0.3) -- (-0.4,0) -- (-0.1,-0.3) -- ( 0.3 ,-0.3) -- cycle; + \path[draw=foreground, line width=1pt] ( 0.15,0.3) -- ( 0.1,0.3) -- (-0.2,0) -- ( 0.1,-0.3) -- ( 0.15,-0.3); % arrow shape part 1 + \path[draw=foreground, line width=1pt] (-0.05,0.3) -- (-0.1,0.3) -- (-0.4,0) -- (-0.1,-0.3) -- (-0.05,-0.3); % arrow shape part 2 + % + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, pics/train_moving_backward/.default=4, } +\tikzset{ + pics/train_moving_slow_forward/.style args={#1}{ + code={ + \fill[fill=background] (-0.3 ,0.3) -- (-0.1,0.3) -- (0.2,0) -- (-0.1,-0.3) -- (-0.3 ,-0.3) -- cycle; + \path[draw=foreground, line width=1pt] (-0.15,0.3) -- (-0.1,0.3) -- (0.2,0) -- (-0.1,-0.3) -- (-0.15,-0.3); % arrow shape part 1 + % + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_moving_slow_forward/.default=4, +} +\tikzset{ + pics/train_moving_slow_backward/.style args={#1}{ + code={ + \fill[fill=background] ( 0.3 ,0.3) -- ( 0.1,0.3) -- (-0.2,0) -- ( 0.1,-0.3) -- ( 0.3 ,-0.3) -- cycle; + \path[draw=foreground, line width=1pt] ( 0.15,0.3) -- ( 0.1,0.3) -- (-0.2,0) -- ( 0.1,-0.3) -- ( 0.15,-0.3); % arrow shape part 1 + % + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_moving_slow_backward/.default=4, +} +\tikzset{ + pics/train_moving_fast_forward/.style args={#1}{ + code={ + \fill[fill=background] (-0.3 ,0.3) -- ( 0.3,0.3) -- (0.6,0) -- ( 0.3,-0.3) -- (-0.3 ,-0.3) -- cycle; + \path[draw=foreground, line width=1pt] (-0.15,0.3) -- (-0.1,0.3) -- (0.2,0) -- (-0.1,-0.3) -- (-0.15,-0.3); % arrow shape part 1 + \path[draw=foreground, line width=1pt] ( 0.05,0.3) -- ( 0.1,0.3) -- (0.4,0) -- ( 0.1,-0.3) -- ( 0.05,-0.3); % arrow shape part 2 + \path[draw=foreground, line width=1pt] ( 0.25,0.3) -- ( 0.3,0.3) -- (0.6,0) -- ( 0.3,-0.3) -- ( 0.25,-0.3); % arrow shape part 3 + % + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_moving_fast_forward/.default=4, +} +\tikzset{ + pics/train_moving_fast_backward/.style args={#1}{ + code={ + \fill[fill=background] ( 0.3 ,0.3) -- (-0.3,0.3) -- (-0.6,0) -- (-0.3,-0.3) -- ( 0.3 ,-0.3) -- cycle; + \path[draw=foreground, line width=1pt] ( 0.15,0.3) -- ( 0.1,0.3) -- (-0.2,0) -- ( 0.1,-0.3) -- ( 0.15,-0.3); % arrow shape part 1 + \path[draw=foreground, line width=1pt] (-0.05,0.3) -- (-0.1,0.3) -- (-0.4,0) -- (-0.1,-0.3) -- (-0.05,-0.3); % arrow shape part 2 + \path[draw=foreground, line width=1pt] (-0.25,0.3) -- (-0.3,0.3) -- (-0.6,0) -- (-0.3,-0.3) -- (-0.25,-0.3); % arrow shape part 3 + % + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_moving_fast_backward/.default=4, +} \tikzset{ pics/train_direction_forward/.style args={#1}{ code={ - \path[draw, line width=1pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, @@ -47,7 +106,7 @@ \tikzset{ pics/train_direction_backward/.style args={#1}{ code={ - \path[draw, line width=1pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape + \path[draw=foreground, line width=1pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, @@ -56,7 +115,7 @@ \tikzset{ pics/ghost_train_direction_forward/.style args={#1}{ code={ - \path[draw, line width=1pt, dashed] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape + \path[draw=foreground, line width=1pt, dashed] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, @@ -65,29 +124,71 @@ \tikzset{ pics/ghost_train_direction_backward/.style args={#1}{ code={ - \path[draw, line width=1pt, dashed] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape + \path[draw=foreground, line width=1pt, dashed] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape % \node at (-2,0) {\emph{#2}}; %label of train } }, pics/ghost_train_direction_backward/.default=4, } +\tikzset{ + pics/train_shunt_mode_forward/.style args={#1}{ + code={ + \path[draw=foreground, double, line width=0.3pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_shunt_mode_forward/.default=4, +} +\tikzset{ + pics/train_shunt_mode_backward/.style args={#1}{ + code={ + \path[draw=foreground, double, line width=0.3pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_shunt_mode_backward/.default=4, +} +\tikzset{ + pics/train_shunting_forward/.style args={#1}{ + code={ + \fill[fill=background] (-0.3 ,0.3) -- (-0.1,0.3) -- (0.2,0) -- (-0.1,-0.3) -- (-0.3 ,-0.3) -- cycle; + \path[draw=foreground, double, line width=0.3pt] (-0.15,0.3) -- (-0.1,0.3) -- (0.2,0) -- (-0.1,-0.3) -- (-0.15,-0.3); % arrow shape part 1 + % + \path[draw=foreground, double, line width=0.3pt, fill=background] (0,0) -- +(-0.3,0.3) -- +(-#1,0.3) -- +(-#1,-0.3) -- +(-0.3,-0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_shunting_forward/.default=4, +} +\tikzset{ + pics/train_shunting_backward/.style args={#1}{ + code={ + \fill[fill=background] ( 0.3 ,0.3) -- ( 0.1,0.3) -- (-0.2,0) -- ( 0.1,-0.3) -- ( 0.3 ,-0.3) -- cycle; + \path[draw=foreground, double, line width=0.3pt] ( 0.15,0.3) -- ( 0.1,0.3) -- (-0.2,0) -- ( 0.1,-0.3) -- ( 0.15,-0.3); % arrow shape part 1 + % + \path[draw=foreground, double, line width=0.3pt, fill=background] (0,0) -- +(0.3,-0.3) -- +(#1,-0.3) -- +(#1,0.3) -- +(0.3,0.3) -- cycle; % train shape + % \node at (-2,0) {\emph{#2}}; %label of train + } + }, + pics/train_shunting_backward/.default=4, +} \tikzset{ train_automatic_forward/.pic={ - \path[draw, fill] (-0.15,0) -- ++(-0.15,0.15) -- ++(0,-0.3) -- cycle; % triangle + \path[draw=foreground, fill] (-0.15,0) -- ++(-0.15,0.15) -- ++(0,-0.3) -- cycle; % triangle }; } \tikzset{ train_automatic_backward/.pic={ - \path[draw, fill] (0.15,0) -- ++(0.15,0.15) -- ++(0,-0.3) -- cycle; % triangle + \path[draw=foreground, fill] (0.15,0) -- ++(0.15,0.15) -- ++(0,-0.3) -- cycle; % triangle }; } \tikzset{ train_human_forward/.pic={ - \path[draw, fill] (-0.4,0) circle (0.15); % dot + \path[draw=foreground, fill] (-0.4,0) circle (0.15); % dot }; } \tikzset{ train_human_backward/.pic={ - \path[draw, fill] (0.4,0) circle (0.15); % dot + \path[draw=foreground, fill] (0.4,0) circle (0.15); % dot }; } \ No newline at end of file