diff --git a/examples/station_berg.tex b/examples/station_berg.tex index 50795b1..39589ef 100644 --- a/examples/station_berg.tex +++ b/examples/station_berg.tex @@ -27,9 +27,9 @@ { % tracks \draw[MainTrack] ( 1.5, 0) -- ++(37,0); \draw[MainTrack] (15 , 0) -- ++( 1,1) -- ++(10,0) -- ++(1,-1); - \draw[SideTrack] (11 ,-1) -- ++( 2,0) -- ++( 1,1); - \draw[SideTrack] ( 9 , 1) -- ++( 7,0); - \draw[SideTrack] (14 , 1) -- ++( 1,1) -- ++(10,0); + \draw[SecondaryTrack] (11 ,-1) -- ++( 2,0) -- ++( 1,1); + \draw[SecondaryTrack] ( 9 , 1) -- ++( 7,0); + \draw[SecondaryTrack] (14 , 1) -- ++( 1,1) -- ++(10,0); % track numbers \node[fill=background] at (11.7, 1) {12}; \node[fill=background] at (11.7,-1) {10}; diff --git a/examples/station_chamstadt.tex b/examples/station_chamstadt.tex index 81af5cd..0d23e31 100644 --- a/examples/station_chamstadt.tex +++ b/examples/station_chamstadt.tex @@ -31,7 +31,7 @@ \draw[MainTrack] (14 , 0) -- ++( 1,-1) -- ++(10.5,0) -- ++( 1,1); \draw[MainTrack] (27 , 1) -- ++( 1,-1); \draw[MainTrack] (29 , 0) -- ++( 5, 5); - \draw[SideTrack] ( 9 , 1) -- ++( 7, 0); + \draw[SecondaryTrack] ( 9 , 1) -- ++( 7, 0); % % track numbers \node[fill=background] at (12.5, 1) {11}; \node[fill=background] at (21.75, 1) { 1}; diff --git a/examples/station_okerbach.tikz b/examples/station_okerbach.tikz index ff6f67d..7d9be19 100644 --- a/examples/station_okerbach.tikz +++ b/examples/station_okerbach.tikz @@ -25,15 +25,15 @@ \draw[MainTrack] (O2R-2) -- (O2S-2); % track 2 \draw[MainTrack] ( 5, 1) -- ++( 1,-1); % track W1/W2 \draw[MainTrack] ( 7, 0) -- ++( 1, 1); % track W3/W4 - \draw[SideTrack] ( 7, 2) -- ++(-3, 3) -- ++(-0.5,0); % track 132 + \draw[SecondaryTrack] ( 7, 2) -- ++(-3, 3) -- ++(-0.5,0); % track 132 \draw[MainTrack] ( 8, 0) -- ++( 1,-1) -- ++(13. ,0) -- ++( 1. , 1); % track 10 \draw[MainTrack] ( 9, 1) -- ++( 1, 1) -- ++(11. ,0) -- ++( 1. ,-1); % track 13 - \draw[SideTrack] (10, 2) -- ++(-4, 0) -- ++(-2. ,2) -- ++(-0.5, 0); % track 131 + \draw[SecondaryTrack] (10, 2) -- ++(-4, 0) -- ++(-2. ,2) -- ++(-0.5, 0); % track 131 \draw[MainTrack] (10, 2) -- ++( 1, 1) -- ++( 9. ,0) -- ++( 1. ,-1); % track 14 - \draw[SideTrack] (11, 3) -- ++( 1, 1) -- ++( 7. ,0) -- ++( 1. ,-1); % track 15 - \draw[SideTrack] (19, 4) -- ++( 4, 0); % track 215 + \draw[SecondaryTrack] (11, 3) -- ++( 1, 1) -- ++( 7. ,0) -- ++( 1. ,-1); % track 15 + \draw[SecondaryTrack] (19, 4) -- ++( 4, 0); % track 215 \draw[MainTrack] (23, 1) -- ++( 1,-1); % track W16/W18 - \draw[SideTrack] (32, 0) -- ++( 1.5,-1.5) -- ++( 4, 0); % track 410 + \draw[SecondaryTrack] (32, 0) -- ++( 1.5,-1.5) -- ++( 4, 0); % track 410 \draw[MainTrack] (35, 0) -- ++( 1, 1); % track W21/W22 } { %% track numbers diff --git a/examples/station_pockelsdorf.tikz b/examples/station_pockelsdorf.tikz index 0fd4ae1..992082a 100644 --- a/examples/station_pockelsdorf.tikz +++ b/examples/station_pockelsdorf.tikz @@ -22,7 +22,7 @@ \draw[MainTrack] ( 5,0) -- ++(1,1) -- ++(14,0) -- ++(1,-1); % track 2 \draw[MainTrack] ( 7,1) -- ++(1,1) -- ++(11,0) -- ++(1,-1); % track 3 \draw[MainTrack] ( P2M) -- ++(5,5); - \draw[SideTrack] (22,0) -- ++(1.5,-1.5) -- ++(3,0); % track 10 + \draw[SecondaryTrack] (22,0) -- ++(1.5,-1.5) -- ++(3,0); % track 10 } { %% track numbers \node[fill=background] at (13.5, 0) { 1}; diff --git a/examples/station_rebenau.tikz b/examples/station_rebenau.tikz index 85c784d..fe7cfa3 100644 --- a/examples/station_rebenau.tikz +++ b/examples/station_rebenau.tikz @@ -23,15 +23,15 @@ \draw[MainTrack] (R2W-1) -- (R2O-1); % track 1 \draw[MainTrack] ( 5, 0) -- ++( 1, 1); \draw[MainTrack] (R2W-2) -- ++( 8, 0) -- ++(2,2) -- ++(26,0) -- ++(2,-2) -- (R2O-2); % track 3 - \draw[SideTrack] ( 9, 1) -- ++( 6, 0); % track 21 - \draw[SideTrack] ( 8, 4) -- ++( 7, 0); % track 41 - \draw[SideTrack] (12, 4) -- ++( 1,-1); + \draw[SecondaryTrack] ( 9, 1) -- ++( 6, 0); % track 21 + \draw[SecondaryTrack] ( 8, 4) -- ++( 7, 0); % track 41 + \draw[SecondaryTrack] (12, 4) -- ++( 1,-1); \draw[MainTrack] (14, 3) -- (15, 4) -- (R2P); % track 4 \draw[MainTrack] (14, 0) -- ++( 1, 1) -- ++(18, 0); % track 2 \draw[MainTrack] (15, 3) -- ++( 2,-2); \draw[MainTrack] (16, 4) -- (17, 5) -- (29, 5) -- ++(5,-5); % track 5 \draw[MainTrack] (28, 1) -- ++( 1, 1) -- ++( 5, 0) -- ++(2, 2); - \draw[SideTrack] (26, 5) -- ++( 1, 1) -- ++( 3, 0); % track 51 + \draw[SecondaryTrack] (26, 5) -- ++( 1, 1) -- ++( 3, 0); % track 51 } { %% track numbers \node[fill=background] at ( 9.0, 4) {41}; diff --git a/examples/station_schleinitz.tikz b/examples/station_schleinitz.tikz index 5a690cb..f917862 100644 --- a/examples/station_schleinitz.tikz +++ b/examples/station_schleinitz.tikz @@ -27,11 +27,11 @@ \draw[MainTrack] ( 5, 0) -- ++( 1, 1); % track W2/W3 \draw[MainTrack] (16, 1) -- ++( 1,-1); % track W4/W5 \draw[MainTrack] (18, 0) -- ++( 1, 1); % track W6/W7 - \draw[SideTrack] (23, 2) -- ++( -5, 0); % track 41 + \draw[SecondaryTrack] (23, 2) -- ++( -5, 0); % track 41 \draw[MainTrack] (22, 0) -- ++( 1,-1) -- ++(13. ,0) -- ++( 1. , 1); % track 1 \draw[MainTrack] (22, 1) -- ++( 1, 1) -- ++(13. ,0) -- ++( 1. ,-1); % track 4 - \draw[SideTrack] (24, 2) -- ++( 1, 1) -- ++(10. ,0) -- ++( 1. ,-1); % track 5 - \draw[SideTrack] (36,-1) -- ++( 5, 0); % track 11 + \draw[SecondaryTrack] (24, 2) -- ++( 1, 1) -- ++(10. ,0) -- ++( 1. ,-1); % track 5 + \draw[SecondaryTrack] (36,-1) -- ++( 5, 0); % track 11 \draw[MainTrack] (38, 1) -- ++( 1,-1); % track W18/W19 } { %% track numbers diff --git a/snippets.pdf b/snippets.pdf index 2ee52ad..dea8774 100644 Binary files a/snippets.pdf and b/snippets.pdf differ diff --git a/snippets.tex b/snippets.tex index 25d730d..dfe7aae 100644 --- a/snippets.tex +++ b/snippets.tex @@ -50,7 +50,7 @@ \hline \No & track distance (in \si{\metre}) & \symbol{track_distance.tikz} & \code{track_distance.tikz} & \texttt{topology} \\ \hline - \No & side track & \symbol{side_track.tikz} & \code{side_track.tikz} & \texttt{topology} \\ + \No & secondary track & \symbol{secondary_track.tikz} & \code{secondary_track.tikz} & \texttt{topology} \\ \hline \No & track number & \symbol{track_number.tikz} & \code{track_number.tikz} & \texttt{topology} \\ \hline diff --git a/snippets/bufferstop_backward.tikz b/snippets/bufferstop_backward.tikz index a674823..7baec64 100644 --- a/snippets/bufferstop_backward.tikz +++ b/snippets/bufferstop_backward.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (0,0) -- ++(2.5,0); +\draw[SecondaryTrack] (0,0) -- ++(2.5,0); \pic at (0,0) {bufferstop_backward}; \ No newline at end of file diff --git a/snippets/bufferstop_forward.tikz b/snippets/bufferstop_forward.tikz index b3a3bda..12c3641 100644 --- a/snippets/bufferstop_forward.tikz +++ b/snippets/bufferstop_forward.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(2.5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(2.5,0); \pic at (0,0) {bufferstop_forward}; \ No newline at end of file diff --git a/snippets/combined_signal_forward.tikz b/snippets/combined_signal_forward.tikz index 2e3f54d..a9c041e 100644 --- a/snippets/combined_signal_forward.tikz +++ b/snippets/combined_signal_forward.tikz @@ -5,5 +5,6 @@ % 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,0) {block_signal_forward}; -\pic at (0,0) {distant_signal_forward}; \ No newline at end of file +\pic at (0,0) {block_signal_forward={S}}; % Order 1 +% replace the S with desired speed or remove +\pic at (0,0) {distant_signal_forward}; % Order 2 \ No newline at end of file diff --git a/snippets/derailer_left_backward.tikz b/snippets/derailer_left_backward.tikz index 43a1b25..925b6cb 100644 --- a/snippets/derailer_left_backward.tikz +++ b/snippets/derailer_left_backward.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \pic at (0,0) {derailer_left_backward}; \ No newline at end of file diff --git a/snippets/derailer_left_forward.tikz b/snippets/derailer_left_forward.tikz index fbb6610..b3c0aac 100644 --- a/snippets/derailer_left_forward.tikz +++ b/snippets/derailer_left_forward.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \pic at (0,0) {derailer_left_forward}; \ No newline at end of file diff --git a/snippets/derailer_right_backward.tikz b/snippets/derailer_right_backward.tikz index 0bfacaf..db9f4ae 100644 --- a/snippets/derailer_right_backward.tikz +++ b/snippets/derailer_right_backward.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \pic at (0,0) {derailer_right_backward}; \ No newline at end of file diff --git a/snippets/derailer_right_forward.tikz b/snippets/derailer_right_forward.tikz index 3600219..3cd482f 100644 --- a/snippets/derailer_right_forward.tikz +++ b/snippets/derailer_right_forward.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \pic at (0,0) {derailer_right_forward}; \ No newline at end of file diff --git a/snippets/hump.tikz b/snippets/hump.tikz index b2a508a..cbcea3e 100755 --- a/snippets/hump.tikz +++ b/snippets/hump.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \pic at (0,0) {hump}; \ No newline at end of file diff --git a/snippets/side_track.tikz b/snippets/secondary_track.tikz similarity index 88% rename from snippets/side_track.tikz rename to snippets/secondary_track.tikz index 679a49c..72be7c3 100644 --- a/snippets/side_track.tikz +++ b/snippets/secondary_track.tikz @@ -4,4 +4,4 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); \ No newline at end of file +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \ No newline at end of file diff --git a/snippets/vehicle.tikz b/snippets/vehicle.tikz index fae0bf7..1d8ea8f 100644 --- a/snippets/vehicle.tikz +++ b/snippets/vehicle.tikz @@ -4,6 +4,6 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-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 index 7ba2d94..411c50e 100644 --- a/snippets/vehicles.tikz +++ b/snippets/vehicles.tikz @@ -4,5 +4,5 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-2.5,0) -- ++(5,0); \pic at (-2,0) {vehicles}; \ No newline at end of file diff --git a/snippets/vehicles_with_label.tikz b/snippets/vehicles_with_label.tikz index 2c57998..81f0834 100644 --- a/snippets/vehicles_with_label.tikz +++ b/snippets/vehicles_with_label.tikz @@ -4,6 +4,6 @@ % 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. -\draw[SideTrack] (-2.5,0) -- ++(5,0); +\draw[SecondaryTrack] (-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/src/tikzlibrarytrackschematic.topology.code.tex b/src/tikzlibrarytrackschematic.topology.code.tex index 95601d6..d2cec05 100644 --- a/src/tikzlibrarytrackschematic.topology.code.tex +++ b/src/tikzlibrarytrackschematic.topology.code.tex @@ -10,7 +10,7 @@ \colorlet{foreground}{black} \tikzset{MainTrack/.style={line width=2pt,foreground}}% -\tikzset{SideTrack/.style={line width=0.7pt,foreground}}% +\tikzset{SecondaryTrack/.style={line width=0.7pt,foreground}}% \tikzset{ pics/track_number/.default=, diff --git a/src/tikzlibrarytrackschematic.trafficcontrol.code.tex b/src/tikzlibrarytrackschematic.trafficcontrol.code.tex index 69b78b7..52577c4 100644 --- a/src/tikzlibrarytrackschematic.trafficcontrol.code.tex +++ b/src/tikzlibrarytrackschematic.trafficcontrol.code.tex @@ -349,4 +349,40 @@ }, } +\tikzset{ + opposing_protection_forward/.pic={ + \path[draw=foreground, fill=background] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + }; +} + +\tikzset{ + opposing_protection_backward/.pic={ + \path[draw=foreground, fill=background] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + }; +} + +\tikzset{ + opposing_protection_granted_forward/.pic={ + \fill[foreground] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + }; +} + +\tikzset{ + opposing_protection_granted_backward/.pic={ + \fill[foreground] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + }; +} + +\tikzset{ + opposing_protection_declined_forward/.pic={ + \path[draw=foreground, fill=background, densely dotted] (-0.175,-0.15) -- ++(0,0.3) -- ++ (0.35,-0.15) -- cycle; + }; +} + +\tikzset{ + opposing_protection_declined_backward/.pic={ + \path[draw=foreground, fill=background, densely dotted] (0.175,-0.15) -- ++(0,0.3) -- ++ (-0.35,-0.15) -- cycle; + }; +} + \endinput diff --git a/symbology.pdf b/symbology.pdf index bb9575a..5e2701c 100644 Binary files a/symbology.pdf and b/symbology.pdf differ diff --git a/symbology.tex b/symbology.tex index c340c30..a3f58f8 100644 --- a/symbology.tex +++ b/symbology.tex @@ -48,7 +48,7 @@ \hline \No & track distance (in \si{\metre}) & \symbol{track_distance.tikz} \\ \hline - \No & side track & \symbol{side_track.tikz} \\ + \No & secondary track & \symbol{secondary_track.tikz} \\ \hline \No & track number & \symbol{track_number.tikz} \\ \hline @@ -122,7 +122,8 @@ \hline \No & transmitter bidirectional & \symbol{transmitter_below_bidirectional.tikz} \\ \hline - \No & block end marker & \symbol{block_end_marker_forward.tikz} \\ + \No & \parbox[c]{4cm}{block end marker\\(end of movement authority)} + & \symbol{block_end_marker_forward.tikz} \\ \hline \No & block clearing point & \symbol{block_clearing_point_forward.tikz} \\ \hline