glaemscribe 1.0.19 → 1.1.0

data/glaemresources/modes/rlyehian.glaem

@@ -33,10 +33,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \language "R'lyehian"
 \writing  Tengwar
 \mode     Glaemscrafu
-\version  0.0.1
-\authors  "Fthalagn"
+\version  0.0.3
+\authors  "H.P.Lovecraft & The Great Ancient Gods, impl. Fthalagn"
 
-\charset  tengwar_ds true
+\beg changelog
+  \entry "0.0.1" "First version"
+	\entry 0.0.2 "Ported to virtual chars"
+	\entry 0.0.3 "Ported to various charsets"
+\end
+
+\charset  tengwar_ds_sindarin true
+\charset  tengwar_ds_parmaite false
+\charset  tengwar_ds_eldamar  false
+\charset  tengwar_ds_annatar  false
+\charset  tengwar_ds_elfica   false
+\charset  tengwar_freemono    false
 
 \beg      options
 \end
@@ -158,38 +169,21 @@ y palatal semi vowel ?
   \beg    rules litteral  
     {VOWELS}            === a               *  e              * i              * o              *  u  * w
 
-    {O_LOOP_XS} === U_TEHTA_XS
-    {O_LOOP_S}  === U_TEHTA_S
-    {O_LOOP_L}  === U_TEHTA_L
-    {O_LOOP_XL} === U_TEHTA_XL
-    {U_LOOP_XS} === O_TEHTA_XS
-    {U_LOOP_S}  === O_TEHTA_S
-    {U_LOOP_L}  === O_TEHTA_L
-    {U_LOOP_XL} === O_TEHTA_XL   
-        
-    {TEHTA_XS}          === A_TEHTA_XS      *  E_TEHTA_XS     *  I_TEHTA_XS    * {O_LOOP_XS}    *  {U_LOOP_XS} * THSUP_SEV_XS
-    {TEHTA__S}          === A_TEHTA_S       *  E_TEHTA_S      *  I_TEHTA_S     * {O_LOOP_S}     *  {U_LOOP_S}  * THSUP_SEV_S
-    {TEHTA__L}          === A_TEHTA_L       *  E_TEHTA_L      *  I_TEHTA_L     * {O_LOOP_L}     *  {U_LOOP_L}  * THSUP_SEV_L
-    {TEHTA_XL}          === A_TEHTA_XL      *  E_TEHTA_XL     *  I_TEHTA_XL    * {O_LOOP_XL}    *  {U_LOOP_XL} * THSUP_SEV_XL
-
-    [{VOWELS}]          --> TELCO [{TEHTA_XS}]  \** Replace isolated short vowels **\
+    {O_LOOP}        === O_TEHTA
+    {U_LOOP}        === U_TEHTA
+       
+    {TEHTAR}            === A_TEHTA      * E_TEHTA      * I_TEHTA    * O_TEHTA     * U_TEHTA * SEV_TEHTA
+  
+    [{VOWELS}]          --> TELCO [{TEHTAR}]  \** Replace isolated short vowels **\
   
-
     {WDIPHTHONGS}       === {NULL} 
     {WDIPHTHENGS}       === {NULL}
       
     {V_D_KER}           === [ {VOWELS} {WDIPHTHONGS} ]
     {V_D_KER_WN}        === [ {VOWELS} {WDIPHTHONGS} * {NULL} ]
 
-    {V_D_IMG_XS}        === [ {TEHTA_XS} {WDIPHTHENGS} ]
-    {V_D_IMG__S}        === [ {TEHTA__L} {WDIPHTHENGS} ]
-    {V_D_IMG__L}        === [ {TEHTA__S} {WDIPHTHENGS} ]
-    {V_D_IMG_XL}        === [ {TEHTA_XL} {WDIPHTHENGS} ]
-    {V_D_IMG_XS_WN}     === [ {TEHTA_XS} {WDIPHTHENGS} * {NULL} ]
-    {V_D_IMG__S_WN}     === [ {TEHTA__L} {WDIPHTHENGS} * {NULL} ]
-    {V_D_IMG__L_WN}     === [ {TEHTA__S} {WDIPHTHENGS} * {NULL} ]
-    {V_D_IMG_XL_WN}     === [ {TEHTA_XL} {WDIPHTHENGS} * {NULL} ]
-  
+    {V_D_IMG}        === [ {TEHTAR} {WDIPHTHENGS} ]
+    {V_D_IMG_WN}     === [ {TEHTAR} {WDIPHTHENGS} * {NULL} ] 
   
     {L1_KER_1}        === t                   * p  
     {L1_IMG_1}        === TINCO               * PARMA
@@ -197,30 +191,30 @@ y palatal semi vowel ?
     {L1_IMG_2}        === CALMA               
     
     \** NORMAL **\
