Sistema simplificado, não precisa mais de template personalizado

p3palazzo · Nov 26, 2020 · 8bf11dc · 8bf11dc
1 parent f86f5f5
commit 8bf11dc
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 522 deletions.
diff --git a/Makefile b/Makefile
@@ -6,21 +6,23 @@ vpath %.csl styles
 vpath %.html .:_includes:_layouts:_site
 vpath %.scss assets/css
 vpath %.xml _site
-vpath %.yaml .:spec
-vpath default.% lib
+vpath %.yaml .:_spec
+
+PANDOC/LATEX := docker run -u "`id -u`:`id -g`" \
+		-v "`pwd`:/data" -v "`pwd`/assets/fonts:/usr/share/fonts" \
+		pandoc/latex:2.11.2
 
 # {{{1 Produtos PDF
 #      ============
 
+artigo.pdf : pdf.yaml artigo.md | styles
+	$(PANDOC/LATEX) -o $@ -d $^
+
 %.pdf : pdf.yaml %.md | styles
-	docker run -v "`pwd`:/data" --user "`id -u`:`id -g`" \
-		-v "`pwd`/assets/fonts:/usr/share/fonts" \
-		pandoc/latex:2.10 -o $@ -d $^
+	$(PANDOC/LATEX) -o $@ -d $^
 
 %.tex : pdf.yaml %.md | styles
-	docker run -v "`pwd`:/data" --user "`id -u`:`id -g`" \
-		-v "`pwd`/assets/fonts:/usr/share/fonts" \
-		pandoc/latex:2.10 -o $@ -d $^
+	$(PANDOC/LATEX) -o $@ -d $^
 
 # {{{1 PHONY
 #      =====

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # UnB-LaTeX
 
- Template para Pandoc e LaTeX com as fontes da Universidade de
- Brasília e um Makefile simples.
+Template para Pandoc e LaTeX com as fontes da Universidade de
+Brasília e um Makefile simples.
 
 Este template formata a página e insere cabeçalhos e rodapés padrão, com
 a marca da UnB em versão contorno.

diff --git a/spec/html.yaml → _spec/html.yaml b/spec/html.yaml → _spec/html.yaml
@@ -8,7 +8,7 @@ shift-heading-level-by: 2
 cite-method           : citeproc
 filters:
   - pandoc-crossref
-  - pandoc-citeproc
+  - citeproc
 metadata:
   csl: "styles/associacao-brasileira-de-normas-tecnicas.csl"
   suppress-bibliography: false

diff --git a/spec/pdf.yaml → _spec/pdf.yaml b/spec/pdf.yaml → _spec/pdf.yaml
@@ -3,15 +3,23 @@ to              : latex
 standalone      : true
 file-scope      : true
 number-sections : true
-template        : "lib/default.latex"
 pdf-engine      : xelatex
 fail-if-warnings: true
 cite-method     : citeproc
 filters:
   - pandoc-crossref
-  - pandoc-citeproc
+  - citeproc
 variables:
+  documentclass: article
+  fontsize: 11pt
+  geometry:
+    - top=3cm
+    - right=2cm
+    - bottom=2.5cm
+    - left=3cm
   header-includes:
+    - \usepackage{fancyhdr}
+    - \pagestyle{fancy}
     - \fancyhf{}
     - \lhead{\XeTeXglyph \XeTeXglyphindex "ass_completa_CONT" \relax}
     - \lfoot{\small{FAU/THAU/PP/2020}}
@@ -20,26 +28,13 @@ variables:
     - \renewcommand{\footrulewidth}{0.5pt}
   include-before:
     - \thispagestyle{empty}
-metadata:
-  csl: "styles/associacao-brasileira-de-normas-tecnicas.csl"
-  suppress-bibliography: false
-  bibliography-title: "Referências bibliográficas"
-  lang: pt
-  documentclass: article
-  fontsize: 11pt
-  papersize: a4
   indent: true
-  secnumdepth: 2
-  pagestyle: fancy
   mainfont: "UnB Pro"
   sansfont: "UnB Pro-Light"
   mainfontoptions:
-    - Numbers=Proportional
+    - Numbers        = Proportional
     - BoldFont       = UnBPro-Bold
     - ItalicFont     = UnBPro-RegularItalic
     - BoldItalicFont = UnBPro-BoldItalic
-  geometry:
-    - top=3cm
-    - right=2cm
-    - bottom=2.5cm
-    - left=3cm
+  papersize: a4
+  secnumdepth: 2
diff --git a/artigo.md b/artigo.md
@@ -3,5 +3,8 @@ title   :
 subtitle:
 author  :
 date    :
-lang    : pt-BR
+lang    : pt
+csl: "styles/associacao-brasileira-de-normas-tecnicas.csl"
+suppress-bibliography: false
+bibliography-title: "Referências bibliográficas"
 ---