Minor changes

This commit is contained in:
Phuntsok Drak-pa 2018-05-29 23:53:11 +02:00
parent be8c857647
commit f7acb6293a
4 changed files with 19 additions and 83 deletions

View File

@ -3,11 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr"> <html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
<head> <head>
<<<<<<< HEAD <!-- 2018-05-29 mar. 23:52 -->
<!-- 2018-05-29 mar. 23:49 -->
=======
<!-- 2018-05-29 mar. 23:44 -->
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Ressources grammaticales du Zöhæň</title> <title>Ressources grammaticales du Zöhæň</title>
@ -184,15 +180,12 @@
.org-svg { width: 90%; } .org-svg { width: 90%; }
/*]]>*/--> /*]]>*/-->
</style> </style>
<<<<<<< HEAD
<link rel="stylesheet" type="text/css" href="https://www.pirilampo.org/styles/readtheorg/css/htmlize.css"/> <link rel="stylesheet" type="text/css" href="https://www.pirilampo.org/styles/readtheorg/css/htmlize.css"/>
<link rel="stylesheet" type="text/css" href="https://www.pirilampo.org/styles/readtheorg/css/readtheorg.css"/> <link rel="stylesheet" type="text/css" href="https://www.pirilampo.org/styles/readtheorg/css/readtheorg.css"/>
<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script> <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
<script type="text/javascript" src="https://www.pirilampo.org/styles/lib/js/jquery.stickytableheaders.min.js"></script> <script type="text/javascript" src="https://www.pirilampo.org/styles/lib/js/jquery.stickytableheaders.min.js"></script>
<script type="text/javascript" src="https://www.pirilampo.org/styles/readtheorg/js/readtheorg.js"></script> <script type="text/javascript" src="https://www.pirilampo.org/styles/readtheorg/js/readtheorg.js"></script>
=======
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<script type="text/javascript"> <script type="text/javascript">
/* /*
@licstart The following is the entire license notice for the @licstart The following is the entire license notice for the
@ -247,27 +240,16 @@ for the JavaScript code in this tag.
<h2>Table des matières</h2> <h2>Table des matières</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
<ul> <ul>
<<<<<<< HEAD <li><a href="#org57c324e">1. Grammaire</a></li>
<li><a href="#orgf32cbff">1. Grammaire</a></li> <li><a href="#org456dbce">2. Lexique</a></li>
<li><a href="#org82cd81e">2. Lexique</a></li> <li><a href="#orgacef733">3. Autre</a></li>
<li><a href="#org73bc785">3. Autre</a></li>
=======
<li><a href="#org909ddaa">1. Grammaire</a></li>
<li><a href="#org2f259f1">2. Lexique</a></li>
<li><a href="#orgbdcd0d0">3. Autre</a></li>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
</ul> </ul>
</div> </div>
</div> </div>
<<<<<<< HEAD <div id="outline-container-org57c324e" class="outline-2">
<div id="outline-container-orgf32cbff" class="outline-2"> <h2 id="org57c324e"><span class="section-number-2">1</span> Grammaire</h2>
<h2 id="orgf32cbff"><span class="section-number-2">1</span> Grammaire</h2>
=======
<div id="outline-container-org909ddaa" class="outline-2">
<h2 id="org909ddaa"><span class="section-number-2">1</span> Grammaire</h2>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<div class="outline-text-2" id="text-1"> <div class="outline-text-2" id="text-1">
<p> <p>
<a href="grammaire.html">Grammaire du Zöhæň</a> (<a href="grammaire.pdf">pdf</a>) <a href="grammaire.html">Grammaire du Zöhæň</a> (<a href="grammaire.pdf">pdf</a>)
@ -275,30 +257,17 @@ for the JavaScript code in this tag.
</div> </div>
</div> </div>
<<<<<<< HEAD <div id="outline-container-org456dbce" class="outline-2">
<div id="outline-container-org82cd81e" class="outline-2"> <h2 id="org456dbce"><span class="section-number-2">2</span> Lexique</h2>
<h2 id="org82cd81e"><span class="section-number-2">2</span> Lexique</h2>
</div> </div>
<div id="outline-container-org73bc785" class="outline-2"> <div id="outline-container-orgacef733" class="outline-2">
<h2 id="org73bc785"><span class="section-number-2">3</span> Autre</h2> <h2 id="orgacef733"><span class="section-number-2">3</span> Autre</h2>
=======
<div id="outline-container-org2f259f1" class="outline-2">
<h2 id="org2f259f1"><span class="section-number-2">2</span> Lexique</h2>
</div>
<div id="outline-container-orgbdcd0d0" class="outline-2">
<h2 id="orgbdcd0d0"><span class="section-number-2">3</span> Autre</h2>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
</div> </div>
</div> </div>
<div id="postamble" class="status"> <div id="postamble" class="status">
<p class="author">Auteur: Lucien Cartier-Tilet</p> <p class="author">Auteur: Lucien Cartier-Tilet</p>
<<<<<<< HEAD <p class="date">Created: 2018-05-29 mar. 23:52</p>
<p class="date">Created: 2018-05-29 mar. 23:49</p>
=======
<p class="date">Created: 2018-05-29 mar. 23:44</p>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<p class="validation"></p> <p class="validation"></p>
</div> </div>
</body> </body>

View File

@ -1,9 +1,5 @@
#+TITLE: Ressources grammaticales du Zöhæň #+TITLE: Ressources grammaticales du Zöhæň
<<<<<<< HEAD
#+INCLUDE: "~/org/headers.org" #+INCLUDE: "~/org/headers.org"
=======
#+INCLUDE: "../headers.org"
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
src_latex{\newpage} src_latex{\newpage}
* Grammaire * Grammaire

View File

@ -3,11 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr"> <html xmlns="http://www.w3.org/1999/xhtml" lang="fr" xml:lang="fr">
<head> <head>
<<<<<<< HEAD <!-- 2018-05-29 mar. 23:52 -->
<!-- 2018-05-29 mar. 23:49 -->
=======
<!-- 2018-05-29 mar. 23:46 -->
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<title>Ressources grammaticales des langues construites de Pundrak</title> <title>Ressources grammaticales des langues construites de Pundrak</title>
@ -244,25 +240,15 @@ for the JavaScript code in this tag.
<h2>Table des matières</h2> <h2>Table des matières</h2>
<div id="text-table-of-contents"> <div id="text-table-of-contents">
<ul> <ul>
<<<<<<< HEAD <li><a href="#org5913eab">1. Hjalpi</a></li>
<li><a href="#org43d2def">1. Hjalpi</a></li> <li><a href="#org3c4c221">2. Draconian</a></li>
<li><a href="#org5518b8e">2. Draconian</a></li>
=======
<li><a href="#orge3ea773">1. Hjalpi</a></li>
<li><a href="#orgdb7631b">2. Draconian</a></li>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
</ul> </ul>
</div> </div>
</div> </div>
<a href="https://github.com/Phundrak/langue-phundrak-fr"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub!"></a> <a href="https://github.com/Phundrak/langue-phundrak-fr"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_gray_6d6d6d.png" alt="Fork me on GitHub!"></a>
<<<<<<< HEAD <div id="outline-container-org5913eab" class="outline-2">
<div id="outline-container-org43d2def" class="outline-2"> <h2 id="org5913eab"><span class="section-number-2">1</span> Hjalpi</h2>
<h2 id="org43d2def"><span class="section-number-2">1</span> Hjalpi</h2>
=======
<div id="outline-container-orge3ea773" class="outline-2">
<h2 id="orge3ea773"><span class="section-number-2">1</span> Hjalpi</h2>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<div class="outline-text-2" id="text-1"> <div class="outline-text-2" id="text-1">
<p> <p>
🔵 <a href="hjalpi/index.html">Hjalpi Originel</a> (en cours) 🔵 <a href="hjalpi/index.html">Hjalpi Originel</a> (en cours)
@ -274,22 +260,14 @@ for the JavaScript code in this tag.
</div> </div>
</div> </div>
<<<<<<< HEAD <div id="outline-container-org3c4c221" class="outline-2">
<div id="outline-container-org5518b8e" class="outline-2"> <h2 id="org3c4c221"><span class="section-number-2">2</span> Draconian</h2>
<h2 id="org5518b8e"><span class="section-number-2">2</span> Draconian</h2>
<div class="outline-text-2" id="text-2"> <div class="outline-text-2" id="text-2">
<p> <p>
🔵 <a href="draconian/auto-generated-draft.html">Łijökken</a> (en cours) 🔵 <a href="draconian/auto-generated-draft.html">Łijökken</a> (en cours)
</p> </p>
<p> <p>
=======
<div id="outline-container-orgdb7631b" class="outline-2">
<h2 id="orgdb7631b"><span class="section-number-2">2</span> Draconian</h2>
<div class="outline-text-2" id="text-2">
<p>
🔵 <a href="draconian/auto-generated-draft.html">Łijökken</a> (en cours)
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
🔵 <a href="draconian-2/index.html">Zöhæň</a> (en cours) 🔵 <a href="draconian-2/index.html">Zöhæň</a> (en cours)
</p> </p>
</div> </div>
@ -297,11 +275,7 @@ for the JavaScript code in this tag.
</div> </div>
<div id="postamble" class="status"> <div id="postamble" class="status">
<p class="author">Auteur: Lucien Cartier-Tilet</p> <p class="author">Auteur: Lucien Cartier-Tilet</p>
<<<<<<< HEAD <p class="date">Created: 2018-05-29 mar. 23:52</p>
<p class="date">Created: 2018-05-29 mar. 23:49</p>
=======
<p class="date">Created: 2018-05-29 mar. 23:46</p>
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
<p class="validation"></p> <p class="validation"></p>
</div> </div>
</body> </body>

View File

@ -11,8 +11,5 @@
* Draconian * Draconian
🔵 [[file:draconian/auto-generated-draft.html][Łijökken]] (en cours) 🔵 [[file:draconian/auto-generated-draft.html][Łijökken]] (en cours)
<<<<<<< HEAD
=======
>>>>>>> afd7f45963c127702d78efa578915db31a43944e
🔵 [[file:draconian-2/index.html][Zöhæň]] (en cours) 🔵 [[file:draconian-2/index.html][Zöhæň]] (en cours)