-    [ {L1_KER_1} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L1_IMG_1} ] [{NULL} * TILD_INF_S] {V_D_IMG__S_WN}
-    [ {L1_KER_2} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L1_IMG_2} ] [{NULL} * TILD_INF_S] {V_D_IMG__S_WN}
+    [ {L1_KER_1} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L1_IMG_1} ] [{NULL} * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
+    [ {L1_KER_2} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L1_IMG_2} ] [{NULL} * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
 
     {L2_KER}        === d      * b        * g      
     {L2_IMG}        === ANDO   * UMBAR    * ANGA    
-    [ {L2_KER} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L2_IMG} ] [{NULL} * TILD_INF_L] {V_D_IMG_XL_WN}
+    [ {L2_KER} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L2_IMG} ] [{NULL} * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
   
     {L3_KER} === f
     {L3_IMG} === FORMEN
-    [ {L3_KER} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L3_IMG} ] [{NULL} * TILD_INF_S] {V_D_IMG_XL_WN}
+    [ {L3_KER} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L3_IMG} ] [{NULL} * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
  
     {L5_KER}  === n     * m     
     {L5_IMG}  === NUMEN * MALTA 
-    [ {L5_KER} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L5_IMG} ] [{NULL} * TILD_INF_L] {V_D_IMG_XL_WN}
+    [ {L5_KER} ] [{NULL} * h] {V_D_KER_WN}  --> [ {L5_IMG} ] [{NULL} * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
   
-    r [{NULL} * y * h] {V_D_KER_WN} --> ROMEN [{NULL} * THINF_DDOT_S * LAMBE_MARK_TILD] {V_D_IMG__L_WN}
-    s {V_D_KER_WN} --> SILME_NUQUERNA {V_D_IMG__L_WN}
-    z {V_D_KER_WN} --> ESSE_NUQUERNA {V_D_IMG__L_WN}
+    r [{NULL} * y * h] {V_D_KER_WN} --> ROMEN [{NULL} * PALATAL_SIGN * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
+    s {V_D_KER_WN} --> SILME_NUQUERNA {V_D_IMG_WN}
+    z {V_D_KER_WN} --> ESSE_NUQUERNA {V_D_IMG_WN}
 
-    l [{NULL} * y * h] {V_D_KER_WN} --> LAMBE [{NULL} * LAMBE_MARK_DDOT * LAMBE_MARK_TILD] {V_D_IMG__L_WN}
-    h [{NULL} * y * h] {V_D_KER_WN} --> AHA [{NULL} * THINF_DDOT_L * LAMBE_MARK_TILD] {V_D_IMG_XL_WN}
-    v [{NULL} * y * h] {V_D_KER_WN} --> VALA [{NULL} * THINF_DDOT_L * LAMBE_MARK_TILD] {V_D_IMG__S_WN}
+    l [{NULL} * y * h] {V_D_KER_WN} --> LAMBE [{NULL} * PALATAL_SIGN * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
+    h [{NULL} * y * h] {V_D_KER_WN} --> AHA [{NULL} * PALATAL_SIGN * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
+    v [{NULL} * y * h] {V_D_KER_WN} --> VALA [{NULL} * PALATAL_SIGN * GEMINATE_SIGN_TILD] {V_D_IMG_WN}
  
-    y {V_D_KER_WN} --> VILYA {V_D_IMG__L_WN}
+    y {V_D_KER_WN} --> VILYA {V_D_IMG_WN}
 
     ' --> HARP_SHAPED
     ’ --> HARP_SHAPED
@@ -252,8 +246,8 @@ y palatal semi vowel ?
     » --> DQUOT_CLOSE 
     
     - --> PUNCT_DOT    
-    – --> WAVE_MED_SIMPLE  
-    — --> WAVE_MED_DOUBLE
+    – --> PUNCT_TILD  
+    — --> PUNCT_DTILD
  
     [ --> PUNCT_PAREN_L
     ] --> PUNCT_PAREN_R
@@ -284,6 +278,10 @@ y palatal semi vowel ?
     A --> NUM_10
     B --> NUM_11   
   \end
-  
+	
 \end
 
+
+\beg postprocessor
+  \resolve_virtuals
+\end  

data/glaemresources/modes/sindarin-beleriand.glaem

@@ -24,21 +24,34 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \** Sindarin Beleriand mode for glaemscribe (MAY BE INCOMPLETE) **\
 \beg changelog
-  \entry 0.0.2 "Added lw"
-  \entry 0.0.3 "Added thorn as equivalent for th"
-  \entry 0.0.4 "Porting to virtual chars to simplify and beautify"
+  \entry "0.0.2" "Added lw"
+  \entry "0.0.3" "Added thorn as equivalent for th"
+  \entry "0.0.4" "Porting to virtual chars to simplify and beautify"
+  \entry "0.0.5" "Added charset support for Annatar"
+  \entry "0.0.6" "Added support for the FreeMonoTengwar font"
+  \entry "0.1.0" "Added support for the Tengwar Elfica font"
 \end
 
 \language "Sindarin"
 \writing  "Tengwar"
 \mode     "Beleriand"
-\version  "0.0.4"
-\authors  "Talagan (Benjamin Babut)"
+\version  "0.1.0"
+\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
-\charset  tengwar_ds         true
-\charset  tengwar_ds_eldamar false
+\charset  tengwar_ds_sindarin true
+\charset  tengwar_ds_parmaite false
+\charset  tengwar_ds_eldamar  false
+\charset  tengwar_ds_annatar  false
+\charset  tengwar_ds_elfica   false
+\charset  tengwar_freemono    false
 
 \beg      options
+
+  \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_BAR
+    \value CONSONANT_MODIFICATION_STYLE_WAVE 0
+    \value CONSONANT_MODIFICATION_STYLE_BAR 1
+  \end
+
   \option reverse_numbers true
   \beg option numbers_base BASE_12
     \value    BASE_10 10
@@ -79,6 +92,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \beg      processor
 
   \beg    rules litteral
+  
+    \if "consonant_modification_style == CONSONANT_MODIFICATION_STYLE_WAVE"
+      {GEMINATE} === GEMINATE_SIGN_TILD
+      {NASAL}    === NASALIZE_SIGN_TILD
+    \else
+      {GEMINATE} === GEMINATE_SIGN
+      {NASAL}    === NASALIZE_SIGN
+    \endif
+  
     {A}                 === a
     {AA}                === á
     {E}                 === e
@@ -134,9 +156,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{L1}]       --> [{_L1_}]
  
-    nt   --> TINCO NASALIZE_SIGN
-    mp   --> PARMA NASALIZE_SIGN
-    n{K} --> CALMA NASALIZE_SIGN
+    nt   --> TINCO {NASAL}
+    mp   --> PARMA {NASAL}
+    n{K} --> CALMA {NASAL}
 
     \** ======== **\
     \** 2ND LINE **\
@@ -146,8 +168,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{L2}] --> [{_L2_}]
 
-    mb   --> UMBAR  NASALIZE_SIGN
-    nd   --> ANDO   NASALIZE_SIGN
+    mb   --> UMBAR  {NASAL}
+    nd   --> ANDO   {NASAL}
 
     \** ======== **\
     \** 3RD LINE **\
@@ -157,10 +179,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
      
     [{L3}] --> [{_L3_}]
 
-    nth   --> SULE    NASALIZE_SIGN
-    mph   --> FORMEN  NASALIZE_SIGN
-    nf    --> FORMEN  NASALIZE_SIGN
-    nch   --> AHA     NASALIZE_SIGN
+    nth   --> SULE    {NASAL}
+    mph   --> FORMEN  {NASAL}
+    nf    --> FORMEN  {NASAL}
+    nch   --> AHA     {NASAL}
 
     \** ======== **\
     \** 4TH LINE **\
@@ -202,7 +224,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{S_LINE}] --> [{_S_LINE_}]
 
-    ns --> SILME_NUQUERNA NASALIZE_SIGN
+    ns --> SILME_NUQUERNA {NASAL}
 
     \** ======== **\
     \** OTHERS **\

data/glaemresources/modes/sindarin-daeron.glaem

@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \writing  "Cirth"
 \mode     "Angerthas Daeron"
 \version  "0.0.4"
-\authors  "Talagan (Benjamin Babut)"
+\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \charset  cirth_ds true
 

data/glaemresources/modes/{sindarin-classical.glaem → sindarin.glaem}

@@ -25,34 +25,54 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \** Sindarin Classical mode for glaemscribe (MAY BE INCOMPLETE) **\
 
 \beg changelog
-  \entry 0.0.2 "Fixed some tehtar versions which did not look quite nice for ch, dh, v, mb. Reworked the problem of labialized consonnants (+w), adding an option for treating the u-curl + tehta combination."
-  \entry 0.0.3 "Extended the labialized consonnants option."
-  \entry 0.0.4 "Fixed nw (BUG : was using ORE from the beleriand mode), added lw"
-  \entry 0.0.5 "Added thorn as equivalent for th"
-  \entry 0.0.6 "Porting to virtual chars to simplify and beautify"
+  \entry "0.0.2" "Fixed some tehtar versions which did not look quite nice for ch, dh, v, mb. Reworked the problem of labialized consonnants (+w), adding an option for treating the u-curl + tehta combination."
+  \entry "0.0.3" "Extended the labialized consonnants option."
+  \entry "0.0.4" "Fixed nw (BUG : was using ORE from the beleriand mode), added lw"
+  \entry "0.0.5" "Added thorn as equivalent for th"
+  \entry "0.0.6" "Porting to virtual chars to simplify and beautify"
+  \entry "0.0.7" "Added charset support for Annatar"
+  \entry "0.0.8" "Added support for the FreeMonoTengwar font" 
+  \entry "0.1.0" "Added support for the Tengwar Elfica font"
 \end
 
 
 \language "Sindarin"
 \writing  "Tengwar"
-\mode     "Classical"
-\version  "0.0.6"
-\authors  "Talagan (Benjamin Babut)"
+\mode     "General Use"
+\version  "0.1.0"
+\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
-\charset  tengwar_ds         true
-\charset  tengwar_ds_eldamar false
+\charset  tengwar_ds_sindarin true
+\charset  tengwar_ds_parmaite false
+\charset  tengwar_ds_eldamar  false
+\charset  tengwar_ds_annatar  false
+\charset  tengwar_ds_elfica   false
+\charset  tengwar_freemono    false
 
 \beg      options
-  \option reverse_numbers true
-  \beg option numbers_base BASE_12
-    \value    BASE_10 10
-    \value    BASE_12 12
+
+  \beg option reverse_o_u_tehtar U_UP_O_DOWN
+    \value O_UP_U_DOWN 1
+    \value U_UP_O_DOWN 2
   \end
+
+  \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_BAR
+    \value CONSONANT_MODIFICATION_STYLE_WAVE 0
+    \value CONSONANT_MODIFICATION_STYLE_BAR 1
+  \end
+
   \beg option labialized_consonants_u_curl LABIALIZED_U_CURL_ALWAYS
     \value    LABIALIZED_U_CURL_NONE      1
     \value    LABIALIZED_U_CURL_NO_TEHTAR 2
     \value    LABIALIZED_U_CURL_ALWAYS    3
   \end
+
+  \option reverse_numbers true
+  \beg option numbers_base BASE_12
+    \value    BASE_10 10
+    \value    BASE_12 12
+  \end
+
 \end
 
 \beg preprocessor
@@ -89,6 +109,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   \beg rules litteral
     
+    \if "consonant_modification_style == CONSONANT_MODIFICATION_STYLE_WAVE"
+      {GEMINATE} === GEMINATE_SIGN_TILD
+      {NASAL}    === NASALIZE_SIGN_TILD
+    \else
+      {GEMINATE} === GEMINATE_SIGN
+      {NASAL}    === NASALIZE_SIGN
+    \endif
+    
+    \if "reverse_o_u_tehtar == U_UP_O_DOWN"
+      {O_LOOP}        === O_TEHTA
+      {U_LOOP}        === U_TEHTA
+     \else
+      {O_LOOP}        === U_TEHTA
+      {U_LOOP}        === O_TEHTA
+    \endif
+    
     \** VOWELS **\
     {A}   === a
     {AA}  === á
@@ -117,12 +153,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {VOWELS}    === {A}             * {E}             * {I}           * {O}         * {U}         * {Y} 
     {LVOWELS}   === {AA}            * {EE}            * {II}          * {OO}        * {UU}        * {YY}   
 
-    {TEHTAR}    === A_TEHTA         * E_TEHTA         * I_TEHTA       * O_TEHTA     * U_TEHTA     * Y_TEHTA 
+    {TEHTAR}    === A_TEHTA         * E_TEHTA         * I_TEHTA       * {O_LOOP}     * {U_LOOP}     * Y_TEHTA 
   
-    {_LTEHTAR_} === ARA A_TEHTA     * ARA E_TEHTA     * ARA I_TEHTA   * ARA O_TEHTA * ARA U_TEHTA * ARA Y_TEHTA 
+    {_LTEHTAR_} === ARA A_TEHTA     * ARA E_TEHTA     * ARA I_TEHTA   * ARA {O_LOOP} * ARA {U_LOOP} * ARA Y_TEHTA 
 
     {DIPHTHONGS}   === {AI}            * {AU}            * {AW}            * {EI}            * {UI}         * {AE}          * {OE}              
-    {_DIPHTHONGS_} === ANNA A_TEHTA    * VALA A_TEHTA    * VALA A_TEHTA    * ANNA E_TEHTA    * ANNA U_TEHTA * YANTA A_TEHTA * YANTA O_TEHTA     
+    {_DIPHTHONGS_} === ANNA A_TEHTA    * VALA A_TEHTA    * VALA A_TEHTA    * ANNA E_TEHTA    * ANNA {U_LOOP} * YANTA A_TEHTA * YANTA {O_LOOP}     
 
     \** Consonants + Vowels, we will often need these ones **\
     {V_D}         === [ {VOWELS} ]
@@ -142,18 +178,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  
     {V_D_WN}[{L1}] --> 2,1 --> [{_L1_}]{_V_D_WN_}
   
-    {V_D_WN}nt   --> TINCO NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}mp   --> PARMA NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}n{K} --> CALMA NASALIZE_SIGN {_V_D_WN_}
+    {V_D_WN}nt   --> TINCO {NASAL} {_V_D_WN_}
+    {V_D_WN}mp   --> PARMA {NASAL} {_V_D_WN_}
+    {V_D_WN}n{K} --> CALMA {NASAL} {_V_D_WN_}
 
     \** 2ND LINE **\
     {L2}        === d     * b     * g     * ng                    \** * g **\
