projects / tengwarjs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e5320ed)
Review samples
authorKris Kowal <kris.kowal@cixar.com>
Sun, 2 Sep 2012 21:40:15 +0000 (14:40 -0700)
committerKris Kowal <kris.kowal@cixar.com>
Sun, 2 Sep 2012 21:40:15 +0000 (14:40 -0700)
general-use.js patch | blob | history
samples/index.html patch | blob | history
samples/namarie.jpg [new file with mode: 0644] patch | blob
spec/general-use.js patch | blob | history

diff --git a/general-use.js b/general-use.js
index 7e16665..f69f97e 100644 (file)
--- a/general-use.js
+++ b/general-use.js
@@ -220,8 +220,23 @@ function parseTengwa(callback, options, tehta) {
                     return callback(makeColumn("ungwe").addTildeAbove());
                 } else if (character === "j") { // nj
                     return callback(makeColumn("anca").addTildeAbove());
-                } else  if (character === "w") { // nw -> ñw XXX maybe
+                } else  if (character === "w") { // nw -> ñw
+                    return function (character) {
+                        if (character === "a") { // nwa
+                            return function (character) { // nwal
+                                if (character === "l") {
+                                    return callback(makeColumn("nwalme").addAbove("w"))("a")(character);
+                                } else { // nwa.
+                                    return callback(makeColumn("numen").addAbove("w"))("a")(character);
+                                }
+                            };
+                        } else if (character === "nw'") { // nw' prime -> ñw
+                            return callback(makeColumn("nwalme").addAbove("w"));
+                        } else { // nw.
+                            return callback(makeColumn("numen").addAbove("w"))(character);
+                        }
                     return callback(makeColumn("nwalme").addAbove("w"));
+                    };
                 } else { // n.
                     return callback(makeColumn("numen"))(character);
                 }
diff --git a/samples/index.html b/samples/index.html
index 30862bd..39d9085 100644 (file)
--- a/samples/index.html
+++ b/samples/index.html
@@ -9,11 +9,18 @@
         <script src="../node_modules/mr/bootstrap.js" data-package=".." data-module="samples/index"></script>
     </head>
     <body>
+        <p>Ring inscription in General Use mode.</p>
+        <blockquote>Ash nazg durbatulûk, ash nazg gimbatul,<br>
+            Ash nazg thrakatulûk agh burzum-ishi krimpatul.</blockquote>
         <div class="tengwar annatar"
             data-tengwar=">Ash nazg durbatulûk, ash nazg gimbatul,<
             Ash nazg thrakatulûk agh burzum-ishi krimpatul."
             data-mode="general-use"></div>
+        <p>Compare to the mode on the actual ring inscription.</p>
         <img src="ring-inscription.jpg">
+
+        <h1>Namárië</h1>
+
         <div class="tengwar parmaite"
             data-tengwar="Ai! laurië lantar lassi súrinen,
             Yéni únótimë ve rámar aldaron!
@@ -35,7 +42,36 @@
 
             Namárië! Nai hiruvalyë Valimar.
             Nai elyë hiruva. Namárië!"
-            data-mode="classical"></div>
+            data-mode="classical" style="float: left"></div>
+
+        <img src="namarie.jpg">
+
+        <blockquote>
+            <p>Ai! laurië lantar lassi súrinen,<br>
+            Yéni únótimë ve rámar aldaron!<br>
+            Yéni ve lintë yuldar avánier<br>
+            mi oromardi lisse-miruvóreva<br>
+            Andúnë pella, Vardo tellumar<br>
+            nu luini yassen tintilar i eleni<br>
+            ómaryo airetári-lírinen.
+
+            <p>Sí man i yulma nin enquantuva?</p>
+
+            <p>An sí Tintallë Varda Oiolossëo<br>
+            ve fanyar máryat Elentári ortanë<br>
+            ar ilyë tier undulávë lumbulë;<br>
+            ar sindanóriello caita mornië<br>
+            i falmalinnar imbë met, ar hísië<br>
+            untúpa Calaciryo míri oialë.<br>
+            Si vanwa ná, Rómello vanwa, Valimar!
+
+            <p>Namárië! Nai hiruvalyë Valimar.<br>
+            Nai elyë hiruva. Namárië!</p>
+
+            </p>
+        </blockquote>
+
+        <h1 style="clear: both">Noteworthy Transcriptions</h1>
 
         <p>The doors of Durin, Lord of Moria. Say: 'friend', and Enter: <span class="tengwar">Ennyn Durin Aran Moria: pedo mellon a minno.</span></p>
 
@@ -123,7 +159,8 @@
         "ungwe".</p>
 
         <p>Nwalme: <span class="transcribe">Nwalme</span>. Interesting because
-        following-W implies that the N represent Ñ.</p>
+        following-WAL implies that the N represent Ñ.  This might not be
+        accurate in all cases, but certainly is for the word Nwalmë.</p>
 
         <p>Iaur: <span class="transcribe">Iaur</span>. In "iaur", the initial-I is
         consonantal, represented by "yanta". This is a very special case and
diff --git a/samples/namarie.jpg b/samples/namarie.jpg
new file mode 100644 (file)
index 0000000..bce05ac
Binary files /dev/null and b/samples/namarie.jpg differ
diff --git a/spec/general-use.js b/spec/general-use.js
index 9226112..65786ee 100644 (file)
--- a/spec/general-use.js
+++ b/spec/general-use.js
@@ -13,7 +13,7 @@ module.exports = {
     "glorfindel": "ungwe;lambe;romen:o;formen;ando:i,tilde-above;lambe:e",
     "gwaith iaur arnor": "ungwe:w;anna:a;thule yanta;vala:a;ore romen:a;numen;ore:o",
     "gwathló": "ungwe:w;thule:a;lambe;long-carrier:o",
-    "hwesta sindarinwa": "hwesta-sindarinwa;silme-nuquerna:e;tinco;short-carrier:a silme;ando:i,tilde-above;romen:a;short-carrier:i;nwalme:w;short-carrier:a",
+    "hwesta sindarinwa": "hwesta-sindarinwa;silme-nuquerna:e;tinco;short-carrier:a silme;ando:i,tilde-above;romen:a;short-carrier:i;numen:w;short-carrier:a",
     "iant": "yanta;tinco:a,tilde-above",
     "iaur": "yanta;vala:a;ore",
     "isildur": "silme-nuquerna:i;lambe:i;ando;ore:u",
Tengwar Transcriber