From 33c1d0685b29db6802e22ae0a4dd7af0fc74f551 Mon Sep 17 00:00:00 2001
From: Wikiti <wikiti.doghound@gmail.com>
Date: Sat, 10 Nov 2018 13:10:53 +0000
Subject: [PATCH] Upgrade template

---
 .gitignore |  2 +-
 Makefile   | 18 +++++++++++-------
 README.md  |  9 ++++++++-
 3 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index dc84959..41ae811 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 build/
-
+*.log
diff --git a/Makefile b/Makefile
index 7859422..e2aabb1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,18 @@
 BUILD = build
+MAKEFILE = Makefile
 OUTPUT_FILENAME = book
 METADATA = metadata.yml
 CHAPTERS = chapters/*.md
 TOC = --toc --toc-depth=2
 IMAGES_FOLDER = images
+IMAGES = $(IMAGES_FOLDER)/*
 COVER_IMAGE = $(IMAGES_FOLDER)/cover.png
 LATEX_CLASS = report
 MATH_FORMULAS = --webtex
 CSS_FILE = style.css
 CSS_ARG = --css=$(CSS_FILE)
-ARGS = $(TOC) $(MATH_FORMULAS) $(CSS_ARG)
+METADATA_ARG = --metadata-file=$(METADATA)
+ARGS = $(TOC) $(MATH_FORMULAS) $(CSS_ARG) $(METADATA_ARG)
 
 all: book
 
@@ -24,16 +27,17 @@ html: $(BUILD)/html/$(OUTPUT_FILENAME).html
 
 pdf: $(BUILD)/pdf/$(OUTPUT_FILENAME).pdf
 
-$(BUILD)/epub/$(OUTPUT_FILENAME).epub: $(METADATA) $(CHAPTERS)
+$(BUILD)/epub/$(OUTPUT_FILENAME).epub: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) \
+																			 $(COVER_IMAGE)
 	mkdir -p $(BUILD)/epub
-	pandoc $(ARGS) -S --epub-metadata=$(METADATA) --epub-cover-image=$(COVER_IMAGE) -o $@ $(sort $^)
+	pandoc $(ARGS) --epub-cover-image=$(COVER_IMAGE) -o $@ $(CHAPTERS)
 
-$(BUILD)/html/$(OUTPUT_FILENAME).html: $(CHAPTERS)
+$(BUILD)/html/$(OUTPUT_FILENAME).html: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES)
 	mkdir -p $(BUILD)/html
-	pandoc $(ARGS) --standalone --to=html5 -o $@ $(sort $^)
+	pandoc $(ARGS) --standalone --to=html5 -o $@ $(CHAPTERS)
 	cp -R $(IMAGES_FOLDER)/ $(BUILD)/html/$(IMAGES_FOLDER)/
 	cp $(CSS_FILE) $(BUILD)/html/$(CSS_FILE)
 
-$(BUILD)/pdf/$(OUTPUT_FILENAME).pdf: $(METADATA) $(CHAPTERS)
+$(BUILD)/pdf/$(OUTPUT_FILENAME).pdf: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES)
 	mkdir -p $(BUILD)/pdf
-	pandoc $(ARGS) -V documentclass=$(LATEX_CLASS) -o $@ $(sort $^)
+	pandoc $(ARGS) -V documentclass=$(LATEX_CLASS) -o $@ $(CHAPTERS)
diff --git a/README.md b/README.md
index 465966e..f8f2357 100644
--- a/README.md
+++ b/README.md
@@ -20,6 +20,13 @@ This template uses [make](https://www.gnu.org/software/make/) to build the outpu
 sudo apt-get install make
 ```
 
+To export to PDF files, make sure to install the following packages:
+
+```sh
+sudo apt-get install texlive-latex-base texlive-latex-recommended \
+  texlive-latex-extra texlive-fonts-recommended
+```
+
 ### Folder structure
 
 Here's a folder structure for a Pandoc book:
@@ -220,7 +227,7 @@ The generated file will be placed in *build/pdf*.
 Please, note that PDF file generation requires some extra dependencies (~ 800 MB):
 
 ```sh
-sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-latex-extra 
+sudo apt-get install texlive-latex-base texlive-fonts-recommended texlive-latex-extra
 ```
 
 #### Export to EPUB