preprocessing system for rapport

doc/Makefile

+GPP = gpp -x -U '!!' "" "{" "}{" "}" "{" "}" "\#" "@"
+GPPMD_SRC := $(wildcard *.gpp.md)
+MD_SRC := $(addsuffix .md, $(basename $(basename $(GPPMD_SRC))))
 PLANTUML_DIAGRAMS_SRC := $(addprefix diagrams/, $(wildcard diagrams/*.puml))
 PLANTUML_DIAGRAMS_SVG := $(addprefix images/diagram_, $(addsuffix .svg, $(notdir $(basename $(PLANTUML_DIAGRAMS_SRC)))))
 PLANTUML_DIAGRAMS_PNG := $(addprefix images/diagram_, $(addsuffix .png, $(notdir $(basename $(PLANTUML_DIAGRAMS_SRC)))))
 
-all: diagrams rapport.pdf
+all: diagrams markdown rapport.pdf
 
-rapport.pdf: rapport.md diagrams
-	pandoc rapport.md -o rapport.pdf --pdf-engine=xelatex
+markdown: $(MD_SRC)
 
-rapport.tex: rapport.md diagrams
+%.md: %.gpp.md
+	$(GPP) -DGITLAB_MARKDOWN $^ | ./trimstart.py > $@
+
+rapport.pdf: rapport.gpp.md diagrams
+	$(GPP) -DPANDOC_PDF $< | ./trimstart.py | pandoc --pdf-engine=xelatex -o $@
+
+rapport.tex: rapport.gpp.md diagrams
 	pandoc rapport.md -o rapport.tex
 
 diagrams: $(PLANTUML_DIAGRAMS_SVG) $(PLANTUML_DIAGRAMS_PNG)
 
 images/diagram_%.svg: diagrams/%.puml
-	for diagram in $^ ; do \
-		cat $$diagram | plantuml -tsvg -pipe > images/diagram_`basename -s .puml $$diagram`.svg ; \
-	done
+	cat $^ | plantuml -tsvg -pipe > images/diagram_`basename -s .puml $^`.svg ; \
 
 images/diagram_%.png: diagrams/%.puml
-	for diagram in $^ ; do \
-		cat $$diagram | plantuml -tpng -pipe > images/diagram_`basename -s .puml $$diagram`.png ; \
-	done
+	cat $^ | plantuml -tpng -pipe > images/diagram_`basename -s .puml $^`.png ; \
 
 clean:
 	rm -rf rapport.pdf; \
 	rm -rf $(PLANTUML_DIAGRAMS_SVG); \
-	rm -rf $(PLANTUML_DIAGRAMS_PNG);
+	rm -rf $(PLANTUML_DIAGRAMS_PNG); \
+	rm -rf $(MD_SRC)
 
-.PHONY: all diagrams clean
\ No newline at end of file
+.PHONY: all diagrams markdown clean
\ No newline at end of file

doc/includes/gitlab-markdown.gpp

+!!define{!!svg{name}{description}}{![[!!name.svg](!!description)](!!name.png)}
\ No newline at end of file

doc/includes/markdown.gpp

+!!define{!!includemd{file}}{
+    !!exec{cat !!file}
+}
+
+!!ifdef{PANDOC_PDF}
+    !!include{pandoc-pdf-markdown.gpp}
+!!endif
+
+!!ifdef{GITLAB_MARKDOWN}
+    !!include{gitlab-markdown.gpp}
+!!endif

doc/includes/pandoc-pdf-markdown.gpp

+!!define{!!svg{name}{description}}{![description](name.svg)}
\ No newline at end of file

doc/logbook.md

-# Log book
 
 ## 2020-04-22
 
@@ -1046,7 +1045,7 @@ to do it.
      the url of the backup repository
      ```bash
      git remote rename origin old-origin
-     git remote add origin ssh://git@ssh.hesge.ch:10572/dimitri.lizzi/bootiful-pre-lfs-backup.git
+     git remote add origin ssh://gitssh.hesge.ch:10572/dimitri.lizzi/bootiful-pre-lfs-backup.git
      ```
 
    - The history and tags have been pushed to the new repository
@@ -1072,7 +1071,7 @@ to do it.
 3. Clone the bare repository in folder `bootiful.git`
    ```bash
    cd ..
-   git clone --mirror ssh://git@ssh.hesge.ch:10572/dimitri.lizzi/bootiful.git
+   git clone --mirror ssh://gitssh.hesge.ch:10572/dimitri.lizzi/bootiful.git
    ```
 
 4. Convert the binary files in git history to lfs
@@ -1109,7 +1108,7 @@ to do it.
    ```bash
    cd ..
    mv bootiful bootiful.pre-lfs.backup
-   git clone ssh://git@ssh.hesge.ch:10572/dimitri.lizzi/bootiful.git
+   git clone ssh://gitssh.hesge.ch:10572/dimitri.lizzi/bootiful.git
    cd bootiful
    ```
 
@@ -1162,6 +1161,8 @@ I'll start with the first that is a modification of the previous diagram:
 
 ## 2020-05-13
 
+### Creation of activity diagram
+
 Now let's create the activity diagram. Abhilash has already created two diagrams
 that I will merge into one:
 
@@ -1176,17 +1177,18 @@ Here is the activity diagram that I have created:
 ![[](images/diagram_activity_deployment.svg)](images/diagram_activity_deployment.png)
 
 
-Meeting:
+### Meeting notes:
  - add a step to recreate partition if we can't mount it.
  - benchmark file transfer methods (ftp, sftp, stp, nfs, tftp, samba, http)
  - benchmark compression protocols
  - do it on real machines
  - see what others do: partimage and clonezilla
-
- I can go to school tomorrow at 16h45 to get a computer to make some real tests
-
+ - I can go to school tomorrow at 16h45 to get a computer to make some real test
  - tool `dstat`: gives info on disk, io in real time
  - study sparse files on android
  - creation of images: maybe reuse clonezilla?
  - windows: just create an image and show that it works but do not focus on how to create images
  - pcs deployed at school: xubuntu 18.04
+
+### Creation of a windows image
+

doc/rapport.gpp.md

+!!include{includes/markdown.gpp}
+!!ifdef{PANDOC_PDF}
+---
+documentclass: memoir
+lang: fr-CH
+title: Travail de bachelor
+subtitle: |
+  Bootiful\
+  Déploiement d'OS à choix durant le processus de boot
+author: |
+  Haute école du paysage, d'ingénierie et d'architecture de Genève\
+  \
+  Étudiant: Dimitri Lizzi\
+  Professeur référent: Florent Gluck
+date: |
+  Mai 2020
+geometry: margin=2.7cm
+papersize: a4paper
+numbersections: true
+monofont: JetBrains Mono
+output: pdf_document
+header-includes: |
+    \usepackage{pdfpages}
+    \usepackage{fancyhdr}
+    \usepackage{graphicx}
+    \usepackage{float}
+    \usepackage{lastpage}
+
+    \pagestyle{fancy}
+    \setlength{\headheight}{14pt}
+
+    \renewcommand{\headrulewidth}{0.4pt}
+    \renewcommand{\footrulewidth}{0.4pt}
+
+    \fancyhead[LO,LE]{Bootiful}
+    \fancyhead[CO,CE]{Déploiement d'OS à choix durant le processus de boot}
+    \fancyhead[RO,RE]{Dimitri Lizzi}
+    \fancyfoot[LO,LE]{Mai 2020}
+
+    \fancyfoot[CO,CE]{}
+    \fancyfoot[RE,RO]{\thepage /\pageref{LastPage}}
+
+    \setcounter{tocdepth}{4}
+
+    \setlength{\parindent}{0pt}
+    \setlength{\parskip}{9pt}
+
+    \floatplacement{figure}{H}
+abstract: |
+    TODO: Abstract
+---
+
+
+\tableofcontents
+
+!!endif
+# Introduction
+
+# Etude des systèmes existants
+
+## Clonezilla
+
+## Fog
+
+## 
+
+# Processus de déploiement
+
+![Diagramme décrivant le processus de déploiement](images/diagram_deployment.svg)
+
+# Conclusion
+
+# Annex A: logbook
+
+!!includemd{logbook.md}

doc/rapport.md

+
+
+
+# Introduction
+
+# Etude des systèmes existants
+
+## Clonezilla
+
+## Fog
+
+## 
+
+# Processus de déploiement
+
+![Diagramme décrivant le processus de déploiement](images/diagram_deployment.svg)
+
+# Conclusion
+
+# Annex A: logbook
+
+
+    !!include{includes/markdown.gpp}
+!!ifdef{PANDOC_PDF}
 ---
 documentclass: memoir
 lang: fr-CH
@@ -48,14 +72,28 @@ abstract: |
     TODO: Abstract
 ---
 
+
 \tableofcontents
 
+!!endif
 # Introduction
 
 # Etude des systèmes existants
 
+## Clonezilla
+
+## Fog
+
+## 
+
 # Processus de déploiement
 
 ![Diagramme décrivant le processus de déploiement](images/diagram_deployment.svg)
 
 # Conclusion
+
+# Annex A: logbook
+
+!!includemd{logbook.md}
+
+

doc/trimstart.py

+#!/usr/bin/env python
+
+import sys
+
+nonempty_line_reached = False
+for line in sys.stdin:
+    if nonempty_line_reached:
+        print(line, end='')
+    else:
+        nonempty_line_reached = line != "\n"
\ No newline at end of file