Merge pull request #1 from gpontesss/fix-chapter-images-positioning

fix chapter images positioning
gpontesss · Mar 15, 2023 · cd44618 · cd44618
2 parents e6040fc + 530bccc
commit cd44618
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 32 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -32,7 +32,7 @@ jobs:
       - uses: teatimeguest/setup-texlive-action@v2
       - name: install xelatex and dependencies
         run: |
-          sudo apt-get install inkscape texlive-xetex texlive-lang-portuguese latexmk
+          sudo apt-get install inkscape texlive-xetex texlive-lang-portuguese
       - name: install project fonts
         run: |
           ./scripts/install-font.sh "Gentium Book Plus" "EB Garamond"

diff --git a/Makefile b/Makefile
@@ -1,13 +1,15 @@
 OUTDIR = out
-TEX = latexmk
-TEXARGS = -output-directory=$(OUTDIR) -shell-escape -xelatex
+TEX = xelatex
+TEXARGS = -output-directory=$(OUTDIR) -shell-escape
 DEPS = $(wildcard *.tex blocks/*.tex)
 
 .PHONY: all
 all: $(OUTDIR)/main.pdf
 
 $(OUTDIR)/%.pdf: %.tex $(DEPS) | $(OUTDIR)
-	@$(TEX) $(TEXARGS) $<
+	# runs twice, to aways ensure TOC is properly generated
+	@$(TEX) $(TEXARGS) $< -o $@
+	@$(TEX) $(TEXARGS) $< -o $@
 
 $(OUTDIR):
 	@mkdir -p $@

diff --git a/blocks/akathist-sweetest-lord-jesus-christ.tex b/blocks/akathist-sweetest-lord-jesus-christ.tex
@@ -2,11 +2,9 @@
 
 \begin{document}
 
-\cleardoubleevenpage{}
-\pagestyle{empty}
-\includesvg[width=\textwidth]{icons/transfiguration}
-\chapter{Acatiste ao Nosso Dulcíssimo Senhor Jesus Cristo}
-\pagestyle{headings}
+\begin{chapterimg}[width=\textwidth]{icons/transfiguration}
+    \chapter{Acatiste ao Nosso Dulcíssimo Senhor Jesus Cristo}
+\end{chapterimg}
 
 \section*{Kontákion 1}
 

diff --git a/blocks/akathist-theotokos.tex b/blocks/akathist-theotokos.tex
@@ -2,11 +2,9 @@
 
 \begin{document}
 
-\cleardoubleevenpage{}
-\pagestyle{empty}
-\includesvg[width=\textwidth]{icons/platytera}
-\chapter{Acatiste à Mãe de Deus}
-\pagestyle{headings}
+\begin{chapterimg}[width=\textwidth]{icons/platytera}
+    \chapter{Acatiste à Mãe de Deus}
+\end{chapterimg}
 
 \section*{Kontákion 1, tom 8}
 

diff --git a/blocks/canon-guardian-angel.tex b/blocks/canon-guardian-angel.tex
@@ -1,11 +1,9 @@
 \documentclass{subfiles}
 \begin{document}
 
-\cleardoubleevenpage{}
-\pagestyle{empty}
-\includesvg[width=\textwidth]{icons/st-michael}
-\chapter{Cânone ao Anjo Guardião}
-\pagestyle{headings}
+\begin{chapterimg}[width=.9\textwidth]{icons/st-michael}
+    \chapter{Cânone ao Anjo Guardião}
+\end{chapterimg}
 
 \section*{Tropário, Tom 6}
 

diff --git a/blocks/matins.tex b/blocks/matins.tex
@@ -2,10 +2,9 @@
 
 \begin{document}
 
-\pagestyle{empty}
-{\centering\includesvg[height=\textheight]{icons/tree-of-life-cross}}
-\Chapter{Orações Matinais}{}
-\pagestyle{headings}
+\begin{chapterimg}[height=.9\textheight]{icons/tree-of-life-cross}
+    \Chapter{Orações Matinais}{}
+\end{chapterimg}
 
 \dotextit{%
 Tendo despertado do sono, antes de qualquer outra ação, levante-se 

diff --git a/blocks/supplicatory-canon-christ.tex b/blocks/supplicatory-canon-christ.tex
@@ -1,10 +1,9 @@
 \documentclass{subfiles}
 \begin{document}
 
-\pagestyle{empty}
-{\centering\includesvg[height=\textheight]{icons/crucifixion}}
-\Chapter{Canône de Arrependimento}{A Nosso Senhor Jesus Cristo}
-\pagestyle{headings}
+\begin{chapterimg}[height=\textheight]{icons/crucifixion}
+    \Chapter{Canône de Arrependimento}{A Nosso Senhor Jesus Cristo}
+\end{chapterimg}
 
 \section*{ODE 1, Tom 2}
 

diff --git a/blocks/supplicatory-canon-theotokos.tex b/blocks/supplicatory-canon-theotokos.tex
@@ -1,10 +1,9 @@
 \documentclass{subfiles}
 \begin{document}
 
-\pagestyle{empty}
-\includesvg[width=\textwidth]{icons/hail-full-of-grace}
-\Chapter{Canône de Súplica}{À Santíssima Mãe de Deus}
-\pagestyle{headings}
+\begin{chapterimg}[width=\textwidth]{icons/hail-full-of-grace}
+    \Chapter{Canône de Súplica}{À Santíssima Mãe de Deus}
+\end{chapterimg}
 
 \section*{Tropário, tom 4}
 

diff --git a/main.tex b/main.tex
@@ -39,6 +39,14 @@
     \def\param{#1}%
     \ifx\param\empty}
 
+\newenvironment{chapterimg}[2][]{%
+    \pagestyle{empty}
+    \ifthispageodd{}{\cleardoubleevenpage{}}
+    {\vspace*{\fill}%
+     \centering\includesvg[#1]{#2}%
+     \vspace*{\fill}}}
+    {\pagestyle{headings}}
+
 % stylization of chapters and sections =========================================
 
 \RedeclareSectionCommand[
@@ -164,7 +172,7 @@
 \raggedbottom{}
 
 \tableofcontents{}
-\pagebreak{}
+\cleardoubleevenpage{}
 \pagestyle{headings}
 
 \subfile{blocks/matins.tex}