diff --git a/build.sh b/build.sh index 959c618..6be174c 100755 --- a/build.sh +++ b/build.sh @@ -39,6 +39,10 @@ install, test or release a package for tikz-trackschematic -t, --test Tests the current src/ against the test/. + -c, --compile-doc Compile documentation sources. + + -y, --compile-symbology Compile symbology sources. + -r, --release VERSION Creates a .zip with the release for given VERSION in Semantic Versioning with leading 'v', e.g: v1.0.0 @@ -50,6 +54,8 @@ VERBOSITY=2 # set by cli argument NOINTERACT=0 # set by cli argument INSTALL=0 # set by cli argument TESTING=0 # set by cli argument +COMPILE=0 # set by cli argument +SYMBOLOGY=0 # set by cli argument RELEASE=0 # set by cli argument CLEANUP=1 # set by cli argument @@ -87,6 +93,12 @@ process_arguments() { -t|--test) TESTING=1 ;; + -c|--compile-doc) + COMPILE=1 + ;; + -y|--compile-symbology) + SYMBOLOGY=1 + ;; -r|--release) RELEASE=1 shift @@ -253,6 +265,19 @@ check_texlive() { exit 1 } +check_latexmk() { + # check for latexmk + STATUS=0 + command -v latexmk >/dev/null 2>&1 || STATUS=1 + if [ $STATUS = 0 ]; then + log_note "latexmk found" + return 0 + fi + + log_error "Program 'latexmk' not found. Be sure to have texlive or mactex installed!" + exit 1 +} + check_pdflatex() { # check for pdflatex STATUS=0 @@ -293,6 +318,19 @@ check_pdftoppm() { # no # exit 1 ## can still modify ImageMagick policy! } +check_pdf2svg() { + # check for poppler/pdf2svg + STATUS=0 + command -v pdf2svg >/dev/null 2>&1 || STATUS=1 + if [ $STATUS = 0 ]; then + log_note "pdf2svg found" + return 0 + fi + + log_note "Program 'pdf2svg' not found." + exit 1 +} + check_imagemagick_policy() { STATUS=1 convert -list policy | grep -q "pattern: PDF" || STATUS=0 @@ -347,7 +385,7 @@ check_trackschematic() { log_note "Package 'tikz-trackschematic-dev' not found - using project src/." - export TEXINPUTS=.:../src/:$TEXINPUTS + export TEXINPUTS=.:$(pwd)/src/:$TEXINPUTS } ## checks for updated repository @@ -524,6 +562,152 @@ create_release_notes() { sedi "s/###/##/g" release-note-$VERSION_STR.md } +run_compile() { + ## compile order + # 1. manual, symbology-table, snippets + # 2. examples + # 3. symbology + cd doc/ + mkdir -p .tex + log_debug "entered documentation dir" + + ## 1. main documentation + set -- manual symbology-table snippets + for NAME in "$@"; do + log_info -n "compiling $NAME:" + # + ## TeX build + EXIT_CODE=0 + /usr/bin/time -p -o .tex/${NAME}.time \ + latexmk -pdf -f -g -emulate-aux-dir -auxdir=.tex -outdir=.tex $NAME.tex >> /dev/null 2>&1 || EXIT_CODE=1 + # + TIME=$(awk "NR==2" .tex/${NAME}.time | cut -d " " -f2) + # understanding TeX statistics: + # -> https://tex.stackexchange.com/questions/26208/components-of-latexs-memory-usage + MEMORY_USAGE=$(grep "words of memory out of" .tex/${NAME}.log | cut -d " " -f2) + MEMORY_USAGE=$(($MEMORY_USAGE/1000)) + # + ## compiling snipptes.tex may run out of memory! + ## to increase available memory find local texmf.cnf: + # kpsewhich -a texmf.cnf + # returns /usr/local/texlive/2021/texmf.cnf + ## append in /usr/local/texlive/2021/texmf.cnf + # % increase available memory + # main_memory = 12000000 + # extra_mem_bot = 12000000 + # font_mem_size = 12000000 + # pool_size = 12000000 + # buf_size = 12000000 + ## run + # sudo mktexlsr + # + if [ $EXIT_CODE = 0 ]; then + log_info " - build successful in ${TIME}s and with ${MEMORY_USAGE}k memory." + # + mv .tex/$NAME.pdf $NAME.pdf + log_debug "copied $NAME to doc/" + else + ERROR_OCCURRED=1 + log_error " - build failed." + fi + done + + ## 2. examples + cd examples/ + mkdir -p .tex + EXAMPLEDIR="../examples" + for EXAMPLE in `ls $EXAMPLEDIR/*.tex`; do + FILE=$(basename "$EXAMPLE") # remove path + NAME=${FILE%.*} # remove extension + # + log_info -n "compiling $FILE:" + # + ## TeX build + EXIT_CODE=0 + /usr/bin/time -p -o .tex/${NAME}.time \ + latexmk -pdf -f -g -emulate-aux-dir -auxdir=.tex -outdir=.tex $NAME.tex >> /dev/null 2>&1 || EXIT_CODE=1 + # + TIME=$(awk "NR==2" .tex/${NAME}.time | cut -d " " -f2) + # understanding TeX statistics: + # -> https://tex.stackexchange.com/questions/26208/components-of-latexs-memory-usage + MEMORY_USAGE=$(grep "words of memory out of" .tex/${NAME}.log | cut -d " " -f2) + MEMORY_USAGE=$(($MEMORY_USAGE/1000)) + # + if [ $EXIT_CODE = 0 ]; then + log_info " - build successful in ${TIME}s and with ${MEMORY_USAGE}k memory." + # + mv .tex/$NAME.pdf $NAME.pdf + log_debug "copied $NAME to doc/examples/" + # + if [ $PDFTOPPM_CONVERT = 0 ]; then + # 'compare' will convert the pdf to png + # -> this reasonably fast! + convert -density 300 ${NAME}.pdf ${NAME}.png >> /dev/null 2>&1 + else + # use 'pdftoppm' convert the pdf to png + # -> this is slower! + pdftoppm -png -r 300 -singlefile ${NAME}.pdf ${NAME}.png + fi + log_debug "converted $NAME.pdf to PNG" + else + ERROR_OCCURRED=1 + log_error " - build failed." + fi + done + cd .. + + ## 3. symbology + + cd .. +} + +run_symbology() { + cd doc/symbology/ + mkdir -p .tex + + for FILE in symbols_tikz/*.tikz; do + SYMBOL=$(basename $FILE .tikz) + log_note "converting: $SYMBOL" + + ## -- header tex file + echo '\\documentclass[tikz,border=0]{standalone}' > tmp.tex + echo '\\usepackage[dev]{tikz-trackschematic}' >> tmp.tex + echo '\\begin{document}' >> tmp.tex + echo '\\begin{tikzpicture}[font=\\sffamily]' >> tmp.tex + + ## -- input symbol + echo '\\input{'$FILE'}' >> tmp.tex + + ## -- footer tex file + echo '\\end{tikzpicture}' >> tmp.tex + echo '\\end{document}' >> tmp.tex + + # echo "---------------" + # cat tmp.tex + # echo "---------------" + + ## -- compile tmp.tex + # pdflatex -output-directory=.tex tmp.tex + pdflatex -output-directory=.tex -interaction=batchmode tmp.tex 2>&1 > /dev/null + + ## -- copy and convert symbols + pdf2svg .tex/tmp.pdf symbols_svg/$SYMBOL.svg + if [ $PDFTOPPM_CONVERT = 0 ]; then + # 'compare' will convert the pdf to png + # -> this reasonably fast! + convert -density 600 .tex/tmp.pdf symbols_png/$SYMBOL.png >> /dev/null 2>&1 + else + # use 'pdftoppm' convert the pdf to png + # -> this is slower! + pdftoppm -png -r 600 -singlefile .tex/tmp.pdf symbols_png/$SYMBOL.png + fi + # + mv .tex/tmp.pdf symbols_pdf/$SYMBOL.pdf + done + + cd ../.. +} + run_test_cases() { cd test/ @@ -704,6 +888,20 @@ cleanup() { $rootrun mv ${POLICY_PATH}.backup $POLICY_PATH fi + ## from run_compile + if [ $COMPILE = 1 ]; then + # remove TMP-folder + rm -rf doc/examples/.tex + rm -rf doc/.tex + fi + + ## from run_symbology + if [ $SYMBOLOGY = 1 ]; then + # remove TMP-folder + rm -rf doc/symbology/.tex/ + rm doc/symbology/tmp.tex + fi + ## from run_test_cases if [ $TESTING = 1 ]; then # remove TMP-folder @@ -751,6 +949,29 @@ if [ $TESTING = 1 ]; then run_test_cases fi +if [ $COMPILE = 1 ]; then + ## + check_latexmk + check_trackschematic + check_imagemagick + check_imagemagick_policy + + ## + run_compile +fi + +if [ $SYMBOLOGY = 1 ]; then + ## + check_pdflatex + check_trackschematic + check_imagemagick + check_imagemagick_policy + check_pdf2svg + + ## + run_symbology +fi + if [ $RELEASE = 1 ]; then ## check if version ist in the correct format check_version_number diff --git a/doc/compile.sh b/doc/compile.sh deleted file mode 100644 index ee2c07e..0000000 --- a/doc/compile.sh +++ /dev/null @@ -1,21 +0,0 @@ -## -- increase available memory for snippets.tex - -## find local texmf.cnf -# kpsewhich -a texmf.cnf -# returns /usr/local/texlive/2021/texmf.cnf - -## append in /usr/local/texlive/2021/texmf.cnf -# % increase available memory -# main_memory = 12000000 -# extra_mem_bot = 12000000 -# font_mem_size = 12000000 -# pool_size = 12000000 -# buf_size = 12000000 - -## run -# sudo mktexlsr - -## compile order -# 1. manual -# 2. symbology-table -# 3. snippets \ No newline at end of file diff --git a/doc/examples/minimal_working_example.pdf b/doc/examples/minimal_working_example.pdf index fd1d562..8a0eb86 100644 Binary files a/doc/examples/minimal_working_example.pdf and b/doc/examples/minimal_working_example.pdf differ diff --git a/doc/examples/minimal_working_example.png b/doc/examples/minimal_working_example.png index 68c6374..aa12f15 100644 Binary files a/doc/examples/minimal_working_example.png and b/doc/examples/minimal_working_example.png differ diff --git a/doc/examples/station_berg.pdf b/doc/examples/station_berg.pdf index f851e18..e3c267f 100644 Binary files a/doc/examples/station_berg.pdf and b/doc/examples/station_berg.pdf differ diff --git a/doc/examples/station_berg.png b/doc/examples/station_berg.png new file mode 100644 index 0000000..3cd6054 Binary files /dev/null and b/doc/examples/station_berg.png differ diff --git a/doc/examples/station_chamstadt.pdf b/doc/examples/station_chamstadt.pdf index ad1e084..ed8ae12 100644 Binary files a/doc/examples/station_chamstadt.pdf and b/doc/examples/station_chamstadt.pdf differ diff --git a/doc/examples/station_chamstadt.png b/doc/examples/station_chamstadt.png new file mode 100644 index 0000000..5edf526 Binary files /dev/null and b/doc/examples/station_chamstadt.png differ diff --git a/doc/manual.pdf b/doc/manual.pdf index 27f472a..d85205e 100644 Binary files a/doc/manual.pdf and b/doc/manual.pdf differ diff --git a/doc/snippets.pdf b/doc/snippets.pdf index 09ba139..41c2a37 100644 Binary files a/doc/snippets.pdf and b/doc/snippets.pdf differ diff --git a/doc/symbology-table.pdf b/doc/symbology-table.pdf index e695d6e..2190ca6 100644 Binary files a/doc/symbology-table.pdf and b/doc/symbology-table.pdf differ diff --git a/doc/symbology/README.md b/doc/symbology/README.md index 9f00169..1cc27cc 100644 --- a/doc/symbology/README.md +++ b/doc/symbology/README.md @@ -10,7 +10,7 @@ The symbols are: - in a forward direction (if applicable) - added with an anchor or two (a small magenta dot) for the placement along the track(s) -Run the script "generate_symbols.sh" to generate the PDF, PNG, and SVG version from the files in the "symbols_tikz" folder. +Run the script "./build.sh --compile-symbology" to generate the PDF, PNG, and SVG version from the files in the "symbols_tikz" folder. The Visio symbols are provided as a stencil. Copy the stencil to the folder named "Documents/My Shapes" which should be present on your computer. Master-shapes in this stencil are smart; just drop a master on a drawing page and right-click. \ No newline at end of file diff --git a/doc/symbology/generate_symbols.sh b/doc/symbology/generate_symbols.sh deleted file mode 100755 index 220bc76..0000000 --- a/doc/symbology/generate_symbols.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env sh - -# Copyright (c) 2018 - 2022, 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. - -LATEX=$(which pdflatex) -PDF2SVG=$(which pdf2svg) -CONVERT=$(which convert) - -mkdir -p .tex - -for FILE in symbols_tikz/*.tikz; do - SYMBOL=$(basename $FILE .tikz) - echo "converting: $SYMBOL" - - ## -- header tex file - echo '\\documentclass[tikz,border=0]{standalone}' > tmp.tex - echo '\\usepackage[dev]{tikz-trackschematic}' >> tmp.tex - echo '\\begin{document}' >> tmp.tex - echo '\\begin{tikzpicture}[font=\\sffamily]' >> tmp.tex - - ## -- input symbol - echo '\\input{'$FILE'}' >> tmp.tex - - ## -- footer tex file - echo '\\end{tikzpicture}' >> tmp.tex - echo '\\end{document}' >> tmp.tex - - # echo "---------------" - # cat tmp.tex - # echo "---------------" - - ## -- compile tmp.tex - # $LATEX -output-directory=.tex tmp.tex - $LATEX -output-directory=.tex -interaction=batchmode tmp.tex 2>&1 > /dev/null - - ## -- copy and convert symbols - $PDF2SVG .tex/tmp.pdf symbols_svg/$SYMBOL.svg - $CONVERT -density 300 .tex/tmp.pdf symbols_png/$SYMBOL.png - mv .tex/tmp.pdf symbols_pdf/$SYMBOL.pdf - -done - -## -- cleanup -rm -rf .tex/ -rm tmp.tex \ No newline at end of file diff --git a/doc/symbology/symbols_pdf/balise_backward_group.pdf b/doc/symbology/symbols_pdf/balise_backward_group.pdf new file mode 100644 index 0000000..5edf1c0 Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_backward_group.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_backward_group_switched.pdf b/doc/symbology/symbols_pdf/balise_backward_group_switched.pdf new file mode 100644 index 0000000..ebf929c Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_backward_group_switched.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_backward_individual.pdf b/doc/symbology/symbols_pdf/balise_backward_individual.pdf new file mode 100644 index 0000000..6d0e748 Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_backward_individual.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_backward_individual_switched.pdf b/doc/symbology/symbols_pdf/balise_backward_individual_switched.pdf new file mode 100644 index 0000000..14a8d05 Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_backward_individual_switched.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_forward_group.pdf b/doc/symbology/symbols_pdf/balise_forward_group.pdf new file mode 100644 index 0000000..e17a312 Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_forward_group.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_forward_group_switched.pdf b/doc/symbology/symbols_pdf/balise_forward_group_switched.pdf new file mode 100644 index 0000000..feb548b Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_forward_group_switched.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_forward_individual.pdf b/doc/symbology/symbols_pdf/balise_forward_individual.pdf new file mode 100644 index 0000000..61688cd Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_forward_individual.pdf differ diff --git a/doc/symbology/symbols_pdf/balise_forward_individual_switched.pdf b/doc/symbology/symbols_pdf/balise_forward_individual_switched.pdf new file mode 100644 index 0000000..c1705a4 Binary files /dev/null and b/doc/symbology/symbols_pdf/balise_forward_individual_switched.pdf differ diff --git a/doc/symbology/symbols_pdf/block_clearing_point.pdf b/doc/symbology/symbols_pdf/block_clearing_point.pdf index f286dec..0cdee5c 100644 Binary files a/doc/symbology/symbols_pdf/block_clearing_point.pdf and b/doc/symbology/symbols_pdf/block_clearing_point.pdf differ diff --git a/doc/symbology/symbols_pdf/block_signal.pdf b/doc/symbology/symbols_pdf/block_signal.pdf index ee0a983..6569968 100644 Binary files a/doc/symbology/symbols_pdf/block_signal.pdf and b/doc/symbology/symbols_pdf/block_signal.pdf differ diff --git a/doc/symbology/symbols_pdf/braking_point.pdf b/doc/symbology/symbols_pdf/braking_point.pdf index 28ed900..c6cc5b3 100644 Binary files a/doc/symbology/symbols_pdf/braking_point.pdf and b/doc/symbology/symbols_pdf/braking_point.pdf differ diff --git a/doc/symbology/symbols_pdf/bridge.pdf b/doc/symbology/symbols_pdf/bridge.pdf index ac7b45b..11b86f5 100644 Binary files a/doc/symbology/symbols_pdf/bridge.pdf and b/doc/symbology/symbols_pdf/bridge.pdf differ diff --git a/doc/symbology/symbols_pdf/bufferstop.pdf b/doc/symbology/symbols_pdf/bufferstop.pdf index f46e6f2..e642444 100644 Binary files a/doc/symbology/symbols_pdf/bufferstop.pdf and b/doc/symbology/symbols_pdf/bufferstop.pdf differ diff --git a/doc/symbology/symbols_pdf/clearing_point.pdf b/doc/symbology/symbols_pdf/clearing_point.pdf index 62e9368..396b9b5 100644 Binary files a/doc/symbology/symbols_pdf/clearing_point.pdf and b/doc/symbology/symbols_pdf/clearing_point.pdf differ diff --git a/doc/symbology/symbols_pdf/danger_point.pdf b/doc/symbology/symbols_pdf/danger_point.pdf index d5a798c..f6b3618 100644 Binary files a/doc/symbology/symbols_pdf/danger_point.pdf and b/doc/symbology/symbols_pdf/danger_point.pdf differ diff --git a/doc/symbology/symbols_pdf/derailer_left.pdf b/doc/symbology/symbols_pdf/derailer_left.pdf index 6aab3a2..9743d3c 100644 Binary files a/doc/symbology/symbols_pdf/derailer_left.pdf and b/doc/symbology/symbols_pdf/derailer_left.pdf differ diff --git a/doc/symbology/symbols_pdf/derailer_right.pdf b/doc/symbology/symbols_pdf/derailer_right.pdf index 9998096..a411178 100644 Binary files a/doc/symbology/symbols_pdf/derailer_right.pdf and b/doc/symbology/symbols_pdf/derailer_right.pdf differ diff --git a/doc/symbology/symbols_pdf/diamond_crossing_left.pdf b/doc/symbology/symbols_pdf/diamond_crossing_left.pdf index 1a9dbb9..c42df7b 100644 Binary files a/doc/symbology/symbols_pdf/diamond_crossing_left.pdf and b/doc/symbology/symbols_pdf/diamond_crossing_left.pdf differ diff --git a/doc/symbology/symbols_pdf/diamond_crossing_right.pdf b/doc/symbology/symbols_pdf/diamond_crossing_right.pdf index be733bc..3be66e7 100644 Binary files a/doc/symbology/symbols_pdf/diamond_crossing_right.pdf and b/doc/symbology/symbols_pdf/diamond_crossing_right.pdf differ diff --git a/doc/symbology/symbols_pdf/direction_control.pdf b/doc/symbology/symbols_pdf/direction_control.pdf index c59468d..83ce301 100644 Binary files a/doc/symbology/symbols_pdf/direction_control.pdf and b/doc/symbology/symbols_pdf/direction_control.pdf differ diff --git a/doc/symbology/symbols_pdf/direction_control_backward.pdf b/doc/symbology/symbols_pdf/direction_control_backward.pdf index 5fe242a..cad24e2 100644 Binary files a/doc/symbology/symbols_pdf/direction_control_backward.pdf and b/doc/symbology/symbols_pdf/direction_control_backward.pdf differ diff --git a/doc/symbology/symbols_pdf/direction_control_forward.pdf b/doc/symbology/symbols_pdf/direction_control_forward.pdf index 9190e1d..e2b19fe 100644 Binary files a/doc/symbology/symbols_pdf/direction_control_forward.pdf and b/doc/symbology/symbols_pdf/direction_control_forward.pdf differ diff --git a/doc/symbology/symbols_pdf/distant_pantograph_down.pdf b/doc/symbology/symbols_pdf/distant_pantograph_down.pdf index 1d3b27e..6c3ff8e 100644 Binary files a/doc/symbology/symbols_pdf/distant_pantograph_down.pdf and b/doc/symbology/symbols_pdf/distant_pantograph_down.pdf differ diff --git a/doc/symbology/symbols_pdf/distant_power_off.pdf b/doc/symbology/symbols_pdf/distant_power_off.pdf index 30920c3..7cb6c5d 100644 Binary files a/doc/symbology/symbols_pdf/distant_power_off.pdf and b/doc/symbology/symbols_pdf/distant_power_off.pdf differ diff --git a/doc/symbology/symbols_pdf/distant_signal.pdf b/doc/symbology/symbols_pdf/distant_signal.pdf index d96d3a6..613fc15 100644 Binary files a/doc/symbology/symbols_pdf/distant_signal.pdf and b/doc/symbology/symbols_pdf/distant_signal.pdf differ diff --git a/doc/symbology/symbols_pdf/double-slip_turnout_left.pdf b/doc/symbology/symbols_pdf/double-slip_turnout_left.pdf index 8882913..aa7aaf2 100644 Binary files a/doc/symbology/symbols_pdf/double-slip_turnout_left.pdf and b/doc/symbology/symbols_pdf/double-slip_turnout_left.pdf differ diff --git a/doc/symbology/symbols_pdf/double-slip_turnout_right.pdf b/doc/symbology/symbols_pdf/double-slip_turnout_right.pdf index 0880e36..5555c58 100644 Binary files a/doc/symbology/symbols_pdf/double-slip_turnout_right.pdf and b/doc/symbology/symbols_pdf/double-slip_turnout_right.pdf differ diff --git a/doc/symbology/symbols_pdf/end_of_movement_authority.pdf b/doc/symbology/symbols_pdf/end_of_movement_authority.pdf index 2a5baba..438d52d 100644 Binary files a/doc/symbology/symbols_pdf/end_of_movement_authority.pdf and b/doc/symbology/symbols_pdf/end_of_movement_authority.pdf differ diff --git a/doc/symbology/symbols_pdf/friction_bufferstop.pdf b/doc/symbology/symbols_pdf/friction_bufferstop.pdf index 946f91e..cb54ef9 100644 Binary files a/doc/symbology/symbols_pdf/friction_bufferstop.pdf and b/doc/symbology/symbols_pdf/friction_bufferstop.pdf differ diff --git a/doc/symbology/symbols_pdf/hump.pdf b/doc/symbology/symbols_pdf/hump.pdf index 7292df0..5f7cb55 100644 Binary files a/doc/symbology/symbols_pdf/hump.pdf and b/doc/symbology/symbols_pdf/hump.pdf differ diff --git a/doc/symbology/symbols_pdf/interlocking.pdf b/doc/symbology/symbols_pdf/interlocking.pdf index 9ea3ed0..c58a1a5 100644 Binary files a/doc/symbology/symbols_pdf/interlocking.pdf and b/doc/symbology/symbols_pdf/interlocking.pdf differ diff --git a/doc/symbology/symbols_pdf/level_crossing_double.pdf b/doc/symbology/symbols_pdf/level_crossing_double.pdf index d3ac1e7..7cdc0b2 100644 Binary files a/doc/symbology/symbols_pdf/level_crossing_double.pdf and b/doc/symbology/symbols_pdf/level_crossing_double.pdf differ diff --git a/doc/symbology/symbols_pdf/level_crossing_single.pdf b/doc/symbology/symbols_pdf/level_crossing_single.pdf index 0f75138..0de5619 100644 Binary files a/doc/symbology/symbols_pdf/level_crossing_single.pdf and b/doc/symbology/symbols_pdf/level_crossing_single.pdf differ diff --git a/doc/symbology/symbols_pdf/level_crossing_without_barrier.pdf b/doc/symbology/symbols_pdf/level_crossing_without_barrier.pdf index 234822d..4e43cb3 100644 Binary files a/doc/symbology/symbols_pdf/level_crossing_without_barrier.pdf and b/doc/symbology/symbols_pdf/level_crossing_without_barrier.pdf differ diff --git a/doc/symbology/symbols_pdf/main_track.pdf b/doc/symbology/symbols_pdf/main_track.pdf index 049e882..536e85d 100644 Binary files a/doc/symbology/symbols_pdf/main_track.pdf and b/doc/symbology/symbols_pdf/main_track.pdf differ diff --git a/doc/symbology/symbols_pdf/pantograph_down.pdf b/doc/symbology/symbols_pdf/pantograph_down.pdf index d6fa4dc..224dfd6 100644 Binary files a/doc/symbology/symbols_pdf/pantograph_down.pdf and b/doc/symbology/symbols_pdf/pantograph_down.pdf differ diff --git a/doc/symbology/symbols_pdf/pantograph_up.pdf b/doc/symbology/symbols_pdf/pantograph_up.pdf index 2e4e07f..8dd0c1a 100644 Binary files a/doc/symbology/symbols_pdf/pantograph_up.pdf and b/doc/symbology/symbols_pdf/pantograph_up.pdf differ diff --git a/doc/symbology/symbols_pdf/parked_vehicle.pdf b/doc/symbology/symbols_pdf/parked_vehicle.pdf index f0b0376..d348da9 100644 Binary files a/doc/symbology/symbols_pdf/parked_vehicle.pdf and b/doc/symbology/symbols_pdf/parked_vehicle.pdf differ diff --git a/doc/symbology/symbols_pdf/platform_left.pdf b/doc/symbology/symbols_pdf/platform_left.pdf index f8949f7..45a721e 100644 Binary files a/doc/symbology/symbols_pdf/platform_left.pdf and b/doc/symbology/symbols_pdf/platform_left.pdf differ diff --git a/doc/symbology/symbols_pdf/platform_middle.pdf b/doc/symbology/symbols_pdf/platform_middle.pdf index 004647a..6a1b254 100644 Binary files a/doc/symbology/symbols_pdf/platform_middle.pdf and b/doc/symbology/symbols_pdf/platform_middle.pdf differ diff --git a/doc/symbology/symbols_pdf/platform_right.pdf b/doc/symbology/symbols_pdf/platform_right.pdf index 40956ce..e2c0882 100644 Binary files a/doc/symbology/symbols_pdf/platform_right.pdf and b/doc/symbology/symbols_pdf/platform_right.pdf differ diff --git a/doc/symbology/symbols_pdf/power_off.pdf b/doc/symbology/symbols_pdf/power_off.pdf index 543aa0f..889e855 100644 Binary files a/doc/symbology/symbols_pdf/power_off.pdf and b/doc/symbology/symbols_pdf/power_off.pdf differ diff --git a/doc/symbology/symbols_pdf/power_on.pdf b/doc/symbology/symbols_pdf/power_on.pdf index c18828b..4a07963 100644 Binary files a/doc/symbology/symbols_pdf/power_on.pdf and b/doc/symbology/symbols_pdf/power_on.pdf differ diff --git a/doc/symbology/symbols_pdf/pylons_left.pdf b/doc/symbology/symbols_pdf/pylons_left.pdf index b817ae3..5e05f62 100644 Binary files a/doc/symbology/symbols_pdf/pylons_left.pdf and b/doc/symbology/symbols_pdf/pylons_left.pdf differ diff --git a/doc/symbology/symbols_pdf/pylons_middle.pdf b/doc/symbology/symbols_pdf/pylons_middle.pdf index 5b92c8d..9860a58 100644 Binary files a/doc/symbology/symbols_pdf/pylons_middle.pdf and b/doc/symbology/symbols_pdf/pylons_middle.pdf differ diff --git a/doc/symbology/symbols_pdf/pylons_right.pdf b/doc/symbology/symbols_pdf/pylons_right.pdf index e05e1e5..1a2579c 100644 Binary files a/doc/symbology/symbols_pdf/pylons_right.pdf and b/doc/symbology/symbols_pdf/pylons_right.pdf differ diff --git a/doc/symbology/symbols_pdf/route.pdf b/doc/symbology/symbols_pdf/route.pdf index 0d5f0b8..5e30e8a 100644 Binary files a/doc/symbology/symbols_pdf/route.pdf and b/doc/symbology/symbols_pdf/route.pdf differ diff --git a/doc/symbology/symbols_pdf/route_clearing_point.pdf b/doc/symbology/symbols_pdf/route_clearing_point.pdf index f5b9999..739251d 100644 Binary files a/doc/symbology/symbols_pdf/route_clearing_point.pdf and b/doc/symbology/symbols_pdf/route_clearing_point.pdf differ diff --git a/doc/symbology/symbols_pdf/route_signal.pdf b/doc/symbology/symbols_pdf/route_signal.pdf index 39036b3..c555c94 100644 Binary files a/doc/symbology/symbols_pdf/route_signal.pdf and b/doc/symbology/symbols_pdf/route_signal.pdf differ diff --git a/doc/symbology/symbols_pdf/secondary_track.pdf b/doc/symbology/symbols_pdf/secondary_track.pdf index ffa2aa6..538b82b 100644 Binary files a/doc/symbology/symbols_pdf/secondary_track.pdf and b/doc/symbology/symbols_pdf/secondary_track.pdf differ diff --git a/doc/symbology/symbols_pdf/shunt_limit.pdf b/doc/symbology/symbols_pdf/shunt_limit.pdf index 07dd0be..d968690 100644 Binary files a/doc/symbology/symbols_pdf/shunt_limit.pdf and b/doc/symbology/symbols_pdf/shunt_limit.pdf differ diff --git a/doc/symbology/symbols_pdf/shunt_signal.pdf b/doc/symbology/symbols_pdf/shunt_signal.pdf index 848669d..1f5941d 100644 Binary files a/doc/symbology/symbols_pdf/shunt_signal.pdf and b/doc/symbology/symbols_pdf/shunt_signal.pdf differ diff --git a/doc/symbology/symbols_pdf/shunt_signal_locked.pdf b/doc/symbology/symbols_pdf/shunt_signal_locked.pdf index de95b7d..5cd296a 100644 Binary files a/doc/symbology/symbols_pdf/shunt_signal_locked.pdf and b/doc/symbology/symbols_pdf/shunt_signal_locked.pdf differ diff --git a/doc/symbology/symbols_pdf/speed_signal.pdf b/doc/symbology/symbols_pdf/speed_signal.pdf index 4d754a8..9de7645 100644 Binary files a/doc/symbology/symbols_pdf/speed_signal.pdf and b/doc/symbology/symbols_pdf/speed_signal.pdf differ diff --git a/doc/symbology/symbols_pdf/track_closure.pdf b/doc/symbology/symbols_pdf/track_closure.pdf index d57ad49..4d31565 100644 Binary files a/doc/symbology/symbols_pdf/track_closure.pdf and b/doc/symbology/symbols_pdf/track_closure.pdf differ diff --git a/doc/symbology/symbols_pdf/loop_transmitter.pdf b/doc/symbology/symbols_pdf/track_loop.pdf similarity index 87% rename from doc/symbology/symbols_pdf/loop_transmitter.pdf rename to doc/symbology/symbols_pdf/track_loop.pdf index 0c76547..c9d2516 100644 Binary files a/doc/symbology/symbols_pdf/loop_transmitter.pdf and b/doc/symbology/symbols_pdf/track_loop.pdf differ diff --git a/doc/symbology/symbols_pdf/train.pdf b/doc/symbology/symbols_pdf/train.pdf index 747b397..38adfc8 100644 Binary files a/doc/symbology/symbols_pdf/train.pdf and b/doc/symbology/symbols_pdf/train.pdf differ diff --git a/doc/symbology/symbols_pdf/train_berth_shape.pdf b/doc/symbology/symbols_pdf/train_berth_shape.pdf index b2ba334..e532c8b 100644 Binary files a/doc/symbology/symbols_pdf/train_berth_shape.pdf and b/doc/symbology/symbols_pdf/train_berth_shape.pdf differ diff --git a/doc/symbology/symbols_pdf/train_berth_sign.pdf b/doc/symbology/symbols_pdf/train_berth_sign.pdf index 6555955..fb09b69 100644 Binary files a/doc/symbology/symbols_pdf/train_berth_sign.pdf and b/doc/symbology/symbols_pdf/train_berth_sign.pdf differ diff --git a/doc/symbology/symbols_pdf/train_drive_automatic.pdf b/doc/symbology/symbols_pdf/train_drive_automatic.pdf index e0800ec..95cbd24 100644 Binary files a/doc/symbology/symbols_pdf/train_drive_automatic.pdf and b/doc/symbology/symbols_pdf/train_drive_automatic.pdf differ diff --git a/doc/symbology/symbols_pdf/train_drive_human.pdf b/doc/symbology/symbols_pdf/train_drive_human.pdf index 73e958a..32da56b 100644 Binary files a/doc/symbology/symbols_pdf/train_drive_human.pdf and b/doc/symbology/symbols_pdf/train_drive_human.pdf differ diff --git a/doc/symbology/symbols_pdf/train_ghost.pdf b/doc/symbology/symbols_pdf/train_ghost.pdf index 04c73d8..58ae75f 100644 Binary files a/doc/symbology/symbols_pdf/train_ghost.pdf and b/doc/symbology/symbols_pdf/train_ghost.pdf differ diff --git a/doc/symbology/symbols_pdf/train_moving.pdf b/doc/symbology/symbols_pdf/train_moving.pdf index 661484e..1e9de25 100644 Binary files a/doc/symbology/symbols_pdf/train_moving.pdf and b/doc/symbology/symbols_pdf/train_moving.pdf differ diff --git a/doc/symbology/symbols_pdf/train_moving_fast.pdf b/doc/symbology/symbols_pdf/train_moving_fast.pdf index 53e2cb6..db4e7d4 100644 Binary files a/doc/symbology/symbols_pdf/train_moving_fast.pdf and b/doc/symbology/symbols_pdf/train_moving_fast.pdf differ diff --git a/doc/symbology/symbols_pdf/train_moving_slow.pdf b/doc/symbology/symbols_pdf/train_moving_slow.pdf index ce8f8db..ce6bcdd 100644 Binary files a/doc/symbology/symbols_pdf/train_moving_slow.pdf and b/doc/symbology/symbols_pdf/train_moving_slow.pdf differ diff --git a/doc/symbology/symbols_pdf/train_shunt_mode.pdf b/doc/symbology/symbols_pdf/train_shunt_mode.pdf index b799240..7648b6f 100644 Binary files a/doc/symbology/symbols_pdf/train_shunt_mode.pdf and b/doc/symbology/symbols_pdf/train_shunt_mode.pdf differ diff --git a/doc/symbology/symbols_pdf/train_shunting.pdf b/doc/symbology/symbols_pdf/train_shunting.pdf index c4b7296..219a6a3 100644 Binary files a/doc/symbology/symbols_pdf/train_shunting.pdf and b/doc/symbology/symbols_pdf/train_shunting.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_left.pdf b/doc/symbology/symbols_pdf/turnout_left.pdf index 6468a05..6c7e62e 100644 Binary files a/doc/symbology/symbols_pdf/turnout_left.pdf and b/doc/symbology/symbols_pdf/turnout_left.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_left_manually.pdf b/doc/symbology/symbols_pdf/turnout_left_manually.pdf index bb6c1da..f8cffd0 100644 Binary files a/doc/symbology/symbols_pdf/turnout_left_manually.pdf and b/doc/symbology/symbols_pdf/turnout_left_manually.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_left_points_left_position.pdf b/doc/symbology/symbols_pdf/turnout_left_points_left_position.pdf index f93654f..5f10a10 100644 Binary files a/doc/symbology/symbols_pdf/turnout_left_points_left_position.pdf and b/doc/symbology/symbols_pdf/turnout_left_points_left_position.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_left_points_moving.pdf b/doc/symbology/symbols_pdf/turnout_left_points_moving.pdf index 0a2e287..b82afbf 100644 Binary files a/doc/symbology/symbols_pdf/turnout_left_points_moving.pdf and b/doc/symbology/symbols_pdf/turnout_left_points_moving.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_left_points_right_position.pdf b/doc/symbology/symbols_pdf/turnout_left_points_right_position.pdf index 43d900b..d8742e2 100644 Binary files a/doc/symbology/symbols_pdf/turnout_left_points_right_position.pdf and b/doc/symbology/symbols_pdf/turnout_left_points_right_position.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_right.pdf b/doc/symbology/symbols_pdf/turnout_right.pdf index 4d91a44..7ff1c3c 100644 Binary files a/doc/symbology/symbols_pdf/turnout_right.pdf and b/doc/symbology/symbols_pdf/turnout_right.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_right_manually.pdf b/doc/symbology/symbols_pdf/turnout_right_manually.pdf index 45b7966..1d3f95a 100644 Binary files a/doc/symbology/symbols_pdf/turnout_right_manually.pdf and b/doc/symbology/symbols_pdf/turnout_right_manually.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_right_points_left_position.pdf b/doc/symbology/symbols_pdf/turnout_right_points_left_position.pdf index a67a6e1..906747e 100644 Binary files a/doc/symbology/symbols_pdf/turnout_right_points_left_position.pdf and b/doc/symbology/symbols_pdf/turnout_right_points_left_position.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_right_points_moving.pdf b/doc/symbology/symbols_pdf/turnout_right_points_moving.pdf index aa2cdb6..fd61556 100644 Binary files a/doc/symbology/symbols_pdf/turnout_right_points_moving.pdf and b/doc/symbology/symbols_pdf/turnout_right_points_moving.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_right_points_right_position.pdf b/doc/symbology/symbols_pdf/turnout_right_points_right_position.pdf index fbc0880..8affe49 100644 Binary files a/doc/symbology/symbols_pdf/turnout_right_points_right_position.pdf and b/doc/symbology/symbols_pdf/turnout_right_points_right_position.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_with_fouling_left.pdf b/doc/symbology/symbols_pdf/turnout_with_fouling_left.pdf index 8b12f74..2bc6c82 100644 Binary files a/doc/symbology/symbols_pdf/turnout_with_fouling_left.pdf and b/doc/symbology/symbols_pdf/turnout_with_fouling_left.pdf differ diff --git a/doc/symbology/symbols_pdf/turnout_with_fouling_right.pdf b/doc/symbology/symbols_pdf/turnout_with_fouling_right.pdf index fe4a8d0..8c0e302 100644 Binary files a/doc/symbology/symbols_pdf/turnout_with_fouling_right.pdf and b/doc/symbology/symbols_pdf/turnout_with_fouling_right.pdf differ diff --git a/doc/symbology/symbols_pdf/view_point.pdf b/doc/symbology/symbols_pdf/view_point.pdf index ca21cb2..8dfb6c2 100644 Binary files a/doc/symbology/symbols_pdf/view_point.pdf and b/doc/symbology/symbols_pdf/view_point.pdf differ diff --git a/doc/symbology/symbols_pdf/wire_limit.pdf b/doc/symbology/symbols_pdf/wire_limit.pdf index fdb3e3a..b3b5be3 100644 Binary files a/doc/symbology/symbols_pdf/wire_limit.pdf and b/doc/symbology/symbols_pdf/wire_limit.pdf differ diff --git a/doc/symbology/symbols_png/loop_transmitter.png b/doc/symbology/symbols_png/balise_backward_group.png similarity index 84% rename from doc/symbology/symbols_png/loop_transmitter.png rename to doc/symbology/symbols_png/balise_backward_group.png index 209eb6d..527bebb 100644 Binary files a/doc/symbology/symbols_png/loop_transmitter.png and b/doc/symbology/symbols_png/balise_backward_group.png differ diff --git a/doc/symbology/symbols_png/balise_backward_group_switched.png b/doc/symbology/symbols_png/balise_backward_group_switched.png new file mode 100644 index 0000000..909df75 Binary files /dev/null and b/doc/symbology/symbols_png/balise_backward_group_switched.png differ diff --git a/doc/symbology/symbols_png/balise_backward_individual.png b/doc/symbology/symbols_png/balise_backward_individual.png new file mode 100644 index 0000000..eb0d283 Binary files /dev/null and b/doc/symbology/symbols_png/balise_backward_individual.png differ diff --git a/doc/symbology/symbols_png/balise_backward_individual_switched.png b/doc/symbology/symbols_png/balise_backward_individual_switched.png new file mode 100644 index 0000000..bbde3d5 Binary files /dev/null and b/doc/symbology/symbols_png/balise_backward_individual_switched.png differ diff --git a/doc/symbology/symbols_png/balise_forward_group.png b/doc/symbology/symbols_png/balise_forward_group.png new file mode 100644 index 0000000..7d9fbde Binary files /dev/null and b/doc/symbology/symbols_png/balise_forward_group.png differ diff --git a/doc/symbology/symbols_png/balise_forward_group_switched.png b/doc/symbology/symbols_png/balise_forward_group_switched.png new file mode 100644 index 0000000..7ae6fe3 Binary files /dev/null and b/doc/symbology/symbols_png/balise_forward_group_switched.png differ diff --git a/doc/symbology/symbols_png/balise_forward_individual.png b/doc/symbology/symbols_png/balise_forward_individual.png new file mode 100644 index 0000000..31643c3 Binary files /dev/null and b/doc/symbology/symbols_png/balise_forward_individual.png differ diff --git a/doc/symbology/symbols_png/balise_forward_individual_switched.png b/doc/symbology/symbols_png/balise_forward_individual_switched.png new file mode 100644 index 0000000..a3c988c Binary files /dev/null and b/doc/symbology/symbols_png/balise_forward_individual_switched.png differ diff --git a/doc/symbology/symbols_png/block_clearing_point.png b/doc/symbology/symbols_png/block_clearing_point.png index 76417c3..8869891 100644 Binary files a/doc/symbology/symbols_png/block_clearing_point.png and b/doc/symbology/symbols_png/block_clearing_point.png differ diff --git a/doc/symbology/symbols_png/block_signal.png b/doc/symbology/symbols_png/block_signal.png index 2207675..1da8682 100644 Binary files a/doc/symbology/symbols_png/block_signal.png and b/doc/symbology/symbols_png/block_signal.png differ diff --git a/doc/symbology/symbols_png/braking_point.png b/doc/symbology/symbols_png/braking_point.png index e08e6fe..5a546be 100644 Binary files a/doc/symbology/symbols_png/braking_point.png and b/doc/symbology/symbols_png/braking_point.png differ diff --git a/doc/symbology/symbols_png/bridge.png b/doc/symbology/symbols_png/bridge.png index 08ee196..87f9106 100644 Binary files a/doc/symbology/symbols_png/bridge.png and b/doc/symbology/symbols_png/bridge.png differ diff --git a/doc/symbology/symbols_png/bufferstop.png b/doc/symbology/symbols_png/bufferstop.png index 0f165b6..bb867c8 100644 Binary files a/doc/symbology/symbols_png/bufferstop.png and b/doc/symbology/symbols_png/bufferstop.png differ diff --git a/doc/symbology/symbols_png/clearing_point.png b/doc/symbology/symbols_png/clearing_point.png index 35f109e..45bb636 100644 Binary files a/doc/symbology/symbols_png/clearing_point.png and b/doc/symbology/symbols_png/clearing_point.png differ diff --git a/doc/symbology/symbols_png/danger_point.png b/doc/symbology/symbols_png/danger_point.png index c772886..0b12b0a 100644 Binary files a/doc/symbology/symbols_png/danger_point.png and b/doc/symbology/symbols_png/danger_point.png differ diff --git a/doc/symbology/symbols_png/derailer_left.png b/doc/symbology/symbols_png/derailer_left.png index 80f8719..61dc58e 100644 Binary files a/doc/symbology/symbols_png/derailer_left.png and b/doc/symbology/symbols_png/derailer_left.png differ diff --git a/doc/symbology/symbols_png/derailer_right.png b/doc/symbology/symbols_png/derailer_right.png index 78da856..2f69870 100644 Binary files a/doc/symbology/symbols_png/derailer_right.png and b/doc/symbology/symbols_png/derailer_right.png differ diff --git a/doc/symbology/symbols_png/diamond_crossing_left.png b/doc/symbology/symbols_png/diamond_crossing_left.png index ccb84fb..73ad1a6 100644 Binary files a/doc/symbology/symbols_png/diamond_crossing_left.png and b/doc/symbology/symbols_png/diamond_crossing_left.png differ diff --git a/doc/symbology/symbols_png/diamond_crossing_right.png b/doc/symbology/symbols_png/diamond_crossing_right.png index 7232de1..99ccf5e 100644 Binary files a/doc/symbology/symbols_png/diamond_crossing_right.png and b/doc/symbology/symbols_png/diamond_crossing_right.png differ diff --git a/doc/symbology/symbols_png/direction_control.png b/doc/symbology/symbols_png/direction_control.png index 9b3c8ed..c3b9b2c 100644 Binary files a/doc/symbology/symbols_png/direction_control.png and b/doc/symbology/symbols_png/direction_control.png differ diff --git a/doc/symbology/symbols_png/direction_control_backward.png b/doc/symbology/symbols_png/direction_control_backward.png index e00ed6f..a8aba9b 100644 Binary files a/doc/symbology/symbols_png/direction_control_backward.png and b/doc/symbology/symbols_png/direction_control_backward.png differ diff --git a/doc/symbology/symbols_png/direction_control_forward.png b/doc/symbology/symbols_png/direction_control_forward.png index 5c5698e..07ff793 100644 Binary files a/doc/symbology/symbols_png/direction_control_forward.png and b/doc/symbology/symbols_png/direction_control_forward.png differ diff --git a/doc/symbology/symbols_png/distant_pantograph_down.png b/doc/symbology/symbols_png/distant_pantograph_down.png index 39cebbf..c474d90 100644 Binary files a/doc/symbology/symbols_png/distant_pantograph_down.png and b/doc/symbology/symbols_png/distant_pantograph_down.png differ diff --git a/doc/symbology/symbols_png/distant_power_off.png b/doc/symbology/symbols_png/distant_power_off.png index d026d85..d893034 100644 Binary files a/doc/symbology/symbols_png/distant_power_off.png and b/doc/symbology/symbols_png/distant_power_off.png differ diff --git a/doc/symbology/symbols_png/distant_signal.png b/doc/symbology/symbols_png/distant_signal.png index 491d318..7c4b0dc 100644 Binary files a/doc/symbology/symbols_png/distant_signal.png and b/doc/symbology/symbols_png/distant_signal.png differ diff --git a/doc/symbology/symbols_png/double-slip_turnout_left.png b/doc/symbology/symbols_png/double-slip_turnout_left.png index 9efbcc2..015c005 100644 Binary files a/doc/symbology/symbols_png/double-slip_turnout_left.png and b/doc/symbology/symbols_png/double-slip_turnout_left.png differ diff --git a/doc/symbology/symbols_png/double-slip_turnout_right.png b/doc/symbology/symbols_png/double-slip_turnout_right.png index 82ad3ae..85b5b44 100644 Binary files a/doc/symbology/symbols_png/double-slip_turnout_right.png and b/doc/symbology/symbols_png/double-slip_turnout_right.png differ diff --git a/doc/symbology/symbols_png/end_of_movement_authority.png b/doc/symbology/symbols_png/end_of_movement_authority.png index 29962dd..293403e 100644 Binary files a/doc/symbology/symbols_png/end_of_movement_authority.png and b/doc/symbology/symbols_png/end_of_movement_authority.png differ diff --git a/doc/symbology/symbols_png/friction_bufferstop.png b/doc/symbology/symbols_png/friction_bufferstop.png index 29f4ab1..6c69dd6 100644 Binary files a/doc/symbology/symbols_png/friction_bufferstop.png and b/doc/symbology/symbols_png/friction_bufferstop.png differ diff --git a/doc/symbology/symbols_png/hump.png b/doc/symbology/symbols_png/hump.png index bf017b5..29539f1 100644 Binary files a/doc/symbology/symbols_png/hump.png and b/doc/symbology/symbols_png/hump.png differ diff --git a/doc/symbology/symbols_png/interlocking.png b/doc/symbology/symbols_png/interlocking.png index 6f815b4..4fdf510 100644 Binary files a/doc/symbology/symbols_png/interlocking.png and b/doc/symbology/symbols_png/interlocking.png differ diff --git a/doc/symbology/symbols_png/level_crossing_double.png b/doc/symbology/symbols_png/level_crossing_double.png index 592e86c..e5e44a8 100644 Binary files a/doc/symbology/symbols_png/level_crossing_double.png and b/doc/symbology/symbols_png/level_crossing_double.png differ diff --git a/doc/symbology/symbols_png/level_crossing_single.png b/doc/symbology/symbols_png/level_crossing_single.png index 89c7ef6..8cd47a3 100644 Binary files a/doc/symbology/symbols_png/level_crossing_single.png and b/doc/symbology/symbols_png/level_crossing_single.png differ diff --git a/doc/symbology/symbols_png/level_crossing_without_barrier.png b/doc/symbology/symbols_png/level_crossing_without_barrier.png index 90e0fdb..9958e19 100644 Binary files a/doc/symbology/symbols_png/level_crossing_without_barrier.png and b/doc/symbology/symbols_png/level_crossing_without_barrier.png differ diff --git a/doc/symbology/symbols_png/main_track.png b/doc/symbology/symbols_png/main_track.png index ebd7673..d90ad06 100644 Binary files a/doc/symbology/symbols_png/main_track.png and b/doc/symbology/symbols_png/main_track.png differ diff --git a/doc/symbology/symbols_png/pantograph_down.png b/doc/symbology/symbols_png/pantograph_down.png index 31e8047..a892b22 100644 Binary files a/doc/symbology/symbols_png/pantograph_down.png and b/doc/symbology/symbols_png/pantograph_down.png differ diff --git a/doc/symbology/symbols_png/pantograph_up.png b/doc/symbology/symbols_png/pantograph_up.png index 5e2c688..8cb3b01 100644 Binary files a/doc/symbology/symbols_png/pantograph_up.png and b/doc/symbology/symbols_png/pantograph_up.png differ diff --git a/doc/symbology/symbols_png/parked_vehicle.png b/doc/symbology/symbols_png/parked_vehicle.png index b63e186..8b77390 100644 Binary files a/doc/symbology/symbols_png/parked_vehicle.png and b/doc/symbology/symbols_png/parked_vehicle.png differ diff --git a/doc/symbology/symbols_png/platform_left.png b/doc/symbology/symbols_png/platform_left.png index c1cb8b9..de64191 100644 Binary files a/doc/symbology/symbols_png/platform_left.png and b/doc/symbology/symbols_png/platform_left.png differ diff --git a/doc/symbology/symbols_png/platform_middle.png b/doc/symbology/symbols_png/platform_middle.png index 8ef21ad..91fb63b 100644 Binary files a/doc/symbology/symbols_png/platform_middle.png and b/doc/symbology/symbols_png/platform_middle.png differ diff --git a/doc/symbology/symbols_png/platform_right.png b/doc/symbology/symbols_png/platform_right.png index 44a8b60..fdf8b1d 100644 Binary files a/doc/symbology/symbols_png/platform_right.png and b/doc/symbology/symbols_png/platform_right.png differ diff --git a/doc/symbology/symbols_png/power_off.png b/doc/symbology/symbols_png/power_off.png index 0c9e385..89d2c64 100644 Binary files a/doc/symbology/symbols_png/power_off.png and b/doc/symbology/symbols_png/power_off.png differ diff --git a/doc/symbology/symbols_png/power_on.png b/doc/symbology/symbols_png/power_on.png index 76e728b..35a630c 100644 Binary files a/doc/symbology/symbols_png/power_on.png and b/doc/symbology/symbols_png/power_on.png differ diff --git a/doc/symbology/symbols_png/pylons_left.png b/doc/symbology/symbols_png/pylons_left.png index 98176d5..952e6ce 100644 Binary files a/doc/symbology/symbols_png/pylons_left.png and b/doc/symbology/symbols_png/pylons_left.png differ diff --git a/doc/symbology/symbols_png/pylons_middle.png b/doc/symbology/symbols_png/pylons_middle.png index 244ce40..7404751 100644 Binary files a/doc/symbology/symbols_png/pylons_middle.png and b/doc/symbology/symbols_png/pylons_middle.png differ diff --git a/doc/symbology/symbols_png/pylons_right.png b/doc/symbology/symbols_png/pylons_right.png index 8807155..7ef2681 100644 Binary files a/doc/symbology/symbols_png/pylons_right.png and b/doc/symbology/symbols_png/pylons_right.png differ diff --git a/doc/symbology/symbols_png/route.png b/doc/symbology/symbols_png/route.png index b6c5588..29ecdd7 100644 Binary files a/doc/symbology/symbols_png/route.png and b/doc/symbology/symbols_png/route.png differ diff --git a/doc/symbology/symbols_png/route_clearing_point.png b/doc/symbology/symbols_png/route_clearing_point.png index 20b8c7c..b3d9454 100644 Binary files a/doc/symbology/symbols_png/route_clearing_point.png and b/doc/symbology/symbols_png/route_clearing_point.png differ diff --git a/doc/symbology/symbols_png/route_signal.png b/doc/symbology/symbols_png/route_signal.png index 0576762..56760b1 100644 Binary files a/doc/symbology/symbols_png/route_signal.png and b/doc/symbology/symbols_png/route_signal.png differ diff --git a/doc/symbology/symbols_png/secondary_track.png b/doc/symbology/symbols_png/secondary_track.png index 833b283..a5cd0e9 100644 Binary files a/doc/symbology/symbols_png/secondary_track.png and b/doc/symbology/symbols_png/secondary_track.png differ diff --git a/doc/symbology/symbols_png/shunt_limit.png b/doc/symbology/symbols_png/shunt_limit.png index e481a36..9ad7c5a 100644 Binary files a/doc/symbology/symbols_png/shunt_limit.png and b/doc/symbology/symbols_png/shunt_limit.png differ diff --git a/doc/symbology/symbols_png/shunt_signal.png b/doc/symbology/symbols_png/shunt_signal.png index a358606..bb00fb3 100644 Binary files a/doc/symbology/symbols_png/shunt_signal.png and b/doc/symbology/symbols_png/shunt_signal.png differ diff --git a/doc/symbology/symbols_png/shunt_signal_locked.png b/doc/symbology/symbols_png/shunt_signal_locked.png index d0765b0..1ede4cd 100644 Binary files a/doc/symbology/symbols_png/shunt_signal_locked.png and b/doc/symbology/symbols_png/shunt_signal_locked.png differ diff --git a/doc/symbology/symbols_png/speed_signal.png b/doc/symbology/symbols_png/speed_signal.png index ab81a31..015103f 100644 Binary files a/doc/symbology/symbols_png/speed_signal.png and b/doc/symbology/symbols_png/speed_signal.png differ diff --git a/doc/symbology/symbols_png/track_closure.png b/doc/symbology/symbols_png/track_closure.png index 07f48d8..4f9c079 100644 Binary files a/doc/symbology/symbols_png/track_closure.png and b/doc/symbology/symbols_png/track_closure.png differ diff --git a/doc/symbology/symbols_png/track_loop.png b/doc/symbology/symbols_png/track_loop.png new file mode 100644 index 0000000..7d32b60 Binary files /dev/null and b/doc/symbology/symbols_png/track_loop.png differ diff --git a/doc/symbology/symbols_png/train.png b/doc/symbology/symbols_png/train.png index dcddf08..c93434f 100644 Binary files a/doc/symbology/symbols_png/train.png and b/doc/symbology/symbols_png/train.png differ diff --git a/doc/symbology/symbols_png/train_berth_shape.png b/doc/symbology/symbols_png/train_berth_shape.png index 26b4cae..bc63244 100644 Binary files a/doc/symbology/symbols_png/train_berth_shape.png and b/doc/symbology/symbols_png/train_berth_shape.png differ diff --git a/doc/symbology/symbols_png/train_berth_sign.png b/doc/symbology/symbols_png/train_berth_sign.png index 3bbc3a5..168c8ab 100644 Binary files a/doc/symbology/symbols_png/train_berth_sign.png and b/doc/symbology/symbols_png/train_berth_sign.png differ diff --git a/doc/symbology/symbols_png/train_drive_automatic.png b/doc/symbology/symbols_png/train_drive_automatic.png index 64e7bee..3a41884 100644 Binary files a/doc/symbology/symbols_png/train_drive_automatic.png and b/doc/symbology/symbols_png/train_drive_automatic.png differ diff --git a/doc/symbology/symbols_png/train_drive_human.png b/doc/symbology/symbols_png/train_drive_human.png index da75e1c..8475151 100644 Binary files a/doc/symbology/symbols_png/train_drive_human.png and b/doc/symbology/symbols_png/train_drive_human.png differ diff --git a/doc/symbology/symbols_png/train_ghost.png b/doc/symbology/symbols_png/train_ghost.png index 1f011ac..5c1ef48 100644 Binary files a/doc/symbology/symbols_png/train_ghost.png and b/doc/symbology/symbols_png/train_ghost.png differ diff --git a/doc/symbology/symbols_png/train_moving.png b/doc/symbology/symbols_png/train_moving.png index 25c6800..c6ff7cb 100644 Binary files a/doc/symbology/symbols_png/train_moving.png and b/doc/symbology/symbols_png/train_moving.png differ diff --git a/doc/symbology/symbols_png/train_moving_fast.png b/doc/symbology/symbols_png/train_moving_fast.png index 2f9ef1d..e430e67 100644 Binary files a/doc/symbology/symbols_png/train_moving_fast.png and b/doc/symbology/symbols_png/train_moving_fast.png differ diff --git a/doc/symbology/symbols_png/train_moving_slow.png b/doc/symbology/symbols_png/train_moving_slow.png index 411cf6d..fb2696a 100644 Binary files a/doc/symbology/symbols_png/train_moving_slow.png and b/doc/symbology/symbols_png/train_moving_slow.png differ diff --git a/doc/symbology/symbols_png/train_shunt_mode.png b/doc/symbology/symbols_png/train_shunt_mode.png index eaac83b..64dda54 100644 Binary files a/doc/symbology/symbols_png/train_shunt_mode.png and b/doc/symbology/symbols_png/train_shunt_mode.png differ diff --git a/doc/symbology/symbols_png/train_shunting.png b/doc/symbology/symbols_png/train_shunting.png index 14aa00f..2b5f5a1 100644 Binary files a/doc/symbology/symbols_png/train_shunting.png and b/doc/symbology/symbols_png/train_shunting.png differ diff --git a/doc/symbology/symbols_png/turnout_left.png b/doc/symbology/symbols_png/turnout_left.png index a262801..5b874c8 100644 Binary files a/doc/symbology/symbols_png/turnout_left.png and b/doc/symbology/symbols_png/turnout_left.png differ diff --git a/doc/symbology/symbols_png/turnout_left_manually.png b/doc/symbology/symbols_png/turnout_left_manually.png index e6b225f..4bd39c8 100644 Binary files a/doc/symbology/symbols_png/turnout_left_manually.png and b/doc/symbology/symbols_png/turnout_left_manually.png differ diff --git a/doc/symbology/symbols_png/turnout_left_points_left_position.png b/doc/symbology/symbols_png/turnout_left_points_left_position.png index 7094460..61398af 100644 Binary files a/doc/symbology/symbols_png/turnout_left_points_left_position.png and b/doc/symbology/symbols_png/turnout_left_points_left_position.png differ diff --git a/doc/symbology/symbols_png/turnout_left_points_moving.png b/doc/symbology/symbols_png/turnout_left_points_moving.png index 3b7b6dd..b3086e8 100644 Binary files a/doc/symbology/symbols_png/turnout_left_points_moving.png and b/doc/symbology/symbols_png/turnout_left_points_moving.png differ diff --git a/doc/symbology/symbols_png/turnout_left_points_right_position.png b/doc/symbology/symbols_png/turnout_left_points_right_position.png index fe51005..554bff1 100644 Binary files a/doc/symbology/symbols_png/turnout_left_points_right_position.png and b/doc/symbology/symbols_png/turnout_left_points_right_position.png differ diff --git a/doc/symbology/symbols_png/turnout_right.png b/doc/symbology/symbols_png/turnout_right.png index db681a1..5a9eb6c 100644 Binary files a/doc/symbology/symbols_png/turnout_right.png and b/doc/symbology/symbols_png/turnout_right.png differ diff --git a/doc/symbology/symbols_png/turnout_right_manually.png b/doc/symbology/symbols_png/turnout_right_manually.png index 7afdd49..38fdbc4 100644 Binary files a/doc/symbology/symbols_png/turnout_right_manually.png and b/doc/symbology/symbols_png/turnout_right_manually.png differ diff --git a/doc/symbology/symbols_png/turnout_right_points_left_position.png b/doc/symbology/symbols_png/turnout_right_points_left_position.png index f85d789..9f0d174 100644 Binary files a/doc/symbology/symbols_png/turnout_right_points_left_position.png and b/doc/symbology/symbols_png/turnout_right_points_left_position.png differ diff --git a/doc/symbology/symbols_png/turnout_right_points_moving.png b/doc/symbology/symbols_png/turnout_right_points_moving.png index e01cd59..161038f 100644 Binary files a/doc/symbology/symbols_png/turnout_right_points_moving.png and b/doc/symbology/symbols_png/turnout_right_points_moving.png differ diff --git a/doc/symbology/symbols_png/turnout_right_points_right_position.png b/doc/symbology/symbols_png/turnout_right_points_right_position.png index 666aac6..523a94e 100644 Binary files a/doc/symbology/symbols_png/turnout_right_points_right_position.png and b/doc/symbology/symbols_png/turnout_right_points_right_position.png differ diff --git a/doc/symbology/symbols_png/turnout_with_fouling_left.png b/doc/symbology/symbols_png/turnout_with_fouling_left.png index cd70142..2d8e80d 100644 Binary files a/doc/symbology/symbols_png/turnout_with_fouling_left.png and b/doc/symbology/symbols_png/turnout_with_fouling_left.png differ diff --git a/doc/symbology/symbols_png/turnout_with_fouling_right.png b/doc/symbology/symbols_png/turnout_with_fouling_right.png index 71b0be6..b85f614 100644 Binary files a/doc/symbology/symbols_png/turnout_with_fouling_right.png and b/doc/symbology/symbols_png/turnout_with_fouling_right.png differ diff --git a/doc/symbology/symbols_png/view_point.png b/doc/symbology/symbols_png/view_point.png index bc9c184..4ad83ec 100644 Binary files a/doc/symbology/symbols_png/view_point.png and b/doc/symbology/symbols_png/view_point.png differ diff --git a/doc/symbology/symbols_png/wire_limit.png b/doc/symbology/symbols_png/wire_limit.png index da6ca49..94e9b44 100644 Binary files a/doc/symbology/symbols_png/wire_limit.png and b/doc/symbology/symbols_png/wire_limit.png differ diff --git a/doc/symbology/symbols_svg/balise_backward_group.svg b/doc/symbology/symbols_svg/balise_backward_group.svg new file mode 100644 index 0000000..949f21c --- /dev/null +++ b/doc/symbology/symbols_svg/balise_backward_group.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_backward_group_switched.svg b/doc/symbology/symbols_svg/balise_backward_group_switched.svg new file mode 100644 index 0000000..a56617f --- /dev/null +++ b/doc/symbology/symbols_svg/balise_backward_group_switched.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_backward_individual.svg b/doc/symbology/symbols_svg/balise_backward_individual.svg new file mode 100644 index 0000000..8f89090 --- /dev/null +++ b/doc/symbology/symbols_svg/balise_backward_individual.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_backward_individual_switched.svg b/doc/symbology/symbols_svg/balise_backward_individual_switched.svg new file mode 100644 index 0000000..0928673 --- /dev/null +++ b/doc/symbology/symbols_svg/balise_backward_individual_switched.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_forward_group.svg b/doc/symbology/symbols_svg/balise_forward_group.svg new file mode 100644 index 0000000..0b783e3 --- /dev/null +++ b/doc/symbology/symbols_svg/balise_forward_group.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_forward_group_switched.svg b/doc/symbology/symbols_svg/balise_forward_group_switched.svg new file mode 100644 index 0000000..568c911 --- /dev/null +++ b/doc/symbology/symbols_svg/balise_forward_group_switched.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_forward_individual.svg b/doc/symbology/symbols_svg/balise_forward_individual.svg new file mode 100644 index 0000000..5526c5e --- /dev/null +++ b/doc/symbology/symbols_svg/balise_forward_individual.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/balise_forward_individual_switched.svg b/doc/symbology/symbols_svg/balise_forward_individual_switched.svg new file mode 100644 index 0000000..489a875 --- /dev/null +++ b/doc/symbology/symbols_svg/balise_forward_individual_switched.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/symbology/symbols_svg/parked_vehicle.svg b/doc/symbology/symbols_svg/parked_vehicle.svg index 2bda98c..58140e3 100644 --- a/doc/symbology/symbols_svg/parked_vehicle.svg +++ b/doc/symbology/symbols_svg/parked_vehicle.svg @@ -6,10 +6,10 @@ - - + + - + diff --git a/doc/symbology/symbols_svg/loop_transmitter.svg b/doc/symbology/symbols_svg/track_loop.svg similarity index 100% rename from doc/symbology/symbols_svg/loop_transmitter.svg rename to doc/symbology/symbols_svg/track_loop.svg diff --git a/doc/symbology/symbols_svg/train.svg b/doc/symbology/symbols_svg/train.svg index ed90abe..27b44aa 100644 --- a/doc/symbology/symbols_svg/train.svg +++ b/doc/symbology/symbols_svg/train.svg @@ -6,9 +6,9 @@ - + - + diff --git a/doc/symbology/symbols_svg/train_drive_automatic.svg b/doc/symbology/symbols_svg/train_drive_automatic.svg index 74518f3..5a4b612 100644 --- a/doc/symbology/symbols_svg/train_drive_automatic.svg +++ b/doc/symbology/symbols_svg/train_drive_automatic.svg @@ -6,9 +6,9 @@ - + - + diff --git a/doc/symbology/symbols_svg/train_drive_human.svg b/doc/symbology/symbols_svg/train_drive_human.svg index 4c40ae3..1183015 100644 --- a/doc/symbology/symbols_svg/train_drive_human.svg +++ b/doc/symbology/symbols_svg/train_drive_human.svg @@ -6,9 +6,9 @@ - + - + diff --git a/doc/symbology/symbols_svg/train_ghost.svg b/doc/symbology/symbols_svg/train_ghost.svg index ff72d34..76ce20d 100644 --- a/doc/symbology/symbols_svg/train_ghost.svg +++ b/doc/symbology/symbols_svg/train_ghost.svg @@ -7,7 +7,7 @@ - + diff --git a/doc/symbology/symbols_svg/train_moving.svg b/doc/symbology/symbols_svg/train_moving.svg index c7f95a4..9e1eee7 100644 --- a/doc/symbology/symbols_svg/train_moving.svg +++ b/doc/symbology/symbols_svg/train_moving.svg @@ -24,9 +24,9 @@ - + - + diff --git a/doc/symbology/symbols_svg/train_moving_fast.svg b/doc/symbology/symbols_svg/train_moving_fast.svg index 26a084b..39d3ed4 100644 --- a/doc/symbology/symbols_svg/train_moving_fast.svg +++ b/doc/symbology/symbols_svg/train_moving_fast.svg @@ -25,9 +25,9 @@ - + - + diff --git a/doc/symbology/symbols_svg/train_moving_slow.svg b/doc/symbology/symbols_svg/train_moving_slow.svg index fea19a5..a12adf0 100644 --- a/doc/symbology/symbols_svg/train_moving_slow.svg +++ b/doc/symbology/symbols_svg/train_moving_slow.svg @@ -13,9 +13,9 @@ - + - + diff --git a/doc/symbology/symbols_svg/train_shunt_mode.svg b/doc/symbology/symbols_svg/train_shunt_mode.svg index 3dc4a14..a2b8f10 100644 --- a/doc/symbology/symbols_svg/train_shunt_mode.svg +++ b/doc/symbology/symbols_svg/train_shunt_mode.svg @@ -1,9 +1,9 @@ - - - + + + diff --git a/doc/symbology/symbols_svg/train_shunting.svg b/doc/symbology/symbols_svg/train_shunting.svg index a757b2a..b956377 100644 --- a/doc/symbology/symbols_svg/train_shunting.svg +++ b/doc/symbology/symbols_svg/train_shunting.svg @@ -16,9 +16,9 @@ - - - + + + diff --git a/doc/symbology/symbols_tikz/derailer_left.tikz b/doc/symbology/symbols_tikz/derailer_left.tikz index fc224db..1014169 100644 --- a/doc/symbology/symbols_tikz/derailer_left.tikz +++ b/doc/symbology/symbols_tikz/derailer_left.tikz @@ -3,7 +3,7 @@ \coordinate (A) at (0,0); -\derailer[forward,branch=left] at (Y) label (); +\derailer[forward,branch=left] at (A) label (); % anchor \anchor at (A); \ No newline at end of file diff --git a/doc/symbology/symbols_tikz/loop_transmitter.tikz b/doc/symbology/symbols_tikz/loop_transmitter.tikz deleted file mode 100644 index da2a8f2..0000000 --- a/doc/symbology/symbols_tikz/loop_transmitter.tikz +++ /dev/null @@ -1,9 +0,0 @@ -% Copyright (c) 2018 - 2022, Martin Scheidt (ISC license) -% Permission to use, copy, modify, and/or distribute this file for any purpose with or without fee is hereby granted, provided that the above copyright notice and this permission notice appear in all copies. - -\coordinate (A) at (0,0); - -\transmitter[type=loop] at (A) label (); - -% anchor -\anchor at (A); \ No newline at end of file diff --git a/doc/symbology/symbols_tikz/trackloop.tikz b/doc/symbology/symbols_tikz/track_loop.tikz similarity index 100% rename from doc/symbology/symbols_tikz/trackloop.tikz rename to doc/symbology/symbols_tikz/track_loop.tikz