Fix CI and tidy code

3 files changed, 25 insertions, 87 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33d01fb..3c8dafa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,34 +1,27 @@
 stages:
-  - build-env
-  - build-doc
+  - build-pdf
+  - build-svg
 
-variables:
-  CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
-  TARGET_BASE: $CLOUD_CI_URL/Documents/$CI_PROJECT_NAMESPACE
-
-# Build the build environment for this document
-build-env:
-  stage: build-env
-  image: quay.io/podman/stable
+build-final:
+  stage: build-pdf
+  image: registry.gitlab.com/containers.ada/tectonic
   script:
-    - podman login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
-    - podman build -t $CONTAINER_RELEASE_IMAGE .
-    - podman push $CONTAINER_RELEASE_IMAGE
+    - tectonic heidelberg.tex
+  artifacts:
+    paths:
+      - heidelberg.pdf
   rules:
     - changes:
-      - Containerfile
+      - "*.tex"
 
-# Build the document and store artefacts
-build-final:
-  stage: build-doc
-  image: $CONTAINER_RELEASE_IMAGE
+build-svg:
+  stage: build-svg
+  image: registry.gitlab.com/containers.ada/pdf2svg
   script:
-    - lualatex heidelberg.tex
-    - inkscape --export-filename=heidelberg.png --export-dpi=300 --export-background=white
+    - pdf2svg heidelberg.svg
   artifacts:
     paths:
-      - heidelberg.pdf
-      - heidelberg.png
+      - heidelberg.svg
   rules:
     - changes:
-      - *.tex
+      - "*.tex"
diff --git a/Containerfile b/Containerfile
deleted file mode 100644
index b7f6597..0000000
--- a/Containerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM registry.fedoraproject.org/fedora-minimal:39
-
-# Build tools
-RUN microdnf install -y inkscape git
-# TeXlive components
-RUN microdnf install -y texlive-scheme-basic \
-    texlive-collection-luatex \
-    texlive-collection-pictures \
-    texlive-collection-latexrecommended \
-    texlive-collection-latexextra \
-    texlive-collection-binextra \
-    texlive-collection-fontsextra
-
-RUN microdnf clean all
diff --git a/heidelberg.tex b/heidelberg.tex
index 52b4dfe..5e89e40 100644
--- a/heidelberg.tex
+++ b/heidelberg.tex
@@ -246,7 +246,7 @@
       -- (Odenwaldstr)
       -- (Kirchheim Rathaus)
       -- (Kirchheim Friedhof)
-      ;
+    ;
 
     % \draw (Technologiepark.north center) -- 
     %   node[rotate=-45,stop2,name=Heiligenbergschule] {} (Hans-Thoma-Platz.south center);
@@ -266,7 +266,8 @@
       }
       -- (Heiligenbergschule.north one half) 
       -- ($(Hans-Thoma-Platz.south one half)+(0,\offset)$) 
-      -- (Hans-Thoma-Platz.one half);
+      -- (Hans-Thoma-Platz.one half)
+    ;
 
     \draw[line, twentyone]
       (Jahnstr.one half)
@@ -285,7 +286,8 @@
       -- (Stadtwerke.two half)
       {[rounded corners=0.2cm]
       -- (Hauptbahnhof.two half)
-      };
+      }
+    ;
 
 
     \draw[line, twentytwo]
@@ -339,7 +341,7 @@
       -- (Kurpfalzcentrum)
       -- (Moltkestr)
       -- (Leimen Friedhof)
-      ;
+    ;
 
     \draw[line, twentyfour] 
       (Rohrbach Süd.one half)
@@ -371,7 +373,8 @@
       -- (Heiligenbergschule.south two half) -- (Heiligenbergschule.north two half) 
       -- ($(Hans-Thoma-Platz.south two quarter)-(0,\offset)$) -- (Hans-Thoma-Platz.two quarter)
       -- (Biethsstr.one half)
-      -- (Burgstr.one half);
+      -- (Burgstr.one half)
+    ;
 
 
     \draw[line, five, -{Latex[length=5mm]}]
@@ -418,7 +421,7 @@
       -- (SRH Campus.center)
       -- (Wieblingen Mitte.center)
       -- (Taubenfeld.center)
-      ;
+    ;
 
   \end{pgfonlayer}
 
