glaemscribe 1.1.14 → 1.3.0

data/glaemresources/modes/{sindarin-beleriand.glaem → sindarin-tengwar-beleriand.glaem}

@@ -33,12 +33,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \entry "0.1.1" "Added support for inlined raw tengwar"
   \entry "0.1.2" "Fine tuning handling of the aw diphthong (Thanks to Dmitry Kourmyshov!)"
   \entry "0.1.3" "Merging au/aw"
+  \entry "0.1.4" "Added support for new unicode charsets"   
+  \entry "0.1.5" "Added support for the Tengwar Telcontar font"
+  \entry "0.1.6" "Corrected use of silme_nuquerna in ns / y, added a few exotic combinations. Reworked median point behaviour, and ng."
+  \entry "0.1.7" "Added variants with dot for short vowels, added gasdil."
 \end
 
 \language "Sindarin"
 \writing  "Tengwar"
 \mode     "Sindarin Tengwar - Beleriand"
-\version  "0.1.3"
+\version  "0.1.6"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \world      arda
@@ -51,10 +55,64 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \charset  tengwar_ds_eldamar  false
 \charset  tengwar_ds_annatar  false
 \charset  tengwar_ds_elfica   false
+
+\charset  tengwar_guni_sindarin false
+\charset  tengwar_guni_parmaite false
+\charset  tengwar_guni_eldamar  false
+\charset  tengwar_guni_annatar  false
+\charset  tengwar_guni_elfica   false
+
 \charset  tengwar_freemono    false
+\charset  tengwar_telcontar   false
 
 \beg      options
 
+  \beg option short_a SHORT_A_WITHOUT_DOT
+    \radio
+    \value SHORT_A_WITHOUT_DOT 0
+    \value SHORT_A_WITH_DOT    1
+  \end
+  
+  \beg option short_e SHORT_E_WITHOUT_DOT
+    \radio
+    \value SHORT_E_WITHOUT_DOT 0
+    \value SHORT_E_WITH_DOT    1
+  \end
+  
+  \beg option short_i SHORT_I_WITHOUT_DOT
+    \radio
+    \value SHORT_I_WITHOUT_DOT 0
+    \value SHORT_I_WITH_DOT    1
+  \end
+  
+  \beg option short_o SHORT_O_WITHOUT_DOT
+    \radio
+    \value SHORT_O_WITHOUT_DOT 0
+    \value SHORT_O_WITH_DOT    1
+  \end
+  
+  \beg option short_u SHORT_U_WITHOUT_DOT
+    \radio
+    \value SHORT_U_WITHOUT_DOT 0
+    \value SHORT_U_WITH_DOT    1
+  \end
+  
+  \beg option short_y SHORT_Y_WITHOUT_DOT
+    \radio
+    \value SHORT_Y_WITHOUT_DOT 0
+    \value SHORT_Y_WITH_DOT    1
+  \end  
+  
+  \beg option apostrophe APOSTROPHE_IGNORED
+    \value APOSTROPHE_IGNORED 0
+    \value APOSTROPHE_GASDIL  1
+  \end
+  
+  \beg option hyphen HYPHEN_WORD_BREAKER
+    \value HYPHEN_WORD_BREAKER  0
+    \value HYPHEN_WORD_JOINER   1
+  \end
+
   \beg option beleriand_aw_diphthong AW_VILYA_AT_ENDINGS_CURL_ELSE
     \value AW_VILYA_AT_ENDINGS_CURL_ELSE 0
     \value AW_ALWAYS_VILYA 1
@@ -79,6 +137,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \** Work exclusively downcase **\
   \downcase
   
+  \if "hyphen == HYPHEN_WORD_JOINER"
+    \** Replace hyphen by median point **\
+    \substitute "-" "·"  
+  \else
+    \** Replace hyphen by glaemscribe's word breaker **\
+    \substitute "-" "|"
+  \endif
+  
+  \** Add keyboard friendly word joiner **\
+  \substitute "*" "·"
+  
   \** Simplify trema vowels **\
   \substitute ä a
   \substitute ë e
