From b67dc48bafd615cbabb0a3cd3a64ca2ea5b1abbd Mon Sep 17 00:00:00 2001 From: Wikiti Date: Mon, 19 Aug 2019 16:59:09 +0100 Subject: [PATCH] Minor code tweaks --- Makefile | 36 +++++++++++++++++------------------- README.md | 4 ++-- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index b29aad3..7b19130 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +#################################################################################################### +# Configuration +#################################################################################################### + BUILD = build MAKEFILE = Makefile OUTPUT_FILENAME = book @@ -7,26 +11,27 @@ 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) METADATA_ARG = --metadata-file=$(METADATA) ARGS = $(TOC) $(MATH_FORMULAS) $(CSS_ARG) $(METADATA_ARG) +PDF_ARGS = -V geometry:margin=1in -V documentclass=report -################################################################################ -# Default Action +#################################################################################################### +# Basic actions +#################################################################################################### all: book -################################################################################ - book: epub html pdf clean: rm -r $(BUILD) -################################################################################ +#################################################################################################### +# File builders +#################################################################################################### epub: $(BUILD)/epub/$(OUTPUT_FILENAME).epub @@ -34,27 +39,20 @@ html: $(BUILD)/html/$(OUTPUT_FILENAME).html pdf: $(BUILD)/pdf/$(OUTPUT_FILENAME).pdf -################################################################################ - -$(BUILD)/epub/$(OUTPUT_FILENAME).epub: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) $(COVER_IMAGE) - @echo "" - @echo "--- $@ building ---" +$(BUILD)/epub/$(OUTPUT_FILENAME).epub: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) \ + $(COVER_IMAGE) mkdir -p $(BUILD)/epub pandoc $(ARGS) --epub-cover-image=$(COVER_IMAGE) -o $@ $(CHAPTERS) - @echo "--- $@ complete ---" + @echo "$@ was built" $(BUILD)/html/$(OUTPUT_FILENAME).html: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) - @echo "" - @echo "--- $@ building ---" mkdir -p $(BUILD)/html pandoc $(ARGS) --standalone --to=html5 -o $@ $(CHAPTERS) cp -R $(IMAGES_FOLDER)/ $(BUILD)/html/$(IMAGES_FOLDER)/ cp $(CSS_FILE) $(BUILD)/html/$(CSS_FILE) - @echo "--- $@ complete ---" + @echo "$@ was built" $(BUILD)/pdf/$(OUTPUT_FILENAME).pdf: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) - @echo "" - @echo "--- $@ building ---" mkdir -p $(BUILD)/pdf - pandoc $(ARGS) -V documentclass=$(LATEX_CLASS) -V geometry:margin=1in -o $@ $(CHAPTERS) - @echo "--- $@ complete ---" + pandoc $(ARGS) $(PDF_ARGS) -o $@ $(CHAPTERS) + @echo "$@ was built" diff --git a/README.md b/README.md index 8503e38..ff00556 100644 --- a/README.md +++ b/README.md @@ -93,11 +93,11 @@ This is the second subsection. Each title (*#*) will represent a chapter, while each subtitle (*##*) will represent a chapter's section. You can use as many levels of sections as markdown supports. -#### For manual control over page ordering +#### Manual control over page ordering You may prefer to have manual control over page ordering instead of using numeric prefixes. -To do so, replace `CHAPTERS = chapters/*.md` in the Makefile with: +To do so, replace `CHAPTERS = chapters/*.md` in the Makefile with your own order. For example: ``` CHAPTERS += $(addprefix ./chapters/,\