Renamed core/latex, fixed shorthands and install script

trojsten · Jan 4, 2024 · 366ba2d · 366ba2d
1 parent f70f9fd
commit 366ba2d
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 15 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -64,7 +64,7 @@ jobs:
         DIR=$(dirname $0)
         TEXHOME=`kpsewhich -var-value=TEXMFHOME`
         mkdir -p $TEXHOME/tex/latex/
-        ln -s $PWD/core/tex/dgs.cls $TEXHOME/tex/latex/dgs.cls
+        ln -s $PWD/core/latex/dgs.cls $TEXHOME/tex/latex/dgs.cls
     - name: Lint with flake8
       run: |
         # stop the build if there are Python syntax errors or undefined names

diff --git a/Makefile b/Makefile
@@ -166,10 +166,10 @@ output/%.html: source/%.md
 	$(call pandochtml,sk)
 
 # DeGeŠ convert Markdown to HTML (for web)
-output/%.html: source/%.md
-	$(call pandochtml,sk)
-	./wr -input $@ -template core/tex/wr.tex --engine xelatex -innerhtml -eqdir .webtex -output $@.conv
-	mv $@.conv $@
+#output/%.html: source/%.md
+#	$(call pandochtml,sk)
+#	./wr -input $@ -template core/latex/wr.tex --engine xelatex -innerhtml -eqdir .webtex -output [email protected]
+#	mv [email protected] $@
 
 .SECONDEXPANSION:
 

diff --git a/core/builder/convertor.py b/core/builder/convertor.py
@@ -105,7 +105,7 @@ class Convertor:
     }
 
     def __init__(self, output_format: str, locale_code: str, infile, outfile, **options):
-        self.output_format = output_format
+        self.output_format: str = output_format
         self.locale_code: str = locale_code
         self.locale: i18n.Locale = i18n.languages[locale_code]
         self.infile = infile

diff --git a/core/tex/dgs.cls → core/latex/dgs.cls b/core/tex/dgs.cls → core/latex/dgs.cls
@@ -82,6 +82,7 @@
 ]{hyperref}
 
 \RequirePackage[
+    shorthands=off,
     slovak,
     czech,
     german,
@@ -163,9 +164,9 @@
     \RenewExpandableDocumentCommand{\activeDirectory}{}{#1}%
 }
 
-\input{core/tex/fonts.tex}
-\input{core/tex/utilities.tex}
-\input{core/tex/math.tex}
-\input{core/tex/hacks.tex}
-\input{core/tex/symbols.tex}
-\input{core/tex/siunitx.tex}
+\input{core/latex/fonts.tex}
+\input{core/latex/utilities.tex}
+\input{core/latex/math.tex}
+\input{core/latex/hacks.tex}
+\input{core/latex/symbols.tex}
+\input{core/latex/siunitx.tex}
diff --git a/core/tex/fonts.tex → core/latex/fonts.tex b/core/tex/fonts.tex → core/latex/fonts.tex
diff --git a/core/tex/hacks.tex → core/latex/hacks.tex b/core/tex/hacks.tex → core/latex/hacks.tex
@@ -47,6 +47,10 @@
   }
 }
 
+
+% Force [H] float placement
+\floatplacement{figure}{H}
+
 \usepackage{stackengine}
 \setstackEOL{\\}
 

diff --git a/core/tex/math.tex → core/latex/math.tex b/core/tex/math.tex → core/latex/math.tex
@@ -29,6 +29,8 @@
 
 \ExplSyntaxOff
 
+\DeclareMathOperator{\arccot}{\mathrm{arccot}}
+
 % Section: differentials
 
 % Regular upright differential

diff --git a/core/tex/siunitx.tex → core/latex/siunitx.tex b/core/tex/siunitx.tex → core/latex/siunitx.tex
diff --git a/core/tex/symbols.tex → core/latex/symbols.tex b/core/tex/symbols.tex → core/latex/symbols.tex
diff --git a/core/tex/utilities.tex → core/latex/utilities.tex b/core/tex/utilities.tex → core/latex/utilities.tex
diff --git a/core/tex/wrt.tex → core/latex/wrt.tex b/core/tex/wrt.tex → core/latex/wrt.tex
@@ -32,8 +32,8 @@
     BoldItalicFont  = *-BoldIt
 ]{MinionPro}
 
-\input{core/tex/siunitx.tex}
-\input{core/tex/math.tex}
+\input{core/latex/siunitx.tex}
+\input{core/latex/math.tex}
 
 \changefontsizes{13pt}
 

diff --git a/install.sh b/install.sh
@@ -3,7 +3,7 @@
 DIR=$(dirname $0)
 TEXHOME=`kpsewhich -var-value=TEXMFHOME`
 mkdir -p $TEXHOME/tex/latex/
-ln -s $PWD/core/tex/dgs.cls $TEXHOME/tex/latex/dgs.cls
+ln -s $PWD/core/latex/dgs.cls $TEXHOME/tex/latex/dgs.cls
 
 sudo apt install texlive-full texlive-fonts-extra pandoc librsvg2-bin