-    {_L2_}      === ANDO  * UMBAR * UNGWE * UNGWE NASALIZE_SIGN      \** * s **\
+    {_L2_}      === ANDO  * UMBAR * UNGWE * UNGWE {NASAL}      \** * s **\
 
     {V_D_WN}[{L2}] --> 2,1 --> [{_L2_}]{_V_D_WN_}
 
-    {V_D_WN}mb   --> UMBAR  NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}nd   --> ANDO   NASALIZE_SIGN {_V_D_WN_}
+    {V_D_WN}mb   --> UMBAR  {NASAL} {_V_D_WN_}
+    {V_D_WN}nd   --> ANDO   {NASAL} {_V_D_WN_}
 
     \** 3RD LINE **\
     {L3}    === (þ,th) * (f,ph,ff) * ch 
@@ -161,10 +197,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     {V_D_WN}[{L3}] --> 2,1 --> [{_L3_}]{_V_D_WN_} 
    
-    {V_D_WN}nth   --> SULE   NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}mph   --> FORMEN NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}nf    --> FORMEN NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}nch   --> HWESTA NASALIZE_SIGN {_V_D_WN_}
+    {V_D_WN}nth   --> SULE   {NASAL} {_V_D_WN_}
+    {V_D_WN}mph   --> FORMEN {NASAL} {_V_D_WN_}
+    {V_D_WN}nf    --> FORMEN {NASAL} {_V_D_WN_}
+    {V_D_WN}nch   --> HWESTA {NASAL} {_V_D_WN_}
 
     \** 4TH LINE **\
     {L4}        === (đ,ð,ðh,dh)   * (v,bh,f_) \** Some noldorin variants here ... **\
