diff --git a/.github/workflows/build-examples.yml b/.github/workflows/build-examples.yml index cbd2b20..648a8f7 100644 --- a/.github/workflows/build-examples.yml +++ b/.github/workflows/build-examples.yml @@ -53,6 +53,8 @@ jobs: tlmgr install awesomebox fontawesome5 # packages only needed for some examples (example boxes-with-pandoc-latex-environment-and-tcolorbox) tlmgr install tcolorbox pgf etoolbox environ trimspaces + - name: Generate a temporary release with single file template versions + run: bash ./tools/release.sh 0.0.0 - name: Build examples run: cd examples && bash build-examples.sh && cd .. - name: Add generated example files diff --git a/examples/basic-example/build.sh b/examples/basic-example/build.sh index 69bb949..9529db2 100644 --- a/examples/basic-example/build.sh +++ b/examples/basic-example/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/basic-example/document.pdf b/examples/basic-example/document.pdf index 54b3d98..b2d291f 100644 Binary files a/examples/basic-example/document.pdf and b/examples/basic-example/document.pdf differ diff --git a/examples/beamer/build.sh b/examples/beamer/build.sh index 1a175eb..2d2b762 100644 --- a/examples/beamer/build.sh +++ b/examples/beamer/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --to beamer --template "../../template/eisvogel.beamer" --listings +pandoc "document.md" -o "document.pdf" --from markdown --to beamer --template "../../dist/eisvogel.beamer" --listings diff --git a/examples/beamer/document.pdf b/examples/beamer/document.pdf index a957e24..ce172d5 100644 Binary files a/examples/beamer/document.pdf and b/examples/beamer/document.pdf differ diff --git a/examples/book/build.sh b/examples/book/build.sh index c9d5154..0d38159 100644 --- a/examples/book/build.sh +++ b/examples/book/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings --top-level-division="chapter" +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings --top-level-division="chapter" diff --git a/examples/book/document.pdf b/examples/book/document.pdf index a0fe460..af413b2 100644 Binary files a/examples/book/document.pdf and b/examples/book/document.pdf differ diff --git a/examples/boxes-with-pandoc-latex-environment-and-awesomebox/build.sh b/examples/boxes-with-pandoc-latex-environment-and-awesomebox/build.sh index a05b8b8..6a52de3 100644 --- a/examples/boxes-with-pandoc-latex-environment-and-awesomebox/build.sh +++ b/examples/boxes-with-pandoc-latex-environment-and-awesomebox/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --filter pandoc-latex-environment --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --filter pandoc-latex-environment --listings diff --git a/examples/boxes-with-pandoc-latex-environment-and-awesomebox/document.pdf b/examples/boxes-with-pandoc-latex-environment-and-awesomebox/document.pdf index e228abb..54d4ca3 100644 Binary files a/examples/boxes-with-pandoc-latex-environment-and-awesomebox/document.pdf and b/examples/boxes-with-pandoc-latex-environment-and-awesomebox/document.pdf differ diff --git a/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/build.sh b/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/build.sh index a05b8b8..6a52de3 100644 --- a/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/build.sh +++ b/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --filter pandoc-latex-environment --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --filter pandoc-latex-environment --listings diff --git a/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/document.pdf b/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/document.pdf index d2b3e76..38369b1 100644 Binary files a/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/document.pdf and b/examples/boxes-with-pandoc-latex-environment-and-tcolorbox/document.pdf differ diff --git a/examples/code-blocks-listings/build.sh b/examples/code-blocks-listings/build.sh index 69bb949..9529db2 100644 --- a/examples/code-blocks-listings/build.sh +++ b/examples/code-blocks-listings/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/code-blocks-listings/document.pdf b/examples/code-blocks-listings/document.pdf index 7b34bd7..44cb821 100644 Binary files a/examples/code-blocks-listings/document.pdf and b/examples/code-blocks-listings/document.pdf differ diff --git a/examples/code-blocks-without-listings/build.sh b/examples/code-blocks-without-listings/build.sh index 15e42c9..ad8af02 100644 --- a/examples/code-blocks-without-listings/build.sh +++ b/examples/code-blocks-without-listings/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --highlight-style kate +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --highlight-style kate diff --git a/examples/code-blocks-without-listings/document.pdf b/examples/code-blocks-without-listings/document.pdf index 15787ec..2f1cadc 100644 Binary files a/examples/code-blocks-without-listings/document.pdf and b/examples/code-blocks-without-listings/document.pdf differ diff --git a/examples/header-and-footer/build.sh b/examples/header-and-footer/build.sh index 69bb949..9529db2 100644 --- a/examples/header-and-footer/build.sh +++ b/examples/header-and-footer/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/header-and-footer/document.pdf b/examples/header-and-footer/document.pdf index 82d1686..d694b0c 100644 Binary files a/examples/header-and-footer/document.pdf and b/examples/header-and-footer/document.pdf differ diff --git a/examples/images-and-tables/build.sh b/examples/images-and-tables/build.sh index 69bb949..9529db2 100644 --- a/examples/images-and-tables/build.sh +++ b/examples/images-and-tables/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/images-and-tables/document.pdf b/examples/images-and-tables/document.pdf index 1602b2d..b17dd21 100644 Binary files a/examples/images-and-tables/document.pdf and b/examples/images-and-tables/document.pdf differ diff --git a/examples/language-chinese/build.sh b/examples/language-chinese/build.sh index 6414351..ba6992c 100644 --- a/examples/language-chinese/build.sh +++ b/examples/language-chinese/build.sh @@ -1,2 +1,2 @@ # No lang option (-V lang=zh) here because Chinese is unsupported in polyglossia and babel. -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings --pdf-engine "xelatex" -V CJKmainfont="HiraginoSans-W4" +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings --pdf-engine "xelatex" -V CJKmainfont="HiraginoSans-W4" diff --git a/examples/language-german/build.sh b/examples/language-german/build.sh index 69bb949..9529db2 100644 --- a/examples/language-german/build.sh +++ b/examples/language-german/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/language-german/document.pdf b/examples/language-german/document.pdf index b5bc630..3eaa9c3 100644 Binary files a/examples/language-german/document.pdf and b/examples/language-german/document.pdf differ diff --git a/examples/language-japanese/build.sh b/examples/language-japanese/build.sh index 7aecb68..6a02a87 100644 --- a/examples/language-japanese/build.sh +++ b/examples/language-japanese/build.sh @@ -1,2 +1,2 @@ # No lang option (-V lang=jp) here because Japanese unsupported in polyglossia. -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings --pdf-engine "xelatex" -V CJKmainfont="HiraginoSans-W4" +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings --pdf-engine "xelatex" -V CJKmainfont="HiraginoSans-W4" diff --git a/examples/page-background/build.sh b/examples/page-background/build.sh index 69bb949..9529db2 100644 --- a/examples/page-background/build.sh +++ b/examples/page-background/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/page-background/document.pdf b/examples/page-background/document.pdf index be8fbb6..3000f87 100644 Binary files a/examples/page-background/document.pdf and b/examples/page-background/document.pdf differ diff --git a/examples/table-of-contents/build.sh b/examples/table-of-contents/build.sh index 3cecb50..31ed117 100644 --- a/examples/table-of-contents/build.sh +++ b/examples/table-of-contents/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" diff --git a/examples/table-of-contents/document.pdf b/examples/table-of-contents/document.pdf index 46f723f..3d5ba55 100644 Binary files a/examples/table-of-contents/document.pdf and b/examples/table-of-contents/document.pdf differ diff --git a/examples/title-page-background/build.sh b/examples/title-page-background/build.sh index 69bb949..9529db2 100644 --- a/examples/title-page-background/build.sh +++ b/examples/title-page-background/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/title-page-background/document.pdf b/examples/title-page-background/document.pdf index 94dda9d..ec44544 100644 Binary files a/examples/title-page-background/document.pdf and b/examples/title-page-background/document.pdf differ diff --git a/examples/title-page-custom/build.sh b/examples/title-page-custom/build.sh index 69bb949..9529db2 100644 --- a/examples/title-page-custom/build.sh +++ b/examples/title-page-custom/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/title-page-custom/document.pdf b/examples/title-page-custom/document.pdf index 18caad2..aae7cec 100644 Binary files a/examples/title-page-custom/document.pdf and b/examples/title-page-custom/document.pdf differ diff --git a/examples/title-page-default/build.sh b/examples/title-page-default/build.sh index 69bb949..9529db2 100644 --- a/examples/title-page-default/build.sh +++ b/examples/title-page-default/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/title-page-default/document.pdf b/examples/title-page-default/document.pdf index e4cf3e6..6b541dc 100644 Binary files a/examples/title-page-default/document.pdf and b/examples/title-page-default/document.pdf differ diff --git a/examples/title-page-green/build.sh b/examples/title-page-green/build.sh index 69bb949..9529db2 100644 --- a/examples/title-page-green/build.sh +++ b/examples/title-page-green/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/title-page-green/document.pdf b/examples/title-page-green/document.pdf index 02de8c3..323b537 100644 Binary files a/examples/title-page-green/document.pdf and b/examples/title-page-green/document.pdf differ diff --git a/examples/title-page-logo/build.sh b/examples/title-page-logo/build.sh index 69bb949..9529db2 100644 --- a/examples/title-page-logo/build.sh +++ b/examples/title-page-logo/build.sh @@ -1 +1 @@ -pandoc "document.md" -o "document.pdf" --from markdown --template "../../template/eisvogel.latex" --listings +pandoc "document.md" -o "document.pdf" --from markdown --template "../../dist/eisvogel.latex" --listings diff --git a/examples/title-page-logo/document.pdf b/examples/title-page-logo/document.pdf index f6d1d28..62271ff 100644 Binary files a/examples/title-page-logo/document.pdf and b/examples/title-page-logo/document.pdf differ diff --git a/template/after-header-includes.latex b/template-multi-file/after-header-includes.latex similarity index 100% rename from template/after-header-includes.latex rename to template-multi-file/after-header-includes.latex diff --git a/template/common.latex b/template-multi-file/common.latex similarity index 100% rename from template/common.latex rename to template-multi-file/common.latex diff --git a/template/eisvogel-added.latex b/template-multi-file/eisvogel-added.latex similarity index 100% rename from template/eisvogel-added.latex rename to template-multi-file/eisvogel-added.latex diff --git a/template/eisvogel-titlepage.latex b/template-multi-file/eisvogel-title-page.latex similarity index 100% rename from template/eisvogel-titlepage.latex rename to template-multi-file/eisvogel-title-page.latex diff --git a/template/eisvogel.beamer b/template-multi-file/eisvogel.beamer similarity index 100% rename from template/eisvogel.beamer rename to template-multi-file/eisvogel.beamer diff --git a/template/eisvogel.latex b/template-multi-file/eisvogel.latex similarity index 99% rename from template/eisvogel.latex rename to template-multi-file/eisvogel.latex index 42b40e7..8277a29 100644 --- a/template/eisvogel.latex +++ b/template-multi-file/eisvogel.latex @@ -118,7 +118,7 @@ $eisvogel-added.latex()$ \begin{document} -$eisvogel-titlepage.latex()$ +$eisvogel-title-page.latex()$ $if(has-frontmatter)$ \frontmatter diff --git a/template/fonts.latex b/template-multi-file/fonts.latex similarity index 100% rename from template/fonts.latex rename to template-multi-file/fonts.latex diff --git a/template/hypersetup.latex b/template-multi-file/hypersetup.latex similarity index 100% rename from template/hypersetup.latex rename to template-multi-file/hypersetup.latex diff --git a/template/passoptions.latex b/template-multi-file/passoptions.latex similarity index 100% rename from template/passoptions.latex rename to template-multi-file/passoptions.latex diff --git a/tools/release.sh b/tools/release.sh index 8e150d1..7aabc1f 100644 --- a/tools/release.sh +++ b/tools/release.sh @@ -1,16 +1,53 @@ #!/bin/bash -rm -rf "dist" -mkdir "dist" +distFolderName="dist" +archiveFolderName="Eisvogel-${1}" +archiveFolder="${distFolderName}/${archiveFolderName}" -cp "eisvogel.tex" "eisvogel.latex" +rm -rf "${distFolderName}" +mkdir "${distFolderName}" +mkdir "${distFolderName}/${archiveFolderName}" -# create .zip files -zip -r -X --exclude="*.DS_Store*" "dist/Eisvogel-${1}.zip" "examples" "eisvogel.latex" "icon.png" "LICENSE" "README.md" "CHANGELOG.md" -cp "dist/Eisvogel-${1}.zip" "dist/Eisvogel.zip" +# create single template file for latex +cp "template-multi-file/eisvogel.latex" "${distFolderName}/eisvogel.latex" -# create .tar.gz files -tar --exclude="*.DS_Store*" --include="examples" --include="eisvogel.latex" --include="icon.png" --include="LICENSE" --include="README.md" --include="CHANGELOG.md" -zcvf "dist/Eisvogel-${1}.tar.gz" * -cp "dist/Eisvogel-${1}.tar.gz" "dist/Eisvogel.tar.gz" +# replace partials (latex) +sed -e '/\$fonts\.latex()\$/ {' -e 'r template-multi-file/fonts.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" +sed -e '/\$common\.latex()\$/ {' -e 'r template-multi-file/common.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" +sed -e '/\$eisvogel-added\.latex()\$/ {' -e 'r template-multi-file/eisvogel-added.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" +sed -e '/\$eisvogel-title-page\.latex()\$/ {' -e 'r template-multi-file/eisvogel-title-page.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" +sed -e '/\$after-header-includes\.latex()\$/ {' -e 'r template-multi-file/after-header-includes.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" +sed -e '/\$hypersetup\.latex()\$/ {' -e 'r template-multi-file/hypersetup.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" +sed -e '/\$passoptions\.latex()\$/ {' -e 'r template-multi-file/passoptions.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.latex" -rm "eisvogel.latex" \ No newline at end of file +# create single template file for beamer +cp "template-multi-file/eisvogel.beamer" "${distFolderName}/eisvogel.beamer" + +# replace partials (beamer) +sed -e '/\$fonts\.latex()\$/ {' -e 'r template-multi-file/fonts.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.beamer" +sed -e '/\$common\.latex()\$/ {' -e 'r template-multi-file/common.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.beamer" +# The beamer template has no eisvogel block $eisvogel-added.latex()$ +# The beamer template has no eisvogel titlepage $eisvogel-titlepage.latex()$ +sed -e '/\$after-header-includes\.latex()\$/ {' -e 'r template-multi-file/after-header-includes.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.beamer" +sed -e '/\$hypersetup\.latex()\$/ {' -e 'r template-multi-file/hypersetup.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.beamer" +sed -e '/\$passoptions\.latex()\$/ {' -e 'r template-multi-file/passoptions.latex' -e 'd' -e '}' -i '' "${distFolderName}/eisvogel.beamer" + + +# create folder for the release eisvogel (ZIP and tar.gz) +cp -r "examples" "${archiveFolder}/examples" +cp -r "template-multi-file" "${archiveFolder}/template-multi-file" +cp "dist/eisvogel.latex" "${archiveFolder}/eisvogel.latex" +cp "dist/eisvogel.beamer" "${archiveFolder}/eisvogel.beamer" +cp "icon.png" "${archiveFolder}/icon.png" +cp "LICENSE" "${archiveFolder}/LICENSE" +cp "README.md" "${archiveFolder}/README.md" +cp "CHANGELOG.md" "${archiveFolder}/CHANGELOG.md" + + +cd dist + +# create .zip file +zip -r -X --exclude="*.DS_Store*" "Eisvogel-${1}.zip" "${archiveFolderName}" + +# create .tar.gz file +tar --exclude="*.DS_Store*" -zcvf "Eisvogel-${1}.tar.gz" "Eisvogel-${1}"