From b177f07d410814ca584e12b0287531e8b33a97ae Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Mon, 19 Apr 2021 01:13:00 +0200
Subject: [PATCH] Update setupfile, better handling of LaTeX headers

All `html_head_extra's are replaced with `html_head's since they have
the same effect.

LaTeX headers are now handled in a separate file for easier handling of
the LaTeX code.
---
 content/headers     | 68 +++++++++++++++++++--------------------------
 content/headers.tex | 14 ++++++++++
 2 files changed, 43 insertions(+), 39 deletions(-)
 create mode 100644 content/headers.tex

diff --git a/content/headers b/content/headers
index 38cc58b..e84c0f5 100644
--- a/content/headers
+++ b/content/headers
@@ -14,48 +14,38 @@
 
 # ### LaTeX ####################################################################
 
-#+latex_class: conlang
-#+latex_class_options: [a4paper,twoside]
-#+latex_header:        \usepackage{xltxtra}
-#+latex_header:        \usepackage[total={17cm,24cm}]{geometry}
-#+latex_header:        \usepackage{newunicodechar}
-#+latex_header:        \usepackage{xcolor}
-#+latex_header:        \usepackage{hyperref}
-#+latex_header:        \usepackage{indentfirst}
-#+latex_header:        \usepackage{enumitem}
-#+latex_header:        \setmainfont{Charis SIL}
-#+latex_header:        \newunicodechar{’}{'}
-#+latex_header:        \newunicodechar{…}{\ldots}
-#+latex_header:        \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
+#+latex_class:         conlang
+#+latex_class_options: [a4paper,twoside,french]
+#+latex_header:        \input{headers.tex}
 
 # ### HTML #####################################################################
 
-#+html_doctype:    html5
-#+html_head_extra: <meta property="og:image" content="https://cdn.phundrak.com/img/rich_preview.png" />
-#+html_head_extra: <meta name="twitter:card" content="summary" />
-#+html_head_extra: <meta name="twitter:site" content="@phundrak" />
-#+html_head_extra: <meta name="twitter:creator" content="@phundrak" />
-#+html_head_extra: <link rel="stylesheet" href="/style/main.css"/>
-#+html_head_extra: <link rel="shortcut icon" href="/img/icon.png" type="img/png" media="screen" />
-#+html_head_extra: <link rel="shortcut icon" href="https://cdn.phundrak.com/img/favicon.ico" type="image/x-icon" media="screen" />
-#+html_head_extra: <link rel="shortcut icon" href="/img/icon.png" type="img/png" media="screen" />
-#+html_head_extra: <link rel="apple-touch-icon" href="/img/icon.png" />
-#+html_head_extra: <script defer src="/dart/main.dart.js"></script>
-#+html_head_extra: <!-- Matomo -->
-#+html_head_extra: <script type="text/javascript">
-#+html_head_extra:  var _paq = window._paq || [];
-#+html_head_extra:  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-#+html_head_extra:  _paq.push(['trackPageView']);
-#+html_head_extra:  _paq.push(['enableLinkTracking']);
-#+html_head_extra:  (function() {
-#+html_head_extra:      var u="//matomo.phundrak.com/";
-#+html_head_extra:      _paq.push(['setTrackerUrl', u+'matomo.php']);
-#+html_head_extra:      _paq.push(['setSiteId', '3']);
-#+html_head_extra:      var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-#+html_head_extra:      g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
-#+html_head_extra:  })();
-#+html_head_extra: </script>
-#+html_head_extra: <!-- End Matomo Code -->
+#+html_doctype: html5
+#+html_head:    <meta property="og:image" content="https://cdn.phundrak.com/img/rich_preview.png" />
+#+html_head:    <meta name="twitter:card" content="summary" />
+#+html_head:    <meta name="twitter:site" content="@phundrak" />
+#+html_head:    <meta name="twitter:creator" content="@phundrak" />
+#+html_head:    <link rel="stylesheet" href="/style/main.css"/>
+#+html_head:    <link rel="shortcut icon" href="/img/icon.png" type="img/png" media="screen" />
+#+html_head:    <link rel="shortcut icon" href="https://cdn.phundrak.com/img/favicon.ico" type="image/x-icon" media="screen" />
+#+html_head:    <link rel="shortcut icon" href="/img/icon.png" type="img/png" media="screen" />
+#+html_head:    <link rel="apple-touch-icon" href="/img/icon.png" />
+#+html_head:    <script defer src="/dart/main.dart.js"></script>
+#+html_head:    <!-- Matomo -->
+#+html_head:    <script type="text/javascript">
+#+html_head:     var _paq = window._paq || [];
+#+html_head:     /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+#+html_head:     _paq.push(['trackPageView']);
+#+html_head:     _paq.push(['enableLinkTracking']);
+#+html_head:     (function() {
+#+html_head:         var u="//matomo.phundrak.com/";
+#+html_head:         _paq.push(['setTrackerUrl', u+'matomo.php']);
+#+html_head:         _paq.push(['setSiteId', '3']);
+#+html_head:         var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+#+html_head:         g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+#+html_head:     })();
+#+html_head:    </script>
+#+html_head:    <!-- End Matomo Code -->
 
 # ### EPUB #####################################################################
 #+publisher: Lucien Cartier-Tilet
diff --git a/content/headers.tex b/content/headers.tex
new file mode 100644
index 0000000..a4aa387
--- /dev/null
+++ b/content/headers.tex
@@ -0,0 +1,14 @@
+% LaTeX headers
+\usepackage[total={17cm,24cm}]{geometry}
+\usepackage{xltxtra}
+\setmainfont{Charis SIL}
+\usepackage{indentfirst}
+\usepackage{enumitem}
+\usepackage{hyperref}
+\usepackage{xcolor}
+\hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
+\usepackage{newunicodechar}
+\newunicodechar{’}{'}
+\newunicodechar{…}{\ldots}
+\newunicodechar{ }{~}
+\newunicodechar{ }{~}
\ No newline at end of file