glaemscribe 1.1.14 → 1.3.0

data/glaemresources/modes/{khuzdul.glaem → khuzdul-cirth-moria.glaem}

@@ -24,12 +24,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \beg changelog
   \entry "0.0.2", "Moved outspace character to general element"
+  \entry "0.0.3", "Adding missing long ô"
 \end
 
 \language "Khuzdul"
 \writing  "Cirth"
 \mode     "Khuzdul Cirth - Angerthas Moria"
-\version  "0.0.2"
+\version  "0.0.3"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \world      arda
@@ -66,6 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \beg    rules litteral
     a --> CIRTH_48
     â --> CIRTH_49
+    
     e --> CIRTH_46
     ê --> CIRTH_47
 
@@ -73,6 +75,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     î --> CIRTH_39 CIRTH_39
 
     o --> CIRTH_50
+    ô --> CIRTH_51
 
     u --> CIRTH_42
     û --> CIRTH_43

data/glaemresources/modes/lang_belta-tengwar-dadef.glaem

@@ -0,0 +1,248 @@
+\**
+
+Glǽmscribe (also written Glaemscribe) is a software dedicated to
+the transcription of texts between writing systems, and more
+specifically dedicated to the transcription of J.R.R. Tolkien's
+invented languages to some of his devised writing systems.
+
+Copyright (C) 2015 Benjamin Babut (Talagan).
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+**\
+
+\beg changelog
+  \entry "0.0.1" "Ported from Westron"
+  \entry "0.0.2" "Simplified"
+  \entry "0.0.3" "Yaterash poetic forms"
+  \entry "0.0.4" "English numeric defaults, use lsd for nasal, poetic finals"
+  \entry "0.0.5" "Bikang option: beacon final hints"
+  \entry "0.0.6" "Lowng & kuwendi options"
+  \entry "0.1.0" "clean up pass"
+\end
+\version  "0.1.0"
+
+\** Lang Belta mode for glaemscribe **\
+\language "Lang Belta"
+\writing  Tengwar
+\mode     "Lang Belta (The Expanse) Tengwar - G*"
+\authors  "Da Def, based on Talagan's Westron"
+
+\world     other_world
+\invention experimental
+
+\raw_mode "raw-tengwar"
+
+\charset  tengwar_ds_sindarin false
+\charset  tengwar_ds_parmaite false
+\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  true
+\charset  tengwar_guni_elfica   false
+
+\charset  tengwar_freemono    false
+\charset  tengwar_telcontar   false
+
+\beg      options
+  \option wit_yaterash false
+  
+  \beg option bikang true 
+    \visible_when "wit_yaterash == true"
+  \end
+  
+  \beg option lowng false
+  	\visible_when "wit_yaterash == true"
+  \end
+  
+  \beg option kuwendi false
+  	\visible_when "wit_yaterash == true && lowng == false"
+  \end
+  
+  \option implicit_a false
+  \option reverse_numbers false
+  \beg option numbers_base BASE_10
+    \value    BASE_10 10
+    \value    BASE_12 12
+  \end
+\end
+
+\beg      preprocessor
+  \** Work exclusively downcase **\
+  \downcase
+
+  \** protect NOLDO and NWALME **\
+  \rxsubstitute "(ny)" "ɲ"
+  \rxsubstitute "(ng)" "ŋ"
+
+  \** Preprocess numbers **\
+  \elvish_numbers "\\eval numbers_base" "\\eval reverse_numbers"
+\end
+
+\beg      processor
+  \beg    rules literal
+
+    \if implicit_a
+        {_A_} === {NULL}
+        {_X_} === NO_VOWEL_DOT
+    \else
+        {_A_} === A_TEHTA
+        {_X_} === {NULL}
+    \endif
+      
+    {PENNAR}  === a     * e       * i       * ow               * o       * u
+    {TEHTAR}  === {_A_} * E_TEHTA * I_TEHTA * A_TEHTA_REVERSED * O_TEHTA * U_TEHTA
+    
+    \** For now, shãsa is a hapax **\
+    {PENNAR}  === {PENNAR} * ã  
+    {TEHTAR}  === {TEHTAR} * E_TEHTA_GRAVE
+
+    \** tentative 
+    {PENNAR}  === {PENNAR} * ẽ               * ĩ              * õw       * õ               * ũ
+    {TEHTAR}  === {TEHTAR} * E_TEHTA_DOUBLE  * I_TEHTA_DOUBLE * WA_TEHTA * O_TEHTA_DOUBLE  * U_TEHTA_DOUBLE
+    **\
+
+    {L1_S}    === t     * p      * ch    * k
+    {L1_T}    === TINCO * PARMA  * CALMA * QUESSE
+    {L2_S}    === d     * b      * dzh   * g
+    {L2_T}    === ANDO  * UMBAR  * ANGA  * UNGWE
+    {L3_S}    ===         f      * sh    * x
+    {L3_T}    ===         FORMEN * AHA   * HWESTA
+    {L4_S}    ===         v
+    {L4_T}    ===         AMPA
+    {L5_S}    === n     * m      * ɲ     * ŋ
+    {L5_T}    === NUMEN * MALTA  * NOLDO * NWALME
+    {L6_S}    ===         w      * y
+    {L6_T}    ===         VALA   * ANNA
+    {IR_S}    === r     * l     * s              * z
+    {IR_T}    === ROMEN * LAMBE * SILME_NUQUERNA * ESSE_NUQUERNA
+
+    {TAPTAR}  === {L1_S} * {L2_S} * {L3_S} * {L4_S} * {L5_S} * {L6_S} * {IR_S}
+    {TENGWAR} === {L1_T} * {L2_T} * {L3_T} * {L4_T} * {L5_T} * {L6_T} * {IR_T}
+
+    [{TAPTAR}]           --> [{TENGWAR}] {_X_}
+    [{TAPTAR}][{PENNAR}] --> [{TENGWAR}][{TEHTAR}]
+              [{PENNAR}] -->   TELCO    [{TEHTAR}]
+
+    \if wit_yaterash
+      
+      \if lowng
+        {TAPTARN}  === nt        * nd        * mp        * mb        * nsh     * ns
+        {TENGWARN} === TINCO_EXT * ANDO_EXT  * PARMA_EXT * UMBAR_EXT * AHA_EXT * TW_HW_LOWDHAM
+
+      	tn[{PENNAR}] --> TW_MH [{TEHTAR}]
+      	lt[{PENNAR}] --> ALDA  [{TEHTAR}]
+      	
+        [{TAPTARN}][{PENNAR}] --> [{TENGWARN}][{TEHTAR}]
+      \else
+      	tn[{PENNAR}]              -->             NUMEN THINNAS  [{TEHTAR}]
+      	l[{TAPTAR}][{PENNAR}]     --> [{TENGWAR}] PALATAL_SIGN   [{TEHTAR}]
+      	
+        \if kuwendi
+          {NASAL} === NASALIZE_SIGN_TILD
+        \else
+          {NASAL} === CIRC_TEHTA_INF
+        \endif
+      
+        (m,n)[{TAPTAR}][{PENNAR}] --> [{TENGWAR}] {NASAL}        [{TEHTAR}]
+      \endif
+
+      \if bikang
+        (m,t)_    --> O_TEHTA_INF
+        (ŋ)_      --> E_TEHTA_DOUBLE_INF
+        (f,k,p)_  --> U_TEHTA_INF
+        (l,x,sh)_ --> E_TEHTA_INF
+      \else
+        (t,k,p,f,x,sh,m,ŋ,l)_ --> GEMINATE_SIGN_TILD
+      \endif
+      
+    \endif
+    
+  \end
+
+  \beg rules punctutation
+    . --> PUNCT_DDOT
+    .. --> PUNCT_DOT PUNCT_DDOT PUNCT_DOT
+    …  --> PUNCT_TILD
+    ... --> PUNCT_TILD
+    .... --> PUNCT_TILD
+    ..... --> PUNCT_TILD
+    ...... --> PUNCT_TILD
+    ....... --> PUNCT_TILD
+
+    , --> PUNCT_DOT
+    : --> PUNCT_DOT
+    ; --> PUNCT_DOT
+    ! --> PUNCT_EXCLAM
+    ? --> PUNCT_INTERR
+    · --> PUNCT_DOT
+
+    \** Apostrophe **\
+
+    ' --> {NULL}
+    ’ --> {NULL}
+
+    \** NBSP **\
+    {NBSP} --> NBSP
+
+    \** Quotes **\
+
+    “ --> DQUOT_OPEN
+    ” --> DQUOT_CLOSE
+    « --> DQUOT_OPEN
+    » --> DQUOT_CLOSE
+
+    - --> PUNCT_DOT
+    – --> PUNCT_TILD
+    — --> PUNCT_DTILD
+
+    [ --> PUNCT_PAREN_L
+    ] --> PUNCT_PAREN_R
+    ( --> PUNCT_PAREN_L
+    ) --> PUNCT_PAREN_R
+    { --> PUNCT_PAREN_L
+    } --> PUNCT_PAREN_R
+    < --> PUNCT_PAREN_L
+    > --> PUNCT_PAREN_R
+
+    \** Not universal between fonts ... **\
+    $ --> ELVISH_PAREN
+    ≤ --> RING_MARK_L \** Ring inscription left beautiful stuff **\
+    ≥ --> RING_MARK_R \** Ring inscription right beautiful stuff **\
+  \end
+
+  \beg rules numbers
+    0 --> NUM_0
+    1 --> NUM_1
+    2 --> NUM_2
+    3 --> NUM_3
+    4 --> NUM_4
+    5 --> NUM_5
+    6 --> NUM_6
+    7 --> NUM_7
+    8 --> NUM_8
+    9 --> NUM_9
+    A --> NUM_10
+    B --> NUM_11
+  \end
+
+\end
+
+\beg postprocessor
+  \resolve_virtuals
+\end

