From c36956b37bb81742af8f0e30a0d5267ba82970bf Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:18:20 +0100 Subject: [PATCH 01/11] add epub target --- Makefile | 7 +++++-- git.txt | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 12ee175..dcc3c83 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ git.txt: advanced.txt automatisierung.txt erste_schritte.txt gitdir.txt \ git.html: git.txt asciidoc.conf asciidoc -a numbered -a data-uri -a toclevels=3 $< +git.epub: git.html + a2x -f epub git.txt + # ARE YOU OUT OF YOUR MIND? ARE YOU NOT CAPABLE OF WRITING UTTERLY # SIMPLE XSL TEMPLATES TO ACHIEVE THIS SIMPLE THING? –– No. I’ve tried and failed. styles/toc.html: git.chunked-prereq @@ -17,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt clean: rm -rf git.html git.chunked style/toc.html diff --git a/git.txt b/git.txt index 01cbb8f..66e73ae 100644 --- a/git.txt +++ b/git.txt @@ -1,6 +1,7 @@ Git === :subtitle: Verteilte Versionskontrolle für Code und Dokumente +:author: Valentin_Haenel_und_Julius_Plenz :doctype: book :revnumber: 3.0 :lang: de From 156807d98114de451554c7e7d7c6a004947ee302 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:20:02 +0100 Subject: [PATCH 02/11] clean up temporary disablement of xmllint --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dcc3c83..ed37b70 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt clean: rm -rf git.html git.chunked style/toc.html From 769984e048299a9b9d2bcde8ae764317934fd619 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:18:20 +0100 Subject: [PATCH 03/11] add epub target --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0778492..4d81087 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ git.txt: advanced.txt automatisierung.txt erste_schritte.txt gitdir.txt \ git.html: git.txt asciidoc.conf asciidoc -a numbered -a data-uri -a toclevels=3 $< +git.epub: git.html + a2x -f epub git.txt + # ARE YOU OUT OF YOUR MIND? ARE YOU NOT CAPABLE OF WRITING UTTERLY # SIMPLE XSL TEMPLATES TO ACHIEVE THIS SIMPLE THING? –– No. I’ve tried and failed. styles/toc.html: git.chunked-prereq @@ -17,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt epub: a2x -dbook -fepub git.txt From f6341f0c5d4cc8e33c5583618d35c9da27cd862c Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:20:02 +0100 Subject: [PATCH 04/11] clean up temporary disablement of xmllint --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4d81087..a61debe 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt epub: a2x -dbook -fepub git.txt From 2b21ff1f0cf86428f13e6ea7e93e01f903eb1b55 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Tue, 5 Jan 2016 12:41:31 +0100 Subject: [PATCH 05/11] If you need both environments - system *and* Homebrew - you can also point to the xml catalog files via environment variables --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59c6ac3..13c83ae 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,12 @@ Mac OS X Zur Vorbereitung (mit [Homebrew](http://brew.sh/)): * `brew install asciidoc xmlstarlet epubcheck` -* [xmllint fixen](https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg): +* [xmllint fixen - nutzt dauerhaft das Homebrew Environment](https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg): * `sudo mkdir /etc/xml` * `sudo ln -s /usr/local/etc/xml/catalog /etc/xml/catalog` +* [xmllint temporär fixen](https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg): + * `export XML_CATALOG_FILES=/usr/local/etc/xml/catalog` + Bauen: * `make` erstellt die HTML Version. From 72ff8a284d87a0b93a72409b14c75f0e5a72d2e4 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:18:20 +0100 Subject: [PATCH 06/11] add epub target --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0778492..4d81087 100644 --- a/Makefile +++ b/Makefile @@ -8,6 +8,9 @@ git.txt: advanced.txt automatisierung.txt erste_schritte.txt gitdir.txt \ git.html: git.txt asciidoc.conf asciidoc -a numbered -a data-uri -a toclevels=3 $< +git.epub: git.html + a2x -f epub git.txt + # ARE YOU OUT OF YOUR MIND? ARE YOU NOT CAPABLE OF WRITING UTTERLY # SIMPLE XSL TEMPLATES TO ACHIEVE THIS SIMPLE THING? –– No. I’ve tried and failed. styles/toc.html: git.chunked-prereq @@ -17,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt epub: a2x -dbook -fepub git.txt From afbbe772ad9d3e1568177e8d762ccaf7bbd579c0 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:20:02 +0100 Subject: [PATCH 07/11] clean up temporary disablement of xmllint --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4d81087..a61debe 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt epub: a2x -dbook -fepub git.txt From 5bab227c3fb58c6e5c653dc12bf03f159f32a418 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:18:20 +0100 Subject: [PATCH 08/11] add epub target --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a61debe..4d81087 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt epub: a2x -dbook -fepub git.txt From 99badf2f46fe25896af663926a0fd8ff6849936c Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Mon, 4 Jan 2016 15:20:02 +0100 Subject: [PATCH 09/11] clean up temporary disablement of xmllint --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4d81087..a61debe 100644 --- a/Makefile +++ b/Makefile @@ -20,10 +20,10 @@ styles/toc.html: git.chunked-prereq git.chunked-prereq: git.txt styles asciidoc.conf rm -f styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt git.chunked: git.chunked-prereq styles/toc.html - a2x -L -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt + a2x -f chunked --xsl-file styles/chunked.xsl --resource styles --stylesheet=gitbuch.css git.txt epub: a2x -dbook -fepub git.txt From 82a09c4dc0b107e1a2a33bb8c9ce59ff7d071821 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Tue, 5 Jan 2016 12:41:31 +0100 Subject: [PATCH 10/11] If you need both environments - system *and* Homebrew - you can also point to the xml catalog files via environment variables --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 59c6ac3..13c83ae 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,12 @@ Mac OS X Zur Vorbereitung (mit [Homebrew](http://brew.sh/)): * `brew install asciidoc xmlstarlet epubcheck` -* [xmllint fixen](https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg): +* [xmllint fixen - nutzt dauerhaft das Homebrew Environment](https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg): * `sudo mkdir /etc/xml` * `sudo ln -s /usr/local/etc/xml/catalog /etc/xml/catalog` +* [xmllint temporär fixen](https://groups.google.com/forum/#!topic/asciidoc/FC-eOwU8rYg): + * `export XML_CATALOG_FILES=/usr/local/etc/xml/catalog` + Bauen: * `make` erstellt die HTML Version. From 288d945960d8f5d55f07bfa68173f1849ef31737 Mon Sep 17 00:00:00 2001 From: Ralph Angenendt Date: Tue, 5 Jan 2016 12:55:02 +0100 Subject: [PATCH 11/11] Somehow my changes crept back. I think I should read this book before commiting :) --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index a61debe..0778492 100644 --- a/Makefile +++ b/Makefile @@ -8,9 +8,6 @@ git.txt: advanced.txt automatisierung.txt erste_schritte.txt gitdir.txt \ git.html: git.txt asciidoc.conf asciidoc -a numbered -a data-uri -a toclevels=3 $< -git.epub: git.html - a2x -f epub git.txt - # ARE YOU OUT OF YOUR MIND? ARE YOU NOT CAPABLE OF WRITING UTTERLY # SIMPLE XSL TEMPLATES TO ACHIEVE THIS SIMPLE THING? –– No. I’ve tried and failed. styles/toc.html: git.chunked-prereq