From 653ea0a51bdf5784d7671f774a3f44e0e06e84b8 Mon Sep 17 00:00:00 2001 From: Johan Larsson Date: Thu, 11 Jan 2024 16:57:31 +0100 Subject: [PATCH] build: rely on l3build instead --- .gitignore | 325 +++++++++++++++++++++++++--- build.lua | 21 ++ doc/{molochtheme.dtx => moloch.tex} | 5 +- src/beamerthememoloch.ins | 70 ++---- 4 files changed, 332 insertions(+), 89 deletions(-) create mode 100644 build.lua rename doc/{molochtheme.dtx => moloch.tex} (99%) diff --git a/.gitignore b/.gitignore index 1f76c2f..756bd14 100644 --- a/.gitignore +++ b/.gitignore @@ -1,43 +1,310 @@ -# Temporary files - -.latex-cache -*.acn -*.acr -*.alg +## Core latex/pdflatex auxiliary files: *.aux -*.bbl -*.blg -*.dvi -*.fdb_latexmk -*.fls -*.glg -*.glo -*.gls -*.idx -*.ilg -*.ind -*.ist *.lof *.log *.lot -*.maf -*.mtc -*.mtc0 -*.nav -*.nlo +*.fls *.out -*.pdfsync -*.ps -*.snm -*.synctex.gz *.toc +*.fmt +*.fot +*.cb +*.cb2 +.*.lb + +## Intermediate documents: +*.dvi +*.xdv +*-converted-to.* +# these rules might exclude image files for figures etc. +# *.ps +# *.eps +# *.pdf + +## Generated if empty string is given at "Please type another file name for output:" +.pdf + +## Bibliography auxiliary files (bibtex/biblatex/biber): +*.bbl +*.bcf +*.blg +*-blx.aux +*-blx.bib +*.run.xml + +## Build tool auxiliary files: +*.fdb_latexmk +*.synctex +*.synctex(busy) +*.synctex.gz +*.synctex.gz(busy) +*.pdfsync + +## Build tool directories for auxiliary files +# latexrun +latex.out/ + +## Auxiliary and intermediate files from other packages: +# algorithms +*.alg +*.loa + +# achemso +acs-*.bib + +# amsthm +*.thm + +# beamer +*.nav +*.pre +*.snm *.vrb -*.xdy + +# changes +*.soc + +# comment +*.cut + +# cprotect +*.cpt + +# elsarticle (documentclass of Elsevier journals) +*.spl + +# endnotes +*.ent + +# fixme +*.lox + +# feynmf/feynmp +*.mf +*.mp +*.t[1-9] +*.t[1-9][0-9] +*.tfm + +#(r)(e)ledmac/(r)(e)ledpar +*.end +*.?end +*.[1-9] +*.[1-9][0-9] +*.[1-9][0-9][0-9] +*.[1-9]R +*.[1-9][0-9]R +*.[1-9][0-9][0-9]R +*.eledsec[1-9] +*.eledsec[1-9]R +*.eledsec[1-9][0-9] +*.eledsec[1-9][0-9]R +*.eledsec[1-9][0-9][0-9] +*.eledsec[1-9][0-9][0-9]R + +# glossaries +*.acn +*.acr +*.glg +*.glo +*.gls +*.glsdefs +*.lzo +*.lzs +*.slg +*.slo +*.sls + +# uncomment this for glossaries-extra (will ignore makeindex's style files!) +# *.ist + +# gnuplot +*.gnuplot +*.table + +# gnuplottex +*-gnuplottex-* + +# gregoriotex +*.gaux +*.glog +*.gtex + +# htlatex +*.4ct +*.4tc +*.idv +*.lg +*.trc +*.xref + +# hyperref +*.brf + +# knitr +*-concordance.tex +# TODO Uncomment the next line if you use knitr and want to ignore its generated tikz files +# *.tikz +*-tikzDictionary + +# listings +*.lol + +# luatexja-ruby +*.ltjruby + +# makeidx +*.idx +*.ilg +*.ind + +# minitoc +*.maf +*.mlf +*.mlt +*.mtc[0-9]* +*.slf[0-9]* +*.slt[0-9]* +*.stc[0-9]* + +# minted +_minted* +*.pyg + +# morewrites +*.mw + +# newpax +*.newpax + +# nomencl +*.nlg +*.nlo +*.nls + +# pax +*.pax + +# pdfpcnotes +*.pdfpc + +# sagetex +*.sagetex.sage +*.sagetex.py +*.sagetex.scmd + +# scrwfile +*.wrt + +# svg +svg-inkscape/ + +# sympy +*.sout +*.sympy +sympy-plots-for-*.tex/ + +# pdfcomment +*.upa +*.upb + +# pythontex +*.pytxcode +pythontex-files-*/ + +# tcolorbox +*.listing + +# thmtools +*.loe + +# TikZ & PGF +*.dpth +*.md5 +*.auxlock + +# titletoc +*.ptc + +# todonotes *.tdo +# vhistory +*.hst +*.ver -# Output +# easy-todo +*.lod +# xcolor +*.xcp + +# xmpincl +*.xmpi + +# xindy +*.xdy + +# xypic precompiled matrices and outlines +*.xyc +*.xyd + +# endfloat +*.ttt +*.fff + +# Latexian +TSWLatexianTemp* + +## Editors: +# WinEdt +*.bak +*.sav + +# Texpad +.texpadtmp + +# LyX +*.lyx~ + +# Kile +*.backup + +# gummi +.*.swp + +# KBibTeX +*~[0-9]* + +# TeXnicCenter +*.tps + +# auto folder when using emacs and auctex +./auto/* +*.el + +# expex forward references with \gathertags +*-tags.tex + +# standalone packages +*.sta + +# Makeindex log files +*.lpz + +# xwatermark package +*.xwm + +# REVTeX puts footnotes in the bibliography by default, unless the nofootinbib +# option is specified. Footnotes are the stored in a file with suffix Notes.bib. +# Uncomment the next line to have this generated file ignored. +#*Notes.bib + +# Ignore sty files generated from dtx *.sty doc/molochtheme.pdf demo/demo.pdf +build/ +.latex-cache +*-ctan.zip +.oc diff --git a/build.lua b/build.lua new file mode 100644 index 0000000..5e8a405 --- /dev/null +++ b/build.lua @@ -0,0 +1,21 @@ +#!/usr/bin/env texlua + +module = "moloch" + +-- sourcefiledir = "src" +-- +-- installfiles = {"*.sty"} +-- sourcefiles = {"src/*.dtx"} +-- typesetfiles = {"src/*.dtx"} + +sourcefiledir = "src" +-- docfiledir = "docs" +-- unpackfiles = { "*.dtx" } +-- -- typesetfiles = { "*.dtx", "*.tex" } +-- typesetfiles = { "moloch.dtx" } +-- installfiles = {"*.sty", "*.dtx"} +-- packtdszip = true + +typesetfiles = {"doc/moloch.tex"} +-- sourcefiles = {"src/*.dtx"} +-- docfiles = {"doc/*.tex"} diff --git a/doc/molochtheme.dtx b/doc/moloch.tex similarity index 99% rename from doc/molochtheme.dtx rename to doc/moloch.tex index eb41dc8..ccd3389 100644 --- a/doc/molochtheme.dtx +++ b/doc/moloch.tex @@ -8,10 +8,9 @@ %% %% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 %% International License (https://creativecommons.org/licenses/by-sa/4.0/). -%% --------------------------------------------------------------------------- +%% --------------------------------------------------------------------------- \documentclass{ltxdoc} -%\OnlyDescription \usepackage{parskip} \usepackage{setspace} @@ -83,7 +82,7 @@ \newcommand{\themename}{\textbf{\textsc{moloch}}\xspace} \usepackage{readprov} -\ReadPackageInfos{beamerthememoloch} +% \ReadPackageInfos{beamerthememoloch} \title{Modern Beamer Presentations with the \themename package} \author{Matthias Vogelgesang \\ \url{matthias.vogelgesang@gmail.com}} diff --git a/src/beamerthememoloch.ins b/src/beamerthememoloch.ins index 8924170..3940291 100644 --- a/src/beamerthememoloch.ins +++ b/src/beamerthememoloch.ins @@ -9,66 +9,22 @@ %% This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 %% International License (https://creativecommons.org/licenses/by-sa/4.0/). %% --------------------------------------------------------------------------- +%% Copyright 2024 Johan Larsson +%% +%% Moloch is a fork of Metropolis, which aims to simplify the package and +%% fix some long-standing issues. +%% +%% --------------------------------------------------------------------------- -\input docstrip.tex % +\input docstrip.tex \keepsilent \askforoverwritefalse -\usedir{tex/latex/moloch} -\preamble ---------------------------------------------------------------------------- -Copyright 2015 Matthias Vogelgesang and the LaTeX community. A full list of -contributors can be found at - - https://github.com/matze/mtheme/graphs/contributors - -and the original template was based on the HSRM theme by Benjamin Weiss. - -This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 -International License (https://creativecommons.org/licenses/by-sa/4.0/). ---------------------------------------------------------------------------- -\endpreamble - -\generate{\file{beamerthememoloch.sty}{% - \from{beamerthememoloch.dtx}{package}} - } -\generate{\file{beamerinnerthememoloch.sty}{% - \from{beamerinnerthememoloch.dtx}{package}} - } -\generate{\file{beamerouterthememoloch.sty}{% - \from{beamerouterthememoloch.dtx}{package}} - } -\generate{\file{beamerfontthememoloch.sty}{% - \from{beamerfontthememoloch.dtx}{package}} - } -\generate{\file{beamercolorthememoloch.sty}{% - \from{beamercolorthememoloch.dtx}{package}} - } -\generate{\file{beamercolorthememoloch-highcontrast.sty}{% - \from{beamercolorthememoloch-highcontrast.dtx}{package}} - } -\generate{\file{pgfplotsthemetol.sty}{% - \from{pgfplotsthemetol.dtx}{package}} - } - -\obeyspaces -\Msg{**************************************************************} -\Msg{* *} -\Msg{* To finish the installation you have to move the following *} -\Msg{* files into a directory searched by TeX: *} -\Msg{* *} -\Msg{* beamerthememoloch.sty *} -\Msg{* beamerinnerthememoloch.sty *} -\Msg{* beamerouterthememoloch.sty *} -\Msg{* beamerfontthememoloch.sty *} -\Msg{* beamercolorthememoloch.sty *} -\Msg{* pgfplotsthemetol.sty *} -\Msg{* *} -\Msg{* To produce the documentation run the file moloch.dtx *} -\Msg{* through LaTeX. *} -\Msg{* *} -\Msg{* Happy TeXing! *} -\Msg{* *} -\Msg{**************************************************************} +\generate{\file{beamerthememoloch.sty}{\from{beamerthememoloch.dtx}{package}}} +\generate{\file{beamerinnerthememoloch.sty}{\from{beamerinnerthememoloch.dtx}{package}}} +\generate{\file{beamerouterthememoloch.sty}{\from{beamerouterthememoloch.dtx}{package}}} +\generate{\file{beamerfontthememoloch.sty}{\from{beamerfontthememoloch.dtx}{package}}} +\generate{\file{beamercolorthememoloch.sty}{\from{beamercolorthememoloch.dtx}{package}}} +\generate{\file{pgfplotsthemetol.sty}{\from{pgfplotsthemetol.dtx}{package}}} \endbatchfile