diff --git a/README.md b/README.md index 9f71ccc..1b215c2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,11 @@ edugame-rail-traffic-flow ====== +Version 0.7.1 +------ +Adapted signals for left- and right-hand traffic + + Version 0.7 ------ reworking of game mechanics together with tasks and figures diff --git a/backmatter/versionhistory.tex b/backmatter/versionhistory.tex index dca7882..93327a1 100644 --- a/backmatter/versionhistory.tex +++ b/backmatter/versionhistory.tex @@ -52,4 +52,8 @@ \IfLanguage{ngerman}{Spielmechanik mit Aufgaben und Abbildungen überarbeitet} \IfLanguage{english}{reworking of game mechanics together with tasks and figures} } + \vhEntry{0.7.1}{2019-09-09}{MS}{ + \IfLanguage{ngerman}{Signale fürs Links- und Rechtsfahren angepasst} + \IfLanguage{english}{Adapted signals for left- and right-hand traffic} + } \end{versionhistory} diff --git a/material/block_signals.pdf b/material/block_signals.pdf index 70f1560..ee5b50a 100644 Binary files a/material/block_signals.pdf and b/material/block_signals.pdf differ diff --git a/material/block_signals.tex b/material/block_signals.tex index 2f5036b..e52258d 100644 --- a/material/block_signals.tex +++ b/material/block_signals.tex @@ -17,16 +17,29 @@ \tikzset{ pics/distant_signal_go/.style args={#1}{ code={ - \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + \iftoggle{LeftHandTraffic}{ + \draw[loosely dashdotted] (0,-1) -- ( 0,0) -- ++(8,0) -- ++(0,-1); - \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole - \draw[line width=4pt,fill=base1!50] (2.1,-1.5) -- ++(2,-1) -- ++(0,2) -- cycle; % signal screen - \draw[fill=#1] (3.5,-1.5) circle (0.5); % signal aspect - \draw[double] (3,-1.5) -- ++(1.0,0); % signal aspect - \node[right] at (0.2,-1) { - \IfLanguage{english}{\Large distant signal} - \IfLanguage{ngerman}{\Large Vorsignal} - }; % label + \draw[line width=4pt] (0,0) -- ++(0,1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (2.1,1.5) -- ++(2,-1) -- ++(0,2) -- cycle; % signal screen + \draw[fill=#1] (3.5,1.5) circle (0.5); % signal aspect + \draw[double] (3,1.5) -- ++(1.0,0); % signal aspect + \node[right] at (0.2,1) { + \IfLanguage{english}{\Large distant signal} + \IfLanguage{ngerman}{\Large Vorsignal} + }; % label + }{ + \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + + \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (2.1,-1.5) -- ++(2,-1) -- ++(0,2) -- cycle; % signal screen + \draw[fill=#1] (3.5,-1.5) circle (0.5); % signal aspect + \draw[double] (3,-1.5) -- ++(1.0,0); % signal aspect + \node[right] at (0.2,-1) { + \IfLanguage{english}{\Large distant signal} + \IfLanguage{ngerman}{\Large Vorsignal} + }; % label + } } }, pics/distant_signal_go/.default=signalgreen, @@ -34,16 +47,29 @@ \tikzset{ pics/block_signal_go/.style args={#1}{ code={ - \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); - - \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole - \draw[line width=4pt,fill=base1!50] (4,-0.5) rectangle ++(2,-2); % signal screen - \draw[fill=#1] (5,-1.5) circle (0.5); % signal aspect - \draw[double] (4.5,-1.5) -- ++(1.0,0); % signal aspect - \node[right] at (0.2,-1) { - \IfLanguage{english}{\Large block signal} - \IfLanguage{ngerman}{\Large Blocksignal} - }; % label + \iftoggle{LeftHandTraffic}{ + \draw[loosely dashdotted] (0,-1) -- ( 0,0) -- ++(8,0) -- ++(0,-1); + + \draw[line width=4pt] (0,0) -- ++(0,1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (4,0.5) rectangle ++(2,2); % signal screen + \draw[fill=#1] (5,1.5) circle (0.5); % signal aspect + \draw[double] (4.5,1.5) -- ++(1.0,0); % signal aspect + \node[right] at (0.2,1) { + \IfLanguage{english}{\Large block signal} + \IfLanguage{ngerman}{\Large Blocksignal} + }; % label + }{ + \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + + \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (4,-0.5) rectangle ++(2,-2); % signal screen + \draw[fill=#1] (5,-1.5) circle (0.5); % signal aspect + \draw[double] (4.5,-1.5) -- ++(1.0,0); % signal aspect + \node[right] at (0.2,-1) { + \IfLanguage{english}{\Large block signal} + \IfLanguage{ngerman}{\Large Blocksignal} + }; % label + } } }, pics/block_signal_go/.default=signalgreen, @@ -51,16 +77,29 @@ \tikzset{ pics/distant_signal_stop/.style args={#1}{ code={ - \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + \iftoggle{LeftHandTraffic}{ + \draw[loosely dashdotted] (0,-1) -- ( 0,0) -- ++(8,0) -- ++(0,-1); - \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole - \draw[line width=4pt,fill=base1!50] (2.1,-1.5) -- ++(2,-1) -- ++(0,2) -- cycle; % signal screen - \draw[fill=#1] (3.5,-1.5) circle (0.5); % signal aspect - \draw[double] (3.14,-1.14) -- ++(0.72,-0.72); % signal aspect - \node[right] at (0.2,-1) { - \IfLanguage{english}{\Large distant signal} - \IfLanguage{ngerman}{\Large Vorsignal} - }; % label + \draw[line width=4pt] (0,0) -- ++(0,1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (2.1,1.5) -- ++(2,-1) -- ++(0,2) -- cycle; % signal screen + \draw[fill=#1] (3.5,1.5) circle (0.5); % signal aspect + \draw[double] (3.14,1.14) -- ++(0.72,0.72); % signal aspect + \node[right] at (0.2,1) { + \IfLanguage{english}{\Large distant signal} + \IfLanguage{ngerman}{\Large Vorsignal} + }; % label + }{ + \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + + \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (2.1,-1.5) -- ++(2,-1) -- ++(0,2) -- cycle; % signal screen + \draw[fill=#1] (3.5,-1.5) circle (0.5); % signal aspect + \draw[double] (3.14,-1.14) -- ++(0.72,-0.72); % signal aspect + \node[right] at (0.2,-1) { + \IfLanguage{english}{\Large distant signal} + \IfLanguage{ngerman}{\Large Vorsignal} + }; % label + } } }, pics/distant_signal_stop/.default=signalyellow, @@ -68,16 +107,29 @@ \tikzset{ pics/block_signal_stop/.style args={#1}{ code={ - \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + \iftoggle{LeftHandTraffic}{ + \draw[loosely dashdotted] (0,-1) -- ( 0,0) -- ++(8,0) -- ++(0,-1); - \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole - \draw[line width=4pt,fill=base1!50] (4,-0.5) rectangle ++(2,-2); % signal screen - \draw[fill=#1] (5,-1.5) circle (0.5); % signal aspect - \draw[double] (5,-1) -- ++(0,-1); % signal aspect - \node[right] at (0.2,-1) { - \IfLanguage{english}{\Large block signal} - \IfLanguage{ngerman}{\Large Blocksignal} - }; % label + \draw[line width=4pt] (0,0) -- ++(0,1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (4,0.5) rectangle ++(2,2); % signal screen + \draw[fill=#1] (5,1.5) circle (0.5); % signal aspect + \draw[double] (5,1) -- ++(0,1); % signal aspect + \node[right] at (0.2,1) { + \IfLanguage{english}{\Large block signal} + \IfLanguage{ngerman}{\Large Blocksignal} + }; % label + }{ + \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + + \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (4,-0.5) rectangle ++(2,-2); % signal screen + \draw[fill=#1] (5,-1.5) circle (0.5); % signal aspect + \draw[double] (5,-1) -- ++(0,-1); % signal aspect + \node[right] at (0.2,-1) { + \IfLanguage{english}{\Large block signal} + \IfLanguage{ngerman}{\Large Blocksignal} + }; % label + } } }, pics/block_signal_stop/.default=signalred, @@ -85,6 +137,7 @@ \begin{document} \selectlanguage{english} % currently supported: english, ngerman + \settoggle{LeftHandTraffic}{true} \tikzset{every path/.style={ultra thick}} \begin{frame} \vfill diff --git a/material/route_signals.pdf b/material/route_signals.pdf index 14b01cc..1b06b9c 100644 Binary files a/material/route_signals.pdf and b/material/route_signals.pdf differ diff --git a/material/route_signals.tex b/material/route_signals.tex index 53c2dd7..d2b2ff6 100644 --- a/material/route_signals.tex +++ b/material/route_signals.tex @@ -17,16 +17,29 @@ \tikzset{ pics/route_signal_stop/.style args={#1}{ code={ - \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); - - \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole - \draw[line width=4pt,fill=base1!50] (5,-1.5) circle (1); % signal screen - \draw[fill=#1] (5,-1.5) circle (0.5); % signal aspect - \draw[double] (5,-1) -- ++(0,-1); % signal aspect - \node[right] at (0.2,-1) { - \IfLanguage{english}{\Large route signal} - \IfLanguage{ngerman}{\Large Fahrstraßensignal} - }; % label + \iftoggle{LeftHandTraffic}{ + \draw[loosely dashdotted] (0,-1) -- ( 0,0) -- ++(8,0) -- ++(0,-1); + + \draw[line width=4pt] (0,0) -- ++(0,1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (5,1.5) circle (1); % signal screen + \draw[fill=#1] (5,1.5) circle (0.5); % signal aspect + \draw[double] (5,1) -- ++(0,1); % signal aspect + \node[right] at (0.2,1) { + \IfLanguage{english}{\Large route signal} + \IfLanguage{ngerman}{\Large Fahrstraßensignal} + }; % label + }{ + \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + + \draw[line width=4pt] (0,0) -- ++(0,-1.5) -- ++(4, 0); % signal pole + \draw[line width=4pt,fill=base1!50] (5,-1.5) circle (1); % signal screen + \draw[fill=#1] (5,-1.5) circle (0.5); % signal aspect + \draw[double] (5,-1) -- ++(0,-1); % signal aspect + \node[right] at (0.2,-1) { + \IfLanguage{english}{\Large route signal} + \IfLanguage{ngerman}{\Large Fahrstraßensignal} + }; % label + } } }, pics/route_signal_stop/.default=signalred, @@ -34,6 +47,7 @@ \begin{document} \selectlanguage{english} % currently supported: english, ngerman + \settoggle{LeftHandTraffic}{true} \tikzset{every path/.style={ultra thick}} \begin{frame} \vfill diff --git a/src/material_header.tex b/src/material_header.tex index 3f968f4..7bb0a42 100644 --- a/src/material_header.tex +++ b/src/material_header.tex @@ -31,3 +31,5 @@ \usepackage{tikz,adjustbox} +\usepackage{etoolbox} +\newtoggle{LeftHandTraffic}