diff --git a/.gitignore b/.gitignore index c491b10..1911750 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store .vscode -output/ +*.pdf +*.epub diff --git a/Makefile b/Makefile index bb318f5..cd02f66 100644 --- a/Makefile +++ b/Makefile @@ -5,17 +5,15 @@ ASCIIDOC_FILES := $(wildcard $(SOURCE_FOLDER)/*.adoc) FIGURES = $(shell find . -name '*.svg') PDF_NAME := book.pdf -PDF_PATH := output/$(PDF_NAME) EPUB_NAME := book.epub -EPUB_PATH := output/$(EPUB_NAME) ASCIIDOC_FLAGS = \ --doctype book -all: $(PDF_PATH) $(EPUB_PATH) +all: $(PDF_NAME) $(EPUB_NAME) -$(PDF_PATH): book.adoc $(ASCIIDOC_FILES) $(FIGURES) Makefile metadata.yaml | output +$(PDF_NAME): book.adoc $(ASCIIDOC_FILES) $(FIGURES) Makefile metadata.yaml asciidoctor-pdf book.adoc $(ASCIIDOC_FLAGS) \ -o $@ \ -r asciidoctor-diagram \ @@ -24,7 +22,7 @@ $(PDF_PATH): book.adoc $(ASCIIDOC_FILES) $(FIGURES) Makefile metadata.yaml | out -a allow-uri-read \ --safe-mode server -$(EPUB_PATH): book.adoc $(ASCIIDOC_FILES) $(FIGURES) Makefile metadata.yaml | output +$(EPUB_NAME): book.adoc $(ASCIIDOC_FILES) $(FIGURES) Makefile metadata.yaml asciidoctor-epub3 book.adoc $(ASCIIDOC_FLAGS) \ -o $@ \ -r asciidoctor-diagram \ @@ -36,8 +34,5 @@ $(EPUB_PATH): book.adoc $(ASCIIDOC_FILES) $(FIGURES) Makefile metadata.yaml | ou count: wc -w source/* -output: - mkdir output - clean: - rm -vrf output + rm -vrf $(PDF_NAME) $(EPUB_NAME) diff --git a/figures/energy_flow-d25c0799101fe30fd0e9fb13fc89a77013b0dad8f559f79be8245940b06771ca.png b/figures/energy_flow-d25c0799101fe30fd0e9fb13fc89a77013b0dad8f559f79be8245940b06771ca.png new file mode 100644 index 0000000..4183a97 Binary files /dev/null and b/figures/energy_flow-d25c0799101fe30fd0e9fb13fc89a77013b0dad8f559f79be8245940b06771ca.png differ diff --git a/figures/forest_diagram-d3a8c1d61f137dd753d0c8c7c6aed9470b11d6955911732cba6ab957300d9300.png b/figures/forest_diagram-d3a8c1d61f137dd753d0c8c7c6aed9470b11d6955911732cba6ab957300d9300.png new file mode 100644 index 0000000..bd3537e Binary files /dev/null and b/figures/forest_diagram-d3a8c1d61f137dd753d0c8c7c6aed9470b11d6955911732cba6ab957300d9300.png differ diff --git a/figures/fractal_diagram-2e4f5afe41c90bac854a35b0e429f8d528ede00e4ab3828962469110bca08be4.png b/figures/fractal_diagram-2e4f5afe41c90bac854a35b0e429f8d528ede00e4ab3828962469110bca08be4.png new file mode 100644 index 0000000..016ad66 Binary files /dev/null and b/figures/fractal_diagram-2e4f5afe41c90bac854a35b0e429f8d528ede00e4ab3828962469110bca08be4.png differ diff --git a/figures/marine_ecosystem-25065c1b9ed04d43694e8387269005ed74545b7a407f98d097b7b199c00a5dcd.png b/figures/marine_ecosystem-25065c1b9ed04d43694e8387269005ed74545b7a407f98d097b7b199c00a5dcd.png new file mode 100644 index 0000000..4e2f871 Binary files /dev/null and b/figures/marine_ecosystem-25065c1b9ed04d43694e8387269005ed74545b7a407f98d097b7b199c00a5dcd.png differ diff --git a/figures/nutrient_cycle-b3167f0de07590ca9fe08e6b8c70ac48b76da6b440495b82aaea1ec0a239eae9.png b/figures/nutrient_cycle-b3167f0de07590ca9fe08e6b8c70ac48b76da6b440495b82aaea1ec0a239eae9.png new file mode 100644 index 0000000..7deb81b Binary files /dev/null and b/figures/nutrient_cycle-b3167f0de07590ca9fe08e6b8c70ac48b76da6b440495b82aaea1ec0a239eae9.png differ