Ubuntu 24.04 for LaTeX

entorb · entorb · commit 36be7da650db · 2024-05-14T20:24:18.000+02:00
docker build now requires "."
requires texlive-lang-greek
diff --git a/.github/workflows/make-pdf-1-select.yml b/.github/workflows/make-pdf-1-select.yml
@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Print selection
         run: |
diff --git a/.github/workflows/make-pdf-6-parallel.yml b/.github/workflows/make-pdf-6-parallel.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build-and-release:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     strategy:
       matrix:
         part: [hpmor-1, hpmor-2, hpmor-3, hpmor-4, hpmor-5, hpmor-6]
diff --git a/.github/workflows/make-pdf-all-serial.yml b/.github/workflows/make-pdf-all-serial.yml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
diff --git a/.github/workflows/make-pdf-test.yml b/.github/workflows/make-pdf-test.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Print start date
         run: date +%Y-%m-%d_%H:%M
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # base image
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 # set timezone
 ENV TZ=Europe/Berlin
@@ -15,7 +15,7 @@ RUN apt-get dist-upgrade -y
 RUN apt-get install -y python3 git
 
 # for pdf, copied from scripts/install_requirements_pdf.sh
-RUN apt-get install -y texlive-xetex texlive-lang-german latexmk
+RUN apt-get install -y texlive-xetex texlive-lang-greek texlive-lang-german latexmk
 # for ebook, copied from scripts/install_requirements_ebook.sh
 RUN apt-get install -y texlive-extra-utils pandoc calibre imagemagick ghostscript
 
@@ -30,7 +30,7 @@ VOLUME /app
 
 # 1. preparation
 # 1.1 build/update image from Dockerfile
-#  docker build -t hpmor
+#  docker build -t hpmor .
 
 # 1.2 create container that mounts current working dir to /app
 #  docker run --name hpmor-de -it --mount type=bind,src="$(pwd)",dst=/app hpmor bash
diff --git a/scripts/ebook/step_6.py b/scripts/ebook/step_6.py
@@ -62,7 +62,7 @@ def fix_ellipsis(s: str) -> str:
         count=1,
     )
 
-    # now done via pandoc -V lang=de in 5.sh
+    # now done via pandoc -V lang=de in step_5.sh
     # # set language
     # cont = re.sub(
     #     r'(<html [^>]*) lang="" xml:lang=""',
@@ -93,13 +93,13 @@ def fix_ellipsis(s: str) -> str:
 
     # remove ids from chapters since umlaute cause problem
     cont = re.sub(
-        r'(<h\d) id="[^"]+"',
+        r'(<h\d)\s+id="[^"]+"',
         r"\1",
         cont,
         flags=re.DOTALL | re.IGNORECASE,
     )
     cont = re.sub(
-        r'(<h\d class="unnumbered") id="[^"]+"',
+        r'(<h\d\s+class="unnumbered")\s+id="[^"]+"',
         r"\1",
         cont,
         flags=re.DOTALL | re.IGNORECASE,
diff --git a/scripts/install_requirements_pdf.sh b/scripts/install_requirements_pdf.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-sudo apt-get install texlive-xetex texlive-lang-german latexmk
+sudo apt-get install texlive-xetex texlive-lang-greek texlive-lang-german latexmk

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`		`-sudo apt-get install texlive-xetex texlive-lang-german latexmk`
	`3`	`+sudo apt-get install texlive-xetex texlive-lang-greek texlive-lang-german latexmk`