fix #26: cannot handle utf-8 strings

mwhite · mwhite · commit 4c1daf343171 · 2014-11-17T22:57:18.000-05:00
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ html:  clean $(HTML)
 	python resume.py html $(GRAVATAR_OPTION) < $< | pandoc -t html -c resume.css -o $@
 
 %.pdf:  %.md $(LATEX_TEMPLATE)
-	python resume.py tex < $< | pandoc --template=$(LATEX_TEMPLATE) -H header.tex -o $@
+	python resume.py tex < $< | pandoc $(PANDOCARGS) --template=$(LATEX_TEMPLATE) -H header.tex -o $@
 
 ifeq ($(OS),Windows_NT)
   # on Windows
diff --git a/README.markdown b/README.markdown
@@ -2,21 +2,22 @@ This is a simple Markdown resumé template, LaTeX header, and pre-processing
 script that can be used with [Pandoc](http://johnmacfarlane.net/pandoc/) to
 create professional-looking PDF and HTML output.
 
-Dependencies
-------------
+## Dependencies
 
-* Pandoc >= 1.9 (you can adjust the Makefile to use an earlier version -- the
-  arguments format changed)
+* Pandoc >= 1.9 
 * Python >= 2.7
 * A Tex installation with pdflatex and the Tex Gyre Pagella font, and some
-  packages needed by pandoc.  On Ubuntu you can get this by installing
-  `texlive`, `texlive-latex-extra`, and `tex-gyre`.
+  packages needed by pandoc.  On Ubuntu you can get this by doing:
 
-Usage
------
+```
+sudo apt-get install texlive texlive-latex-extra tex-gyre
+```
 
-Simply run `make` to generate PDF and HTML versions of each .md file in the
-directory.
+## Usage
+
+To generate PDF and HTML versions of each .md file in the directory:
+
+    $ make
 
 In order to enable visually appealing display of contact information, the
 Markdown is passed through a Python script that looks for contact details
@@ -25,5 +26,18 @@ box at the top of the document.  Lines with bullets (•) will be treated as
 separate contact lines in the output.
 
 By default, an image of your [Gravatar](http://www.gravatar.com) will be added
-to the HTML resumé.  This feature can be disabled by setting the environment
-variable `GRAVATAR_OPTION=--no-gravatar`.
+to the HTML resumé.  To avoid this:
+
+    $ GRAVATAR_OPTION=--no-gravatar make
+
+## Unicode characters
+
+The default setup should handle most unicode characters.  If you still get
+errors (such as for Chinese characters), install XeTeX and a font that has
+glyphs for the characters you need.
+
+    $ sudo apt-get install texlive-xetex ttf-wqy-zenhei
+
+Modify `header.tex` to use the name of your preferred font, then run:
+
+    $ PANDOCARGS='--latex-engine=xelatex' make
diff --git a/header.tex b/header.tex
@@ -1,5 +1,11 @@
 \usepackage[top=.5in, bottom=.5in, left=1in, right=1in]{geometry}
 \usepackage{tgpagella}
+\ifxetex
+  \usepackage{xeCJK}
+  \setCJKmainfont{WenQuanYi Zen Hei}
+  \setmainfont[Mapping=tex-text]{TeXGyrePagella}
+\fi
+
 \usepackage{titlesec}
 \titleformat{\section}{\huge\bfseries}{\thesection}{1em}{}
 \titlespacing{\section}{0pt}{0pt}{1em}
diff --git a/pandoc-templates b/pandoc-templates
@@ -1 +1 @@
-Subproject commit a8fd250b9f5edf9d90da36525ec93792d0968b08
+Subproject commit f64b73260c0ad78e637f6042673b53b12da24ffd
diff --git a/resume.html b/resume.html
@@ -5,13 +5,14 @@
   <meta http-equiv="Content-Style-Type" content="text/css" />
   <meta name="generator" content="pandoc" />
   <title></title>
+  <style type="text/css">code{white-space: pre;}</style>
   <link rel="stylesheet" href="resume.css" type="text/css" />
 </head>
 <body>
 <div id='container'><div id='contact'><p>
 <a href="https://raw.github.com/mwhite/resume/master/resume.md">Markdown</a> -&gt; <a href="https://raw.github.com/mwhite/resume/master/resume.pdf">PDF</a>, <a href="http://mwhite.github.com/resume">HTML</a>, and more
 </p><p>
-<a href="http://github.com/mwhite/resume"><code class="url">http://github.com/mwhite/resume</code></a>
+<a href="http://github.com/mwhite/resume">http://github.com/mwhite/resume</a>
 </p></div>
 <div>
 <h1 id="markdown-resumé">Markdown Resumé</h1>
@@ -61,6 +62,5 @@ <h2 id="skills">Skills</h2>
 <li><p>Familiar with GNU Make, bash</p></li>
 </ul>
 </div>
-
 </body>
 </html>
diff --git a/resume.pdf b/resume.pdf