@@ -105,6 +174,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   since it seems more logical that aw would behave as a semi vowel **\
   \rxsubstitute "aw([aeouyáāâéēêíīîóōôúūûýȳŷ])" "a|w\\1"
   
+  \** Special case for ng : before the vast majority of consonnants, treat as ŋ **\
+  \** Don't include r / l / lh / w **\
+  \rxsubstitute "ng([tpckbdfðvnmhs])" "ŋ\\1"
+  
+  \** Avoid mutated ng of being treated as strong middle word n|g (ex : i·ngelaidh [iŋɛlaið] ) **\
+  \substitute "·ng" "·ŋ"  
+  \** But avoid losing the strong g in nasal mutation of g (ex : in·Gelydh [iŋgɛlyð]] ) **\
+  \substitute "n·g" "·ŋg"
+  \** Use median dot as word joiner **\
+  \substitute "·" ""
+
   \** Preprocess numbers **\
   \elvish_numbers "\\eval numbers_base" "\\eval reverse_numbers"
 \end
@@ -143,34 +223,62 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {OE}                === {O}{E}
              
     {K}                 === (c,k)
-
-    \** RULES **\
-    {A}                 --> OSSE
-    {E}                 --> YANTA
-    {I}                 --> TELCO
-    {O}                 --> ANNA
-    {U}                 --> URE
     
-    {Y}                 --> SILME_NUQUERNA_ALT
+    \if "short_a == SHORT_A_WITH_DOT"
+      {A}                 --> OSSE I_TEHTA
+    \else
+      {A}                 --> OSSE
+    \endif
+    
+    \if "short_e == SHORT_E_WITH_DOT"
+      {E}                 --> YANTA I_TEHTA
+    \else
+      {E}                 --> YANTA
+    \endif
+    
+    \if "short_i == SHORT_I_WITH_DOT"
+      {I}                 --> TELCO I_TEHTA
+    \else
+      {I}                 --> TELCO
+    \endif
+    
+    \if "short_o == SHORT_O_WITH_DOT"
+      {O}                 --> ANNA I_TEHTA
+    \else
+      {O}                 --> ANNA
+    \endif
+    
+    \if "short_u == SHORT_U_WITH_DOT"
+      {U}                 --> URE I_TEHTA
+    \else
+      {U}                 --> URE
+    \endif
+
+    \if "short_y == SHORT_Y_WITH_DOT"
+      {Y}                 --> SILME_NUQUERNA I_TEHTA
+    \else
+      {Y}                 --> SILME_NUQUERNA
+    \endif
 
     {AA}                --> OSSE  E_TEHTA
     {EE}                --> YANTA E_TEHTA
     {II}                --> TELCO E_TEHTA
     {OO}                --> ANNA  E_TEHTA
     {UU}                --> URE   E_TEHTA
-    {YY}                --> SILME_NUQUERNA_ALT E_TEHTA
+    {YY}                --> SILME_NUQUERNA E_TEHTA
 
-    {AE}                --> OSSE  YANTA  \** Should chose between OSSE YANTA and OSSE THSUP_TICK_INV_L. Old tengscribe had second one, amanye tenceli has first one. **\ 
+    \** Should chose between OSSE YANTA and OSSE THSUP_TICK_INV. Old tengscribe had second one, amanye tenceli has first one. **\ 
+    {AE}                --> OSSE  YANTA  
     {AI}                --> OSSE  Y_TEHTA
-    {AU}                --> OSSE  SEV_TEHTA 
+    {AU}                --> OSSE  WA_TEHTA 
     
     \if "beleriand_aw_diphthong == AW_VILYA_AT_ENDINGS_CURL_ELSE"
-      ({AU},{AW})         --> OSSE SEV_TEHTA
+      ({AU},{AW})         --> OSSE WA_TEHTA
       ({AU},{AW})_        --> OSSE VILYA
     \elsif "beleriand_aw_diphthong == AW_ALWAYS_VILYA"
       ({AU},{AW})         --> OSSE VILYA
     \elsif "beleriand_aw_diphthong == AW_ALWAYS_CURL"
-      ({AU},{AW})         --> OSSE SEV_TEHTA
+      ({AU},{AW})         --> OSSE WA_TEHTA
     \endif
       
     {EI}                --> YANTA Y_TEHTA
@@ -197,9 +305,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{L2}] --> [{_L2_}]
 
-    mb   --> UMBAR  {NASAL}
-    nd   --> ANDO   {NASAL}
-
+    mb          --> UMBAR  {NASAL}
+    nd          --> ANDO   {NASAL}
+    
+    \** /ŋg/ : this is ng in middle of words + might be found at word start on mutation.
+    \** See also final/initial ng_ / _ng below **\
+    (ng,ngg,ŋg,ñg)    --> ANGA   {NASAL} 
+    
     \** ======== **\
     \** 3RD LINE **\
     \** ======== **\
@@ -224,7 +336,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** ======== **\
     \** 5TH LINE **\
     \** ======== **\
-    {L5}    === nn    * mm    * ng
+    {L5}    === nn    * mm    * (ng_,_ng,ŋ,ñ)
     {_L5_}  === NUMEN * MALTA * NOLDO 
 
     [{L5}] --> [{_L5_}]
@@ -253,7 +365,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{S_LINE}] --> [{_S_LINE_}]
 
-    ns --> SILME_NUQUERNA {NASAL}
+    \** REMOVING NEXT ONE WHICH CLASHES WITH Y **\
+    \** ns --> SILME_NUQUERNA {NASAL} **\
 
     \** ======== **\
     \** OTHERS **\
@@ -266,12 +379,26 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     hw   --> HWESTA_SINDARINWA
 
     \** labialized consonants **\
-    dw   --> ANDO   SEV_TEHTA
-    gw   --> ANGA   SEV_TEHTA
-    lw   --> LAMBE  SEV_TEHTA
-    nw   --> ORE    SEV_TEHTA
-    rw   --> ROMEN  SEV_TEHTA 
-
+    bw              --> UMBAR  WA_TEHTA \** Gnomish **\
+    dw              --> ANDO   WA_TEHTA
+    gw              --> ANGA   WA_TEHTA
+    lw              --> LAMBE  WA_TEHTA
+    nw              --> ORE    WA_TEHTA
+    rw              --> ROMEN  WA_TEHTA 
+    (ng,ngg,ŋg,ñg)w --> ANGA {NASAL} WA_TEHTA
+    (_ng,ng_,ŋ,ñ)w  --> NOLDO  WA_TEHTA
+    
+    \if "apostrophe == APOSTROPHE_IGNORED"
+      ' --> {NULL}
+      ’ --> {NULL}
+    \else
+      \** use gasdil **\
+      ' --> HALLA
+      ’ --> HALLA
+    \endif
+    
+    \** Forced gasdil **\
+    ° --> HALLA
   \end
   
   \beg    rules punctuation
@@ -297,8 +424,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     \** Apostrophe **\
 
-    ' --> {NULL}
-    ’ --> {NULL}
+
     
     \** NBSP **\
     {NBSP} --> NBSP
@@ -320,7 +446,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     > --> PUNCT_PAREN_R
 
     \** Not universal between fonts ... **\
-    $ --> BOOKMARK_SIGN
+    $ --> ELVISH_PAREN
     ≤ --> RING_MARK_L \** Ring inscription left beautiful stuff **\
     ≥ --> RING_MARK_R \** Ring inscription right beautiful stuff **\
   \end

data/glaemresources/modes/{sindarin.glaem → sindarin-tengwar-general_use.glaem}

@@ -35,12 +35,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \entry "0.1.0" "Added support for the Tengwar Elfica font"
   \entry "0.1.1" "Added support for inlined raw tengwar"  
   \entry "0.1.2" "Added support for non-breaking spaces"  
+  \entry "0.1.3" "Added support for new unicode charsets"   
+  \entry "0.1.4" "Added support for the Tengwar Telcontar font"
+  \entry "0.1.5" "Added a few labial exotic combinations. Reworked median point behaviour, and ng."
+  \entry "0.1.6" "Added gasdil handling."
 \end
 
 \language "Sindarin"
 \writing  "Tengwar"
 \mode     "Sindarin Tengwar - General Use"
-\version  "0.1.2"
+\version  "0.1.6"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \world      arda
@@ -51,7 +55,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \charset  tengwar_ds_eldamar  false
 \charset  tengwar_ds_annatar  false
 \charset  tengwar_ds_elfica   false
+
+\charset  tengwar_guni_sindarin false
+\charset  tengwar_guni_parmaite false
+\charset  tengwar_guni_eldamar  false
+\charset  tengwar_guni_annatar  false
+\charset  tengwar_guni_elfica   false
+
 \charset  tengwar_freemono    false
+\charset  tengwar_telcontar   false
 
 \raw_mode "raw-tengwar"
 
@@ -62,6 +74,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \value U_UP_O_DOWN 2
   \end
 
+  \beg option apostrophe APOSTROPHE_IGNORED
+    \value APOSTROPHE_IGNORED 0
+    \value APOSTROPHE_GASDIL  1
+  \end
+  
+  \beg option hyphen HYPHEN_WORD_BREAKER
+    \value HYPHEN_WORD_BREAKER  0
+    \value HYPHEN_WORD_JOINER   1
+  \end
+
   \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_BAR
     \value CONSONANT_MODIFICATION_STYLE_WAVE 0
     \value CONSONANT_MODIFICATION_STYLE_BAR 1
@@ -85,6 +107,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \** Work exclusively downcase **\
   \downcase
   
+  \if "hyphen == HYPHEN_WORD_JOINER"
+    \** Replace hyphen by median point **\
+    \substitute "-" "·"  
+  \else
+    \** Replace hyphen by glaemscribe's word breaker **\
+    \substitute "-" "|"
+  \endif
+  
+  \** Add keyboard friendly word joiner **\
+  \substitute "*" "·"
+  
   \** Simplify trema vowels **\
   \substitute ä a
   \substitute ë e
@@ -107,6 +140,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \** Special case of starting 'i' before vowels, replace i by j **\     
   \rxsubstitute "\\bi([aeouyáāâéēêíīîóōôúūûýȳŷ])" "j\\1"
   
+  \** Special case for ng : before the vast majority of consonnants, treat as ŋ **\
+  \** Don't include r / l / lh / w **\
+  \rxsubstitute "ng([tpckbdfðvnmhs])" "ŋ\\1"
+  
+  \** Avoid mutated ng of being treated as strong middle word n|g (ex : i·ngelaidh [iŋɛlaið] ) **\
+  \substitute "·ng" "·ŋ"  
+  \** But avoid losing the strong g in nasal mutation of g (ex : in·Gelydh [iŋgɛlyð]] ) **\
+  \substitute "n·g" "·ŋg"
+  \** Use median dot as word joiner **\
+  \substitute "·" ""
+  
   \** Preprocess numbers **\
   \elvish_numbers "\\eval numbers_base" "\\eval reverse_numbers"
 \end
@@ -189,8 +233,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {V_D_WN}n{K} --> CALMA {NASAL} {_V_D_WN_}
 
     \** 2ND LINE **\
-    {L2}        === d     * b     * g     * ng                    \** * g **\
-    {_L2_}      === ANDO  * UMBAR * UNGWE * UNGWE {NASAL}      \** * s **\
+    \** 
+        /ŋg/ : this is ng in middle of words + might be found at word start. 
+        See also final/initial ng_ / _ng below 
+    **\
+    {L2}        === d     * b     * g     * (ng,ngg,ŋg,ñg)              
+    {_L2_}      === ANDO  * UMBAR * UNGWE * UNGWE {NASAL}      
 
     {V_D_WN}[{L2}] --> 2,1 --> [{_L2_}]{_V_D_WN_}
 
@@ -210,13 +258,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     \** 4TH LINE **\
     {L4}        === (đ,ð,ðh,dh)   * (v,bh,f_) \** Some noldorin variants here ... **\
-    {_L4_}        === ANTO          * AMPA 
+    {_L4_}      === ANTO          * AMPA 
 
     {V_D_WN}[{L4}] --> 2,1 --> [{_L4_}]{_V_D_WN_}
 
     \** 5TH LINE **\
-    {L5}        === n * m * _ng * _mh
-    {_L5_}      === NUMEN * MALTA * NWALME * MALTA_W_HOOK 
+    {L5}        === n     *   m       * (_ng,ng_,ŋ,ñ)   * _mh  \** weak ng at initial and final **\
+    {_L5_}      === NUMEN *   MALTA   * NWALME          * MALTA_W_HOOK 
 
     {V_D_WN}[{L5}] --> 2,1 --> [{_L5_}]{_V_D_WN_}
 
@@ -226,7 +274,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** 6TH LINE **\
 
     \** 7TH LINE **\
-    {L7}        === r_    * r     * l     * ll                    * w     
+    {L7}        === r_    * r     * l     * ll               * w     
     {_L7_}      === ORE   * ROMEN * LAMBE * LAMBE {GEMINATE} * VALA
         
     {V_D_WN}[{L7}] --> 2,1 --> [{_L7_}]{_V_D_WN_}
@@ -252,29 +300,47 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     \** 
         Ok here come the labialized consonants which are really tricky
-        The fonts generally do not handle well the u curl + tehtar, this should be one more argument for
+        The fonts generally do not handle well the wa-tehta curl + tehtar, this should be one more argument for
         adopting open type anchors with which we can stack diacritics (see the sarati modes).
         For here, we cheat. Either we don't have any tehta on the tengwa, and it's easy.
         Or, we put the two signs in their small versions, side by side.
         We give an option not to use that trick, if the option is not set, we simply do not use
-        the u-curl at all when there's a tehta on the tengwa.
+        the wa-tehta curl at all when there's a tehta on the tengwa.
     **\
     
     \if "labialized_consonants_u_curl == LABIALIZED_U_CURL_NO_TEHTAR || labialized_consonants_u_curl == LABIALIZED_U_CURL_ALWAYS"
-      dw   --> ANDO  SEV_TEHTA  
-      gw   --> UNGWE SEV_TEHTA  
-      lw   --> LAMBE SEV_TEHTA
-      nw   --> NUMEN SEV_TEHTA   
-      rw   --> ROMEN SEV_TEHTA   
+      bw   --> UMBAR WA_TEHTA
+      dw   --> ANDO  WA_TEHTA  
+      gw   --> UNGWE WA_TEHTA  
+      lw   --> LAMBE WA_TEHTA
+      nw   --> NUMEN WA_TEHTA   
+      rw   --> ROMEN WA_TEHTA   
+      (ng,ngg,ŋg,ñg)w --> UNGWE {NASAL} WA_TEHTA
+      (_ng,ng_,ŋ,ñ)w  --> NWALME WA_TEHTA
     \endif
 
     \if "labialized_consonants_u_curl == LABIALIZED_U_CURL_ALWAYS"    
