From 49431d9443516ec4fd026bd320d50ebe42f43d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Wed, 19 May 2021 22:57:48 +0300
Subject: [PATCH] paper sizes

---
 Makefile     | 24 +++++++++++++++++-------
 layer2img.py |  3 ++-
 mj-msc.tex   |  8 --------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index dfd5df5..b12420b 100644
--- a/Makefile
+++ b/Makefile
@@ -21,6 +21,17 @@ FIGURES = test-figures \
 					selfcrossing-1-before \
 					selfcrossing-1-after
 
+A4p = 210x297
+A4l = 297x210
+A5p = 148x210
+A5l = 148x210
+A6p = 105x148
+A6l = 148x105
+A7p = 74x105
+A7l = 105x74
+A8p = 52x74
+A8l = 74x52
+
 #################################
 # The thesis, publishable version
 #################################
@@ -85,34 +96,33 @@ fig5-gentle-inflection-after_1SELECT = wm_debug where name='fig5' AND stage='cin
 fig5-gentle-inflection-after_2SELECT = wm_debug where name='fig5' AND stage='cinflections-polygon' AND gen=1
 fig5-gentle-inflection-after_2CMAP = 1
 
-inflection-1-gentle-inflection-before_WIDTHDIV = 2
+inflection-1-gentle-inflection-before_SIZE = A5
 inflection-1-gentle-inflection-before_1SELECT = wm_debug where name='inflection-1' AND stage='bbends' AND gen=1
 inflection-1-gentle-inflection-before_2SELECT = wm_debug where name='inflection-1' AND stage='bbends-polygon' AND gen=1
 inflection-1-gentle-inflection-before_2CMAP = 1
-inflection-1-gentle-inflection-after_WIDTHDIV = 2
+inflection-1-gentle-inflection-after_SIZE = A5
 inflection-1-gentle-inflection-after_1SELECT = wm_debug where name='inflection-1' AND stage='cinflections' AND gen=1
 inflection-1-gentle-inflection-after_2SELECT = wm_debug where name='inflection-1' AND stage='cinflections-polygon' AND gen=1
 inflection-1-gentle-inflection-after_2CMAP = 1
 
-fig6-selfcrossing-before_WIDTHDIV = 4
+fig6-selfcrossing-before_SIZE = A7
 fig6-selfcrossing-before_1SELECT = wm_debug where name='fig6' AND stage='bbends' AND gen=1
 fig6-selfcrossing-before_2SELECT = wm_visuals where name='fig6-baseline'
 fig6-selfcrossing-before_2LINESTYLE = dotted
 fig6-selfcrossing-before_3SELECT = wm_visuals where name='fig6-newline'
-fig6-selfcrossing-after_WIDTHDIV = 4
+fig6-selfcrossing-after_SIZE = A7
 fig6-selfcrossing-after_1SELECT = wm_debug where name='fig6' AND stage='dcrossings' AND gen=1
 
-selfcrossing-1-before_WIDTHDIV = 4
+selfcrossing-1-before_SIZE = A7
 selfcrossing-1-before_1SELECT = wm_debug where name='selfcrossing-1' AND stage='bbends' AND gen=1
 selfcrossing-1-before_2SELECT = wm_visuals where name='selfcrossing-1-baseline'
 selfcrossing-1-before_2LINESTYLE = dotted
 selfcrossing-1-before_3SELECT = wm_visuals where name='selfcrossing-1-newline'
-selfcrossing-1-after_WIDTHDIV = 4
+selfcrossing-1-after_SIZE = A7
 selfcrossing-1-after_1SELECT = wm_debug where name='selfcrossing-1' AND stage='dcrossings' AND gen=1
 selfcrossing-1-after_2SELECT = wm_debug where name='selfcrossing-1' AND stage='bbends' AND gen=1
 selfcrossing-1-after_2LINESTYLE = invisible
 
-
 .faux_test-rivers: tests-rivers.sql wm.sql .faux_db
 	./db -f $<
 	touch $@
diff --git a/layer2img.py b/layer2img.py
index 86d7364..1dda684 100644
--- a/layer2img.py
+++ b/layer2img.py
@@ -84,9 +84,10 @@ def main():
 
     rc('text', usetex=True)
     fig, ax = plt.subplots()
-    fig.set_figwidth(8.27 / args.widthdiv)
     if args.size:
         fig.set_size_inches(args.size)
+    else:
+        fig.set_figwidth(8.27 / args.widthdiv)
     if c := args.clip:
         ax.set_xlim(left=c[0], right=c[2])
         ax.set_ylim(bottom=c[1], top=c[3])
diff --git a/mj-msc.tex b/mj-msc.tex
index db282ed..fa3215a 100644
--- a/mj-msc.tex
+++ b/mj-msc.tex
@@ -32,14 +32,6 @@
 \newcommand{\MYTITLE}{Cartographic Generalization of Lines using free software (example of rivers)}
 \newcommand{\MYAUTHOR}{Motiejus Jakštys}
 
-\iffalse
-a4: 210x297mm
-a5: 148x210mm
-a6: 105x148xmm
-a7: 74x105mm
-a8: 52x74mm
-\fi
-
 \title{\MYTITLE}
 \author{\MYAUTHOR}
 \date{\VCDescribe}