diff --git a/.gitignore b/.gitignore index 7a49033..4ae354f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1 @@ -Assets/__backmatter.filled.tex -Assets/__frontmatter.filled.tex Assets/__titlepage.filled.tex \ No newline at end of file diff --git a/Assets/backmatter.tex b/Assets/backmatter.tex deleted file mode 100644 index baf0349..0000000 --- a/Assets/backmatter.tex +++ /dev/null @@ -1,18 +0,0 @@ - -%------------------------------------- Declaration Page ---------------------------- -$if(declaration)$ -\cleardoublepage - -\thispagestyle{empty} - -\vspace*{\fill} - -\textbf{Eidesstattliche Erklärung} - -\noindent{$declaration$} - -\vspace{20mm} - -\noindent\textit{Minden, den $date$} -$endif$ -%------------------------------------- Declaration Page ---------------------------- diff --git a/Assets/frontmatter.tex b/Assets/frontmatter.tex deleted file mode 100644 index 217aa97..0000000 --- a/Assets/frontmatter.tex +++ /dev/null @@ -1,50 +0,0 @@ - -%------------------------------------- Custom Title (Back) Page -------------------- -%------------------------------------- Custom Title (Back) Page -------------------- - - - -%------------------------------------- Custom Abstract Page ------------------------ -$if(abstract-de)$ -\cleardoublepage -\begin{minipage}{\linewidth} - -\chapter*{Zusammenfassung} -%\addcontentsline{toc}{chapter}{Zusammenfassung} -$abstract-de$ - -$if(abstract-en)$ -\chapter*{Abstract} -%\addcontentsline{toc}{chapter}{Abstract} -$abstract-en$ -$endif$ - -\end{minipage} -\cleardoublepage -$endif$ -%------------------------------------- Custom Abstract Page ------------------------ - - - -%------------------------------------- Acknowledgements Page ----------------------- -$if(acknowledgements)$ -\chapter*{Danksagung} -%\addcontentsline{toc}{chapter}{Danksagung} -$acknowledgements$ -$endif$ -%------------------------------------- Acknowledgements Page ----------------------- - - - -%------------------------------------- Restriction Note Page ----------------------- -$if(restrictionnote)$ -\chapter*{Sperrvermerk} -$restrictionnote$ -$endif$ -%------------------------------------- Restriction Note Page ----------------------- - - - -%------------------------------------- Clear page before TOC ----------------------- -\cleardoublepage -%------------------------------------- Clear page before TOC ----------------------- diff --git a/Assets/metadata.yaml b/Assets/metadata.yaml index 9f2d4c4..e85ccde 100644 --- a/Assets/metadata.yaml +++ b/Assets/metadata.yaml @@ -4,9 +4,9 @@ subtitle: "Diseño y Desarrollo de Sistemas de Información" author: [Amin Kasrou Aouam] date: "18 Octubre 2019" logo: /home/coolneng/Pictures/Logos/UGR.png +lang: es-ES toc: true toc-own-page: true -lang: es-ES documentclass: scrbook classoption: - open=right diff --git a/Assets/titlepage.tex b/Assets/titlepage.tex index 0f73477..9e9b2b4 100644 --- a/Assets/titlepage.tex +++ b/Assets/titlepage.tex @@ -41,29 +41,13 @@ $endif$ \end{tabular} } %------------------------------------- Custom Title Page --------------------------- -%------------------------------------- Custom Title (Back) Page -------------------- -%------------------------------------- Custom Title (Back) Page -------------------- - -%------------------------------------- Patch Eisvogel's frontmatter ---------------- -%% Eisvogel template uses `\frontmatter` directly *after* `\maketitle`, thus there is -%% a `\doubleclearpage` after the titlepage, which prevents our title-back-page to be -%% positioned on the backside of the titlepage ... -%% (Pandocs default template uses `\frontmatter` *before* `\maketitle`) -$if(eisvogel)$ -\usepackage{xpatch} -\xpretocmd{\frontmatter}{\customtitlebackpage}{}{} -\xapptocmd{\frontmatter}{\setcounter{page}{3}}{}{} -$endif$ -%------------------------------------- Patch Eisvogel's frontmatter ---------------- - $if(logo)$ \usepackage[export]{adjustbox} \usepackage{graphicx} $endif$ - %------------------------------------- Workaround for CleanStyle ------------------- %% cleanthesis.sty *will* check the bibfile, even if `configurebiblatex=false` ... %% So we need to set it appropriately using our metadata variable "cleanthesisbibfile" diff --git a/Design.org b/Design.org index bc11522..f38bbaf 100644 --- a/Design.org +++ b/Design.org @@ -8,10 +8,10 @@ * Users ** Admin * Tasks -** TODO Parsing script [0/3] [0%] +** TODO Parsing script [0/2] [0%] - [ ] Select useful fiels with awk - [ ] Sum of the volume and areas of each year -** DONE Type requirements handout [4/5] [80%] +** DONE Type requirements handout [4/4] [100%] CLOSED: [2019-09-27 Fri 14:54] SCHEDULED: <2019-09-27 Fri 23:55> - [X] Problem description - [X] Functional requirements diff --git a/Docs/Project.pdf b/Docs/Project.pdf index 538e689..b74a9ae 100644 Binary files a/Docs/Project.pdf and b/Docs/Project.pdf differ diff --git a/Makefile b/Makefile index bd925c1..4b17652 100644 --- a/Makefile +++ b/Makefile @@ -17,13 +17,7 @@ TARGET = $(DOC)/Project.pdf ## Auxiliary files ## (Do not change!) TITLEPAGE = titlepage.tex -FRONTMATTER = frontmatter.tex -BACKMATTER = backmatter.tex - -TMP1 = Assets/$(TITLEPAGE:%.tex=__%.filled.tex) -TMP2 = Assets/$(FRONTMATTER:%.tex=__%.filled.tex) -TMP3 = Assets/$(BACKMATTER:%.tex=__%.filled.tex) -TMP = $(TMP1) $(TMP2) $(TMP3) +TMP = Assets/$(TITLEPAGE:%.tex=__%.filled.tex) ## Pandoc options @@ -35,9 +29,7 @@ OPTIONS += --filter=pandoc-citeproc OPTIONS += --metadata-file=$(META) OPTIONS += -M bibliography=$(BIBFILE) OPTIONS += --listings -OPTIONS += --include-in-header=$(TMP1) -OPTIONS += --include-before-body=$(TMP2) -OPTIONS += --include-after-body=$(TMP3) +OPTIONS += --include-in-header=$(TMP) ## Template variables @@ -82,11 +74,11 @@ distclean: clean ## Download template files ## Build thesis -${TARGET}: $(SRC) $(REFERENCES) $(META) $(BIBFILE) $(TMP) - $(PANDOC) ${OPTIONS} -o $@ $(SRC) $(REFERENCES) +${TARGET}: $(SRC) $(META) $(BIBFILE) $(TMP) + $(PANDOC) ${OPTIONS} -o $@ $(SRC) -## Build auxiliary files (title page, backmater, references) +## Build auxiliary files (title page, references) $(TMP): Assets/__%.filled.tex: Assets/%.tex $(META) $(PANDOC) $(AUX_OPTS) --template=$< --metadata-file=$(META) -o $@ $<