Polish node spacing

2 files changed, 61 insertions, 56 deletions

diff --git a/2018Q4_pa2.tex b/2018Q4_pa2.tex
index c616234..ca5adca 100644
--- a/2018Q4_pa2.tex
+++ b/2018Q4_pa2.tex
@@ -16,8 +16,11 @@
 % \usepackage{xcolor}
 % \selectcolormodel{gray}
 \usepackage{draftwatermark}
-\SetWatermarkText{\textsc{Draft}}
-\SetWatermarkScale{3}
+\SetWatermarkText{\textbf{Draft: \today}}
+\SetWatermarkHorCenter{0.5cm}
+\SetWatermarkVerCenter{4cm}
+\SetWatermarkAngle{90}
+\SetWatermarkFontSize{16pt}
 
 \renewcommand{\familydefault}{\sfdefault}
 \definecolor{y}{RGB}{227,238,167}
@@ -25,9 +28,9 @@
 \definecolor{b}{RGB}{54,137,194}
 
 % Define the date highlights
-\newcommand{\ward}{\node[xshift=-2ex,fill=y,circle] {};}
-\newcommand{\church}{\node[xshift=-2ex,fill=b,circle] {};}
-\newcommand{\stake}{\node[xshift=-2ex,fill=g,circle] {};}
+\newcommand{\ward}{\node[xshift=-1.9ex,fill=y,circle] {};}
+\newcommand{\church}{\node[xshift=-1.9ex,fill=b,circle] {};}
+\newcommand{\stake}{\node[xshift=-1.9ex,fill=g,circle] {};}
 \newcommand{\wardbullet}{\begin{tikzpicture}\node[fill=y,circle,scale=0.8] {};\end{tikzpicture}}
 \newcommand{\churchbullet}{\begin{tikzpicture}\node[fill=b,circle,scale=0.8] {};\end{tikzpicture}}
 \newcommand{\stakebullet}{\begin{tikzpicture}\node[fill=g,circle,scale=0.8] {};\end{tikzpicture}}
@@ -69,13 +72,12 @@
       \pgftransformxshift{\pgf@x}
     },
     execute after day scope={
-      % Week is done, shift to the next line.
+      % Shift to the next line at the end of the week.
       \ifdate{Saturday}{
         \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
         \pgftransformyshift{-\pgf@y}
       }{}%
     },
-    % This should be defined, glancing from the source code.
     tikz@lib@cal@width=7
   ]
 
@@ -127,14 +129,13 @@
     ; \\
   };
   \end{tikzpicture}
-  \vspace{3ex}
 \end{minipage}
 \begin{minipage}[h]{0.37\paperheight}
   \subsection*{Important Dates}
   \begin{itemize}[leftmargin=0.5cm,itemsep=2pt]
     \item[\churchbullet] Sep 9: Face to Face for young adults with Elder Quintin
       L. Cook
-    \item[\wardbullet] Sep 19: Young Womens Mother \& Daughter Service Project
+    \item[\wardbullet] Sep 19: YW Mother \& Daughter Service Project
     \item[\wardbullet] Sep 22: Relief Society Fall Dinner \& Social
     \item[\wardbullet] Sep 30: Primary Program in Sacrament Meeting
     \item[\churchbullet] Oct 6--7: General Conference
@@ -147,12 +148,13 @@
     \item[\wardbullet] Nov 17: Combined YM/YW Service Project w/ Muslim Association
     \item[\stakebullet] Dec 1--Dec 5: Christmas Crèche Exhibit
     \item[\churchbullet] Dec 2: First Presidency Christmas Devotional \& Youth Crèche Sunday
+    \item[\stakebullet] Dec 5: Laurels \& Priest Stake Caroling Activity
     \item[\wardbullet] Dec 14: PAII Ward Christmas Party
-    \item[\wardbullet] Dec 15: Young Womens San Fransisco Activity
+    \item[\wardbullet] Dec 15: YM/YW San Francisco Activity
     \item[\wardbullet] Dec 18: Relief Society Dinner
     \item[\wardbullet] Dec 23: Christmas Program
   \end{itemize}
-  \vspace{0.6cm}
+  \vspace{1ex}
 \end{minipage}
 \begin{center}
   \begin{tabular}{llll}
diff --git a/pa2cal.tex b/pa2cal.tex
index 997fbed..09022b8 100644
--- a/pa2cal.tex
+++ b/pa2cal.tex
@@ -28,9 +28,9 @@
 \definecolor{b}{RGB}{54,137,194}
 
 % Define the date highlights
-\newcommand{\ward}{\node[xshift=-2ex,fill=y,circle] {};}
-\newcommand{\church}{\node[xshift=-2ex,fill=b,circle] {};}
-\newcommand{\stake}{\node[xshift=-2ex,fill=g,circle] {};}
+\newcommand{\ward}{\node[xshift=-1.95ex,fill=y,circle] {};}
+\newcommand{\church}{\node[xshift=-1.95ex,fill=b,circle] {};}
+\newcommand{\stake}{\node[xshift=-1.95ex,fill=g,circle] {};}
 \newcommand{\wardbullet}{\begin{tikzpicture}\node[fill=y,circle,scale=0.8] {};\end{tikzpicture}}
 \newcommand{\churchbullet}{\begin{tikzpicture}\node[fill=b,circle,scale=0.8] {};\end{tikzpicture}}
 \newcommand{\stakebullet}{\begin{tikzpicture}\node[fill=g,circle,scale=0.8] {};\end{tikzpicture}}
