From 96e0fbf6e2fd1937017a04e45e5887c0192d7aaa Mon Sep 17 00:00:00 2001
From: Lucien Cartier-Tilet <lucien@phundrak.com>
Date: Mon, 19 Jul 2021 16:37:10 +0200
Subject: [PATCH] [Eittlandic] Whitespace, vowels update

---
 content/eittland.org             | 117 +++++++++++++++----------------
 content/en/proto-nyqy.org-ignore |  42 +++++------
 content/headers                  |  60 +++++++++-------
 3 files changed, 113 insertions(+), 106 deletions(-)

diff --git a/content/eittland.org b/content/eittland.org
index 33c2489..6de2b52 100644
--- a/content/eittland.org
+++ b/content/eittland.org
@@ -825,10 +825,9 @@ non-accentuées.
 |        <r> |    <c>    |   <c>   |    <c>     |
 |            | antérieur | central | postérieur |
 |------------+-----------+---------+------------|
-|      fermé |    i y    |         |     u      |
-|  pré-fermé |   (ɪ ʏ)   |         |    (ʊ)     |
+|  pré-fermé |    ɪ ʏ    |         |     ʊ      |
 |   mi-fermé |    e ø    |         |     o      |
-|      moyen |           |   ə ɚ   |            |
+|      moyen |           |    ə    |            |
 |  mi-ouvert |    ɛ œ    |         |     ɔ      |
 | pré-ouvert |     æ     |         |            |
 |     ouvert |     a     |         |            |
@@ -847,19 +846,19 @@ certaines voyelles courtes. Ainsi, on obtient l’orthographe suivante concernan
 les voyelles eittlandaises présentée dans le tableau [[vow:eittland:orth]].
 
 #+NAME: vow:eittland:orth
-|        /         |         <          |       <       |       <       | <                                 |
-|       <c>        |        <c>         |      <c>      |      <c>      | <l>                               |
-|      Runes       | Latin traditionnel | Latin réformé | Prononciation | Comme dans                        |
-|------------------+--------------------+---------------+---------------+-----------------------------------|
-|     {{{rune(i)}}}      |         i          |       i       |    {{{phon(i)}}}    | Français : /île/                  |
+|        /         |         <          |       <       |       <       | <                               |
+|       <c>        |        <c>         |      <c>      |      <c>      | <l>                             |
+|      Runes       | Latin traditionnel | Latin réformé | Prononciation | Comme dans                      |
+|------------------+--------------------+---------------+---------------+---------------------------------|
+|     {{{rune(i)}}}      |         i          |       i       |    {{{phon(ɪ)}}}    | Français : /île/                  |
 | {{{rune(e)}}}, {{{rune(i)}}} |        e, í        |       e       |    {{{phon(e)}}}    | Français : /été/                  |
 | {{{rune(é)}}}, {{{rune(á)}}} |        é, á        |       é       |    {{{phon(ɛ)}}}    | Français : /bête/                 |
 |     {{{rune(ę)}}}      |         ę          |       æ       |    {{{phon(æ)}}}    | Anglais américain général : /cat/ |
 | {{{rune(a)}}}, {{{rune(æ)}}} |        a, æ        |       a       |    {{{phon(a)}}}    | Français : /chat/                 |
-|     {{{rune(y)}}}      |         y          |       y       |    {{{phon(y)}}}    | Français : /lune/                 |
+|     {{{rune(y)}}}      |         y          |       y       |    {{{phon(ʏ)}}}    | Français : /lune/                 |
 | {{{rune(ø)}}}, {{{rune(ý)}}} |        ø, ý        |       ø       |    {{{phon(ø)}}}    | Français : /deux/                 |
 | {{{rune(œ)}}}, {{{rune(á)}}} |        œ, á        |       œ       |    {{{phon(œ)}}}    | Français : /neuf/                 |
-|     {{{rune(u)}}}      |         u          |       u       |    {{{phon(u)}}}    | Français : /doux/                 |
+|     {{{rune(u)}}}      |         u          |       u       |    {{{phon(ʊ)}}}    | Français : /doux/                 |
 | {{{rune(o)}}}, {{{rune(ú)}}} |        o, ú        |       o       |    {{{phon(o)}}}    | Français : /eau/                  |
 | {{{rune(ó)}}}, {{{rune(ǫ)}}} |        ó, ǫ        |       ó       |    {{{phon(ɔ)}}}    | Français : /vote/                 |
 