data/glaemresources/modes/{mercian.glaem → old_english-tengwar-mercian.glaem}

@@ -27,12 +27,13 @@ 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" "Doing some cleaning"
   \entry "0.1.3" "Added support for non-breaking spaces"     
+  \entry "0.1.4" "Added support for new unicode charsets"
 \end
 
 \language "Old English"
 \writing  "Tengwar"
 \mode     "Old English Tengwar - 'Mercian' Usage"
-\version  "0.1.3"
+\version  "0.1.4"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \world      primary_related_to_arda
@@ -46,9 +47,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \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
+
+
 \** List of features that would prevent use of other charsets 
-\charset  tengwar_freemono    false
- Free Mono Tengwar : missing [OLD_ENGLISH_AND,SHOOK_BEAUTIFUL] / sa-rince management not accurate
+  \charset  tengwar_freemono    false
+  \charset  tengwar_telcontar   false
+
+   Free Mono Tengwar : missing [OLD_ENGLISH_AND,SARINCE_FLOURISHED] / sa-rince management not accurate
 **\
 
 
@@ -123,13 +133,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {S_VOWELS_WP_KERNEL}   === {S_VOWELS_NP_KERNEL} * @                           
 
     \** UP TEHTAS **\    
-    {TEHTAR_UP_NP}  === A_TEHTA    * Y_TEHTA     * E_TEHTA_DOUBLE   * E_TEHTA   *   I_TEHTA    * O_TEHTA    * U_TEHTA   * SEV_TEHTA 
+    {TEHTAR_UP_NP}  === A_TEHTA    * Y_TEHTA     * E_TEHTA_DOUBLE   * E_TEHTA   *   I_TEHTA    * O_TEHTA    * U_TEHTA   * WA_TEHTA 
  
     {TEHTAR_UP}     === {TEHTAR_UP_NP}  * {NULL}
 
     \** FOR LONG VOWELS **\
     {LVOWELS}       === {AA}           * {AEAE}       * {OEOE}             * {EE}         * {II}         * {OO}          * {UU}         * {YY}  
