diff --git a/.gitea/workflows/create-presentation.yml b/.gitea/workflows/create-presentation.yml index 6b95211..b6116ee 100644 --- a/.gitea/workflows/create-presentation.yml +++ b/.gitea/workflows/create-presentation.yml @@ -6,7 +6,7 @@ on: jobs: build: - name: Build the debian package + name: Convert to PDF runs-on: ubuntu-latest steps: @@ -16,11 +16,27 @@ jobs: run: git checkout "${{ gitea.sha }}" - name: "Submodules auschecken" run: git submodule update --init - - uses: docker://git.kocoder.xyz/docker/ga-pandoc:c6eaa45b623c284e80f37434872621defc00f864 + - name: "Debug" + run: ls -la ./Defensio + - uses: docker://git.kocoder.xyz/docker/ga-pandoc:d2995fb914e313703da2c7754763e7fa01dae88f + name: Pandoc with: - env: TEXINPUTS=.:./libs/awesome-beamer/:./libs/smile/ + env: TEXINPUTS=./Defensio:./Defensio/libs/awesome-beamer/:./Defensio/libs/smile/ command: pandoc - args: "--help" # gets appended to pandoc command + args: >- + /workspace/Diplomarbeit-Absolventenverein/pm/Defensio/01_Praesentation_Allgemein.md + /workspace/Diplomarbeit-Absolventenverein/pm/Defensio/02_Praesentation_Konstantin_Hintermayer.md + /workspace/Diplomarbeit-Absolventenverein/pm/Defensio/03_Praesentation_Florian_Edlmayer.md + /workspace/Diplomarbeit-Absolventenverein/pm/Defensio/04_Praesentation_Adam_Gaiswinkler.md + -t beamer + --template /workspace/Diplomarbeit-Absolventenverein/pm/Defensio/00_preamble.tex + --pdf-engine=pdflatex + --slide-level=2 + --number-sections + --lua-filter /workspace/Diplomarbeit-Absolventenverein/pm/_extensions/diagram/diagram.lua + --syntax-definition /workspace/Diplomarbeit-Absolventenverein/pm/_extensions/razor/razor.xml + --syntax-definition /workspace/Diplomarbeit-Absolventenverein/pm/_extensions/nginx/nginx.xml + -o defensio.pdf - name: "Create release" uses: akkuman/gitea-release-action@v1 with: diff --git a/.gitea/workflows/word-count.yml b/.gitea/workflows/word-count.yml index f037306..78b421a 100644 --- a/.gitea/workflows/word-count.yml +++ b/.gitea/workflows/word-count.yml @@ -1,8 +1,6 @@ name: Word Count on: - push: - branches: [ "main", "master" ] pull_request: branches: [ "main", "master" ] diff --git a/.gitignore b/.gitignore index 294b427..d3f365c 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -diplomarbeitsbuch.pdf \ No newline at end of file +diplomarbeitsbuch.pdf +defensio.pdf \ No newline at end of file diff --git a/Defensio/defensio.pdf b/Defensio/defensio.pdf deleted file mode 100644 index cf612b4..0000000 Binary files a/Defensio/defensio.pdf and /dev/null differ diff --git a/Defensio/puppeteer-config.json b/Defensio/puppeteer-config.json new file mode 100644 index 0000000..3201af7 --- /dev/null +++ b/Defensio/puppeteer-config.json @@ -0,0 +1,3 @@ +{ + "args": ["--no-sandbox"] +} diff --git a/_extensions/diagram/diagram.lua b/_extensions/diagram/diagram.lua index c48d01c..d20d5bc 100644 --- a/_extensions/diagram/diagram.lua +++ b/_extensions/diagram/diagram.lua @@ -151,6 +151,11 @@ local mermaid = { compile = function (self, code) local mime_type = self.mime_type or 'image/svg+xml' local file_extension = extension_for_mimetype[mime_type] + + -- Resolve puppeteer config path + local puppeteer_config = pandoc.path.join({pandoc.system.get_working_directory(), 'puppeteer-config.json'}) + + return with_temporary_directory("diagram", function (tmpdir) return with_working_directory(tmpdir, function () local infile = 'diagram.mmd' @@ -158,7 +163,7 @@ local mermaid = { write_file(infile, code) pipe( self.execpath or 'mmdc', - {"--pdfFit", "--iconPacksNamesAndUrls", "mdi#https://unpkg.com/@iconify-json/mdi@1.2.3/icons.json", "--input", infile, "--output", outfile}, + {"--pdfFit", "--iconPacksNamesAndUrls", "mdi#https://unpkg.com/@iconify-json/mdi@1.2.3/icons.json", "-p", puppeteer_config, "--input", infile, "--output", outfile}, '' ) return read_file(outfile), mime_type @@ -167,6 +172,24 @@ local mermaid = { end, } +-- Source - https://stackoverflow.com/a/27028488 +-- Posted by hookenz, modified by community. See post 'Timeline' for change history +-- Retrieved 2026-04-18, License - CC BY-SA 4.0 + +function dump(o) + if type(o) == 'table' then + local s = '{ ' + for k,v in pairs(o) do + if type(k) ~= 'number' then k = '"'..k..'"' end + s = s .. '['..k..'] = ' .. dump(v) .. ',' + end + return s .. '} ' + else + return tostring(o) + end +end + + --- TikZ -- diff --git a/defensio.md b/defensio.md deleted file mode 100644 index 30bb275..0000000 --- a/defensio.md +++ /dev/null @@ -1,31 +0,0 @@ -% Habits -% John Doe -% March 22, 2005 - -# In the morning - -## Getting up - -- Turn off alarm -- Get out of bed - -## Breakfast - -- Eat eggs -- Drink coffee - -# In the evening - -## Dinner - -- Eat spaghetti -- Drink wine - ------------------- - -![picture of spaghetti](images/spaghetti.jpg) - -## Going to sleep - -- Get in bed -- Count sheep \ No newline at end of file diff --git a/pandoc-tex.sh b/pandoc-tex.sh deleted file mode 100644 index 7e3d5eb..0000000 --- a/pandoc-tex.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -pandoc \ - 00-praemble.md \ - 01-toc.md \ - 02-Allgemein.md \ - 03-Diplomarbeitsbuch-individueller-teil-Adam-Gaiswinkler.md \ - 04-Diplomarbeitsbuch-individueller-teil-Florian-Edlmayer.md \ - 05-Diplomarbeitsbuch-individueller-teil-Konstantin-Hintermayer.md \ - 97-tabellenverzeichnis.md \ - 98-abbildungsverzeichnis.md \ - 99-bibliographie.md \ - --number-sections \ - --lua-filter _extensions/diagram/diagram.lua \ - --syntax-definition _extensions/razor/razor.xml \ - --syntax-definition _extensions/nginx/nginx.xml \ - --citeproc \ - --bibliography sources.bib \ - --csl _extensions/sources/tgm.csl \ - --include-before-body 00_preamble.tex \ - -H _extensions/header/header.tex \ - -V geometry:"top=2.5cm, bottom=2cm, left=3cm, right=2cm, a4paper" \ - -V toc-title="Inhaltsverzeichnis" \ - -V classoption=twoside \ - -V fontsize=12pt \ - -V linestretch=1.5 \ - -o diplomarbeitsbuch.tex diff --git a/puppeteer-config.json b/puppeteer-config.json new file mode 100644 index 0000000..3201af7 --- /dev/null +++ b/puppeteer-config.json @@ -0,0 +1,3 @@ +{ + "args": ["--no-sandbox"] +}