summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2015-01-04 17:15:19 +0100
committerJonas Smedegaard <dr@jones.dk>2015-01-04 17:15:19 +0100
commit019be0e004d7d646709e3a0a01aafaa9ad48c384 (patch)
treeef2463b01c80a08e72ba134b2b80865563d40761
parent3eb8cb8867f083047c277527e83692cfaa479613 (diff)
Add separately authored copyright text (and drop upstream copyright section).
-rw-r--r--Makefile7
-rw-r--r--copyright.md35
-rwxr-xr-xmediawiki-matter1
3 files changed, 41 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b8606d2..0c2ece8 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,10 @@ filters = ./pandoc-cs1 ./pandoc-todo
filters += $(if $(citeproc_file),pandoc-citeproc)
filters += ./pandoc-iri
-mediawiki_includes = copyright.mw preface.mw foreword.mw
+markdown_includes = copyright.md
+mediawiki_includes = preface.mw foreword.mw
+includes += $(markdown_includes:.md=.tex)
includes += $(mediawiki_includes:.mw=.tex)
localfilters = $(filter ./%,$(filters))
@@ -60,6 +62,9 @@ $(stem).native: $(stem).mw $(localfilters)
$(mediawiki_includes:.mw=.tex): %.tex: %.mw $(stem).mw
pandoc -f mediawiki -t latex --chapters -o $@ $<
+$(markdown_includes:.md=.tex): %.tex: %.md
+ pandoc -f markdown -t latex --chapters -o $@ $<
+
$(flavors:%=$(stem)-%.tex): $(stem)-%.tex: $(stem).native $(templates) $(includes)
pandoc $(args_meta) $(args_latex) $(args_$*) -o $@ $<
diff --git a/copyright.md b/copyright.md
new file mode 100644
index 0000000..7254a74
--- /dev/null
+++ b/copyright.md
@@ -0,0 +1,35 @@
+Commissioned by the Greens/EFA Group in the European Parliament.
+Editor: Erik Josefsson <erik.josefsson@europarl.europa.eu>
+Rue Wiertz 60, B-1047 Brussels, Belgium.
+
+Study copyright © 2014 Carlo Piana, Ulf Öberg.
+Study is licensed under
+the Creative Commons Attribution-ShareAlike 4.0 International License,
+<https://creativecommons.org/licenses/by-sa/4.0/>.
+Source available at <http://euwiki.org/EUT/2nd-edition>.
+
+Book design copyright © 2014-2015 Jonas Smedegaard <dr@jones.dk>.
+Book design is licensed under
+the Creative Commons Attribution-ShareAlike 4.0 International License
+<https://creativecommons.org/licenses/by-sa/4.0/>.
+Source available at <\mytodo{data-only source}{FIXME}>.
+
+Cover illustration copyright © 2014 Siri Reiter <siri@jones.dk>.
+Cover illustration is licensed under
+the Creative Commons Attribution-ShareAlike 3.0 International License,
+<https://creativecommons.org/licenses/by-sa/3.0/>.
+Source available at <http://source.sirireiter.dk/?p=transparency.git>.
+
+Cover photo copyright © 2011 European Union PE-EP.
+Source available at <http://audiovisual.europarl.europa.eu/Assetdetail.aspx?id=3a50e246-d3c4-4ae8-9068-ce3249307d15>.
+
+Font Lora copyright © Cyreal (<http://www.cyreal.org/> <a@cyreal.org>).
+Font Lora is licensed under
+the SIL Open Font License version 1.1,
+<http://scripts.sil.org/OFL>.
+Source available at <https://github.com/cyrealtype/Lora>.
+
+ISBN \mytodo{ISBN No.}{0-1234-FIXME-2}
+
+First edition published December 11, 2014
+Second edition published \mytodo{release date}{FIXME}, 2015
diff --git a/mediawiki-matter b/mediawiki-matter
index 584e5f4..04f5393 100755
--- a/mediawiki-matter
+++ b/mediawiki-matter
@@ -20,7 +20,6 @@ s|^((?:.*?\n)?)(= Foreword(?:(?!\n=).)*\n)(=.*)$|$1$3|s;
path('foreword.mw')->spew_utf8($2);
s|^((?:.*?\n)?)(= Copyright(?:(?!\n=).)*\n)(=.*)$|$1$3|s;
-path('copyright.mw')->spew_utf8($2);
s|^((?:.*?\n)?)(= Table of Contents(?:(?!\n=).)*\n)(=.*)$|$1$3|s;