-    {LTEHTAR}       === ARA A_TEHTA    * ARA Y_TEHTA  * ARA E_TEHTA_DOUBLE * ARA E_TEHTA  * ARA I_TEHTA  * ARA O_TEHTA   * ARA U_TEHTA  * ARA SEV_TEHTA    
+    {LTEHTAR}       === ARA A_TEHTA    * ARA Y_TEHTA  * ARA E_TEHTA_DOUBLE * ARA E_TEHTA  * ARA I_TEHTA  * ARA O_TEHTA   * ARA U_TEHTA  * ARA WA_TEHTA    
 
     {LVOWEL_MARKER}  === THINNAS
   
@@ -324,7 +334,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [l * ll * ld] {S_VOWELS_WN}               --> [LAMBE * LAMBE {_GEMINATE_} * ALDA] {_S_VOWELS_UP_WN_}
 
     \** ========== **\
-    \** Alveolar (sifflantes) **\
+    \** sibilant (sifflantes) **\
     
     {L8_KER}      ===  s * z 
     {L8_IMG}      ===  SILME_NUQUERNA * ESSE_NUQUERNA 
@@ -339,9 +349,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L8_KER_GEMS}]{S_VOWELS_WN}              --> [{L8_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
     \**  Final s (Challenging!) **\
-    s_                --> SHOOK_BEAUTIFUL                             \** Final rule for s **\
+    s_                --> SARINCE_FLOURISHED                       \** Final rule for s **\
     {S_VOWELS}s_      --> TELCO {_S_VOWELS_UP_} SILME_NUQUERNA     \** Rule es_ **\
-    [{LVOWELS}]s_     --> [{LTEHTAR}] SILME_NUQUERNA                \** Rule és_ **\
+    [{LVOWELS}]s_     --> [{LTEHTAR}] SILME_NUQUERNA               \** Rule és_ **\
 
     s --> SILME    \** Overload lonely s **\
     z --> ESSE    \** Overload lonely z **\
@@ -377,9 +387,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** X **\
     \** For x, due to the cedilla, we cannot put tehtas under the tengwa (so no need to treat diphthongs or long vowels) **\
 
-    x{S_VOWELS_WN}                               --> QUESSE ALVEOLAR_SIGN {_S_VOWELS_UP_WN_}
-    xx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN {_GEMINATE_} {_S_VOWELS_UP_WN_}
-    nx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN {_NASAL_} {_S_VOWELS_UP_WN_}     
+    x{S_VOWELS_WN}                               --> QUESSE SARINCE {_S_VOWELS_UP_WN_}
+    xx{S_VOWELS_WN}                              --> QUESSE SARINCE {_GEMINATE_} {_S_VOWELS_UP_WN_}
+    nx{S_VOWELS_WN}                              --> QUESSE SARINCE {_NASAL_} {_S_VOWELS_UP_WN_}     
     
     
   \end
@@ -432,7 +442,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/{westsaxon.glaem → old_english-tengwar-westsaxon.glaem}

@@ -27,12 +27,13 @@ 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" "Doing some cleaning"
   \entry "0.1.3" "Added support for non-breaking spaces"     
+  \entry "0.1.4" "Added support for new unicode charsets"
 \end
 
 \language "Old English"
 \writing  "Tengwar"
 \mode     "Old English Tengwar - 'West Saxon' Usage"
-\version  "0.1.3"
+\version  "0.1.4"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \world      primary_related_to_arda
@@ -46,9 +47,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \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
+
 \** List of features that would prevent use of other charsets 
-\charset  tengwar_freemono    false
- Free Mono Tengwar : missing [OLD_ENGLISH_AND,SHOOK_BEAUTIFUL] / sa-rince management not accurate
+  \charset  tengwar_freemono    false
+  \charset  tengwar_telcontar   false
+
+   Free Mono Tengwar : missing [OLD_ENGLISH_AND,SARINCE_FLOURISHED] / sa-rince management not accurate
 **\
 
 \beg options
@@ -124,12 +133,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {S_VOWELS_WP_KERNEL}   === {S_VOWELS_NP_KERNEL} * @ 
     
     \** UP TEHTAS **\    
-    {TEHTAR_UP_NP}  === E_TEHTA    * A_TEHTA    * E_TEHTA_DOUBLE   * Y_TEHTA      * I_TEHTA    * O_TEHTA    * U_TEHTA    * SEV_TEHTA   * VILYA    
+    {TEHTAR_UP_NP}  === E_TEHTA    * A_TEHTA    * E_TEHTA_DOUBLE   * Y_TEHTA      * I_TEHTA    * O_TEHTA    * U_TEHTA    * WA_TEHTA   * VILYA    
     {TEHTAR_UP}     === {TEHTAR_UP_NP}  * {NULL}
   
     \** FOR LONG VOWELS **\
     {L_VOWELS}      === {AA}              * {AEAE}          * {OEOE}                * {EE}            * {II}            * {OO}              * {UU}            * {YY}  
-    {L_TEHTAR}      === ARA E_TEHTA       * ARA A_TEHTA     * ARA E_TEHTA_DOUBLE    * ARA Y_TEHTA     * ARA I_TEHTA     * ARA O_TEHTA       * ARA U_TEHTA     * ARA SEV_TEHTA       
+    {L_TEHTAR}      === ARA E_TEHTA       * ARA A_TEHTA     * ARA E_TEHTA_DOUBLE    * ARA Y_TEHTA     * ARA I_TEHTA     * ARA O_TEHTA       * ARA U_TEHTA     * ARA WA_TEHTA       
 
     \** DOWN TEHTAS **\
     {TEHTAR_DN}     === E_TEHTA_INF       * A_TEHTA_INF     * CIRC_TEHTA_INF        * Y_TEHTA_INF     * I_TEHTA_INF     * TELCO O_TEHTA     * TELCO U_TEHTA   * THINNAS   * VILYA * {NULL}
@@ -260,7 +269,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {S_VOWELS_WN}ld                         --> ALDA {_S_VOWELS_UP_WN_}
 
 
-    \** ## Alveolar (sifflantes) **\
+    \** ## Sibilant (sifflantes) **\
     \** ## **\
     {L8_KER}      ===  s * z 
     {L8_IMG}      ===  SILME_NUQUERNA * ESSE_NUQUERNA 
@@ -272,7 +281,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
     \** ## FINAL S (Challenging!) **\
-    {S_VOWELS_WN}s_                               --> SHOOK_BEAUTIFUL {_S_VOWELS_UP_WN_} \** # Final rule for s **\
+    {S_VOWELS_WN}s_                               --> SARINCE_FLOURISHED {_S_VOWELS_UP_WN_} \** # Final rule for s **\
     _{S_VOWELS_WN}s_                              --> SILME_NUQUERNA {_S_VOWELS_UP_WN_} \** # Rule _es_ **\
     [{L_VOWELS} * _ ]{S_VOWELS_WN}s_              --> [{L_TEHTAR} * {NULL} ] SILME_NUQUERNA {_S_VOWELS_UP_WN_} \** # Rule for éis_, és_ **\
     {NULL}[ {S_VOWELS_NP_KERNEL} ]{S_VOWELS}s_    --> TELCO [ {TEHTAR_UP_NP} ] SILME_NUQUERNA {_S_VOWELS_UP_} \** # Rule for ies_   **\
@@ -295,9 +304,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     \** ## X **\
     \** ## For x, due to the cedilla, we cannot put tehtas under the tengwa. **\
-    {S_VOWELS_WN}x  --> QUESSE SHOOK_LEFT_L {_S_VOWELS_UP_WN_}
-    {S_VOWELS_WN}xx --> QUESSE SHOOK_LEFT_L {_GEMINATE_} {_S_VOWELS_UP_WN_}
-    {S_VOWELS_WN}nx --> QUESSE SHOOK_LEFT_L {_NASAL_} {_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}x  --> QUESSE SARINCE {_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}xx --> QUESSE SARINCE {_GEMINATE_} {_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}nx --> QUESSE SARINCE {_NASAL_} {_S_VOWELS_UP_WN_}
   \end
   
   \beg rules punctuation 
@@ -348,7 +357,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/{quenya.glaem → quenya-tengwar-classical.glaem}

@@ -52,8 +52,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \entry "0.9.7" "Correcting visibility options to conform to new glaeml args strict syntax"
   \entry "0.9.8" "Adding palatalized geminates (requested)"
   \entry "0.9.9" "Hotfix on 0.9.8"
+  \entry "0.9.10" "Removing option on palatalized geminates (always accumulate)"
+  \entry "0.9.11" "Added support for new unicode charsets"
+  \entry "0.9.12" "Added support for the Tengwar Telcontar font"
 \end
-\version  "0.9.9"
+\version  "0.9.12"
 
 \language "Quenya"
 \writing  "Tengwar"
@@ -68,7 +71,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"
 
@@ -118,12 +129,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \value ST_PT_HT_SEPARATED 1
     \value ST_PT_HT_WITH_XTD 2
   \end
-  
-  \beg option palatalized_geminates PALATALIZED_GEMINATES_SPLIT
-    \value PALATALIZED_GEMINATES_SPLIT 0
-    \value PALATALIZED_GEMINATES_CUMULATE 1
-  \end
-  
+    
   \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_BAR
     \value CONSONANT_MODIFICATION_STYLE_WAVE 0
     \value CONSONANT_MODIFICATION_STYLE_BAR 1
@@ -158,25 +164,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   \** Dis-ambiguate qu **\
   \substitute   "qu" "q" 
-  
-  \if "palatalized_geminates == PALATALIZED_GEMINATES_SPLIT"
-    \substitute     "ppy"       "p|py"
-    \substitute     "tty"       "t|ty"
-    \rxsubstitute   "[ck][ck]y" "k|ky"
-
-    \substitute     "nny"       "n|ny"
-    \substitute     "mmy"       "m|my"
-
-    \substitute     "nnty"      "n|nty"
-    \substitute     "nndy"      "n|ndy"
     
-    \substitute     "rry"       "r|ry"
-    \substitute     "rrdy"      "r|rdy"
-
-    \substitute     "lly"       "l|ly"
-    \substitute     "lldy"      "l|ldy"
-  \endif
-  
   \elvish_numbers "\\eval numbers_base" "\\eval reverse_numbers"
 \end
 
@@ -330,18 +318,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     \** PALATAL **\
     [t * p * {K}] y {V_D_WN} --> [TINCO * PARMA * CALMA] {PALATAL} {_V_D_WN_}
+
+    \** PALATAL GEMINATES **\
+    [tt * pp * {K}{K}] y {V_D_WN} --> [TINCO * PARMA * CALMA] {GEMINATE} {PALATAL} {_V_D_WN_}
     
-    \if "palatalized_geminates == PALATALIZED_GEMINATES_CUMULATE"
-      [tt * pp * {K}{K}] y {V_D_WN} --> [TINCO * PARMA * CALMA] {GEMINATE} {PALATAL} {_V_D_WN_}
-    \endif
-    
-    \** For alveolarized consonants, we must put the alveolar_sign just after the tengwa
+    \** For alveolarized consonants, we must put the SARINCE just after the tengwa
         because else, FreeMonoTengwar will not handle well the ligature. Anyway, this is
         more logical, but the tehta placement will not be perfect for older fonts **\
-    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    **\
@@ -355,9 +342,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** Palatalized **\
     ndy{V_D_WN} --> ANDO {PALATAL} {_V_D_WN_}
 
-    \if "palatalized_geminates == PALATALIZED_GEMINATES_CUMULATE"
-      [nnd] y {V_D_WN} --> [ANDO] {GEMINATE} {PALATAL} {_V_D_WN_}
-    \endif
+    \** PALATAL GEMINATES **\
+    [nnd] y {V_D_WN} --> [ANDO] {GEMINATE} {PALATAL} {_V_D_WN_}
 
     \** Have some rules for d,b,g,gw although there are not theoritically possible, aldudénie e.g needs it **\
     {L2_UN}               === d       * b         * g       * gw
@@ -413,9 +399,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** PALATAL **\
     nty {V_D_WN}       --> ANTO {PALATAL} {_V_D_WN_}
 
-    \if "palatalized_geminates == PALATALIZED_GEMINATES_CUMULATE"
-      [nnt] y {V_D_WN} --> [ANTO] {GEMINATE} {PALATAL} {_V_D_WN_}
-    \endif
+    \** PALATAL GEMINATES **\
+    [nnt] y {V_D_WN} --> [ANTO] {GEMINATE} {PALATAL} {_V_D_WN_}
 
     \** ===================== **\
     \**     5TH LINE RULES    **\
@@ -431,9 +416,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     ny{V_D_WN}          --> NUMEN {PALATAL} {_V_D_WN_}
     my{V_D_WN}          --> MALTA {PALATAL} {_V_D_WN_}
 
-    \if "palatalized_geminates == PALATALIZED_GEMINATES_CUMULATE"
-      [nn * mm] y {V_D_WN} --> [NUMEN * MALTA] {GEMINATE} {PALATAL} {_V_D_WN_}
-    \endif
+    \** PALATAL GEMINATES **\
+    [nn * mm] y {V_D_WN} --> [NUMEN * MALTA] {GEMINATE} {PALATAL} {_V_D_WN_}
 
     \** ===================== **\
     \**     6TH LINE RULES    **\
@@ -465,9 +449,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     ry{V_D_WN}        --> ROMEN {PALATAL} {_V_D_WN_}
     rdy{V_D_WN}       --> ARDA {PALATAL} {_V_D_WN_}
     
-    \if "palatalized_geminates == PALATALIZED_GEMINATES_CUMULATE"
-      [rr * rrd] y {V_D_WN} --> [ROMEN * ARDA] {GEMINATE} {PALATAL} {_V_D_WN_}
-    \endif
+    \** PALATAL GEMINATES **\
+    [rr * rrd] y {V_D_WN} --> [ROMEN * ARDA] {GEMINATE} {PALATAL} {_V_D_WN_}
 
     \** ===================== **\
     \**     L  LINE RULES     **\
@@ -480,9 +463,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     ly{V_D_WN}            --> LAMBE {PALATAL} {_V_D_WN_}
     ldy{V_D_WN}           --> ALDA  {PALATAL} {_V_D_WN_}
     
-    \if "palatalized_geminates == PALATALIZED_GEMINATES_CUMULATE"
-      [ll * lld] y {V_D_WN} --> [LAMBE * ALDA] {GEMINATE} {PALATAL} {_V_D_WN_}
-    \endif
+    \** PALATAL GEMINATES **\
+    [ll * lld] y {V_D_WN} --> [LAMBE * ALDA] {GEMINATE} {PALATAL} {_V_D_WN_}
     
     hl{V_D_WN}            --> HALLA LAMBE {_V_D_WN_}
     hr{V_D_WN}            --> HALLA ROMEN {_V_D_WN_}
@@ -550,7 +532,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 **\