@@ -47,40 +47,39 @@
 
   % Define our own style
   \tikzstyle{week list sunday}=[
-      % Note that we cannot extend from week list,
-      % the execute before day scope is cumulative
-      execute before day scope={%
-             \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}{
-             % On first of month, except when first date in calendar.
-                 \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@month@yshift}%
-                 \pgftransformyshift{-\pgf@y}
-             }}{}%
-      },
-      execute at begin day scope={%
-          % Because for TikZ Monday is 0 and Sunday is 6,
-          % we can't directly use \pgfcalendercurrentweekday,
-          % but instead we define \c@pgf@counta (basically) as:
-          % (\pgfcalendercurrentweekday + 1) % 7
-          \pgfmathsetlength\pgf@x{\tikz@lib@cal@xshift}%
-          \ifnum\pgfcalendarcurrentweekday=6
-              \c@pgf@counta=0
-          \else
-              \c@pgf@counta=\pgfcalendarcurrentweekday
-              \advance\c@pgf@counta by 1
-          \fi
-          \pgf@x=\c@pgf@counta\pgf@x
-          % Shift to the right position for the day.
-          \pgftransformxshift{\pgf@x}
-      },
-      execute after day scope={
-          % Week is done, shift to the next line.
-          \ifdate{Saturday}{
-              \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
-              \pgftransformyshift{-\pgf@y}
-          }{}%
-      },
-      % This should be defined, glancing from the source code.
-      tikz@lib@cal@width=7
+    % Note that we cannot extend from week list,
+    % the execute before day scope is cumulative
+    execute before day scope={%
+      \ifdate{day of month=1}{\ifdate{equals=\pgfcalendarbeginiso}{}{
+      % On first of month, except when first date in calendar.
+        \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@month@yshift}%
+        \pgftransformyshift{-\pgf@y}
+      }}{}%
+    },
+    execute at begin day scope={%
+      % Because for TikZ Monday is 0 and Sunday is 6,
+      % we can't directly use \pgfcalendercurrentweekday,
+      % but instead we define \c@pgf@counta (basically) as:
+      % (\pgfcalendercurrentweekday + 1) % 7
+      \pgfmathsetlength\pgf@x{\tikz@lib@cal@xshift}%
+      \ifnum\pgfcalendarcurrentweekday=6
+        \c@pgf@counta=0
+      \else
+        \c@pgf@counta=\pgfcalendarcurrentweekday
+        \advance\c@pgf@counta by 1
+      \fi
+      \pgf@x=\c@pgf@counta\pgf@x
+      % Shift to the right position for the day.
+      \pgftransformxshift{\pgf@x}
+    },
+    execute after day scope={
+      % Shift to the next line at the end of the week.
+      \ifdate{Saturday}{
+        \pgfmathsetlength{\pgf@y}{\tikz@lib@cal@yshift}%
+        \pgftransformyshift{-\pgf@y}
+      }{}%
+    },
+    tikz@lib@cal@width=7
   ]
 
   \makeatother
@@ -88,17 +87,19 @@
 \begin{minipage}[h]{0.28\linewidth}
   % The actual calendar is now rather easy:
   \begin{tikzpicture}[every calendar/.style={
-      month label left,
-      month text={\%mt},
-      month yshift=0pt,
-      if={(Sunday) [blue!100]},
-      week list sunday,
-    },
-    % every day/.style={anchor=base},
-    day text={\%d=},rounded corners=0,anchor=base,text height=1ex,text depth=-0.5ex
+        month label left,
+        month text={\%mt},
+        month yshift=0pt,
+        if={(Sunday) [blue!100]},
+        week list sunday,
+      },
+      % every day/.style={anchor=base},
+      day text={\%d=},rounded corners=0,anchor=base,text height=1ex,text depth=-0.5ex
     ]\small
     \matrix[column sep=0em, row sep=0em] {
       \calendar[dates=2019-01-01 to 2019-12-last]
+      if (equals=2019-01-16) {\ward}% YW New Beginnings
+      if (equals=2019-03-16) {\ward}% Easter Breakfast
       if (equals=2019-03-30) {\ward}% Easter Breakfast
       if (equals=2019-05-03) {\ward}% Fathers & Kids Campout
       if (equals=2019-05-04) {\ward}%
@@ -122,6 +123,8 @@
 \begin{minipage}[h]{0.65\linewidth}
 \subsection*{Important Dates}
 \begin{itemize}[leftmargin=0.5cm,itemsep=1pt]
+  \item[\wardbullet] Jan 16: New Beginnings \& YW in Excellence
+  \item[\wardbullet] Mar 16: Relief Society Birthday Dinner \& Service Activity
   \item[\wardbullet] Mar 30: Easter Breakfast at Foothills Park
   \item[\churchbullet] Apr 6--7: General Conference
   \item[\wardbullet] May 3--4: Fathers \& Kids Campout at Foothills Park