@@ -1010,28 +1009,28 @@ peut retrouver pour l’Eittlandais.
 
 #+name: table:cons
 #+caption: * Rare, uniquement dans des termes étrangers
-| /      | <>                              |         |
-| Lettre | Prononciation                   | Exemple |
-|--------+---------------------------------+---------|
-| b      | {{{phon(b)}}}                         |         |
-| c*     | {{{phon(k)}}}                         |         |
-| d      | {{{phon(d)}}}                         |         |
-| f      | {{{phon(f)}}},{{{phon(v)}}}                 |         |
-| g      | {{{phon(g)}}},{{{phon(ʝ)}}},{{{phon(x)}}},{{{phon(ɣ)}}} |         |
-| h      | {{{phon(h)}}},{{{phon(ç)}}}                 |         |
-| j      | {{{phon(j)}}}                         |         |
-| k      | {{{phon(k)}}}                         |         |
-| l      | {{{phon(l)}}}                         |         |
-| m      | {{{phon(m)}}}                         |         |
-| n      | {{{phon(n)}}},{{{phon(ŋ)}}}                 |         |
-| p      | {{{phon(p)}}},{{{phon(ɸ)}}}                 |         |
-| q*     | {{{phon(k)}}}                         |         |
-| s      | {{{phon(ç)}}}                         |         |
-| t      | {{{phon(t)}}}                         |         |
-| v      | {{{phon(w)}}},{{{phon(β)}}}                 |         |
-| w*     | {{{phon(w)}}},{{{phon(β)}}}                 |         |
-| x*     | {{{phon(ks)}}},{{{phon(ɡz)}}}               |         |
-| z      | {{{phon(ʝ)}}}                         |         |
+| /      | <>                                 |         |
+| Lettre | Prononciation                      | Exemple |
+|--------+------------------------------------+---------|
+| b      | {{{phon(b)}}}                            |         |
+| c*     | {{{phon(k)}}}                            |         |
+| d      | {{{phon(d)}}}                            |         |
+| f      | {{{phon(f)}}}, {{{phon(v)}}}                   |         |
+| g      | {{{phon(g)}}}, {{{phon(ʝ)}}}, {{{phon(x)}}}, {{{phon(ɣ)}}} |         |
+| h      | {{{phon(h)}}}, {{{phon(ç)}}}                   |         |
+| j      | {{{phon(j)}}}                            |         |
+| k      | {{{phon(k)}}}                            |         |
+| l      | {{{phon(l)}}}                            |         |
+| m      | {{{phon(m)}}}                            |         |
+| n      | {{{phon(n)}}}, {{{phon(ŋ)}}}                   |         |
+| p      | {{{phon(p)}}}, {{{phon(ɸ)}}}                   |         |
+| q*     | {{{phon(k)}}}                            |         |
+| s      | {{{phon(ç)}}}                            |         |
+| t      | {{{phon(t)}}}                            |         |
+| v      | {{{phon(w)}}}, {{{phon(β)}}}                   |         |
+| w*     | {{{phon(w)}}}, {{{phon(β)}}}                   |         |
+| x*     | {{{phon(ks)}}}, {{{phon(ɡz)}}}                 |         |
+| z      | {{{phon(ʝ)}}}                            |         |
 
 On peut remarquer quelques évolutions dans la façon dont sont prononcées les
 diverses consonnes de l’Eittlandais. Tout d’abord, le <v> est prononcé soit
@@ -1313,33 +1312,33 @@ inspirées des runes médiévales.
 
 #+NAME: table:writing-system
 #+CAPTION: Correspondance de l’alphabet latin éittlandais et des runes eittlandaises