@@ -178,14 +214,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     {V_D_WN}[{L5}] --> 2,1 --> [{_L5_}]{_V_D_WN_}
 
-    {V_D_WN}nn        --> NUMEN NASALIZE_SIGN {_V_D_WN_}
-    {V_D_WN}mm        --> MALTA NASALIZE_SIGN {_V_D_WN_}
+    {V_D_WN}nn        --> NUMEN {NASAL} {_V_D_WN_}
+    {V_D_WN}mm        --> MALTA {NASAL} {_V_D_WN_}
 
     \** 6TH LINE **\
 
     \** 7TH LINE **\
     {L7}        === r_    * r     * l     * ll                    * w     
-    {_L7_}      === ORE   * ROMEN * LAMBE * LAMBE LAMBE_MARK_TILD * VALA
+    {_L7_}      === ORE   * ROMEN * LAMBE * LAMBE {GEMINATE} * VALA
         
     {V_D_WN}[{L7}] --> 2,1 --> [{_L7_}]{_V_D_WN_}
     
@@ -198,7 +234,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     {V_D_WN}[{L8}]  --> 2,1 --> [{_L8_}]{_V_D_WN_}
 
-    {V_D_WN}ns      --> SILME_NUQUERNA NASALIZE_SIGN {_V_D_WN_}
+    {V_D_WN}ns      --> SILME_NUQUERNA {NASAL} {_V_D_WN_}
 
     s --> SILME
 
