diff --git a/README.md b/README.md index fc4e9e6..b582dc3 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,18 @@ edugame-rail-traffic-flow ====== + +Version 0.5.1 +------ +minor improvements and some refactoring + + Version 0.5 ------ -* added Material for paper based game: -** papercut tracks, signals, and trains -** collection of trains with appropriate driving dynamics -** protocol template -* minor improvements and some refactoring +added Material for paper based game: +* papercut tracks, signals, and trains +* collection of trains with appropriate driving dynamics +* protocol template +minor improvements and some refactoring Version 0.4 ------ diff --git a/backmatter/versionhistory.tex b/backmatter/versionhistory.tex index f10b584..121ac57 100644 --- a/backmatter/versionhistory.tex +++ b/backmatter/versionhistory.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \newcommand{\MS}{Martin Scheidt} diff --git a/figures/composition.pdf b/figures/composition.pdf new file mode 100644 index 0000000..f76f46b Binary files /dev/null and b/figures/composition.pdf differ diff --git a/figures/composition.tex b/figures/composition.tex index 3c82ca2..21c7b69 100644 --- a/figures/composition.tex +++ b/figures/composition.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass[tikz,border=2,preview=true]{standalone} diff --git a/figures/composition.tikz b/figures/composition.tikz index fbb0475..5de8f7d 100644 --- a/figures/composition.tikz +++ b/figures/composition.tikz @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = composition.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope}[>=latex] diff --git a/figures/control_lever.pdf b/figures/control_lever.pdf new file mode 100644 index 0000000..c37f34d Binary files /dev/null and b/figures/control_lever.pdf differ diff --git a/figures/control_lever.tex b/figures/control_lever.tex index d11660e..555082e 100644 --- a/figures/control_lever.tex +++ b/figures/control_lever.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass[tikz,border=2,preview=true]{standalone} diff --git a/figures/control_lever.tikz b/figures/control_lever.tikz index 132aec5..3148435 100644 --- a/figures/control_lever.tikz +++ b/figures/control_lever.tikz @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = control_lever.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope} diff --git a/figures/initial_setup.pdf b/figures/initial_setup.pdf new file mode 100644 index 0000000..6192823 Binary files /dev/null and b/figures/initial_setup.pdf differ diff --git a/figures/initial_setup.tex b/figures/initial_setup.tex index 4857db2..7055ad6 100644 --- a/figures/initial_setup.tex +++ b/figures/initial_setup.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass[tikz,border=2,preview=true]{standalone} diff --git a/figures/initial_setup.tikz b/figures/initial_setup.tikz index 040d7be..c770a75 100644 --- a/figures/initial_setup.tikz +++ b/figures/initial_setup.tikz @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = initial_setup.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope}[>=latex] diff --git a/figures/movement_example1.tikz b/figures/movement_example1.tikz index 73fc942..4779946 100644 --- a/figures/movement_example1.tikz +++ b/figures/movement_example1.tikz @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope} diff --git a/figures/movement_example2.tikz b/figures/movement_example2.tikz index cf5e084..c1eba3b 100644 --- a/figures/movement_example2.tikz +++ b/figures/movement_example2.tikz @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope} diff --git a/figures/movement_example3.tikz b/figures/movement_example3.tikz index 9dbb2ae..f4d58fb 100644 --- a/figures/movement_example3.tikz +++ b/figures/movement_example3.tikz @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope} diff --git a/figures/movement_example4.tikz b/figures/movement_example4.tikz index 37d6c4d..b183fd3 100644 --- a/figures/movement_example4.tikz +++ b/figures/movement_example4.tikz @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope} diff --git a/figures/movement_example5.tikz b/figures/movement_example5.tikz index 22c8fd6..60eb3de 100644 --- a/figures/movement_example5.tikz +++ b/figures/movement_example5.tikz @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{scope} diff --git a/frontmatter/copyright.tex b/frontmatter/copyright.tex index 624a8a3..6f05b79 100644 --- a/frontmatter/copyright.tex +++ b/frontmatter/copyright.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \vspace*{\fill} diff --git a/frontmatter/preambel.tex b/frontmatter/preambel.tex index 6e21524..c1b5697 100644 --- a/frontmatter/preambel.tex +++ b/frontmatter/preambel.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \chapter*{\IfLanguage{english}{Aim and Materials}\IfLanguage{ngerman}{Ziel und Materialien}} diff --git a/frontmatter/titlepage.tex b/frontmatter/titlepage.tex index ef7f9ed..970f5c0 100644 --- a/frontmatter/titlepage.tex +++ b/frontmatter/titlepage.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{titlepage} diff --git a/handbook.pdf b/handbook.pdf index 947ee2c..0ed4277 100644 Binary files a/handbook.pdf and b/handbook.pdf differ diff --git a/handbook.tex b/handbook.tex index 4fec22e..2c827d0 100644 --- a/handbook.tex +++ b/handbook.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass[ diff --git a/mainmatter/challenges.tex b/mainmatter/challenges.tex index b16ef4d..0fcdfe4 100644 --- a/mainmatter/challenges.tex +++ b/mainmatter/challenges.tex @@ -1,25 +1,25 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \part{\IfLanguage{english}{Challenges}\IfLanguage{ngerman}{Aufgaben}} - + \chapter{\IfLanguage{english}{First Stage}\IfLanguage{ngerman}{Erste Stufe}} \section{\IfLanguage{english}{Introduction to Driving Dynamics}\IfLanguage{ngerman}{Einführung Fahrdynamik}} \setup \begin{itemize} \IfLanguage{english}{ \item A single train, - \item Line with fields $-2$ to $36$, + \item Line with fields $-2$ to $39$, \item Platform A at field $-2$ to $0$, \item Platform B at field $13$ to $15$, - \item Platform C at field $34$ to $36$. + \item Platform C at field $37$ to $39$. } \IfLanguage{ngerman}{ \item ein Zug, - \item Strecke mit Feldern $-2$ bis $36$, + \item Strecke mit Feldern $-2$ bis $39$, \item Bahnsteig A am Feld $-2$ bis $0$, \item Bahnsteig B am Feld $13$ bis $15$, \item Bahnsteig C am Feld $37$ bis $39$. @@ -107,7 +107,7 @@ \IfLanguage{english}{ \item Two different trains with different train dynamics. \item A track with at least 3 complete blocks. - \item Am Anfang der Strecke brechen Züge ein. Am Ende der Strecke brechen Züge aus. Die Infrastruktur vor und nach der Strecke wird vernachlässigt. + \item Trains enter the system at the beginning of the track. At the end of the track trains exit the system. The infrastructure before and after the line is neglected. } \IfLanguage{ngerman}{ \item Zwei verschiedene Züge mit unterschiedlicher Fahrdynamik. diff --git a/mainmatter/manual.tex b/mainmatter/manual.tex index 0792d2f..b1fa87f 100644 --- a/mainmatter/manual.tex +++ b/mainmatter/manual.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \part{\IfLanguage{english}{Manual}\IfLanguage{ngerman}{Anleitung}} diff --git a/material/signals.pdf b/material/block_signals.pdf similarity index 100% rename from material/signals.pdf rename to material/block_signals.pdf diff --git a/material/signals.tex b/material/block_signals.tex similarity index 90% rename from material/signals.tex rename to material/block_signals.tex index 14a76ca..ab5ca48 100644 --- a/material/signals.tex +++ b/material/block_signals.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} @@ -28,7 +28,7 @@ pics/distant_signal_go/.default=signalgreen, } \tikzset{ - pics/main_signal_go/.style args={#1}{ + pics/block_signal_go/.style args={#1}{ code={ \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); \draw[line width=4pt] (7.5,-0.5) -- ++(1,0); @@ -41,7 +41,7 @@ \draw[double] (5.2,-1.5) -- ++(1.6,0); } }, - pics/main_signal_go/.default=signalgreen, + pics/block_signal_go/.default=signalgreen, } \tikzset{ pics/distant_signal_stop/.style args={#1}{ @@ -57,7 +57,7 @@ pics/distant_signal_stop/.default=signalyellow, } \tikzset{ - pics/main_signal_stop/.style args={#1}{ + pics/block_signal_stop/.style args={#1}{ code={ \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); \draw[line width=4pt] (7.5,-0.5) -- ++(1,0); @@ -70,7 +70,7 @@ \draw[double] (6.0,-0.7) -- ++(0,-1.6); } }, - pics/main_signal_stop/.default=signalred, + pics/block_signal_stop/.default=signalred, } \begin{document} @@ -81,7 +81,7 @@ \begin{tikzpicture}[font=\sffamily] \foreach \x in {0,9.5,19} \foreach \y in {10,15} - \pic at (\x,\y) {main_signal_go}; + \pic at (\x,\y) {block_signal_go}; \foreach \x in {0,9.5,19} \foreach \y in {0,5} \pic at (\x,\y) {distant_signal_go}; @@ -96,7 +96,7 @@ \pic at (\x,\y) {distant_signal_stop}; \foreach \x in {0,9.5,19} \foreach \y in {0,5} - \pic at (\x,\y) {main_signal_stop}; + \pic at (\x,\y) {block_signal_stop}; \end{tikzpicture} \vfil \end{frame} diff --git a/material/fast_train.tex b/material/fast_train.tex index 4b00d72..fd8b234 100644 --- a/material/fast_train.tex +++ b/material/fast_train.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} diff --git a/material/freight_train.tex b/material/freight_train.tex index 2a2b418..7c5e1b0 100644 --- a/material/freight_train.tex +++ b/material/freight_train.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} diff --git a/material/local_train.tex b/material/local_train.tex index 43423c6..f260ea2 100644 --- a/material/local_train.tex +++ b/material/local_train.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} diff --git a/material/plain_platform.tex b/material/plain_platform.tex index a23cc7f..1e07f06 100644 --- a/material/plain_platform.tex +++ b/material/plain_platform.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} diff --git a/material/plain_track.tex b/material/plain_track.tex index c14aa8f..8e5bd46 100644 --- a/material/plain_track.tex +++ b/material/plain_track.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} diff --git a/material/predefined_track.tex b/material/predefined_track.tex index 6c5aae8..6d8ad2e 100644 --- a/material/predefined_track.tex +++ b/material/predefined_track.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass{beamer} diff --git a/material/protocol.tex b/material/protocol.tex index 19b7f7d..bab8140 100644 --- a/material/protocol.tex +++ b/material/protocol.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \documentclass[ diff --git a/material/route_signals.pdf b/material/route_signals.pdf new file mode 100644 index 0000000..9d05691 Binary files /dev/null and b/material/route_signals.pdf differ diff --git a/material/route_signals.tex b/material/route_signals.tex new file mode 100644 index 0000000..034e57a --- /dev/null +++ b/material/route_signals.tex @@ -0,0 +1,46 @@ +%!TEX TS-program = pdflatexmk + +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) +% You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. + +\documentclass{beamer} +\usepackage[ + size=a4, +]{beamerposter} +\beamertemplatenavigationsymbolsempty + +\def\ROOT{./..} +\input{\ROOT/src/material_header.tex} +\input{\ROOT/src/colors.tex} +% \input{\ROOT/src/hyperref.tex} + +\tikzset{ + pics/route_signal_stop/.style args={#1}{ + code={ + \draw[loosely dashdotted] (0,1) -- ( 0,0) -- ++(8,0) -- ++(0,1); + \draw[line width=4pt] (7.5,-0.5) -- ++(1,0); + \fill (7.8,-0.5) circle (0.2); + \fill (8.2,-0.5) circle (0.2); + \draw[line width=4pt] (0,-0.5) -- ++(0,-2); + \draw[line width=4pt] (0,-1.5) -- ++(4, 0); + \draw[line width=4pt,fill=base1] (4,-0.5) -- ++(2,0) arc (-90:-270:-1) -- ++(-2,0) -- cycle; + \draw[fill=#1] (6,-1.5) circle (0.8); + \draw[double] (6.0,-0.7) -- ++(0,-1.6); + } + }, + pics/route_signal_stop/.default=signalred, +} + +\begin{document} + \selectlanguage{ngerman} % currently supported: english, ngerman + \tikzset{every path/.style={ultra thick}} + \begin{frame} + \vfill + \begin{tikzpicture}[font=\sffamily] + \foreach \x in {0,9.5,19} + \foreach \y in {0,5} + \pic at (\x,\y) {route_signal_stop}; + \end{tikzpicture} + \vfil + \end{frame} +\end{document} \ No newline at end of file diff --git a/src/colors.tex b/src/colors.tex index dcf1644..73f8ce7 100644 --- a/src/colors.tex +++ b/src/colors.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \usepackage[prefix=]{xcolor-solarized} diff --git a/src/game_procedure.tex b/src/game_procedure.tex index c55905b..1e3408a 100644 --- a/src/game_procedure.tex +++ b/src/game_procedure.tex @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. Spiel Ablauf: diff --git a/src/handbook_header.tex b/src/handbook_header.tex index 8a2cfbf..632a36a 100644 --- a/src/handbook_header.tex +++ b/src/handbook_header.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. % --------[ Coding and Language ]---------- diff --git a/src/hyperref.tex b/src/hyperref.tex index 941d145..cb0fd2f 100644 --- a/src/hyperref.tex +++ b/src/hyperref.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. % -----------[ PDF linking ]---------------- diff --git a/src/material_header.tex b/src/material_header.tex index c405f7d..3f968f4 100644 --- a/src/material_header.tex +++ b/src/material_header.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. % --------[ Coding and Language ]---------- diff --git a/src/signals.tikz b/src/signal_aspects.tikz similarity index 93% rename from src/signals.tikz rename to src/signal_aspects.tikz index 265c724..fdcbb9c 100644 --- a/src/signals.tikz +++ b/src/signal_aspects.tikz @@ -1,6 +1,6 @@ %!TEX TS-program = pdflatexmk -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \tikzset{ diff --git a/tables/example_movement.tex b/tables/example_movement.tex index 503f0c2..396e5bb 100644 --- a/tables/example_movement.tex +++ b/tables/example_movement.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{tabularx}{0.95\textwidth}{rcccX} diff --git a/tables/example_protocol.tex b/tables/example_protocol.tex index 074567b..8e97868 100644 --- a/tables/example_protocol.tex +++ b/tables/example_protocol.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{tabular}{cccc|c} diff --git a/tables/protocol.tex b/tables/protocol.tex index f41232e..29b2138 100644 --- a/tables/protocol.tex +++ b/tables/protocol.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../material/protocol.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{tabularx}{0.99\textwidth}{c||X|X|X||X} diff --git a/tables/signal_aspects.tex b/tables/signal_aspects.tex index 2b59ec5..cc44c41 100644 --- a/tables/signal_aspects.tex +++ b/tables/signal_aspects.tex @@ -1,10 +1,10 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. -\input{\ROOT/src/signals.tikz} +\input{\ROOT/src/signal_aspects.tikz} \begin{tabular}{rcc} \toprule diff --git a/tables/visibility_conditions.tex b/tables/visibility_conditions.tex index 73d5234..100128f 100644 --- a/tables/visibility_conditions.tex +++ b/tables/visibility_conditions.tex @@ -1,7 +1,7 @@ %!TEX TS-program = pdflatexmk %!TEX root = ../handbook.tex -% Copyright 2018 RailToolKit (Attribution 4.0 International, CC-BY 4.0) +% Copyright 2019 Martin Scheidt (Attribution 4.0 International, CC-BY 4.0) % You are free to copy and redistribute the material in any medium or format. You are free to remix, transform, and build upon the material for any purpose, even commercially. You must give appropriate credit, provide a link to the license, and indicate if changes were made. You may not apply legal terms or technological measures that legally restrict others from doing anything the license permits. No warranties are given. \begin{tabular}{rl}