-|           <c>           |   <c>    |
-|          latin          |  runes   |
-|-------------------------+----------|
-|   A, a / Á, á / Ǫ, ǫ    | {{{rune(a)}}}  |
-|          B, b           | {{{rune(b)}}}  |
-|          D, d           | {{{rune(d)}}}  |
-|          Ð, ð           | {{{rune(ð)}}}  |
-|   E, e / Ę, ę / Æ, æ    | {{{rune(e)}}}  |
-|          É, é           | {{{rune(é)}}}  |
-|          F, f           | {{{rune(f)}}}  |
-|          G, g           | {{{rune(g)}}}  |
-|          H, h           | {{{rune(h)}}}  |
-|         Hv, hv          | {{{rune(hv)}}} |
-|   I, i / Í, í / J, j    | {{{rune(i)}}}  |
-|          K, k           | {{{rune(k)}}}  |
-|          L, l           | {{{rune(l)}}}  |
-|          M, m           | {{{rune(m)}}}  |
-|          N, n           | {{{rune(n)}}}  |
-|       O, o / Ó, ó       | {{{rune(o)}}}  |
-|       Ø, ø / Œ, œ       | {{{rune(ø)}}}  |
-|          P, p           | {{{rune(p)}}}  |
-|          R, r           | {{{rune(r)}}}  |
-|          S, s           | {{{rune(s)}}}  |
-|          T, t           | {{{rune(t)}}}  |
-|          Þ, þ           | {{{rune(þ)}}}  |
-|   U, u / Ú, ú / V, v    | {{{rune(u)}}}  |
-|       Y, y / Ý, ý       | {{{rune(y)}}}  |
+|          <c>          |   <c>    |
+|         latin         |  runes   |
+|-----------------------+----------|
+|  A, a / Á, á / Ǫ, ǫ   | {{{rune(a)}}}  |
+|         B, b          | {{{rune(b)}}}  |
+|         D, d          | {{{rune(d)}}}  |
+|         Ð, ð          | {{{rune(ð)}}}  |
+|  E, e / Ę, ę / Æ, æ   | {{{rune(e)}}}  |
+|         É, é          | {{{rune(é)}}}  |
+|         F, f          | {{{rune(f)}}}  |
+|         G, g          | {{{rune(g)}}}  |
+|         H, h          | {{{rune(h)}}}  |
+|        Hv, hv         | {{{rune(hv)}}} |
+|  I, i / Í, í / J, j   | {{{rune(i)}}}  |
+|         K, k          | {{{rune(k)}}}  |
+|         L, l          | {{{rune(l)}}}  |
+|         M, m          | {{{rune(m)}}}  |
+|         N, n          | {{{rune(n)}}}  |
+|      O, o / Ó, ó      | {{{rune(o)}}}  |
+|      Ø, ø / Œ, œ      | {{{rune(ø)}}}  |
+|         P, p          | {{{rune(p)}}}  |
+|         R, r          | {{{rune(r)}}}  |
+|         S, s          | {{{rune(s)}}}  |
+|         T, t          | {{{rune(t)}}}  |
+|         Þ, þ          | {{{rune(þ)}}}  |
+|  U, u / Ú, ú / V, v   | {{{rune(u)}}}  |
+|      Y, y / Ý, ý      | {{{rune(y)}}}  |
 |  /délimiteur de mots/   | {{{rune(:)}}}  |
 | /délimiteur de phrases/ | {{{rune(,)}}}  |
 
diff --git a/content/en/proto-nyqy.org-ignore b/content/en/proto-nyqy.org-ignore
index 57d3325..32ad11a 100644
--- a/content/en/proto-nyqy.org-ignore
+++ b/content/en/proto-nyqy.org-ignore
@@ -492,31 +492,31 @@
 
     #+NAME: table:cons:ipa
     #+CAPTION: Consonnes du Ñyqy (IPA)
-    |              <r5> |        <c5>        |        <c5>         |          <c5>           |       <c5>       |       <c5>        |       <c5>        |
-    |                 / |         <          |          <          |            <            |        <         |         <         |         <         |
+    |              <r5> |     <c5>     |     <c5>      |       <c5>        |    <c5>    |    <c5>     |    <c5>     |
+    |                 / |      <       |       <       |         <         |     <      |      <      |      <      |
     |                   | {{{v(bilablial)}}} | {{{v(alvéolaire)}}} | {{{v(labial-velaire)}}} | {{{v(palatal)}}} | {{{v(uvulaire)}}} | {{{v(pharygal)}}} |