@@ -226,12 +262,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       rw   --> ROMEN SEV_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_}
+    \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_}
     \endif
   \end
   

data/glaemresources/modes/telerin.glaem

@@ -25,20 +25,58 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \** Telerin mode for glaemscribe (MAY BE INCOMPLETE) - Derived from Quenya **\
 
 \beg changelog
-  \entry 0.0.2 "Correcting ts/ps sequences to work better with eldamar"
-  \entry 0.0.3 "Porting to virtual chars"
+  \entry "0.0.2" "Correcting ts/ps sequences to work better with eldamar"
+  \entry "0.0.3" "Porting to virtual chars"
+  \entry "0.0.4" "Added charset support for Annatar"
+  \entry "0.0.5" "Added support for the FreeMonoTengwar font" 
+  \entry "0.0.6" "Ported some options from the quenya mode"
+  \entry "0.1.0" "Added support for the Tengwar Elfica font"
 \end
 
 \language "Telerin"
 \writing  "Tengwar"
 \mode     "Glaemscrafu"
-\version  "0.0.3"
-\authors  "Talagan (Benjamin Babut)"
+\version  "0.1.0"
+\authors  "Talagan (Benjamin Babut), based on J.R.R Tolkien"
+
+\charset  tengwar_ds_sindarin true
+\charset  tengwar_ds_parmaite false
+\charset  tengwar_ds_eldamar  false
+\charset  tengwar_ds_annatar  false
+\charset  tengwar_ds_elfica   false
+\charset  tengwar_freemono    false
 
-\charset  tengwar_ds         true
-\charset  tengwar_ds_eldamar false
 
 \beg      options
+
+  \beg option reverse_o_u_tehtar U_UP_O_DOWN
+    \value O_UP_U_DOWN 1
+    \value U_UP_O_DOWN 2
+  \end
+
+  \beg option long_vowels_format LONG_VOWELS_USE_LONG_CARRIER
+    \value LONG_VOWELS_USE_LONG_CARRIER 1
+    \value LONG_VOWELS_USE_DOUBLE_TEHTAR 2
+  \end  
+
+  \beg option double_tehta_e false
+    \visible_when 'long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR'
+  \end
+  \beg option double_tehta_i false
+    \visible_when 'long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR'
+  \end
+  \beg option double_tehta_o true
+    \visible_when 'long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR'
+  \end
+  \beg option double_tehta_u true
+    \visible_when 'long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR'
+  \end
+  
+  \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_BAR
+    \value CONSONANT_MODIFICATION_STYLE_WAVE 0
+    \value CONSONANT_MODIFICATION_STYLE_BAR 1
+  \end
+
   \option reverse_numbers true
   \beg option numbers_base BASE_12
     \value    BASE_10 10
@@ -74,52 +112,109 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \beg processor
 
   \beg rules litteral
-    {A}                 === a
-    {AA}                === á
-    {E}                 === e
-    {EE}                === é
-    {I}                 === i
-    {II}                === í
-    {O}                 === o
-    {OO}                === ó
-    {U}                 === u
-    {UU}                === ú
-    
-    {AI}                === {A}{I}
-    {AU}                === {A}{U}
-    {EU}                === {E}{U}
-    {IU}                === {I}{U}
-    {OI}                === {O}{I}
-    {UI}                === {U}{I}
-
-                      
+                       
     {K}                 === (c,k)
     {W}                 === (v,w)
     {SS}                === (z,ss)
     
-    \** {MB}                === (b,mb) **\
-    \** {SS}                === (z,ss) **\
-  
-    {VOWELS}            === {A}           * {E}         * {I}           * {O}           * {U}
-    {LVOWELS}           === {AA}          * {EE}        * {II}          * {OO}          * {UU}
+    \if "consonant_modification_style == CONSONANT_MODIFICATION_STYLE_WAVE"
+      {GEMINATE} === GEMINATE_SIGN_TILD
+    \else
+      {GEMINATE} === GEMINATE_SIGN
+    \endif
     
-    {TEHTAR}            === A_TEHTA      * E_TEHTA      * I_TEHTA    * O_TEHTA     * U_TEHTA
-       
-    {DIPHTHONGS}         === {AI}             * {AU}            * {EU}            *  {IU}           * {OI}            * {UI}
-    {_DIPHTHONGS_}       === YANTA A_TEHTA    * URE A_TEHTA     * URE E_TEHTA     * URE I_TEHTA     * YANTA O_TEHTA   * YANTA U_TEHTA
-
+    {VOWELS}            === a               *  e              * i              * o              *  u
+    {LVOWELS}           === á               *  é              * í              * ó              *  ú
+
+    \if "reverse_o_u_tehtar == U_UP_O_DOWN"
+      {O_LOOP}        === O_TEHTA
+      {O_LOOP_DOUBLE} === O_TEHTA_DOUBLE
+      {U_LOOP}        === U_TEHTA
+      {U_LOOP_DOUBLE} === U_TEHTA_DOUBLE
+    \else
+      {O_LOOP}        === U_TEHTA
+      {O_LOOP_DOUBLE} === U_TEHTA_DOUBLE
+      {U_LOOP}        === O_TEHTA
+      {U_LOOP_DOUBLE} === O_TEHTA_DOUBLE
+    \endif
+
+    \** Shape of the a, option removed from quenya, may be readded later **\
+    {A_SHAPE}         === A_TEHTA
+
+    \** Implicit a, option removed from quenya, may be readded later **\
+    {_A_}              === {A_SHAPE}
+    {_NVOWEL_}         === {NULL}
+  
+    {_TEHTAR_}          === {_A_}      *  E_TEHTA     *  I_TEHTA    * {O_LOOP}    *  {U_LOOP}
 
-    {V_D}         === [ {VOWELS}   * {DIPHTHONGS} ]
-    {_V_D_}       === [ {TEHTAR} * {_DIPHTHONGS_} ]
+    \** Split diphtongs option removed from quenya, may be readded later **\
+    {DIPHTHONGS}      === ai            * au            * eu            * iu             * oi               * ui
+    {_DIPHTHONGS_}    === YANTA {_A_}   * URE {_A_}     * URE E_TEHTA   * URE I_TEHTA    * YANTA {O_LOOP}   * YANTA {U_LOOP}
+    {WDIPHTHONGS}     === * {DIPHTHONGS}   \** groovy! **\
+    {_WDIPHTHONGS_}   === * {_DIPHTHONGS_} \** same thing **\
     
-    {V_D_WN}      === [ {VOWELS} * {DIPHTHONGS} * {NULL} ]  
-    {_V_D_WN_}    === [ {TEHTAR} * {_DIPHTHONGS_} * {NULL} ]
- 
-    \** VOWEL RULES **\
-    [{VOWELS}]        -->   TELCO[{TEHTAR}] \** Replace isolated short vowels **\
-    [{LVOWELS}]       -->   ARA[{TEHTAR}] \**  Replace long vowels **\
-    [{DIPHTHONGS}]     -->  [{_DIPHTHONGS_}]  \**  Replace diphthongs **\
+		{_LONG_A_}      === ARA {A_SHAPE}
+		{_LONG_E_}      === ARA E_TEHTA	
+		{_LONG_I_}      === ARA I_TEHTA
+		{_LONG_O_}      === ARA {O_LOOP}	
+		{_LONG_U_}      === ARA {U_LOOP}
+		{_LONE_LONG_A_} === {_LONG_A_}
+		{_LONE_LONG_E_} === {_LONG_E_}
+		{_LONE_LONG_I_} === {_LONG_I_}
+		{_LONE_LONG_O_} === {_LONG_O_}
+		{_LONE_LONG_U_} === {_LONG_U_}
+    
+    {LTEHTAR}       === {NULL}
+    {_LTEHTAR_}     === {NULL} 				
+ 		
+		\if "long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR"
+	    \if double_tehta_e
+		    {_LONG_E_}       === E_TEHTA_DOUBLE
+		    {_LONE_LONG_E_}  === TELCO {_LONG_E_}
+        {LTEHTAR}        === {LTEHTAR}   * é
+        {_LTEHTAR_}      === {_LTEHTAR_} * {_LONG_E_}
+			\endif
+		  \if double_tehta_i
+		    {_LONG_I_}       === I_TEHTA_DOUBLE
+		    {_LONE_LONG_I_}  === TELCO {_LONG_I_}
+        {LTEHTAR}        === {LTEHTAR}   * í
+        {_LTEHTAR_}      === {_LTEHTAR_} * {_LONG_I_}
+		  \endif
+		  \if double_tehta_o
+		    {_LONG_O_}       === {O_LOOP_DOUBLE}
+		    {_LONE_LONG_O_}  === TELCO {_LONG_O_}
+        {LTEHTAR}        === {LTEHTAR}   * ó
+        {_LTEHTAR_}      === {_LTEHTAR_} * {_LONG_O_}
+		  \endif
+		  \if double_tehta_u
+		    {_LONG_U_}       === {U_LOOP_DOUBLE}
+		    {_LONE_LONG_U_}  === TELCO {_LONG_U_}
+        {LTEHTAR}        === {LTEHTAR}   * ú
+        {_LTEHTAR_}      === {_LTEHTAR_} * {_LONG_U_}
+		  \endif
+    \endif  
+       		
+    \** images of long vowels, either tehtar or ara versions **\
+    {_LVOWELS_}     === {_LONG_A_} * {_LONG_E_} * {_LONG_I_} * {_LONG_O_} * {_LONG_U_}      
+
+		{WLONG}         === * {LVOWELS} 
+		{_WLONG_}       === * {_LVOWELS_}
+
+    {V_D}           === [ {VOWELS} {WLONG} {WDIPHTHONGS} ]
+    {V_D_WN}        === [ {VOWELS} {WLONG} {WDIPHTHONGS} * {NULL} ]
+
+    {_V_D_}         === [ {_TEHTAR_} {_WLONG_} {_WDIPHTHONGS_} ]
+    {_V_D_WN_}      === [ {_TEHTAR_} {_WLONG_} {_WDIPHTHONGS_} * {_NVOWEL_} ]
+		
+		\** LONE SHORT VOWELS **\
+    [{VOWELS}]    --> TELCO [{_TEHTAR_}]  \** Replace isolated short vowels **\
+    
+		\** LONE LONG VOWELS **\	
+		[{LVOWELS}]   --> [{_LONE_LONG_A_} * {_LONE_LONG_E_} * {_LONE_LONG_I_} * {_LONE_LONG_O_} * {_LONE_LONG_U_}]
 
+    [{DIPHTHONGS}]    -->   [{_DIPHTHONGS_}]     \**  Replace diphthongs **\
+    
+  
     \** TELERIN: changed v/w, removed all y rules **\
     
     \** ===================== **\
@@ -129,14 +224,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {_L1_}        === CALMA * QUESSE * TINCO   * PARMA
     
     {L1_GEMS}     === {K}{K}              * tt                     * pp
-    {_L1_GEMS_}   === CALMA GEMINATE_SIGN * TINCO GEMINATE_SIGN    * PARMA GEMINATE_SIGN
+    {_L1_GEMS_}   === CALMA {GEMINATE} * TINCO {GEMINATE}    * PARMA {GEMINATE}
 
     \** NORMAL **\
     [ {L1} ] {V_D_WN}         --> [ {_L1_} ] {_V_D_WN_}
     [ {L1_GEMS} ] {V_D_WN}    --> [ {_L1_GEMS_} ] {_V_D_WN_}
                             
-    ts{V_D_WN}          --> TINCO {_V_D_WN_} ALVEOLAR_SIGN
-    ps{V_D_WN}          --> PARMA {_V_D_WN_} ALVEOLAR_SIGN
+    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 **\
                             
@@ -159,9 +254,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L3}]{V_D_WN}  --> [{_L3_}]{_V_D_WN_}
       
     \** Override h with vowels (descendent) **\
-    _h{V_D}                     --> HYARMEN {_V_D_}
-    h[{LVOWELS}]                --> HYARMEN ARA [{TEHTAR}] 
-    h                           --> AHA
+    _h{V_D}         --> HYARMEN {_V_D_}
+    \** Starting voiced h before long vowels **\
+    _h[{LVOWELS}]   --> HYARMEN [{_LVOWELS_}]
+
+    (h,χ)           --> AHA
 
     \** ===================== **\
     \** 4TH LINE RULES **\
@@ -180,8 +277,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{L5}]{V_D_WN}  --> [{_L5_}]{_V_D_WN_}
 
-    nn{V_D_WN}          --> NUMEN GEMINATE_SIGN {_V_D_WN_}
-    mm{V_D_WN}          --> MALTA GEMINATE_SIGN {_V_D_WN_}
+    nn{V_D_WN}          --> NUMEN {GEMINATE} {_V_D_WN_}
+    mm{V_D_WN}          --> MALTA {GEMINATE} {_V_D_WN_}
 
     \** ===================== **\
     \** 6TH LINE RULES **\
@@ -191,32 +288,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{L6}]{V_D_WN} --> [{_L6_}]{_V_D_WN_}
 
-    rr{V_D_WN}        --> ROMEN GEMINATE_SIGN {_V_D_WN_}
+    rr{V_D_WN}        --> ROMEN {GEMINATE} {_V_D_WN_}
     rd{V_D_WN}        --> ARDA {_V_D_WN_}
 
     \** ===================== **\
     \** L   LINE RULES **\
     \** ===================== **\
     {LINE_L}          === l     * ld      * ll
-    {_LINE_L_}        === LAMBE * ALDA    * LAMBE GEMINATE_SIGN
+    {_LINE_L_}        === LAMBE * ALDA    * LAMBE {GEMINATE}
 
     [{LINE_L}]{V_D_WN}    --> [{_LINE_L_}]{_V_D_WN_}
+
     hl{V_D_WN}            --> HALLA LAMBE {_V_D_WN_}
     hr{V_D_WN}            --> HALLA ROMEN {_V_D_WN_}
-
+    
     \** ===================== **\
     \** S/Z LINE RULES **\
     \** ===================== **\
-    {L8}        === s               * {SS}   
-    {_L8_}      === SILME_NUQUERNA  * ESSE_NUQUERNA 
-
-    [{L8}]{V_D_WN} --> [{_L8_}]{_V_D_WN_}
+    {L8}              === s               * {SS}
+    {_L8_TEHTAR_}     === SILME_NUQUERNA  * ESSE_NUQUERNA
+    {_L8_NO_TEHTAR_}  === SILME           * ESSE
 
-    \** Override lonely s / ss / before consonant **\
-    s               --> SILME
-    s[{LVOWELS}]    --> SILME ARA [{TEHTAR}] 
-    {SS}            --> ESSE
-    {SS}[{LVOWELS}] --> ESSE ARA [{TEHTAR}] 
+    [{L8}][{VOWELS}]   --> [{_L8_TEHTAR_}][{_TEHTAR_}]
+    [{L8}][{LTEHTAR}]  --> [{_L8_TEHTAR_}][{_LTEHTAR_}]
+    
+    {L8}               --> {_L8_NO_TEHTAR_}
+    {L8}[{DIPHTHONGS}] --> {_L8_NO_TEHTAR_}[{_DIPHTHONGS_}]
   \end
   
   \beg rules punctuation