Fix bullets and sizing

2 files changed, 42 insertions, 44 deletions

diff --git a/2018Q4_pa2.tex b/2018Q4_pa2.tex
index 445f2a1..c616234 100644
--- a/2018Q4_pa2.tex
+++ b/2018Q4_pa2.tex
@@ -1,6 +1,8 @@
 \documentclass{article}
 \usepackage[T1]{fontenc}
-\usepackage[hidelinks]{hyperref}
+\usepackage[pdfauthor={Luke Hsiao},
+            pdftitle={PAII Ward 2018 Q4-at-a-Glace},
+            hidelinks]{hyperref}
 \usepackage[letterpaper,landscape,margin=0.1in,paperheight=0.5\paperheight]{geometry}
 \usepackage[utf8]{inputenc}
 \usepackage{booktabs}
@@ -23,12 +25,12 @@
 \definecolor{b}{RGB}{54,137,194}
 
 % Define the date highlights
-\newcommand{\ward}{\node[xshift=-1.75ex,fill=y,circle] {};}
-\newcommand{\church}{\node[xshift=-1.75ex,fill=b,circle] {};}
-\newcommand{\stake}{\node[xshift=-1.75ex,fill=g,circle] {};}
-\newcommand{\wardbullet}{\begin{tikzpicture}\node[xshift=-1.75ex,fill=y,circle,scale=0.8] {};\end{tikzpicture}}
-\newcommand{\churchbullet}{\begin{tikzpicture}\node[xshift=-1.75ex,fill=b,circle,scale=0.8] {};\end{tikzpicture}}
-\newcommand{\stakebullet}{\begin{tikzpicture}\node[xshift=-1.75ex,fill=g,circle,scale=0.8] {};\end{tikzpicture}}
+\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{\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}}
 
 \begin{document}
   \title{\vspace{-0.8cm}Palo Alto 2nd Ward 2018 Q4-at-a-Glance\vspace{-1.2cm}}
@@ -154,9 +156,9 @@
 \end{minipage}
 \begin{center}
   \begin{tabular}{llll}
-    \begin{tikzpicture}\ward\end{tikzpicture} Palo Alto 2nd Ward Events &
-    \begin{tikzpicture}\stake\end{tikzpicture} Menlo Park Stake Events &
-    \begin{tikzpicture}\church\end{tikzpicture} Church-wide Events \\
+    \wardbullet~Palo Alto 2nd Ward Events &
+    \stakebullet~Menlo Park Stake Events &
+    \churchbullet~Church-wide Events \\
   \end{tabular}
   \vfill
   Find the full, up-to-date calendar at
diff --git a/pa2cal.tex b/pa2cal.tex
index 19d90a1..7a11989 100644
--- a/pa2cal.tex
+++ b/pa2cal.tex
@@ -1,6 +1,9 @@
 \documentclass{article}
-\usepackage[hidelinks]{hyperref}
-\usepackage[letterpaper,margin=0.3in]{geometry}
+\usepackage[T1]{fontenc}
+\usepackage[pdfauthor={Luke Hsiao},
+            pdftitle={PAII Ward 2018 Q4-at-a-Glace},
+            hidelinks]{hyperref}
+\usepackage[letterpaper,margin=0.1in]{geometry}
 \usepackage[utf8]{inputenc}
 \usepackage{booktabs}
 \usepackage{enumitem}
@@ -12,16 +15,22 @@
 \usetikzlibrary{shapes.geometric}
 % \usepackage{xcolor}
 % \selectcolormodel{gray}
-\renewcommand{\rmdefault}{cmss}
+\usepackage{draftwatermark}
+\SetWatermarkText{\textsc{Draft}}
+\SetWatermarkScale{5}
+
+\renewcommand{\familydefault}{\sfdefault}
 \definecolor{y}{RGB}{227,238,167}
 \definecolor{g}{RGB}{127,205,187}
 \definecolor{b}{RGB}{54,137,194}
 
 % Define the date highlights
-\newcommand{\ward}{\node[fill=y,circle] {};}
-\newcommand{\church}{\node[fill=b,circle] {};}
-\newcommand{\stake}{\node[fill=g,circle] {};}
-\newcommand{\orangedot}{\node[fill=green!70,circle] {};}
+\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{\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}}
 
 
 \begin{document}
@@ -33,15 +42,6 @@
   \thispagestyle{empty} % Remove page numbers and headers
   \makeatletter
 
-  % This way you can define your own conditions, for example, you
-  % could make something as `full moon', `even week', `odd week',
-  % et cetera. In principle. The math in TeX could be hard.
-  \pgfkeys{/pgf/calendar/start of year/.code={%
-      \ifnum\pgfcalendarifdateday=1\relax%
-          \ifnum\pgfcalendarifdatemonth=1\relax\pgfcalendarmatchestrue\fi%
-      \fi%
-  }}%
-
   % Define our own style
   \tikzstyle{week list sunday}=[
       % Note that we cannot extend from week list,
@@ -82,7 +82,7 @@
 
   \makeatother
 
-\begin{minipage}{0.28\linewidth}
+\begin{minipage}[h]{0.28\linewidth}
   % The actual calendar is now rather easy:
   \begin{tikzpicture}[every calendar/.style={
       month label left,
@@ -91,7 +91,7 @@
       if={(Sunday) [blue!100]},
       week list sunday,
     },
-    every day/.style={anchor=base},
+    % 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] {
@@ -116,28 +116,24 @@
   \end{tikzpicture}
 
 \end{minipage}
-\begin{minipage}[t]{0.65\linewidth}
+\begin{minipage}[h]{0.65\linewidth}
 \subsection*{Important Dates}
-\begin{itemize}[itemsep=1pt]
-  \item[\begin{tikzpicture}\ward\end{tikzpicture}] Mar 30: Easter Breakfast at
-    Foothills Park
-  \item[\begin{tikzpicture}\church\end{tikzpicture}] Apr 6--7: General Conference
-  \item[\begin{tikzpicture}\ward\end{tikzpicture}] May 3--4: Fathers \& Kids
-    Campout at Foothills Park
-  \item[\begin{tikzpicture}\ward\end{tikzpicture}] Jul 4: 4th of July Breakfast
-  \item[\begin{tikzpicture}\church\end{tikzpicture}] Oct 5--6: General Conference
-  \item[\begin{tikzpicture}\ward\end{tikzpicture}] Oct 11--12: Annual Ward
-    Campout at Huddart Park
-  \item[\begin{tikzpicture}\stake\end{tikzpicture}] Nov 30--Dec 4: Christmas
-    Crèche Exhibit
+\begin{itemize}[leftmargin=0.5cm,itemsep=1pt]
+  \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
+  \item[\wardbullet] Jul 4: 4th of July Breakfast
+  \item[\churchbullet] Oct 5--6: General Conference
+  \item[\wardbullet] Oct 11--12: Annual Ward Campout at Huddart Park
+  \item[\stakebullet] Nov 30--Dec 4: Christmas Crèche Exhibit
 \end{itemize}
 \end{minipage}
 
   \begin{center}
     \begin{tabular}{llll}
-      \begin{tikzpicture}\ward\end{tikzpicture} Palo Alto 2nd Ward Events &
-      \begin{tikzpicture}\stake\end{tikzpicture} Menlo Park Stake Events &
-      \begin{tikzpicture}\church\end{tikzpicture} Church-wide Events \\
+      \wardbullet~Palo Alto 2nd Ward Events &
+      \stakebullet~Menlo Park Stake Events &
+      \churchbullet~Church-wide Events \\
     \end{tabular}
 
     \vspace{0.5em}