-      {V_D}dw   --> ANDO  SEV_TEHTA {_V_D_}
-      {V_D}gw   --> UNGWE SEV_TEHTA {_V_D_}
-      {V_D}lw   --> LAMBE SEV_TEHTA {_V_D_}   
-      {V_D}nw   --> NUMEN SEV_TEHTA {_V_D_}
-      {V_D}rw   --> ROMEN SEV_TEHTA {_V_D_}
+      {V_D}bw               --> UMBAR WA_TEHTA {_V_D_}
+      {V_D}dw               --> ANDO  WA_TEHTA {_V_D_}
+      {V_D}gw               --> UNGWE WA_TEHTA {_V_D_}
+      {V_D}lw               --> LAMBE WA_TEHTA {_V_D_}   
+      {V_D}nw               --> NUMEN WA_TEHTA {_V_D_}
+      {V_D}rw               --> ROMEN WA_TEHTA {_V_D_}
+      {V_D}(ng,ngg,ŋg,ñg)w  --> UNGWE {NASAL} WA_TEHTA {_V_D_}
+      {V_D}(_ng,ng_,ŋ,ñ)w   --> NWALME WA_TEHTA {_V_D_}
     \endif
+    
+    \if "apostrophe == APOSTROPHE_IGNORED"
+      ' --> {NULL}
+      ’ --> {NULL}
+    \else
+      \** use gasdil **\
+      ' --> HALLA
+      ’ --> HALLA
+    \endif
+    
+    \** Forced gasdil **\
+    ° --> HALLA
   \end
   
   \beg rules punctuation
@@ -297,11 +363,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     - --> {NULL} 
     – --> PUNCT_TILD  
     — --> PUNCT_TILD
-
-    \** Apostrophe **\
-
-    ' --> {NULL}
-    ’ --> {NULL}
     
     \** NBSP **\
     {NBSP} --> NBSP
@@ -323,7 +384,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     > --> PUNCT_PAREN_R
 
     \** Not universal between fonts ... **\
-    $ --> BOOKMARK_SIGN
+    $ --> ELVISH_PAREN
     ≤ --> RING_MARK_L \** Ring inscription left beautiful stuff **\
     ≥ --> RING_MARK_R \** Ring inscription right beautiful stuff **\
   \end

data/glaemresources/modes/{telerin.glaem → telerin-tengwar-glaemscrafu.glaem}

@@ -34,12 +34,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \entry "0.1.1" "Added support for inlined raw tengwar"  
   \entry "0.1.2" "Added support for non-breaking spaces"   
   \entry "0.1.3" "Correcting visibility options to conform to new glaeml args strict syntax"  
+  \entry "0.1.4" "Added support for new unicode charsets"   
+  \entry "0.1.5" "Added support for the Tengwar Telcontar font"
 \end
 
 \language "Telerin"
 \writing  "Tengwar"
 \mode     "Telerin Tengwar - G*"
-\version  "0.1.3"
+\version  "0.1.5"
 \authors  "Talagan (Benjamin Babut), based on J.R.R Tolkien"
 
 \world      arda
@@ -50,7 +52,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \charset  tengwar_ds_eldamar  false
 \charset  tengwar_ds_annatar  false
 \charset  tengwar_ds_elfica   false
+
+\charset  tengwar_guni_sindarin false
+\charset  tengwar_guni_parmaite false
+\charset  tengwar_guni_eldamar  false
+\charset  tengwar_guni_annatar  false
+\charset  tengwar_guni_elfica   false
+
 \charset  tengwar_freemono    false
+\charset  tengwar_telcontar   false
 
 \raw_mode "raw-tengwar"
 
@@ -237,10 +247,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [ {L1} ] {V_D_WN}         --> [ {_L1_} ] {_V_D_WN_}
     [ {L1_GEMS} ] {V_D_WN}    --> [ {_L1_GEMS_} ] {_V_D_WN_}
                             
