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.
This commit is contained in:
Lucien Cartier-Tilet 2021-04-19 01:13:00 +02:00
parent 9ff59c31d4
commit b177f07d41
Signed by: phundrak
GPG Key ID: BD7789E705CB8DCA
2 changed files with 43 additions and 39 deletions

View File

@ -15,47 +15,37 @@
# ### LaTeX #################################################################### # ### LaTeX ####################################################################
#+latex_class: conlang #+latex_class: conlang
#+latex_class_options: [a4paper,twoside] #+latex_class_options: [a4paper,twoside,french]
#+latex_header: \usepackage{xltxtra} #+latex_header: \input{headers.tex}
#+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}}
# ### HTML ##################################################################### # ### HTML #####################################################################
#+html_doctype: html5 #+html_doctype: html5
#+html_head_extra: <meta property="og:image" content="https://cdn.phundrak.com/img/rich_preview.png" /> #+html_head: <meta property="og:image" content="https://cdn.phundrak.com/img/rich_preview.png" />
#+html_head_extra: <meta name="twitter:card" content="summary" /> #+html_head: <meta name="twitter:card" content="summary" />
#+html_head_extra: <meta name="twitter:site" content="@phundrak" /> #+html_head: <meta name="twitter:site" content="@phundrak" />
#+html_head_extra: <meta name="twitter:creator" content="@phundrak" /> #+html_head: <meta name="twitter:creator" content="@phundrak" />
#+html_head_extra: <link rel="stylesheet" href="/style/main.css"/> #+html_head: <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: <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: <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: <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: <link rel="apple-touch-icon" href="/img/icon.png" />
#+html_head_extra: <script defer src="/dart/main.dart.js"></script> #+html_head: <script defer src="/dart/main.dart.js"></script>
#+html_head_extra: <!-- Matomo --> #+html_head: <!-- Matomo -->
#+html_head_extra: <script type="text/javascript"> #+html_head: <script type="text/javascript">
#+html_head_extra: var _paq = window._paq || []; #+html_head: var _paq = window._paq || [];
#+html_head_extra: /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ #+html_head: /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
#+html_head_extra: _paq.push(['trackPageView']); #+html_head: _paq.push(['trackPageView']);
#+html_head_extra: _paq.push(['enableLinkTracking']); #+html_head: _paq.push(['enableLinkTracking']);
#+html_head_extra: (function() { #+html_head: (function() {
#+html_head_extra: var u="//matomo.phundrak.com/"; #+html_head: var u="//matomo.phundrak.com/";
#+html_head_extra: _paq.push(['setTrackerUrl', u+'matomo.php']); #+html_head: _paq.push(['setTrackerUrl', u+'matomo.php']);
#+html_head_extra: _paq.push(['setSiteId', '3']); #+html_head: _paq.push(['setSiteId', '3']);
#+html_head_extra: var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; #+html_head: 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: 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: })();
#+html_head_extra: </script> #+html_head: </script>
#+html_head_extra: <!-- End Matomo Code --> #+html_head: <!-- End Matomo Code -->
# ### EPUB ##################################################################### # ### EPUB #####################################################################
#+publisher: Lucien Cartier-Tilet #+publisher: Lucien Cartier-Tilet

14
content/headers.tex Normal file
View File

@ -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{}{~}