From 1bab351c21c366daccac10b1bf1445c8c63e5ebb Mon Sep 17 00:00:00 2001 From: Brian Khuu Date: Mon, 19 Aug 2019 01:38:07 +1000 Subject: [PATCH] Added tips to Readme, adjusted margin for pdf --- Makefile | 23 ++++++++++++++++++++--- README.md | 15 +++++++++++++++ 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ba7b683..b29aad3 100644 --- a/Makefile +++ b/Makefile @@ -14,30 +14,47 @@ CSS_ARG = --css=$(CSS_FILE) METADATA_ARG = --metadata-file=$(METADATA) ARGS = $(TOC) $(MATH_FORMULAS) $(CSS_ARG) $(METADATA_ARG) +################################################################################ +# Default Action + all: book +################################################################################ + book: epub html pdf clean: rm -r $(BUILD) +################################################################################ + epub: $(BUILD)/epub/$(OUTPUT_FILENAME).epub 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) +################################################################################ + +$(BUILD)/epub/$(OUTPUT_FILENAME).epub: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) $(COVER_IMAGE) + @echo "" + @echo "--- $@ building ---" mkdir -p $(BUILD)/epub pandoc $(ARGS) --epub-cover-image=$(COVER_IMAGE) -o $@ $(CHAPTERS) + @echo "--- $@ complete ---" $(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 ---" $(BUILD)/pdf/$(OUTPUT_FILENAME).pdf: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) + @echo "" + @echo "--- $@ building ---" mkdir -p $(BUILD)/pdf - pandoc $(ARGS) -V documentclass=$(LATEX_CLASS) -o $@ $(CHAPTERS) + pandoc $(ARGS) -V documentclass=$(LATEX_CLASS) -V geometry:margin=1in -o $@ $(CHAPTERS) + @echo "--- $@ complete ---" diff --git a/README.md b/README.md index 7506e73..8503e38 100644 --- a/README.md +++ b/README.md @@ -93,6 +93,21 @@ 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 + +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: + +``` +CHAPTERS += $(addprefix ./chapters/,\ + 01-introduction.md\ + 02-installation.md\ + 03-usage.md\ + 04-references.md\ +) +``` + #### Links between chapters Anchor links can be used to link chapters within the book: