From 8e071714ebdab7e7b990d4598da0bffc79e6176d Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Sat, 18 Jul 2020 15:39:00 +0200
Subject: [PATCH] Lowercase Org options, change link to main website, add
 Matomo headers

---
 content/eittland.org   | 26 ++++++-------
 content/en/nyqy.org    |  5 ++-
 content/headers        | 85 ++++++++++++++++++++++++++----------------
 content/matter.org     |  4 +-
 content/proto-nyqy.org | 27 +++++++-------
 content/proto-taso.org |  4 +-
 6 files changed, 84 insertions(+), 67 deletions(-)

diff --git a/content/eittland.org b/content/eittland.org
index 6ecaff0..eaafd97 100644
--- a/content/eittland.org
+++ b/content/eittland.org
@@ -1,18 +1,16 @@
 # -*- org-confirm-babel-evaluate: nil -*-
-#+TITLE: Eittlandais
-#+LANGUAGE: fr
-#+HTML_HEAD: <meta name="description" content="Grammaire détaillée de l’Eittlandais" />
-#+HTML_HEAD: <meta property="og:title" content="Grammaire de l’Eittlandais" />
-#+HTML_HEAD: <meta property="og:description" content="Grammaire détaillée de l’idéolangue Eittlandaise" />
-#+LATEX_HEADER: \usepackage{allrunes}
-#+INCLUDE: headers
-#+MACRO: rune-manual @@latex:\textara{$1}@@@@html:$2@@
-#+MACRO: rune (eval (conlanging/eittlanda-org-export-runes $1))
-#+STARTUP: content
-#+STARTUP: shrink
-#+KEYWORDS: eittland eittlande einnland einnlande nordique viking islande norrois
-#+OPTIONS: auto-id:t
-#+UID: https://langue.phundrak.com/eittland
+#+setupfile: headers
+#+title: Eittlandais
+#+html_head: <meta name="description" content="Grammaire détaillée de l’Eittlandais" />
+#+html_head: <meta property="og:title" content="Grammaire de l’Eittlandais" />
+#+html_head: <meta property="og:description" content="Grammaire détaillée de l’idéolangue Eittlandaise" />
+#+latex_header: \usepackage{allrunes}
+#+macro: rune-manual @@latex:\textara{$1}@@@@html:$2@@
+#+macro: rune (eval (conlanging/eittlanda-org-export-runes $1))
+#+keywords: eittland eittlande einnland einnlande nordique viking islande norrois
+#+options: auto-id:t
+#+uid: https://langue.phundrak.com/eittland
+#+startup: content
 
 * Propos préliminaires
   :PROPERTIES:
diff --git a/content/en/nyqy.org b/content/en/nyqy.org
index 10f40ba..8e530f7 100644
--- a/content/en/nyqy.org
+++ b/content/en/nyqy.org
@@ -8,6 +8,7 @@
 #+HTML_HEAD_EXTRA: <link rel="stylesheet" href="../css/nyqy.css"/>
 #+OPTIONS: auto-id:t
 #+MACRO: nyqy (eval (conlanging/nyqy-to-phonetics $1))
+#+startup: content
 
 # To be used at https://jasontank.net/wordgen.html
 #+NAME: wordgen-backup
@@ -1288,8 +1289,8 @@ with a base 12 system, except for its units.
 
 [fn:3] [[https://www.internationalphoneticassociation.org/content/ipa-chart]]
 
-[fn:2] [[https://phundrak.fr]]
+[fn:2] [[https://phundrak.com]]
 
-[fn:1] https://langue.phundrak.fr
+[fn:1] https://langue.phundrak.com
 
 #  LocalWords:  Rhete né Hje lpel neography Ňy Qy proto
diff --git a/content/headers b/content/headers
index d825863..19983df 100644
--- a/content/headers
+++ b/content/headers
@@ -6,46 +6,65 @@
 
 # ### ORG OPTIONS ##############################################################
 
-#+OPTIONS: H:4 broken_links:mark email:t ^:{} tex:dvisvgm
-#+KEYWORDS: conlang idéolangue langue langues linguistique phundrak drakpa
+#+options: H:4 broken_links:mark email:t ^:{} tex:dvisvgm
+#+keywords: conlang idéolangue langue langues linguistique phundrak drakpa
 
 # ### LaTeX ####################################################################
 
-#+LATEX_CLASS: conlang
-#+LaTeX_CLASS_OPTIONS: [a4paper,twoside]
-#+LATEX_HEADER_EXTRA: \usepackage{xltxtra}
-#+LATEX_HEADER_EXTRA: \usepackage[total={17cm,24cm}]{geometry}
-#+LATEX_HEADER_EXTRA: \setmainfont{Charis SIL}
-#+LATEX_HEADER_EXTRA: \usepackage{newunicodechar}
-#+LATEX_HEADER_EXTRA: \newunicodechar{’}{'}
-#+LATEX_HEADER_EXTRA: \newunicodechar{…}{...}
-#+LATEX_HEADER_EXTRA: \usepackage{xcolor}
-#+LATEX_HEADER_EXTRA: \usepackage{hyperref}
-#+LATEX_HEADER_EXTRA: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
-#+LATEX_HEADER_EXTRA: \usepackage{indentfirst}
+#+latex_class: conlang
+#+latex_class_options: [a4paper,twoside]
+#+latex_header_extra: \usepackage{xltxtra}
+#+latex_header_extra: \usepackage[total={17cm,24cm}]{geometry}
+#+latex_header_extra: \usepackage{newunicodechar}
+#+latex_header_extra: \usepackage{xcolor}
+#+latex_header_extra: \usepackage{hyperref}
+#+latex_header_extra: \usepackage{indentfirst}
+#+latex_header_extra: \usepackage{enumitem}
+#+latex_header_extra: \setmainfont{Charis SIL}
+#+latex_header_extra: \newunicodechar{’}{'}
+#+latex_header_extra: \newunicodechar{…}{\ldots}
+#+latex_header_extra: \hypersetup{colorlinks=true,linkbordercolor=red,linkcolor=blue,pdfborderstyle={/S/U/W 1}}
+
 
 # ### 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/style.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_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/style.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 -->
 
 # ### EPUB #####################################################################
-#+PUBLISHER: Lucien Cartier-Tilet
+#+publisher: Lucien Cartier-Tilet
 
 # ### MACROS ###################################################################
-#+MACRO: newline @@latex:\hspace{0pt}\\@@ @@html:<br>@@
-#+MACRO: newpage @@latex:\newpage@@
-#+MACRO: latex-html @@latex:$1@@@@html:$2@@
-#+MACRO: phon @@latex:/$1/@@@@html:/$1/@@@@ascii:/$1/@@
-#+MACRO: v @@latex:\rotatebox[origin=c]{270}{$1}@@@@html:<span class=vertical>$1</span>@@
-#+MACRO: begin-largetable @@html:<div class="largetable">@@
-#+MACRO: end-largetable @@html:</div>@@
+#+macro: newline @@latex:\hspace{0pt}\\@@ @@html:<br>@@
+#+macro: newpage @@latex:\newpage@@
+#+macro: latex-html @@latex:$1@@@@html:$2@@
+#+macro: phon @@latex:/$1/@@@@html:/$1/@@@@ascii:/$1/@@
+#+macro: v @@latex:\rotatebox[origin=c]{270}{$1}@@@@html:<span class=vertical>$1</span>@@
+#+macro: begin-largetable @@html:<div class="largetable">@@
+#+macro: end-largetable @@html:</div>@@
+#+macro: def @@latex:\hfill@@
+#+macro: defnl @@latex: \hfill\\@@
diff --git a/content/matter.org b/content/matter.org
index 9c859a9..2a749e4 100644
--- a/content/matter.org
+++ b/content/matter.org
@@ -2722,8 +2722,8 @@
 
 [fn:3] [[https://www.internationalphoneticassociation.org/content/ipa-chart]]
 
-[fn:2] [[https://phundrak.fr]]
+[fn:2] [[https://phundrak.com]]
 
-[fn:1] https://langue.phundrak.fr
+[fn:1] https://langue.phundrak.com
 
 #  LocalWords:  Pappa langue-jouet Matté Einlant Mattés
diff --git a/content/proto-nyqy.org b/content/proto-nyqy.org
index f666f43..411662a 100644
--- a/content/proto-nyqy.org
+++ b/content/proto-nyqy.org
@@ -1,16 +1,15 @@
 # -*- org-confirm-babel-evaluate: nil -*-
-#+TITLE: Proto-Ñyqy
-#+SUBTITLE: Un détail de la langue construite prototype du Proto-Ñyqy, et une rapide description de son peuple et sa culture
-#+HTML_HEAD_EXTRA: <meta name="description" content="Grammaire détaillée de la langue construite Proto-Ñyqy" />
-#+HTML_HEAD_EXTRA: <meta property="og:title" content="Grammaire du Proto-Ñyqy" />
-#+HTML_HEAD_EXTRA: <meta property="og:description" content="Grammaire détaillée de la langue construite Proto-Ñyqy" />
-#+INCLUDE: headers
-#+OPTIONS: auto-id:t
-#+MACRO: nyqy (eval (conlanging/nyqy-to-org $1))
-#+LATEX_HEADER_EXTRA: \usepackage{enumitem}
-#+STARTUP: content
-#+SUBJECT: Grammaire du Proto-Ñyqy
-#+UID: https://langue.phundrak.com/proto-nyqy
+#+setupfile: headers
+#+title: Proto-Ñyqy
+#+subtitle: Un détail de la langue construite prototype du Proto-Ñyqy, et une rapide description de son peuple et sa culture
+#+html_head_extra: <meta name="description" content="Grammaire détaillée de la langue construite Proto-Ñyqy" />
+#+html_head_extra: <meta property="og:title" content="Grammaire du Proto-Ñyqy" />
+#+html_head_extra: <meta property="og:description" content="Grammaire détaillée de la langue construite Proto-Ñyqy" />
+#+macro: nyqy (eval (conlanging/nyqy-to-org $1))
+#+options: auto-id:t
+#+subject: Grammaire du Proto-Ñyqy
+#+uid: https://langue.phundrak.com/proto-nyqy
+#+startup: content
 
 * Propos préliminaires
   :PROPERTIES:
@@ -3174,9 +3173,9 @@ CPWCP
 
 [fn:3] [[https://www.internationalphoneticassociation.org/content/ipa-chart]]
 
-[fn:2] [[https://phundrak.fr]]
+[fn:2] [[https://phundrak.com]]
 
-[fn:1] https://langue.phundrak.fr
+[fn:1] https://langue.phundrak.com
 
 # Traduction de « je t’aime »
 # Mon âme est tienne
diff --git a/content/proto-taso.org b/content/proto-taso.org
index 70d4aab..9d154a5 100644
--- a/content/proto-taso.org
+++ b/content/proto-taso.org
@@ -1032,6 +1032,6 @@
   :CUSTOM_ID: h-defe47b2-686b-4d1c-ba9b-c84e6c482478
   :END:
 
-[fn:2] [[https://phundrak.fr]]
+[fn:2] [[https://phundrak.com]]
 
-[fn:1] [[https://langue.phundrak.fr]]
+[fn:1] [[https://langue.phundrak.com]]