diff --git a/.gitignore b/.gitignore index 9905df7..c251fbe 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ __pycache__ *.gpkg-wal *.gpkg-shm +.tmp/ env/ *.pyc *.inc.tex diff --git a/IV/Makefile b/IV/Makefile index 374de69..cfffea1 100644 --- a/IV/Makefile +++ b/IV/Makefile @@ -193,12 +193,16 @@ slides-2021-03-29.pdf: slides-2021-03-29.txt dump-debug_wm.sql.xz: docker exec -ti wm-mj pg_dump -Uosm osm -t wm_devug | xz -v > $@ -release.zip: mj-msc.tex version.inc.tex vars.inc.tex \ +release.zip: mj-msc.tex mj-msc.bbl version.inc.tex vars.inc.tex \ $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS)) \ $(shell git ls-files .) -rm $@ + mkdir -p .tmp; touch .tmp/editorial-version zip $@ $^ + zip $@ -j .tmp/editorial-version +mj-msc.bbl: mj-msc.tex bib.bib + biber mj-msc mj-msc-gray.pdf: mj-msc.pdf gs \ diff --git a/IV/mj-msc.tex b/IV/mj-msc.tex index 44a8fc3..0e11406 100644 --- a/IV/mj-msc.tex +++ b/IV/mj-msc.tex @@ -24,8 +24,12 @@ \usepackage{tikz} \usepackage{fancyvrb} %\usepackage{charter} +%\usepackage{setspace} +%\doublespacing -\iftrue +\IfFileExists{./editorial-version}{\def \mjEditorial {}}{} + +\ifx \mjEditorial \undefined % requires minted \usepackage{minted} \newcommand{\inputcode}[2]{\inputminted[fontsize=\small]{#1}{#2}} @@ -33,8 +37,6 @@ % does not require minted \usepackage{verbatim} \newcommand{\inputcode}[2]{\verbatiminput{#2}} -\usepackage{setspace} -\doublespacing \fi \input{version.inc} @@ -534,6 +536,13 @@ This type of illustration works quite well, since polygons created from bends are almost never overlapping, and discriminating different backgrounds is easier than discriminating different line shapes or colors. +\subsection{Debugging} + +NOTE: this will explain how intermediate debugging tables (\texttt{wm\_debug}) +work. This is not related to the algorithm, but the only the implementation +itself (probably should come together with paper's regeneration and unit +tests). + \subsection{Merging pieces of the river into one} NOTE: explain how different river segments are merged into a single line. This