@@ -491,8 +494,6 @@
       Kirchheim Friedhof/left/east/0,
       Burgstr/right/west/0%
     } \node[label, \placement=0.05cm of \stop, rotate=\rotate, anchor=\anchor] {\contour{white}{\stop}};
-    % \node[label, right=0.05cm of Altes Hallenbad, rotate=60, anchor=south west, align=left] {Altes Hallenbad};
-    % \node[label, right=0.05cm of Campus Bergheim, rotate=60, anchor=south west, align=left] {Campu Bergheim};
     \node[line name, fill=twentytwo, left=0.2cm of Eppelheim Kirchheimer Str] {\bf 22};
     \node[line name, fill=twentysix, right=0.2cm of Kirchheim Friedhof] {\bf 26};
     \node[line name, fill=twentythree, left=0.2cm of Leimen Friedhof] {\bf 23};
@@ -504,48 +505,6 @@
     \node[line name, fill=twentythree, right=0.6cm of Bismarckplatz] {\bf 23};
   \end{pgfonlayer}
 
-
-  % \node[draw, fill=white, color=black, shape=stop] (test) at (Hauptbahnhof) {};
-
-  % \draw[line, color=twentyfour]
-  %   (Hauptbahnhof) -- (Betriebshof) -- 
-  %   (Jahnstr) -- (Bunsengymnasium) --
-  %   (Technologiepark) -- (Heiligenbergschule) -- 
-  %   (Hans-Thoma-Platz);
-  % \draw[line, color=twentyone] 
-  %   ($(Hauptbahnhof)-(0.1,0)$) -- ($(Betriebshof)-(0.1,0)$) -- 
-  %   ($(Jahnstr)-(0.1,0)$) -- ($(Bunsengymnasium)-(0.1,0)$) --
-  %   ($(Technologiepark)-(0.1,0)$) -- ($(Heiligenbergschule)-(-45:0.1)$) -- 
-  %   ($(Hans-Thoma-Platz)-(0.1,0.2)$) -- ($(Hans-Thoma-Platz)-(0.1,0)$);
-
-  %
-  % \node[stop, shape=rectangle, minimum width=0.5cm, shift={(-0.1cm, 0cm)}] at (Hans-Thoma-Platz) {};
-  %
-  % \node[stop, shape=rectangle, minimum width=0.3cm, shift={(-0.05cm, 0cm)}] at (Hauptbahnhof) {};
-  % \node[label, anchor=west] at (Hauptbahnhof) {Hauptbahnhof};
-  %
-  % \node[stop, shape=rectangle, minimum width=0.3cm, shift={(-0.05cm, 0cm)}] at (Betriebshof) {};
-  % \node[label, anchor=west] at (Betriebshof) {Betriebshof};
-  %
-  % \node[stop, shape=rectangle, minimum width=0.3cm, shift={(-0.05cm, 0cm)}] at (Jahnstr) {};
-  % \node[label, anchor=west] at (Jahnstr) {Jahnstr};
-  %
-  % \node[stop, shape=rectangle, minimum width=0.3cm, shift={(-0.05cm, 0cm)}] at (Bunsengymnasium) {};
-  % \node[label, anchor=west] at (Bunsengymnasium) {Bunsengymnasium};
-  %
-  % \node[stop, shape=rectangle, minimum width=0.3cm, shift={(-0.05cm, 0cm)}] at (Technologiepark) {};
-  % \node[label, anchor=west] at (Technologiepark) {Technologiepark};
-
-  % \draw[stop, shift={(-0.1cm,-0.1cm)}] 
-  %   (Hans-Thoma-Platz) 
-  %   rectangle ++(0.2cm,0.2cm) 
-  %   node[right, label] {Hans-Thoma-Platz};
-  % \draw[stop] (Heiligenbergschule) circle node[right, label, anchor=north west] {Heiligenbergschule};
-  % \draw[stop] (Technologiepark) circle node[right, label, anchor=north west] {Technologiepark};
-  % \draw[stop] (Bunsengymnasium) circle node[right, label] {Bunsengymnasium};
-  % \draw[stop] (Jahnstr) circle node[right, label] {Jahnstr};
-  % \draw[stop] (Betriebshof) circle node[right, label] {Betriebshof};
-  % \draw[stop] (Hauptbahnhof) circle node[right, label] {Hauptbahnhof};
 \end{tikzpicture}
 
 \vfill