glaemscribe 1.0.19 → 1.1.0

data/glaemresources/modes/{futhorc.glaem.disabled → futhorc.glaem}

@@ -26,10 +26,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \writing  "Runes"
 \mode     "Futhorc"
 \version  "0.0.1"
-\authors  "Bertrand Bellet"
+\authors  "Historical impl. Bertrand Bellet"
 
 \charset  unicode_runes true
 
+\beg options
+  \option use_cweorth                     true
+  \option use_stan                        true
+  \option use_calc_and_gar                true
+\end
+
 \beg      preprocessor
   \downcase
 \end
@@ -45,9 +51,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {Y}       === (y,ý)
     {AE}      === (æ,ǽ)
     {OE}      === (œ,œ́)
-		{EA}      === (ea,éa)
-		{EO}      === (eo,éo)
-		{IO}      === (io,ío)
+    {EA}      === (ea,éa)
+    {EO}      === (eo,éo)
+    {IO}      === (io,ío)
 
     \**  VOWELS **\
 
@@ -59,54 +65,86 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {Y}       --> YR
     {AE}      --> AESC
     {OE}      --> ETHEL
-		{EA}      --> EAR
-		{EO}      --> EOH
-		{IO}      --> IOR                    
+    {EA}      --> EAR
+    {EO}      --> EOH
+    {IO}      --> IOR                    
 
     \**  IOTATED VOWELS **\
-
-    i{A}      --> GER AC
-    i{E}      --> GER EH
-    i{O}      --> GER OS
-    i{U}      --> GER UR
-    i{Y}      --> GER YR
-    i{AE}     --> GER AESC
-    i{OE}     --> GER ETHEL
-		i{EA}     --> GER EAR
-		i{EO}     --> GER EOH   
+    {IOTABLES}    ===  {A}  * {E} * {O} * {U} * {Y} * {AE} * {OE}   * {EA}  * {EO}
+    {_IOTABLES_}  ===  AC   * EH  * OS  * UR  * YR  * AESC * ETHEL  * EAR   * EOH 
+    
+    i [{IOTABLES}] --> GER [{_IOTABLES_} ]  
 
     \**  CONSONANTS **\
-  
     (b,bb)         --> BEORC
-		(c,cc,k,kk)    --> CALC
+    
+	  \** (c,cc,k,kk)    --> CALC **\
+    \** (ċ,ċċ)         --> CEN **\
+    (c,cc,k,kk)    --> CEN
     (ċ,ċċ)         --> CEN
+    \if use_calc_and_gar
+      \** overload when option is on **\ 
+      (c,cc,k,kk)    --> CALC
+    \endif
+      
     (d,dd)         --> DAEG
-    (ð,ðð)         --> THORN
-    (f,ff)         --> FEOH
+    (f,ff,v)       --> FEOH
+    
+	  \**  (g,gg,cg)      --> GAR  **\  
+    \**  (ȝ,ġ,ġġ,ċġ)    --> GYFU **\
+    (g,gg,cg)      --> GYFU    
     (ȝ,ġ,ġġ,ċġ)    --> GYFU
-		(g,gg,cg)      --> GAR    
-    (h,hh)         --> HAEGL
+    \if use_calc_and_gar
+      \** overload when option is on **\ 
+      (g,gg,cg)      --> GAR
+    \endif
+    
+    (h,hh,ç,χ)     --> HAEGL
+    (j,jj,ĭ)       --> GER
     (l,ll)         --> LAGU
     (m,mm)         --> MAN
     (n,nn)         --> NYD
     (p,pp)         --> PEORTH
     (r,rr)         --> RAD
-    (s,ss)         --> SIGEL
+    (s,ss,z)       --> SIGEL
     (t,tt)         --> TIR
-    (þ,þþ)         --> THORN
+    (þ,þþ,ð,ðð)    --> THORN
     (w,ww)         --> WYNN
