several cleanup steps

- fully incorporated back sayamindu's stuff for dealing with encrypted
  signatures files (not a bad idea!)

- removed an old uw-header file from a previous version

diff --git a/.gitignore b/.gitignore
index c77fc3b53d6888286b62908e7e27d3016d47ca3b..f05e9ec744f2909dfcdb9f0902b3bfc05b7c8aec 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 ## files from here
 *.pdf
 ## files from here
 *.pdf

-figures/signature.png
+figures/signature.pdf

 
 ## From: https://github.com/github/gitignore/blob/master/TeX.gitignore
 ## Core latex/pdflatex auxiliary files:
 
 ## From: https://github.com/github/gitignore/blob/master/TeX.gitignore
 ## Core latex/pdflatex auxiliary files:

diff --git a/Makefile b/Makefile
index 1211cf32d878da70a2ead061d231718001bcf3cb..3441f9b31bb223fde9275b481df9440ccbe075f1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,24 @@
 #!/usr/bin/make
 #!/usr/bin/make

-.RECIPEPREFIX +=
-SIGIMAGE = figures/signature.png.gpg

 
 

-all: $(patsubst %.tex,%.pdf,$(wildcard *.tex)) 
+ENC_SIGIMAGE = figures/signature.pdf.gpg
+DEC_SIGIMAGE = figures/signature.pdf

 
 

-%.pdf: update-sig %.tex 
-       latexmk -f -xelatex $<
+all: figures/signature.pdf $(patsubst %.tex,%.pdf,$(wildcard *.tex))
+
+figures/signature.pdf:
+       gpg --yes --output $(DEC_SIGIMAGE) --decrypt $(ENC_SIGIMAGE)

 
 

-<update-sig:
-    gpg --yes --output figures/signature.png --decrypt $(SIGIMAGE)
+%.pdf: %.tex
+       latexmk -f -xelatex $<

 
 

-clean: 
+clean:

        latexmk -C *.tex
        $(RM) -f *.tmp *.run.xml
        latexmk -C *.tex
        $(RM) -f *.tmp *.run.xml

-       $(RM) -f figures/signature.png
+       $(RM) -f $(DEC_SIGIMAGE)

 
 viewpdf: all
        evince *.pdf
 
 pdf: all
 
 
 viewpdf: all
        evince *.pdf
 
 pdf: all
 

-.PHONY: clean all
+.PHONY: clean all update-sig

diff --git a/figures/fake-signature.pdf b/figures/fake-signature.pdf
deleted file mode 100644 (file)
index b76d285..0000000
Binary files a/figures/fake-signature.pdf and /dev/null differ

diff --git a/figures/signature.pdf.gpg b/figures/signature.pdf.gpg
new file mode 100644 (file)
index 0000000..0903831
Binary files /dev/null and b/figures/signature.pdf.gpg differ

diff --git a/figures/signature.png.gpg b/figures/signature.png.gpg
deleted file mode 100644 (file)
index ad18b06..0000000
Binary files a/figures/signature.png.gpg and /dev/null differ

diff --git a/figures/uw-header.pdf b/figures/uw-header.pdf
deleted file mode 100644 (file)
index b524256..0000000
Binary files a/figures/uw-header.pdf and /dev/null differ

diff --git a/washington_letterhead_letter-matrix-deptartment.tex b/washington_letterhead_letter-matrix-deptartment.tex
index 1508150fa0ed479a9cbd80e3b790a07089331294..464f1fabcdb9eb7c3d9864db2e71c9ae6dd86b5e 100644 (file)
--- a/washington_letterhead_letter-matrix-deptartment.tex
+++ b/washington_letterhead_letter-matrix-deptartment.tex
@@ -119,7 +119,7 @@ Sed ullamcorper morbi tincidunt ornare massa eget egestas purus. Feugiat pretium
 
 Sincerely,
 
 
 Sincerely,
 

-\includegraphics[width=2.2in]{figures/fake-signature.pdf}\\
+\includegraphics[width=1.7in]{figures/signature.pdf}\\

 John Hancock\\
 Assistant Professor of Communication\\
 Adjunct Assistant Professor of Human-Centered Design and Engineering
 John Hancock\\
 Assistant Professor of Communication\\
 Adjunct Assistant Professor of Human-Centered Design and Engineering