-    |-------------------+--------------------+---------------------+-------------------------+------------------+-------------------+-------------------|
-    |            plosif |        p b         |                     |                         |                  |        q ɢ        |                   |
-    |             nasal |         m          |          n          |                         |                  |         ɴ         |                   |
-    |              tapé |                    |                     |                         |                  |        (ʀ)        |                   |
-    |          fricatif |                    |         s z         |                         |     (x) (ɣ)      |      (χ) (ʁ)      |      (ħ) (ʕ)      |
-    |          affriqué |                    |        t͡ʃ d͡ʒ        |                         |                  |                   |                   |
-    | latérale affriqué |                    |       (ɬ) (ɮ)       |                         |                  |                   |                   |
-    |  latérale spirant |                    |         (l)         |                         |                  |                   |                   |
-    |       approximant |                    |                     |                         |       (j)        |                   |                   |
-    |           spirant |                    |                     |            w            |                  |                   |                   |
+    |-------------------+--------------+---------------+-------------------+------------+-------------+-------------|
+    |            plosif |     p b      |               |                   |            |     q ɢ     |             |
+    |             nasal |      m       |       n       |                   |            |      ɴ      |             |
+    |              tapé |              |               |                   |            |     (ʀ)     |             |
+    |          fricatif |              |      s z      |                   |  (x) (ɣ)   |   (χ) (ʁ)   |   (ħ) (ʕ)   |
+    |          affriqué |              |     t͡ʃ d͡ʒ     |                   |            |             |             |
+    | latérale affriqué |              |    (ɬ) (ɮ)    |                   |            |             |             |
+    |  latérale spirant |              |      (l)      |                   |            |             |             |
+    |       approximant |              |               |                   |    (j)     |             |             |
+    |           spirant |              |               |         w         |            |             |             |
 
     #+NAME: table:cons:trans
     #+CAPTION: Consonnes du Ñyqy (translittération)
-    |      <r> |        <c5>        |        <c5>         |          <c5>           |       <c5>        |
-    |        / |         <          |          <          |            <            |         <         |
+    |      <r> |     <c5>     |     <c5>      |       <c5>        |    <c5>     |
+    |        / |      <       |       <       |         <         |      <      |
     |          | {{{v(bilablial)}}} | {{{v(alvéolaire)}}} | {{{v(labial-velaire)}}} | {{{v(uvulaire)}}} |
-    |----------+--------------------+---------------------+-------------------------+-------------------|
-    |   plosif |        p b         |                     |                         |        q g        |
-    |    nasal |         m          |          n          |                         |         ñ         |
-    | fricatif |                    |         s z         |                         |                   |
-    | affriqué |                    |         c j         |                         |                   |
-    |  spirant |                    |                     |            w            |                   |
+    |----------+--------------+---------------+-------------------+-------------|
+    |   plosif |     p b      |               |                   |     q g     |
+    |    nasal |      m       |       n       |                   |      ñ      |
+    | fricatif |              |      s z      |                   |             |
+    | affriqué |              |      c j      |                   |             |
+    |  spirant |              |               |         w         |             |
 
 *** Tons et accentuation
     :PROPERTIES:
@@ -1266,7 +1266,7 @@
 
    |     <c>     |      <c>       |   <c>    |   <c>    |
    | {{{nyqy(gé si)}}} | {{{nyqy(co mó mó)}}} | {{{nyqy(ñy)}}} | {{{nyqy(qi)}}} |
-   |   4×6^{3}   |    5×6^{2}     | 1×6^{1}  | 2×6^{0}  |
+   |    4×6^{3}     |      5×6^{2}      |   1×6^{1}   |   2×6^{0}   |
    |    4×216    |      5*36      |   1×6    |   2×1    |
    |     864     |      180       |    6     |    2     |
 
diff --git a/content/headers b/content/headers
index e84c0f5..34dece3 100644
--- a/content/headers
+++ b/content/headers
@@ -15,37 +15,45 @@
 # ### LaTeX ####################################################################
 
 #+latex_class:         conlang
-#+latex_class_options: [a4paper,twoside,french]
+#+latex_class_options: [a4paper,french]
 #+latex_header:        \input{headers.tex}
 
 # ### HTML #####################################################################
 
 #+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 -->
+#+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 = window._paq || [];
+#+html_head:   /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+#+html_head:  _paq.push(['requireConsent']);
+#+html_head:  _paq.push(['trackPageview']);
+#+html_head:  _paq.push(['setConsentGiven']);
+#+html_head:  _paq.push(['rememberConsentGiven'])
+#+html_head:   _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+#+html_head:   _paq.push(["setCookieDomain", "*.phundrak.com"]);
+#+html_head:   _paq.push(["setDomains", ["*.phundrak.com","*.blog.phundrak.com","*.config.phundrak.com","*.langue.phundrak.com"]]);
+#+html_head:   _paq.push(["setDoNotTrack", true]);
+#+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.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+#+html_head:   })();
+#+html_head: </script>
+#+html_head: <!-- End Matomo Code -->
 
 # ### EPUB #####################################################################
 #+publisher: Lucien Cartier-Tilet