-		
-    \**  CLUSTERS **\		
-
-    ng       --> ING GAR
-		nġ       --> ING GYFU
-		nc       --> ING CALC
-		nċ       --> ING CEN
-	  (cw,qu)  --> CWEORTH
-		x        --> EOLHX
-		(z,ts)   --> TIR SIGEL
-		st       --> STAN
-		
+  
+    \** OLD ENGLISH AND **\
+    
+    ⁊             --> OS NYD DAEG
+      
+    \**  CLUSTERS WITH ING **\    
+    
+    \** ng            --> ING GAR **\
+    \** nġ            --> ING GYFU **\
+    ng            --> ING GYFU
+    nġ            --> ING GYFU
+    \if use_calc_and_gar
+      ng            --> ING GAR
+    \endif
+      
+    \** nc            --> ING CALC **\
+    \** (nċ,nk,nq)    --> ING CEN  **\
+    nc            --> ING CEN
+    (nċ,nk,nq)    --> ING CEN
+    \if use_calc_and_gar
+      ng            --> ING CALC
+    \endif     
+      
+    \**  CLUSTERS WITH S **\   
+    x             --> EOLHX
+    (z,ts)        --> TIR SIGEL
+    
+    \**  ADDITIONAL RUNES **\    
+    \if use_cweorth 
+      (cw,qu,ccw,cqu)   --> CWEORTH
+    \endif
+    \if use_stan
+      st                --> STAN
+    \endif
+      
   \end
   
   \beg    rules  punctuation
@@ -115,7 +153,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     : --> RUNIC_MULTIPLE_PUNCTUATION
     . --> RUNIC_MULTIPLE_PUNCTUATION
     ! --> RUNIC_MULTIPLE_PUNCTUATION
-    ? --> RUNIC_CROSS_PUNCTUATION	
+    ? --> RUNIC_CROSS_PUNCTUATION 
   \end
 \end
   

data/glaemresources/modes/gothic.glaem

@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \writing  "Gothic Alphabet"
 \mode     "Standard"
 \version  "0.0.1"
-\authors  "Talagan (Benjamin Babut)"
+\authors  "Historical, impl. Talagan (Benjamin Babut)"
 
 \charset  unicode_gothic true
 

data/glaemresources/modes/khuzdul.glaem

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

data/glaemresources/modes/mercian.glaem

@@ -29,10 +29,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \language "Old English"
 \writing  "Tengwar"
 \mode     "Mercian"
-\version  "0.0.2"
-\authors  "Talagan (Benjamin Babut)"
+\version  "0.1.0"
+\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \charset  tengwar_ds_eldamar true
+\** Other charsets cannot handle all diacritics we are using here ... **\
+
+\beg options
+  \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_WAVE
+    \value CONSONANT_MODIFICATION_STYLE_WAVE 0
+    \value CONSONANT_MODIFICATION_STYLE_BAR 1
+  \end
+\end
 
 \beg      preprocessor
   \** Work exclusively downcase **\
@@ -63,6 +71,13 @@ 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"
+      {NASAL}    === NASALIZE_SIGN_TILD
+    \else
+      {NASAL}    === NASALIZE_SIGN
+    \endif
+  
     {A}   === a
     {AA}  === á
     {E}   === e
@@ -86,7 +101,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** @ is the phantom vowel added by the preprocessor **\
 
     {S_VOWELS_NP_KERNEL}   === {A} * {AE} * {OE} * {E} * {I}   * {O} * {U} * {Y}
