summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2016-12-20 11:03:25 +0100
committerNao Pross <naopross@thearcway.org>2016-12-20 11:03:25 +0100
commit004ffbe26deb7635978d854180d4415e5b9e3999 (patch)
tree2ab345e5f8f33830ab02841ac3a725d878158c7f
parentrewritten introduction & smaller edits (diff)
downloadPDI-004ffbe26deb7635978d854180d4415e5b9e3999.tar.gz
PDI-004ffbe26deb7635978d854180d4415e5b9e3999.zip
renamed 'docs' to 'doc'
-rw-r--r--.gitignore2
-rw-r--r--doc/make.bat (renamed from docs/make.bat)0
-rw-r--r--doc/makefile (renamed from docs/makefile)3
-rw-r--r--doc/pdi.bib (renamed from docs/pdi.bib)7
-rw-r--r--doc/pdi.tex (renamed from docs/pdi.tex)2
-rw-r--r--doc/res/images/cam_cpt_logo.pdfbin0 -> 8546 bytes
-rw-r--r--doc/res/images/cam_cpt_logo.svg (renamed from docs/res/images/cam_cpt_logo.svg)0
-rw-r--r--doc/res/images/canada_settlements.pdf (renamed from docs/res/images/canada_settlements_orig.pdf)bin131202 -> 126072 bytes
-rw-r--r--doc/res/images/canada_settlements.png (renamed from docs/res/images/canada_settlements.png)bin166902 -> 166902 bytes
-rw-r--r--doc/res/images/canada_settlements.svg (renamed from docs/res/images/canada_settlements.svg)0
-rw-r--r--doc/res/images/canada_settlements_orig.pdf (renamed from docs/res/images/canada_settlements.pdf)bin136741 -> 125924 bytes
-rw-r--r--doc/res/images/canada_settlements_orig.svg (renamed from docs/res/images/canada_settlements_orig.svg)0
-rw-r--r--doc/res/images/canadian_red_ensign.pdf (renamed from docs/res/images/canadian_red_ensign.pdf)bin36599 -> 36599 bytes
-rw-r--r--doc/res/images/canadian_red_ensign.svg (renamed from docs/res/images/canadian_red_ensign.svg)0
-rw-r--r--doc/res/images/flag_of_canada.pdf (renamed from docs/res/images/flag_of_canada.pdf)bin1445 -> 1445 bytes
-rw-r--r--doc/res/images/flag_of_canada.svg (renamed from docs/res/images/flag_of_canada.svg)0
-rw-r--r--doc/res/photos/first_nations.jpg (renamed from docs/res/photos/first_nations.jpg)bin74708 -> 74708 bytes
-rw-r--r--doc/tex/conclusioni.tex (renamed from docs/tex/conclusioni.tex)0
-rw-r--r--doc/tex/consumo.tex (renamed from docs/tex/consumo.tex)0
-rw-r--r--doc/tex/introduzione.tex (renamed from docs/tex/introduzione.tex)0
-rw-r--r--doc/tex/politica.tex (renamed from docs/tex/politica.tex)0
-rw-r--r--doc/tex/produzione.tex (renamed from docs/tex/produzione.tex)0
-rw-r--r--docs/res/images/cam_cpt_logo.pdfbin8932 -> 0 bytes
23 files changed, 10 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 574d79b..a1df957 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-docs/build/**
+doc/build/**
**/*~
diff --git a/docs/make.bat b/doc/make.bat
index 93cbbcc..93cbbcc 100644
--- a/docs/make.bat
+++ b/doc/make.bat
diff --git a/docs/makefile b/doc/makefile
index 8336791..6baefea 100644
--- a/docs/makefile
+++ b/doc/makefile
@@ -17,7 +17,8 @@ BIB := biber
.PHONY: all build clean
all: build
-build: $(PDFS)
+build: $(PDFS)
+ mkdir -p $(BUILD_DIR)
$(TEX) --output-directory=$(BUILD_DIR) $(DOCUMENT)
$(BIB) --output-directory=$(BUILD_DIR) $(BIBLIOGRAPHY)
$(TEX) --output-directory=$(BUILD_DIR) $(DOCUMENT)
diff --git a/docs/pdi.bib b/doc/pdi.bib
index 13c386d..8ac8d64 100644
--- a/docs/pdi.bib
+++ b/doc/pdi.bib
@@ -107,8 +107,13 @@ $$ }}}
url = "https://commons.wikimedia.org/wiki/File:QueenAnnesWarBefore.svg"
}
-%% }}}
+@online{firstnations,
+ author = "George Gordon First Nation",
+ keywords = "pic",
+ url = "http://www.georgegordonfirstnation.com/treaty4.htm"
+}
+%% }}}
%% -----------------------------------------------------------------------------
%% DOCUMENTI DA ENTITA` GOVERNATIVE {{{
diff --git a/docs/pdi.tex b/doc/pdi.tex
index eeda071..153c80f 100644
--- a/docs/pdi.tex
+++ b/doc/pdi.tex
@@ -7,7 +7,7 @@
%% Alan Scheidegger 3B
%%
-\documentclass[draft,a4paper,twoside,12pt]{report}
+\documentclass[a4paper,twoside,12pt]{report}
%% Packages {{{
% file encoding and language
diff --git a/doc/res/images/cam_cpt_logo.pdf b/doc/res/images/cam_cpt_logo.pdf
new file mode 100644
index 0000000..91a12da
--- /dev/null
+++ b/doc/res/images/cam_cpt_logo.pdf
Binary files differ
diff --git a/docs/res/images/cam_cpt_logo.svg b/doc/res/images/cam_cpt_logo.svg
index c18ceec..c18ceec 100644
--- a/docs/res/images/cam_cpt_logo.svg
+++ b/doc/res/images/cam_cpt_logo.svg
diff --git a/docs/res/images/canada_settlements_orig.pdf b/doc/res/images/canada_settlements.pdf
index d9b2636..6fe09c5 100644
--- a/docs/res/images/canada_settlements_orig.pdf
+++ b/doc/res/images/canada_settlements.pdf
Binary files differ
diff --git a/docs/res/images/canada_settlements.png b/doc/res/images/canada_settlements.png
index 3e1e5e3..3e1e5e3 100644
--- a/docs/res/images/canada_settlements.png
+++ b/doc/res/images/canada_settlements.png
Binary files differ
diff --git a/docs/res/images/canada_settlements.svg b/doc/res/images/canada_settlements.svg
index 895d4bc..895d4bc 100644
--- a/docs/res/images/canada_settlements.svg
+++ b/doc/res/images/canada_settlements.svg
diff --git a/docs/res/images/canada_settlements.pdf b/doc/res/images/canada_settlements_orig.pdf
index 42c8c72..73aa1fb 100644
--- a/docs/res/images/canada_settlements.pdf
+++ b/doc/res/images/canada_settlements_orig.pdf
Binary files differ
diff --git a/docs/res/images/canada_settlements_orig.svg b/doc/res/images/canada_settlements_orig.svg
index b24c25f..b24c25f 100644
--- a/docs/res/images/canada_settlements_orig.svg
+++ b/doc/res/images/canada_settlements_orig.svg
diff --git a/docs/res/images/canadian_red_ensign.pdf b/doc/res/images/canadian_red_ensign.pdf
index 84c90db..84c90db 100644
--- a/docs/res/images/canadian_red_ensign.pdf
+++ b/doc/res/images/canadian_red_ensign.pdf
Binary files differ
diff --git a/docs/res/images/canadian_red_ensign.svg b/doc/res/images/canadian_red_ensign.svg
index 86de5c1..86de5c1 100644
--- a/docs/res/images/canadian_red_ensign.svg
+++ b/doc/res/images/canadian_red_ensign.svg
diff --git a/docs/res/images/flag_of_canada.pdf b/doc/res/images/flag_of_canada.pdf
index 9c1c1fe..9c1c1fe 100644
--- a/docs/res/images/flag_of_canada.pdf
+++ b/doc/res/images/flag_of_canada.pdf
Binary files differ
diff --git a/docs/res/images/flag_of_canada.svg b/doc/res/images/flag_of_canada.svg
index 8941f6c..8941f6c 100644
--- a/docs/res/images/flag_of_canada.svg
+++ b/doc/res/images/flag_of_canada.svg
diff --git a/docs/res/photos/first_nations.jpg b/doc/res/photos/first_nations.jpg
index b285eb2..b285eb2 100644
--- a/docs/res/photos/first_nations.jpg
+++ b/doc/res/photos/first_nations.jpg
Binary files differ
diff --git a/docs/tex/conclusioni.tex b/doc/tex/conclusioni.tex
index 9818f07..9818f07 100644
--- a/docs/tex/conclusioni.tex
+++ b/doc/tex/conclusioni.tex
diff --git a/docs/tex/consumo.tex b/doc/tex/consumo.tex
index d95d7b5..d95d7b5 100644
--- a/docs/tex/consumo.tex
+++ b/doc/tex/consumo.tex
diff --git a/docs/tex/introduzione.tex b/doc/tex/introduzione.tex
index 871dc1e..871dc1e 100644
--- a/docs/tex/introduzione.tex
+++ b/doc/tex/introduzione.tex
diff --git a/docs/tex/politica.tex b/doc/tex/politica.tex
index 2fb4573..2fb4573 100644
--- a/docs/tex/politica.tex
+++ b/doc/tex/politica.tex
diff --git a/docs/tex/produzione.tex b/doc/tex/produzione.tex
index 15f3938..15f3938 100644
--- a/docs/tex/produzione.tex
+++ b/doc/tex/produzione.tex
diff --git a/docs/res/images/cam_cpt_logo.pdf b/docs/res/images/cam_cpt_logo.pdf
deleted file mode 100644
index 423c6dc..0000000
--- a/docs/res/images/cam_cpt_logo.pdf
+++ /dev/null
Binary files differ