summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tikz-trackschematic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-30 20:12:42 +0000
committerKarl Berry <karl@freefriends.org>2021-09-30 20:12:42 +0000
commite0203f54b481dfa2e7dc0ef0d286e443bc188ac0 (patch)
tree09d8c3016593b369c2e61a12c2714263814e6ae8 /Master/texmf-dist/tex/latex/tikz-trackschematic
parent238b0d49b198d51c90e018dca8452f66a6772c93 (diff)
tikz-trackschematic (30sep21)
git-svn-id: svn://tug.org/texlive/trunk@60658 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tikz-trackschematic')
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikz-trackschematic.sty121
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.code.tex3
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.electrics.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.measures.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.symbology.code.tex125
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex2
-rw-r--r--Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex2
9 files changed, 138 insertions, 123 deletions
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikz-trackschematic.sty b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikz-trackschematic.sty
index 2afa50dbfef..39aadd7fdc2 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikz-trackschematic.sty
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikz-trackschematic.sty
@@ -7,17 +7,16 @@
\NeedsTeXFormat{LaTeX2e}%
\ProvidesPackage{tikz-trackschematic}[2021/01/02 tikz-trackschematic]%
%
-% Required Packages for tikz-trackschematic
-\RequirePackage{tikz,etoolbox,lmodern}%
-%
%%%%%%%%%%%%%%%
% Package options
%%%%%%%%%%%%%%%
-\RequirePackage{xkeyval,etoolbox}%
+\RequirePackage{tikz,xkeyval,etoolbox}%
\newtoggle{development}%
\DeclareOptionX{dev}[\settoggle{development}{false}]{\settoggle{development}{true}}
\ProcessOptionsX
%
+\settoggle{development}{true}
+
\iftoggle{development}{%
\PackageInfo{tikz-trackschematic}{development mode}%
%
@@ -28,6 +27,7 @@
\usetikzlibrary{trackschematic-dev.constructions}%
\usetikzlibrary{trackschematic-dev.electrics}%
\usetikzlibrary{trackschematic-dev.measures}%
+ \usetikzlibrary{trackschematic-dev.symbology}%
\usetikzlibrary{trackschematic-dev}%
}{%
\PackageError{tikz-trackschematic}{development mode not available}{execute the dev-install.sh script provided by the package repository}%
@@ -39,120 +39,9 @@
\usetikzlibrary{trackschematic.constructions}%
\usetikzlibrary{trackschematic.electrics}%
\usetikzlibrary{trackschematic.measures}%
+ \usetikzlibrary{trackschematic.symbology}%
}%
%
%%%%%%%%%%%%%%%
-% commands
-%%%%%%%%%%%%%%%
-\RequirePackage{adjustbox}%
-\usetikzlibrary{calc}%
-%
-\DeclareRobustCommand{\tsSymbol}[2][1]{%
- \adjustbox{valign=c}{%
- \begin{tikzpicture}]%
- \pic at (0,0) {symbology_#2};%
- \path ($0.5*(-0.2,-#1)$) rectangle ($0.5*(12.2,#1)$);% background rectangle to unify every cell containing a symbol
- \end{tikzpicture}%
- }%
-}%
-%%%%%%%%%%%%%%%
-% symbology table
-%%%%%%%%%%%%%%%
-%
-%% TODO: replave with package glossaries
-% \@ifpackageloaded{glossaries}{%
-% \newglossaryentry{main_track}{name={main track},description={},symbol={\tsSymbol{main_track}}}%
-% }{}%
-%%
-\RequirePackage{booktabs,xltabular,multicol}%
-%% command
-\DeclareRobustCommand\tsFullSymbology{%
- \begin{xltabular}{\textwidth}{cX}%
- \toprule%
- \textbf{Notation} & \multicolumn{1}{c}{\textbf{Description}} \\%
- \midrule%
- \endfirsthead%
- % -----------
- \midrule%
- \textbf{Notation} & \multicolumn{1}{c}{\textbf{Description}} \\%
- \midrule%
- \endhead%
- % -----------
- \midrule%
- \multicolumn{2}{c}{\footnotesize -- continued on next page -- } \\%
- \endfoot%
- % -----------
- \bottomrule%
- \endlastfoot%
- % -----------
- \tsSymbol{main_track} & main track \\%
- \tsSymbol{secondary_track} & secondary track \\%
- \tsSymbol{track_label} & track label \\%
- \tsSymbol{bufferstop} & bufferstop \\%
- \tsSymbol{friction_bufferstop} & friction bufferstop \\%
- \tsSymbol{track_closure} & track closure \\%
- \tsSymbol{turnout} & turnout \\%
- \tsSymbol{turnout_fouling} & turnout with fouling point indicator \\%
- \tsSymbol{turnout_manually} & turnout operated manually \\%
- \tsSymbol{diamond_crossing} & diamond crossing \\%
- \tsSymbol{slip_turnout} & double-slip turnout \\%
- \tsSymbol{turnout_points_right} & turnout with points in right position \\%
- \tsSymbol{turnout_points_left} & turnout with points in left position \\%
- \tsSymbol{turnout_points_moving} & turnout with moving points \\%
- \tsSymbol{derailer} & derailer \\%
- \tsSymbol{parked_vehicles} & parked vehicles \\%
- \tsSymbol{train_shunt_mode} & train in shunting mode \\%
- \tsSymbol{train_shunting} & train shunting \\%
- \tsSymbol{train} & train \\%
- \tsSymbol{train_moving_slow} & train moving slow \\%
- \tsSymbol{train_moving} & train moving \\%
- \tsSymbol{train_moving_fast} & train moving fast \\%
- \tsSymbol{train_ghost} & train ghost \\%
- \tsSymbol{train_drive_automatic} & train operated automatic \\%
- \tsSymbol{train_drive_human} & train operated by human \\%
- \tsSymbol[1.4]{distant_signal} & distant signal \\%
- \tsSymbol[1.4]{distant_speed_signal}& distant signal with speed indicator \\%
- \tsSymbol[1.4]{speed_signal} & speed signal \\%
- \tsSymbol[1.4]{block_signal} & block signal \\%
- \tsSymbol[1.4]{route_signal} & route signal \\%
- \tsSymbol[1.4]{combined_signal} & combined signal (distant, block and route signal) \\%
- \tsSymbol[1.4]{shunt_signal} & shunt signal \\%
- \tsSymbol[1.4]{locked_shunt_signal} & shunt signal locked \\%
- \tsSymbol[1.4]{shunt_limit} & shunt limit \\%
- \tsSymbol[1.4]{train_berth_sign} & train berth sign \\%
- \tsSymbol[1.4]{view_point} & view point \\%
- \tsSymbol[1.4]{braking_point} & braking point \\%
- \tsSymbol[1.4]{end_of_authority} & end of movement authority \\%
- \tsSymbol[1.4]{danger_point} & danger point \\%
- \tsSymbol{clearing_point} & clearing point \\%
- \tsSymbol{block_clearing_point} & block clearing point \\%
- \tsSymbol{route_clearing_point} & route clearing point \\%
- \tsSymbol{transmitter} & transmitter \\%
- \tsSymbol{transmitter_forward} & transmitter effective forward \\%
- \tsSymbol{transmitter_bidirectional}& transmitter bidirectional \\%
- \tsSymbol{loop_transmitter} & loop transmitter \\%
- \tsSymbol{route} & route \\%
- \tsSymbol{direction_control} & direction control \\%
- \tsSymbol{platform} & platform \\%
- \tsSymbol{level_crossing} & level crossing \\%
- \tsSymbol[2.0]{bridge} & bridge \\%
- \tsSymbol[1.4]{hump} & hump \\%
- \tsSymbol{pylon} & pylons \\%
- \tsSymbol{interlocking} & interlocking \\%
- \tsSymbol[1.4]{distant_power_off} & distant power off \\%
- \tsSymbol[1.4]{power_off} & power off \\%
- \tsSymbol[1.4]{power_on} & power on \\%
- \tsSymbol[1.4]{distant_pantograph_down}& distant pantograph down \\%
- \tsSymbol[1.4]{pantograph_down} & pantograph down \\%
- \tsSymbol[1.4]{pantograph_up} & pantograph up \\%
- \tsSymbol[1.4]{wire_limit} & wire limit \\%
- \tsSymbol[2.0]{track_distance} & track distance \\%
- \tsSymbol{train_berth} & train berth \\%
- \tsSymbol{measure_line} & measure line \\%
- \tsSymbol{hectometer} & hectometer \\%
- \tsSymbol{track_marking} & track marking \\%
- \end{xltabular}%
-}%
-%%%%%%%%%%%%%%%
\endinput%
% \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.code.tex
index b26089fc759..d6d64170623 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.code.tex
@@ -6,7 +6,7 @@
%
\ProvidesFileRCS{tikzlibrarytrackschematic.code.tex}%
%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
%
%%%%%%%%%%%%%%%
% loading sublibraries
@@ -17,6 +17,7 @@
% \usetikzlibrary{trackschematic.constructions}%
% \usetikzlibrary{trackschematic.electrics}%
% \usetikzlibrary{trackschematic.measures}%
+% \usetikzlibrary{trackschematic.symbology}%
%%%%%%%%%%%%%%%
%% template for new symbol definitions
%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex
index d36e3bece1c..2d1b5d583f9 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.constructions.code.tex
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%
% global settings
%%%%%%%%%%%%%%%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
\usetikzlibrary{calc}%
%
\ifdeflength{\objectlength}{}{% Not defined, so define it!
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.electrics.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.electrics.code.tex
index 70956611e63..6b8942bd4f5 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.electrics.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.electrics.code.tex
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%
% global settings
%%%%%%%%%%%%%%%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
\usetikzlibrary{calc,intersections,arrows.meta}%
%
% https://tex.stackexchange.com/questions/56353/extract-x-y-coordinate-of-an-arbitrary-point-on-curve-in-tikz
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.measures.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.measures.code.tex
index ac636773919..4b79f6a7a5a 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.measures.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.measures.code.tex
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%
% global settings
%%%%%%%%%%%%%%%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
\usetikzlibrary{calc,intersections,arrows.meta}%
%
% https://tex.stackexchange.com/questions/56353/extract-x-y-coordinate-of-an-arbitrary-point-on-curve-in-tikz
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.symbology.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.symbology.code.tex
new file mode 100644
index 00000000000..46ae2fa4da6
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.symbology.code.tex
@@ -0,0 +1,125 @@
+%!TEX TS-program = pdflatexmk
+%!TEX root = ../test/test.tex
+%
+%% symbol library for TikZ track schematics
+%
+% Copyright (c) 2018 - 2021, 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.
+%
+\ProvidesFileRCS{tikzlibrarytrackschematic.symbology.code.tex}%
+%
+%%%%%%%%%%%%%%%
+% commands
+%%%%%%%%%%%%%%%
+\RequirePackage{adjustbox}%
+\usetikzlibrary{calc}%
+%
+\DeclareRobustCommand{\tsSymbol}[2][1]{%
+ \adjustbox{valign=c}{%
+ \begin{tikzpicture}]%
+ \pic at (0,0) {symbology_#2};%
+ \path ($0.5*(-0.2,-#1)$) rectangle ($0.5*(12.2,#1)$);% background rectangle to unify every cell containing a symbol
+ \end{tikzpicture}%
+ }%
+}%
+%%%%%%%%%%%%%%%
+% symbology table
+%%%%%%%%%%%%%%%
+%
+%% TODO: replave with package glossaries
+% \@ifpackageloaded{glossaries}{%
+% \newglossaryentry{main_track}{name={main track},description={},symbol={\tsSymbol{main_track}}}%
+% }{}%
+%%
+\RequirePackage{booktabs,xltabular,multicol}%
+%% command
+\DeclareRobustCommand\tsFullSymbology{%
+ \begin{xltabular}{\textwidth}{cX}%
+ \toprule%
+ \textbf{Notation} & \multicolumn{1}{c}{\textbf{Description}} \\%
+ \midrule%
+ \endfirsthead%
+ % -----------
+ \midrule%
+ \textbf{Notation} & \multicolumn{1}{c}{\textbf{Description}} \\%
+ \midrule%
+ \endhead%
+ % -----------
+ \midrule%
+ \multicolumn{2}{c}{\footnotesize -- continued on next page -- } \\%
+ \endfoot%
+ % -----------
+ \bottomrule%
+ \endlastfoot%
+ % -----------
+ \tsSymbol{main_track} & main track \\%
+ \tsSymbol{secondary_track} & secondary track \\%
+ \tsSymbol{track_label} & track label \\%
+ \tsSymbol{bufferstop} & bufferstop \\%
+ \tsSymbol{friction_bufferstop} & friction bufferstop \\%
+ \tsSymbol{track_closure} & track closure \\%
+ \tsSymbol{turnout} & turnout \\%
+ \tsSymbol{turnout_fouling} & turnout with fouling point indicator \\%
+ \tsSymbol{turnout_manually} & turnout operated manually \\%
+ \tsSymbol{diamond_crossing} & diamond crossing \\%
+ \tsSymbol{slip_turnout} & double-slip turnout \\%
+ \tsSymbol{turnout_points_right} & turnout with points in right position \\%
+ \tsSymbol{turnout_points_left} & turnout with points in left position \\%
+ \tsSymbol{turnout_points_moving} & turnout with moving points \\%
+ \tsSymbol{derailer} & derailer \\%
+ \tsSymbol{parked_vehicles} & parked vehicles \\%
+ \tsSymbol{train_shunt_mode} & train in shunting mode \\%
+ \tsSymbol{train_shunting} & train shunting \\%
+ \tsSymbol{train} & train \\%
+ \tsSymbol{train_moving_slow} & train moving slow \\%
+ \tsSymbol{train_moving} & train moving \\%
+ \tsSymbol{train_moving_fast} & train moving fast \\%
+ \tsSymbol{train_ghost} & train ghost \\%
+ \tsSymbol{train_drive_automatic} & train operated automatic \\%
+ \tsSymbol{train_drive_human} & train operated by human \\%
+ \tsSymbol[1.4]{distant_signal} & distant signal \\%
+ \tsSymbol[1.4]{distant_speed_signal}& distant signal with speed indicator \\%
+ \tsSymbol[1.4]{speed_signal} & speed signal \\%
+ \tsSymbol[1.4]{block_signal} & block signal \\%
+ \tsSymbol[1.4]{route_signal} & route signal \\%
+ \tsSymbol[1.4]{combined_signal} & combined signal (distant, block and route signal) \\%
+ \tsSymbol[1.4]{shunt_signal} & shunt signal \\%
+ \tsSymbol[1.4]{locked_shunt_signal} & shunt signal locked \\%
+ \tsSymbol[1.4]{shunt_limit} & shunt limit \\%
+ \tsSymbol[1.4]{train_berth_sign} & train berth sign \\%
+ \tsSymbol[1.4]{view_point} & view point \\%
+ \tsSymbol[1.4]{braking_point} & braking point \\%
+ \tsSymbol[1.4]{end_of_authority} & end of movement authority \\%
+ \tsSymbol[1.4]{danger_point} & danger point \\%
+ \tsSymbol{clearing_point} & clearing point \\%
+ \tsSymbol{block_clearing_point} & block clearing point \\%
+ \tsSymbol{route_clearing_point} & route clearing point \\%
+ \tsSymbol{transmitter} & transmitter \\%
+ \tsSymbol{transmitter_forward} & transmitter effective forward \\%
+ \tsSymbol{transmitter_bidirectional}& transmitter bidirectional \\%
+ \tsSymbol{loop_transmitter} & loop transmitter \\%
+ \tsSymbol{route} & route \\%
+ \tsSymbol{direction_control} & direction control \\%
+ \tsSymbol{platform} & platform \\%
+ \tsSymbol{level_crossing} & level crossing \\%
+ \tsSymbol[2.0]{bridge} & bridge \\%
+ \tsSymbol[1.4]{hump} & hump \\%
+ \tsSymbol{pylon} & pylons \\%
+ \tsSymbol{interlocking} & interlocking \\%
+ \tsSymbol[1.4]{distant_power_off} & distant power off \\%
+ \tsSymbol[1.4]{power_off} & power off \\%
+ \tsSymbol[1.4]{power_on} & power on \\%
+ \tsSymbol[1.4]{distant_pantograph_down}& distant pantograph down \\%
+ \tsSymbol[1.4]{pantograph_down} & pantograph down \\%
+ \tsSymbol[1.4]{pantograph_up} & pantograph up \\%
+ \tsSymbol[1.4]{wire_limit} & wire limit \\%
+ \tsSymbol[2.0]{track_distance} & track distance \\%
+ \tsSymbol{train_berth} & train berth \\%
+ \tsSymbol{measure_line} & measure line \\%
+ \tsSymbol{hectometer} & hectometer \\%
+ \tsSymbol{track_marking} & track marking \\%
+ \end{xltabular}%
+}%
+%%%%%%%%%%%%%%%
+\end \ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex
index 368986cce45..26972797f69 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.topology.code.tex
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%
% Requirements
%%%%%%%%%%%%%%%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
\usetikzlibrary{calc,patterns}%
%
% https://tex.stackexchange.com/questions/56353/extract-x-y-coordinate-of-an-arbitrary-point-on-curve-in-tikz
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex
index 07b2c09065c..b46450add4c 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.trafficcontrol.code.tex
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%
% Requirements
%%%%%%%%%%%%%%%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
\usetikzlibrary{calc}%
%
% https://tex.stackexchange.com/questions/56353/extract-x-y-coordinate-of-an-arbitrary-point-on-curve-in-tikz
diff --git a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex
index cf8aad3898d..d8e0687fd7f 100644
--- a/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex
+++ b/Master/texmf-dist/tex/latex/tikz-trackschematic/tikzlibrarytrackschematic.vehicles.code.tex
@@ -12,7 +12,7 @@
%%%%%%%%%%%%%%%
% Requirements
%%%%%%%%%%%%%%%
-\RequirePackage{tikz,etoolbox,lmodern}%
+\RequirePackage{tikz,etoolbox}%
\usetikzlibrary{calc}%
%
% https://tex.stackexchange.com/questions/56353/extract-x-y-coordinate-of-an-arbitrary-point-on-curve-in-tikz