-    {S_VOWELS_WP_KERNEL}      === {S_VOWELS_NP_KERNEL} * @                           
+    {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 
@@ -167,12 +182,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** Nasals (tild above) **\
     \** nC, nCV, nCVV **\
     \** We also have rules for long vowels **\
-    [ nt * mp ]                                       -->  [ TINCO NASALIZE_SIGN_TILD * PARMA NASALIZE_SIGN_TILD ]
-    [ nċ * nc ]                                       -->  [ CALMA NASALIZE_SIGN_TILD * QUESSE NASALIZE_SIGN_TILD ]
-    [ nt * mp ]{S_VOWELS}{S_VOWELS_WN}                -->  [ TINCO NASALIZE_SIGN_TILD * PARMA NASALIZE_SIGN_TILD ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
-    [ nċ * nc ]{S_VOWELS}{S_VOWELS_WN}                -->  [ CALMA NASALIZE_SIGN_TILD * QUESSE NASALIZE_SIGN_TILD ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
-    [ nt * mp ][{LVOWELS}]                            -->  [ TINCO NASALIZE_SIGN_TILD * PARMA NASALIZE_SIGN_TILD ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
-    [ nċ * nc ][{LVOWELS}]                            -->  [ CALMA NASALIZE_SIGN_TILD * QUESSE NASALIZE_SIGN_TILD ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [ nt * mp ]                                       -->  [ TINCO {NASAL} * PARMA {NASAL} ]
+    [ nċ * nc ]                                       -->  [ CALMA {NASAL} * QUESSE {NASAL} ]
+    [ nt * mp ]{S_VOWELS}{S_VOWELS_WN}                -->  [ TINCO {NASAL} * PARMA {NASAL} ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [ nċ * nc ]{S_VOWELS}{S_VOWELS_WN}                -->  [ CALMA {NASAL} * QUESSE {NASAL} ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [ nt * mp ][{LVOWELS}]                            -->  [ TINCO {NASAL} * PARMA {NASAL} ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [ nċ * nc ][{LVOWELS}]                            -->  [ CALMA {NASAL} * QUESSE {NASAL} ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** ========== **\
     \** 2nd Line (Voiced occlusives) **\
@@ -193,9 +208,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L2_KER_GEMS}]{S_VOWELS_WN}                      --> [{L2_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
     \** Nasals, with diphthongs! **\
-    [ nd * mb * nġ * ng ]                             -->  [ ANDO NASALIZE_SIGN_TILD * UMBAR NASALIZE_SIGN_TILD * ANGA NASALIZE_SIGN_TILD * UNGWE NASALIZE_SIGN_TILD ]
-    [ nd * mb * nġ * ng ]{S_VOWELS}{S_VOWELS_WN}      -->  [ ANDO NASALIZE_SIGN_TILD * UMBAR NASALIZE_SIGN_TILD * ANGA NASALIZE_SIGN_TILD * UNGWE NASALIZE_SIGN_TILD ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
-    [ nd * mb * nġ * ng ][{LVOWELS}]                  -->  [ ANDO NASALIZE_SIGN_TILD * UMBAR NASALIZE_SIGN_TILD * ANGA NASALIZE_SIGN_TILD * UNGWE NASALIZE_SIGN_TILD ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [ nd * mb * nġ * ng ]                             -->  [ ANDO {NASAL} * UMBAR {NASAL} * ANGA {NASAL} * UNGWE {NASAL} ]
+    [ nd * mb * nġ * ng ]{S_VOWELS}{S_VOWELS_WN}      -->  [ ANDO {NASAL} * UMBAR {NASAL} * ANGA {NASAL} * UNGWE {NASAL} ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [ nd * mb * nġ * ng ][{LVOWELS}]                  -->  [ ANDO {NASAL} * UMBAR {NASAL} * ANGA {NASAL} * UNGWE {NASAL} ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** ========== **\
     \** 3rd Line (Voiceless fricatives) **\
@@ -256,9 +271,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** Gemination === nasalisation **\
     \** So prefer using tild to put tehtas up and down for diphthongs and long vowels **\
 
-    [ nn * mm ]                               --> [ NUMEN NASALIZE_SIGN_TILD * MALTA NASALIZE_SIGN_TILD ]
-    [ nn * mm ]{S_VOWELS}{S_VOWELS_WN}        --> [ NUMEN NASALIZE_SIGN_TILD * MALTA NASALIZE_SIGN_TILD ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
-    [ nn * mm ][{LVOWELS}]                    --> [ NUMEN NASALIZE_SIGN_TILD * MALTA NASALIZE_SIGN_TILD ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [ nn * mm ]                               --> [ NUMEN {NASAL} * MALTA {NASAL} ]
+    [ nn * mm ]{S_VOWELS}{S_VOWELS_WN}        --> [ NUMEN {NASAL} * MALTA {NASAL} ]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [ nn * mm ][{LVOWELS}]                    --> [ NUMEN {NASAL} * MALTA {NASAL} ][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** ========== **\
     \** 6th Line (Approximants == fr : Spirantes) **\
@@ -345,7 +360,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     x{S_VOWELS_WN}                               --> QUESSE ALVEOLAR_SIGN {_S_VOWELS_UP_WN_}
     xx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
-    nx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN NASALIZE_SIGN_TILD {_S_VOWELS_UP_WN_}     
+    nx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN {NASAL} {_S_VOWELS_UP_WN_}     
   \end
   
   \beg    rules punctuation 

data/glaemresources/modes/quenya-sarati.glaem

@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \writing  "Sarati"
 \mode     "Quenya Usage"
 \version  "0.0.1"
-\authors  "Talagan (Benjamin Babut)"
+\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
 \charset  sarati_eldamar true
 
@@ -65,9 +65,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \substitute   "oi" "oy"
   \substitute   "ui" "uy"
 
-  \substitute   "á" "aa" \** Split long a  **\
+  \** Split long a  **\
+  \substitute   "á" "aa" 
 
-  \substitute   "qu" "q" \** Dis-ambiguate qu **\
+  \** Dis-ambiguate qu **\
+  \substitute   "qu" "q" 
 \end
 
 \beg      processor

data/glaemresources/modes/quenya.glaem

@@ -23,21 +23,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **\
 
 \beg changelog
-  \entry "0.0.2", "added χ for the word χarina, correcting ts/ps sequences to work better with eldamar"
-  \entry "0.0.3", "added o/u curl option"
-  \entry "0.0.4", "added voiced plosives corner cases treatment and option to chose method"
-  \entry "0.0.5", "fixing h+long vowel medially"
-  \entry "0.0.6", "adding option for alveolarized consonants  st (t+t), pt (p+t), ht (c+t)"
-  \entry "0.0.7", "Fixing rb/lb, to be treated as r+mb and l+mb"
-  \entry "0.0.8", "Correcting double dot version for ry (aesthetics)"
-  \entry "0.0.9", "Adding 'implicit a' option."
-  \entry "0.1.0", "Simplified diacritic use by using new post-processor directive"
-  \entry "0.1.1", "Added default option for voiced plosives : use mb, nd, ng, ngw"
-  \entry "0.1.2", "Added a tehta shape selection"
-  \entry "0.1.3", "Fixing ks, ps, ts. Fixing dot under ore, romen in implicit a mode."
-  \entry "0.1.4", "Conforming to the new csub format. Cleaning with new csub classes."
-  \entry "0.1.5", "csub removed. Now using virtual chars defined in charsets."
-  \entry "0.1.6", "Removing unutixe under óre for coherency in implicit a submode."
+  \entry "0.0.2" "added χ for the word χarina, correcting ts/ps sequences to work better with eldamar"
+  \entry "0.0.3" "added o/u curl option"
+  \entry "0.0.4" "added voiced plosives corner cases treatment and option to chose method"
+  \entry "0.0.5" "fixing h+long vowel medially"
+  \entry "0.0.6" "adding option for alveolarized consonants  st (t+t), pt (p+t), ht (c+t)"
+  \entry "0.0.7" "Fixing rb/lb, to be treated as r+mb and l+mb"
+  \entry "0.0.8" "Correcting double dot version for ry (aesthetics)"
+  \entry "0.0.9" "Adding 'implicit a' option."
+  \entry "0.1.0" "Simplified diacritic use by using new post-processor directive"
+  \entry "0.1.1" "Added default option for voiced plosives : use mb, nd, ng, ngw"
+  \entry "0.1.2" "Added a tehta shape selection"
+  \entry "0.1.3" "Fixing ks, ps, ts. Fixing dot under ore, romen in implicit a mode."
+  \entry "0.1.4" "Conforming to the new csub format. Cleaning with new csub classes."
+  \entry "0.1.5" "csub removed. Now using virtual chars defined in charsets."
+  \entry "0.1.6" "Removing unutixe under óre for coherency in implicit a submode."
+  \entry "0.9.0" "Adding double tehtar support"
+  \entry "0.9.1" "Added support for the FreeMonoTengwar font"
+  \entry "0.9.2" "Added support for the Tengwar Elfica font"
 \end
 
 \**
@@ -48,14 +51,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \language "Quenya"
 \writing  "Tengwar"
 \mode     "Classical"
-\version  "0.1.6"
-\authors  "Talagan (Benjamin Babut)"
+\version  "0.9.2"
+\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
+
+\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
   \option implicit_a false
+  
   \beg option a_tetha_shape A_SHAPE_THREE_DOTS
     \value A_SHAPE_THREE_DOTS 1
     \value A_SHAPE_CIRCUMFLEX 2
@@ -64,6 +73,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \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  
+  
+  \** REMOVED BECAUSE UNATTESTED
+  \beg option double_tehta_a false
+    \visible_when 'long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR'
+  \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
+  
   \option split_diphthongs false
   \option always_use_romen_for_r false
   \beg option voiced_plosives_treatment VOICED_PLOSIVES_AS_NASALIZED
@@ -75,6 +107,12 @@ 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 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
@@ -102,7 +140,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \rxsubstitute "(ū|û|uu)" "ú"
   \rxsubstitute "(ȳ|ŷ|yy)" "ý"
 
-  \substitute   "qu" "q" \** Dis-ambiguate qu **\
+  \** Dis-ambiguate qu **\
+  \substitute   "qu" "q" 
 
   \elvish_numbers "\\eval numbers_base" "\\eval reverse_numbers"
 \end
@@ -111,25 +150,35 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \beg processor
 
   \beg    rules litteral
-
+    
     {K}                 ===  (c,k)
     {SS}                ===  (z,ss)
+    
+    \if "consonant_modification_style == CONSONANT_MODIFICATION_STYLE_WAVE"
+      {GEMINATE} === GEMINATE_SIGN_TILD
+    \else
+      {GEMINATE} === GEMINATE_SIGN
+    \endif
 
     {VOWELS}            === a               *  e              * i              * o              *  u
     {LVOWELS}           === á               *  é              * í              * ó              *  ú
 
     \if "reverse_o_u_tehtar == U_UP_O_DOWN"
-      {O_LOOP} === O_TEHTA
-      {U_LOOP} === U_TEHTA
+      {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
-      {U_LOOP} === O_TEHTA
+      {O_LOOP}        === U_TEHTA
+      {O_LOOP_DOUBLE} === U_TEHTA_DOUBLE
+      {U_LOOP}        === O_TEHTA
+      {U_LOOP_DOUBLE} === O_TEHTA_DOUBLE
     \endif
 
     \if "a_tetha_shape == A_SHAPE_THREE_DOTS"
-      {A_SHAPE} === A_TEHTA
+      {A_SHAPE}         === A_TEHTA
     \else
-      {A_SHAPE} === A_TEHTA_CIRCUM
+      {A_SHAPE}         === A_TEHTA_CIRCUM
     \endif
 
     \if implicit_a
@@ -151,35 +200,80 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       {WDIPHTHONGS}     === * {DIPHTHONGS}   \** groovy! **\
       {_WDIPHTHONGS_}   === * {_DIPHTHONGS_} \** same thing **\
     \endif
-
-    \if implicit_a
-      \** consonants will take a tehta for a, and have ara + tehta in other cases **\
-      
-      \** Bertrand does like the dot before long vowels **\
-      \** {_LTEHTAR_}     === {A_SHAPE} * {_NVOWEL_} ARA E_TEHTA * {_NVOWEL_} ARA I_TEHTA * {_NVOWEL_} ARA {O_LOOP} * {_NVOWEL_} ARA {U_LOOP} **\
-      
-      {_LTEHTAR_}         === {A_SHAPE} * ARA E_TEHTA * ARA I_TEHTA * ARA {O_LOOP} * ARA {U_LOOP}
-      {_WLONG_}           === * {_LTEHTAR_}
-      {WLONG}             === * {LVOWELS}
-    \else
-      {_LTEHTAR_}         === ARA {A_SHAPE} * ARA E_TEHTA * ARA I_TEHTA * ARA {O_LOOP} * ARA {U_LOOP}
-      {_WLONG_}           === {NULL}
-      {WLONG}             === {NULL}
+    
+		{_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 implicit_a
+     	{_LONG_A_}         === {A_SHAPE}        \** Eat the long a **\
+  		{_LONE_LONG_A_}    === TELCO {A_SHAPE}  \** Eat the long a **\
+      {LTEHTAR}          === {LTEHTAR}   * á
+      {_LTEHTAR_}        === {_LTEHTAR_} * {_LONG_A_}
     \endif
+ 		
+		\if "long_vowels_format == LONG_VOWELS_USE_DOUBLE_TEHTAR"
+    \** REMOVED BECAUSE UNATTESTED
+	    \if "double_tehta_a && !implicit_a"
+		    {_LONG_A_}       === A_TEHTA_DOUBLE
+			  {_LONE_LONG_A_}  === TELCO {_LONG_A_}
+        {LTEHTAR}        === {LTEHTAR}   * á
+        {_LTEHTAR_}      === {_LTEHTAR_} * {_LONG_A_}
+  	  \endif		
+    **\
+	    \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_} ]
-
-    \** VOWEL RULES **\
+		
+		\** LONE SHORT VOWELS **\
     [{VOWELS}]    --> TELCO [{_TEHTAR_}]  \** Replace isolated short vowels **\
-    \if implicit_a
-      [{LVOWELS}] --> TELCO {A_SHAPE}  * ARA E_TEHTA * ARA I_TEHTA * ARA {O_LOOP} * ARA {U_LOOP}
-    \else
-      [{LVOWELS}] --> [{_LTEHTAR_}]       \** Replace long vowels **\
-    \endif
+    
+		\** LONE LONG VOWELS **\	
+		[{LVOWELS}]   --> [{_LONE_LONG_A_} * {_LONE_LONG_E_} * {_LONE_LONG_I_} * {_LONE_LONG_O_} * {_LONE_LONG_U_}]
 
     \if !split_diphthongs
       [{DIPHTHONGS}]    -->   [{_DIPHTHONGS_}]     \**  Replace diphthongs **\
@@ -192,8 +286,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {_L1_}        === TINCO * PARMA   * CALMA * QUESSE
 
     \** GEMINATED **\
-    {L1_1_GEMS}   === tt                  * pp                    * {K}{K}
-    {_L1_1_GEMS_} === TINCO GEMINATE_SIGN * PARMA GEMINATE_SIGN   * CALMA GEMINATE_SIGN
+    {L1_1_GEMS}   === tt               * pp                 * {K}{K}
+    {_L1_1_GEMS_} === TINCO {GEMINATE} * PARMA {GEMINATE}   * CALMA {GEMINATE}
 
     \** NORMAL **\
     [ {L1} * {L1_1_GEMS} ] {V_D_WN} --> [ {_L1_} * {_L1_1_GEMS_} ] {_V_D_WN_}
@@ -202,8 +296,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     ty{V_D_WN}          --> TINCO PALATAL_SIGN {_V_D_WN_}
     py{V_D_WN}          --> PARMA PALATAL_SIGN {_V_D_WN_}
 
-    ts{V_D_WN}          --> TINCO {_V_D_WN_} ALVEOLAR_SIGN
-    ps{V_D_WN}          --> PARMA {_V_D_WN_} ALVEOLAR_SIGN
+    \** For alveolarized consonants, we must put the alveolar_sign 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 **\
 
@@ -225,7 +322,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \if "voiced_plosives_treatment == VOICED_PLOSIVES_AS_NASALIZED"
       [{L2_UN}]{V_D_WN}   --> [{_L2_}] {_V_D_WN_}
     \elsif "voiced_plosives_treatment == VOICED_PLOSIVES_WITH_STROKE"
-      [{L2_UN}]{V_D_WN}   --> [{_L2_}] THINF_STROKE_XL {_V_D_WN_}
+      [{L2_UN}]{V_D_WN}   --> [{_L2_}] THINF_STROKE {_V_D_WN_}
     \else
       {_L2_UN_}            === TW_EXT_21 * TW_EXT_22 * TW_EXT_23 * TW_EXT_24
       [{L2_UN}]{V_D_WN}    --> [{_L2_UN_}] {_V_D_WN_}
@@ -252,7 +349,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     \** Override h with vowels (descendent of hy) **\
     _h{V_D}         --> HYARMEN {_V_D_}
-    _h[{LVOWELS}]   --> HYARMEN [{_LTEHTAR_}]
+    \** Starting voiced h before long vowels **\
+    _h[{LVOWELS}]   --> HYARMEN [{_LVOWELS_}]
 
     (h,χ)           --> AHA
 
@@ -276,9 +374,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L5}]{V_D_WN}  --> [{_L5_}]{_V_D_WN_}
 
     ny{V_D_WN}          --> NUMEN PALATAL_SIGN {_V_D_WN_}
-    nn{V_D_WN}          --> NUMEN GEMINATE_SIGN   {_V_D_WN_}
+    nn{V_D_WN}          --> NUMEN {GEMINATE}   {_V_D_WN_}
     my{V_D_WN}          --> MALTA PALATAL_SIGN {_V_D_WN_}
-    mm{V_D_WN}          --> MALTA GEMINATE_SIGN   {_V_D_WN_}
+    mm{V_D_WN}          --> MALTA {GEMINATE}   {_V_D_WN_}
 
     \** ===================== **\
     \**     6TH LINE RULES    **\
@@ -295,13 +393,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     [{L6}]{V_D_WN} --> [{_L6_}]{_V_D_WN_}
 
-    \** r before long vowels is voiced **\
-    r[{LVOWELS}]      --> ROMEN [{_LTEHTAR_}]
-
     \** Override rule r + null **\
     r                 --> {_LONE_R_}
 
-    rr{V_D_WN}        --> ROMEN GEMINATE_SIGN {_V_D_WN_}
+    rr{V_D_WN}        --> ROMEN {GEMINATE} {_V_D_WN_}
     ry{V_D_WN}        --> ROMEN PALATAL_SIGN {_V_D_WN_}
     rd{V_D_WN}        --> ARDA {_V_D_WN_}
 
@@ -309,7 +404,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \**     L  LINE RULES     **\
     \** ===================== **\
     {LINE_L}          === l     * ld      * ll
-    {_LINE_L_}        === LAMBE * ALDA    * LAMBE LAMBE_MARK_TILD
+    {_LINE_L_}        === LAMBE * ALDA    * LAMBE {GEMINATE}
 
     [{LINE_L}]{V_D_WN}    --> [{_LINE_L_}]{_V_D_WN_}
 
@@ -320,22 +415,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** ===================== **\
     \**   S/Z LINE RULES      **\
     \** ===================== **\
-    {L8}        === s               * {SS}
-    {_L8_}      === SILME_NUQUERNA  * ESSE_NUQUERNA
-
-    [{L8}]{V_D_WN} --> [{_L8_}]{_V_D_WN_}
-
-    \** Override lonely s / ss / before consonant **\
-    s               --> SILME
-    s[{LVOWELS}]    --> SILME [{_LTEHTAR_}]
-    {SS}            --> ESSE
-    {SS}[{LVOWELS}] --> ESSE [{_LTEHTAR_}]
-
-    \if implicit_a
-      sá            --> SILME_NUQUERNA {A_SHAPE}
-      {SS}á         --> ESSE_NUQUERNA {A_SHAPE}
-    \endif
-
+    
+    \** SILME is a bit tricky : the shape is not linked to voicing but to a tehta presence or not **\
+    {L8}              === s               * {SS}
+    {_L8_TEHTAR_}     === SILME_NUQUERNA  * ESSE_NUQUERNA
+    {_L8_NO_TEHTAR_}  === SILME           * ESSE
+
+    [{L8}][{VOWELS}]   --> [{_L8_TEHTAR_}][{_TEHTAR_}]
+    [{L8}][{LTEHTAR}]  --> [{_L8_TEHTAR_}][{_LTEHTAR_}]
+    
+    {L8}               --> {_L8_NO_TEHTAR_}
+    {L8}[{DIPHTHONGS}] --> {_L8_NO_TEHTAR_}[{_DIPHTHONGS_}]
+    
   \end
 
   \beg    rules punctuation