-    ts{V_D_WN}          --> TINCO ALVEOLAR_SIGN {_V_D_WN_} 
-    ps{V_D_WN}          --> PARMA ALVEOLAR_SIGN {_V_D_WN_}
-    {K}s{V_D_WN}        --> CALMA ALVEOLAR_SIGN {_V_D_WN_}   
-    x{V_D_WN}           --> CALMA ALVEOLAR_SIGN {_V_D_WN_}   \** render ks for x **\
+    ts{V_D_WN}          --> TINCO SARINCE {_V_D_WN_} 
+    ps{V_D_WN}          --> PARMA SARINCE {_V_D_WN_}
+    {K}s{V_D_WN}        --> CALMA SARINCE {_V_D_WN_}   
+    x{V_D_WN}           --> CALMA SARINCE {_V_D_WN_}   \** render ks for x **\
                             
     \** ===================== **\
     \** 2ND LINE RULES **\
@@ -369,7 +379,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     > --> PUNCT_PAREN_R  
 
     \** Not universal between fonts ... **\
-    $ --> BOOKMARK_SIGN
+    $ --> ELVISH_PAREN
     ≤ --> RING_MARK_L \** Ring inscription left beautiful stuff **\
     ≥ --> RING_MARK_R \** Ring inscription right beautiful stuff **\
  

data/glaemresources/modes/{westron.glaem → westron-tengwar-glaemscrafu.glaem}

@@ -30,13 +30,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \entry "0.1.0" "Added support for the Tengwar Elfica font"
   \entry "0.1.1" "Added support for inlined raw tengwar"  
   \entry "0.1.2" "Added support for non-breaking spaces"   
+  \entry "0.1.3" "Added support for new unicode charsets"   
+  \entry "0.1.4" "Added support for the Tengwar Telcontar font"
 \end
 
 \**  Westron mode for glaemscribe (MAY BE INCOMPLETE) **\
 \language Westron
 \writing  Tengwar
 \mode     "Westron Tengwar - G*"
-\version  "0.1.2"
+\version  "0.1.4"
 \authors  "Talagan (Benjamin Babut), based on J.R.R. Tolkien"
 
 \world      arda
@@ -49,7 +51,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \charset  tengwar_ds_eldamar  false
 \charset  tengwar_ds_annatar  false
 \charset  tengwar_ds_elfica   false
+
+\charset  tengwar_guni_sindarin false
+\charset  tengwar_guni_parmaite false
+\charset  tengwar_guni_eldamar  false
+\charset  tengwar_guni_annatar  false
+\charset  tengwar_guni_elfica   false
+
 \charset  tengwar_freemono    false
+\charset  tengwar_telcontar   false
 
 \beg      options
 
@@ -293,13 +303,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     nz{V_D}           --> ESSE_NUQUERNA {NASAL} {_V_D_}   
     nz                --> ESSE_NUQUERNA {NASAL}                
 
-    ts                --> TINCO ALVEOLAR_SIGN
-    ps                --> PARMA ALVEOLAR_SIGN
-    (ks,cs,x)         --> QUESSE ALVEOLAR_SIGN
+    ts                --> TINCO SARINCE
+    ps                --> PARMA SARINCE
+    (ks,cs,x)         --> QUESSE SARINCE
 
-    ts{V_D}           --> TINCO ALVEOLAR_SIGN {_V_D_}  
-    ps{V_D}           --> PARMA ALVEOLAR_SIGN {_V_D_}
-    (ks,cs,x){V_D}    --> QUESSE ALVEOLAR_SIGN {_V_D_}	
+    ts{V_D}           --> TINCO SARINCE {_V_D_}  
+    ps{V_D}           --> PARMA SARINCE {_V_D_}
+    (ks,cs,x){V_D}    --> QUESSE SARINCE {_V_D_}	
 
     h{V_D}            --> HYARMEN {_V_D_}
     h                 --> HYARMEN
@@ -366,7 +376,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     > --> PUNCT_PAREN_R  
 
     \** Not universal between fonts ... **\
-    $ --> BOOKMARK_SIGN
+    $ --> ELVISH_PAREN
     ≤ --> RING_MARK_L \** Ring inscription left beautiful stuff **\
     ≥ --> RING_MARK_R \** Ring inscription right beautiful stuff **\
   \end