Minor code tweaks

This commit is contained in:
Wikiti 2019-08-19 16:59:09 +01:00
parent db5aa904af
commit b67dc48baf
2 changed files with 19 additions and 21 deletions

View File

@ -1,3 +1,7 @@
####################################################################################################
# Configuration
####################################################################################################
BUILD = build BUILD = build
MAKEFILE = Makefile MAKEFILE = Makefile
OUTPUT_FILENAME = book OUTPUT_FILENAME = book
@ -7,26 +11,27 @@ TOC = --toc --toc-depth=2
IMAGES_FOLDER = images IMAGES_FOLDER = images
IMAGES = $(IMAGES_FOLDER)/* IMAGES = $(IMAGES_FOLDER)/*
COVER_IMAGE = $(IMAGES_FOLDER)/cover.png COVER_IMAGE = $(IMAGES_FOLDER)/cover.png
LATEX_CLASS = report
MATH_FORMULAS = --webtex MATH_FORMULAS = --webtex
CSS_FILE = style.css CSS_FILE = style.css
CSS_ARG = --css=$(CSS_FILE) CSS_ARG = --css=$(CSS_FILE)
METADATA_ARG = --metadata-file=$(METADATA) METADATA_ARG = --metadata-file=$(METADATA)
ARGS = $(TOC) $(MATH_FORMULAS) $(CSS_ARG) $(METADATA_ARG) ARGS = $(TOC) $(MATH_FORMULAS) $(CSS_ARG) $(METADATA_ARG)
PDF_ARGS = -V geometry:margin=1in -V documentclass=report
################################################################################ ####################################################################################################
# Default Action # Basic actions
####################################################################################################
all: book all: book
################################################################################
book: epub html pdf book: epub html pdf
clean: clean:
rm -r $(BUILD) rm -r $(BUILD)
################################################################################ ####################################################################################################
# File builders
####################################################################################################
epub: $(BUILD)/epub/$(OUTPUT_FILENAME).epub epub: $(BUILD)/epub/$(OUTPUT_FILENAME).epub
@ -34,27 +39,20 @@ html: $(BUILD)/html/$(OUTPUT_FILENAME).html
pdf: $(BUILD)/pdf/$(OUTPUT_FILENAME).pdf 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 mkdir -p $(BUILD)/epub
pandoc $(ARGS) --epub-cover-image=$(COVER_IMAGE) -o $@ $(CHAPTERS) 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) $(BUILD)/html/$(OUTPUT_FILENAME).html: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES)
@echo ""
@echo "--- $@ building ---"
mkdir -p $(BUILD)/html mkdir -p $(BUILD)/html
pandoc $(ARGS) --standalone --to=html5 -o $@ $(CHAPTERS) pandoc $(ARGS) --standalone --to=html5 -o $@ $(CHAPTERS)
cp -R $(IMAGES_FOLDER)/ $(BUILD)/html/$(IMAGES_FOLDER)/ cp -R $(IMAGES_FOLDER)/ $(BUILD)/html/$(IMAGES_FOLDER)/
cp $(CSS_FILE) $(BUILD)/html/$(CSS_FILE) cp $(CSS_FILE) $(BUILD)/html/$(CSS_FILE)
@echo "--- $@ complete ---" @echo "$@ was built"
$(BUILD)/pdf/$(OUTPUT_FILENAME).pdf: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES) $(BUILD)/pdf/$(OUTPUT_FILENAME).pdf: $(MAKEFILE) $(METADATA) $(CHAPTERS) $(CSS_FILE) $(IMAGES)
@echo ""
@echo "--- $@ building ---"
mkdir -p $(BUILD)/pdf mkdir -p $(BUILD)/pdf
pandoc $(ARGS) -V documentclass=$(LATEX_CLASS) -V geometry:margin=1in -o $@ $(CHAPTERS) pandoc $(ARGS) $(PDF_ARGS) -o $@ $(CHAPTERS)
@echo "--- $@ complete ---" @echo "$@ was built"

View File

@ -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. 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. 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/,\ CHAPTERS += $(addprefix ./chapters/,\