From 72f746b155000a403a0cfd9e50b624a93290041a Mon Sep 17 00:00:00 2001 From: Cian Bagshaw Date: Thu, 26 Jun 2025 16:19:34 +0100 Subject: [PATCH] Removed some magic numbers --- cv.tmac | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/cv.tmac b/cv.tmac index aba505b..f5cc95d 100644 --- a/cv.tmac +++ b/cv.tmac @@ -2,6 +2,12 @@ .ps 12 .vs 13 . +.ds PIC_WIDTH 2i +.ds PIC_HEIGHT 2i +.ds PIC_NAME profile.pdf +. +.ds FIG_PAD 1.2m \" figure padding +. .aln VERT_POS nl .de EXEC \\$^ @@ -10,10 +16,10 @@ .de LEFT_RULE . br . nr RULE_TOP \\n[VERT_POS] -. in +.5m +. in +1n .. .de LEFT_RULE_END -. in -.5m +. in -1n . nr RULE_HEIGHT (\\n[VERT_POS] - \\n[RULE_TOP]) . sp -1 . EXEC \L'-\\n[RULE_HEIGHT]u' @@ -21,10 +27,10 @@ .. .de HEADER . nr HEADER_TOP \\n[VERT_POS] -. device pdf: pdfpic \\$2 -L 2i -. in +2.2i +. device pdf: pdfpic \\*[PIC_NAME] -L \\*[PIC_WIDTH] +. in +(\\*[PIC_WIDTH] + \\*[FIG_PAD]) . sp 1.3 -. EXEC \s[40]\\$1\s[] +. EXEC \s[40]\\$^\s[] . sp 0.3 . ps 15 . EXEC \fICurriculum Vitae\fP @@ -35,8 +41,8 @@ .de HEADER_END . LEFT_RULE_END . ps -. in -2.2i -. sp (\\n[HEADER_TOP]u + 2i + 1v - \\n[VERT_POS]u) +. in -(\\*[PIC_WIDTH] + \\*[FIG_PAD]) +. sp (\\n[HEADER_TOP]u + \\*[PIC_HEIGHT] + 1v - \\n[VERT_POS]u) .. .de INFO . ta T 0.7i @@ -56,7 +62,7 @@ . nr COL_NUM (\\n[ITEM_NUM] / \\n[MAX_ROWS]) . nr ITEM_NUM (\\n[ITEM_NUM] + 1) . nr INDENT (\\n[COL_NUM] * \\n[COL_WIDTH]) -. ti +(\\n[INDENT] + 1.2) +. ti +(\\n[INDENT] + \\*[FIG_PAD]) . EXEC \(bu \\$^ . sp .3 . if ( (\\n[ITEM_NUM] % \\n[MAX_ROWS]) = 0 ) \ @@ -74,8 +80,8 @@ .. .de TIMELINE_DATE . sp .5 -. in +1.2 -. ll -1.2 +. in +\\*[FIG_PAD] +. ll -\\*[FIG_PAD] . EXEC \fI\\$1 \- \\$2\fP . in +1i . sp -1 @@ -86,8 +92,8 @@ .. .de TIMELINE_DATE_END . LEFT_RULE_END -. in -1i+1.2 -. ll +1.2 +. in -(1i + \\*[FIG_PAD]) +. ll +\\*[FIG_PAD] .. .de FOOTER ' sp -- 2.20.1