glaemscribe 1.0.19 → 1.1.0

data/glaemresources/modes/valarin-sarati.glaem

@@ -28,7 +28,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \writing  "Sarati"
 \mode     "Glaemscrafu"
 \version  "0.0.1"
-\authors  "Talagan (Benjamin Babut)"
+\authors  "Talagan (Benjamin Babut), based on J.R.R. Tolkien"
 
 \charset  sarati_eldamar true
 

data/glaemresources/modes/westron.glaem

@@ -23,26 +23,44 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 **\
 
 \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.1.0" "Added support for the Tengwar Elfica font"
 \end
 
 \**  Westron mode for glaemscribe (MAY BE INCOMPLETE) **\
 \language Westron
 \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         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 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
+
   \option reverse_numbers true
   \beg option numbers_base BASE_12
     \value    BASE_10 10
     \value    BASE_12 12
   \end
+  
 \end
 
 \beg      preprocessor
@@ -72,6 +90,27 @@ 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
+    
+    \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
+  
     {A}   === a
     {AA}  === á
     {E}   === e
@@ -102,16 +141,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {OOU} === {OO}{U} \** ôu **\
 
     {SDIPHTHONGS}  === {AI}           * {AU}          * {EI} 				    * {EU}        * {IU}        * {OI}          * {OU}        * {UI}
-    {_SDIPHTONGS_} === YANTA A_TEHTA  * URE A_TEHTA   * YANTA E_TEHTA	  * URE E_TEHTA * URE I_TEHTA * YANTA O_TEHTA * URE O_TEHTA * YANTA U_TEHTA                   
+    {_SDIPHTONGS_} === YANTA A_TEHTA  * URE A_TEHTA   * YANTA E_TEHTA	  * URE E_TEHTA * URE I_TEHTA * YANTA {O_LOOP} * URE {O_LOOP} * YANTA {U_LOOP}                   
     
     {LDIPHTHONGS}  === {AAI}              * {AAU}              * {EEI}              * {EEU}            * {OOI}              * {OOU}
-    {_LDIPHTONGS_} === ARA A_TEHTA YANTA  * ARA A_TEHTA URE    * ARA E_TEHTA YANTA  * ARA E_TEHTA URE  * ARA O_TEHTA YANTA  * ARA O_TEHTA URE
+    {_LDIPHTONGS_} === ARA A_TEHTA YANTA  * ARA A_TEHTA URE    * ARA E_TEHTA YANTA  * ARA E_TEHTA URE  * ARA {O_LOOP} YANTA  * ARA {O_LOOP} URE
                    
     {VOWELS}      === {A}      * {E}      * {I}        * {O}        * {U}    
-    {TEHTAR}      === A_TEHTA  * E_TEHTA  * I_TEHTA    * O_TEHTA    * U_TEHTA
+    {TEHTAR}      === A_TEHTA  * E_TEHTA  * I_TEHTA    * {O_LOOP}    * {U_LOOP}
                   
     {LVOWELS}     === {AA}         * {EE}         * {II}         * {OO}         * {UU}
-    {LTETHAR}     === ARA A_TEHTA  * ARA E_TEHTA  * ARA I_TEHTA  * ARA O_TEHTA  * ARA U_TEHTA 
+    {LTETHAR}     === ARA A_TEHTA  * ARA E_TEHTA  * ARA I_TEHTA  * ARA {O_LOOP}  * ARA {U_LOOP} 
 
     \** Let' put all vowels/diphthongs in the same basket **\
     {V_D}         === [ {VOWELS}  * {LVOWELS} * {SDIPHTHONGS} * {LDIPHTHONGS} ]        
@@ -133,14 +172,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L1_S}]       -->  [ {L1_T} ]
     [{L1_S}]{V_D}  -->  [ {L1_T} ]{_V_D_} 
 	
-    {L1_G_S}         === tt			              * pp                  * cch				          * (c,k)(c,k)             
-    {L1_G_T}         === TINCO GEMINATE_SIGN  * PARMA GEMINATE_SIGN * CALMA GEMINATE_SIGN	* QUESSE GEMINATE_SIGN  
+    {L1_G_S}         === tt			           * pp               * cch				        * (c,k)(c,k)             
+    {L1_G_T}         === TINCO {GEMINATE}  * PARMA {GEMINATE} * CALMA {GEMINATE}	* QUESSE {GEMINATE}  
     
     [{L1_G_S}]       -->  [ {L1_G_T} ]
     [{L1_G_S}]{V_D}  -->  [ {L1_G_T} ]{_V_D_} 
 	  
-    {L1_N_S}         === nt			              * mp                    * nch				          * (n,ñ)(c,k)             
-    {L1_N_T}         === TINCO NASALIZE_SIGN  * PARMA NASALIZE_SIGN   * CALMA NASALIZE_SIGN * QUESSE NASALIZE_SIGN  
+    {L1_N_S}         === nt			        * mp              * nch				    * (n,ñ)(c,k)             
+    {L1_N_T}         === TINCO {NASAL}  * PARMA {NASAL}   * CALMA {NASAL} * QUESSE {NASAL}  
     
     [{L1_N_S}]       -->  [ {L1_N_T} ]
     [{L1_N_S}]{V_D}  -->  [ {L1_N_T} ]{_V_D_} 	 
@@ -151,14 +190,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L2_S}]       --> [{L2_T}] 
     [{L2_S}]{V_D}  --> [{L2_T}]{_V_D_} 
 
-    {L2_G_S}         === dd                 * bb                  * jj			            * gg
-    {L2_G_T}         === ANDO GEMINATE_SIGN * UMBAR GEMINATE_SIGN * ANGA GEMINATE_SIGN  * UNGWE GEMINATE_SIGN
+    {L2_G_S}         === dd              * bb               * jj			         * gg
+    {L2_G_T}         === ANDO {GEMINATE} * UMBAR {GEMINATE} * ANGA {GEMINATE}  * UNGWE {GEMINATE}
 		
     [{L2_G_S}]       --> [{L2_G_T}] 
     [{L2_G_S}]{V_D}  --> [{L2_G_T}]{_V_D_} 
 
-    {L2_N_S}         === nd                 * mb                  * nj			            * (n,ñ)g
-    {L2_N_T}         === ANDO NASALIZE_SIGN * UMBAR NASALIZE_SIGN * ANGA NASALIZE_SIGN  * UNGWE NASALIZE_SIGN
+    {L2_N_S}         === nd           * mb            * nj			      * (n,ñ)g
+    {L2_N_T}         === ANDO {NASAL} * UMBAR {NASAL} * ANGA {NASAL}  * UNGWE {NASAL}
 		
     [{L2_N_S}]       --> [{L2_N_T}] 
     [{L2_N_S}]{V_D}  --> [{L2_N_T}]{_V_D_} 
@@ -176,22 +215,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L3_2_S}]        --> [{L3_2_T}] 
     [{L3_2_S}]{V_D}   --> [{L3_2_T}]{_V_D_} 
 		
-    {L3_1G_S}         === (thth,tth,þþ)       * (ff,phph,pph)
-    {L3_1G_T}         === SULE GEMINATE_SIGN  * FORMEN GEMINATE_SIGN
+    {L3_1G_S}         === (thth,tth,þþ)    * (ff,phph,pph)
+    {L3_1G_T}         === SULE {GEMINATE}  * FORMEN {GEMINATE}
    
-    {L3_2G_S}          === (shsh,ssh)         * (k,kh)kh
-    {L3_2G_T}          === AHA GEMINATE_SIGN  * HWESTA GEMINATE_SIGN
+    {L3_2G_S}          === (shsh,ssh)      * (k,kh)kh
+    {L3_2G_T}          === AHA {GEMINATE}  * HWESTA {GEMINATE}
    
     [{L3_1G_S}]        --> [{L3_1G_T}] 
     [{L3_1G_S}]{V_D}   --> [{L3_1G_T}]{_V_D_} 
     [{L3_2G_S}]        --> [{L3_2G_T}] 
     [{L3_2G_S}]{V_D}   --> [{L3_2G_T}]{_V_D_} 		
 
-    {L3_1N_S}          === (nth,nþ)           * (nf,mf,mph)      
-    {L3_1N_T}          === SULE NASALIZE_SIGN * FORMEN NASALIZE_SIGN  
+    {L3_1N_S}          === (nth,nþ)     * (nf,mf,mph)      
+    {L3_1N_T}          === SULE {NASAL} * FORMEN {NASAL}  
    
-    {L3_2N_S}          === nsh               * (n,ñ)kh     
-    {L3_2N_T}          === AHA NASALIZE_SIGN * HWESTA NASALIZE_SIGN
+    {L3_2N_S}          === nsh         * (n,ñ)kh     
+    {L3_2N_T}          === AHA {NASAL} * HWESTA {NASAL}
    
     [{L3_1N_S}]        --> [{L3_1N_T}] 
     [{L3_1N_S}]{V_D}   --> [{L3_1N_T}]{_V_D_} 
@@ -204,14 +243,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L4_S}]          --> [{L4_T}] 
     [{L4_S}]{V_D}     --> [{L4_T}]{_V_D_} 
 
-    {L4_G_S}            === (dh,ð)(dh,ð)        * vv                  * (zhzh,zzh)	        * (ghgh,ggh)
-    {L4_G_T}            === ANTO GEMINATE_SIGN  * AMPA GEMINATE_SIGN  * ANCA GEMINATE_SIGN  * UNQUE GEMINATE_SIGN
+    {L4_G_S}            === (dh,ð)(dh,ð)     * vv               * (zhzh,zzh)	     * (ghgh,ggh)
+    {L4_G_T}            === ANTO {GEMINATE}  * AMPA {GEMINATE}  * ANCA {GEMINATE}  * UNQUE {GEMINATE}
 		
     [{L4_G_S}]          --> [{L4_G_T}] 
     [{L4_G_S}]{V_D}     --> [{L4_G_T}]{_V_D_} 
 
-    {L4_N_S}            === n(dh,ð)             * (mv,nv)             * nzh	                * (n,ñ)gh
-    {L4_N_T}            === ANTO NASALIZE_SIGN  * AMPA NASALIZE_SIGN  * ANCA NASALIZE_SIGN  * UNQUE NASALIZE_SIGN
+    {L4_N_S}            === n(dh,ð)       * (mv,nv)       * nzh	          * (n,ñ)gh
+    {L4_N_T}            === ANTO {NASAL}  * AMPA {NASAL}  * ANCA {NASAL}  * UNQUE {NASAL}
 		
     [{L4_N_S}]          --> [{L4_N_T}] 
     [{L4_N_S}]{V_D}     --> [{L4_N_T}]{_V_D_} 
@@ -228,8 +267,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     [{L5_G_S}]          --> [{L5_G_T}] 
     [{L5_G_S}]{V_D}     --> [{L5_G_T}]{_V_D_} 
 		
-    {L6_S}            === w  	  * y     * rr                  * ww         	        * yy
-    {L6_T}            === VALA  * ANNA  * ROMEN GEMINATE_SIGN * VALA GEMINATE_SIGN  * ANNA GEMINATE_SIGN
+    {L6_S}            === w  	  * y     * rr               * ww         	    * yy
+    {L6_T}            === VALA  * ANNA  * ROMEN {GEMINATE} * VALA {GEMINATE}  * ANNA {GEMINATE}
     [r * {L6_S}]      --> [ ORE   * {L6_T}] 
     [r * {L6_S}]{V_D} --> [ ROMEN * {L6_T}]{_V_D_} 
 
@@ -242,29 +281,29 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     z{V_D}            --> ESSE_NUQUERNA {_V_D_}   \** Before a vowel goes down **\
     z                 --> ESSE                    \** Any other pos, up **\
 		
-    ns{V_D}           --> SILME_NUQUERNA NASALIZE_SIGN {_V_D_}
-    ns                --> SILME_NUQUERNA NASALIZE_SIGN                   
-    nz{V_D}           --> ESSE_NUQUERNA NASALIZE_SIGN {_V_D_}   
-    nz                --> ESSE_NUQUERNA NASALIZE_SIGN                
+    ns{V_D}           --> SILME_NUQUERNA {NASAL} {_V_D_}
+    ns                --> SILME_NUQUERNA {NASAL}                   
+    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{V_D}           --> TINCO {_V_D_} ALVEOLAR_SIGN 
-    ps{V_D}           --> PARMA {_V_D_} ALVEOLAR_SIGN
+    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_}	
 
     h{V_D}            --> HYARMEN {_V_D_}
     h                 --> HYARMEN
-    hh{V_D}           --> HYARMEN GEMINATE_SIGN {_V_D_}
-    hh                --> HYARMEN GEMINATE_SIGN
+    hh{V_D}           --> HYARMEN {GEMINATE} {_V_D_}
+    hh                --> HYARMEN {GEMINATE}
                       
     l{V_D}            --> LAMBE {_V_D_}
     l                 --> LAMBE
                       
-    ll{V_D}           --> LAMBE LAMBE_MARK_TILD {_V_D_}
-    ll                --> LAMBE LAMBE_MARK_TILD
+    ll{V_D}           --> LAMBE {GEMINATE} {_V_D_}
+    ll                --> LAMBE {GEMINATE}
 		
     (hl,lh){V_D}      --> ALDA {_V_D_}
     (hl,lh)           --> ALDA		
@@ -304,8 +343,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     » --> DQUOT_CLOSE 
     
     - --> PUNCT_DOT    
-    – --> WAVE_MED_SIMPLE  
-    — --> WAVE_MED_DOUBLE
+    – --> PUNCT_TILD  
+    — --> PUNCT_DTILD
  
     [ --> PUNCT_PAREN_L
     ] --> PUNCT_PAREN_R

data/glaemresources/modes/westsaxon.glaem

@@ -29,10 +29,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \language "Old English"
 \writing  "Tengwar"
 \mode     "West Saxon"
-\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 **\
@@ -65,6 +73,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,16 +151,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L1_KER_2}      === ċ     * c       * k
     {L1_IMG_2}      === CALMA * QUESSE  * QUESSE
         
-    {L1_KER_1_GEMS} === tt                      * pp   
+    {L1_KER_1_GEMS} === tt                     * pp   
     {L1_IMG_1_GEMS} === TINCO GEMINATE_DOUBLE  * PARMA GEMINATE_DOUBLE
-    {L1_KER_2_GEMS} === ċċ                      * cc                      * kk 
+    {L1_KER_2_GEMS} === ċċ                     * cc                     * kk 
     {L1_IMG_2_GEMS} === CALMA GEMINATE_DOUBLE  * QUESSE GEMINATE_DOUBLE * QUESSE GEMINATE_DOUBLE
 
   
     {S_VOWELS_WN}[{L1_KER_1}]{S_VOWELS_WN}  --> 2,1,3 --> [{L1_IMG_1}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L1_KER_1_GEMS}]              --> 2,1   --> [{L1_IMG_1_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L1_KER_1_GEMS}]          --> 2,1   --> [{L1_IMG_1_GEMS}]{_S_VOWELS_UP_WN_}
     {S_VOWELS_WN}[{L1_KER_2}]{S_VOWELS_WN}  --> 2,1,3 --> [{L1_IMG_2}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L1_KER_2_GEMS}]              --> 2,1   --> [{L1_IMG_2_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L1_KER_2_GEMS}]          --> 2,1   --> [{L1_IMG_2_GEMS}]{_S_VOWELS_UP_WN_}
 
     {S_VOWELS_WN}[ nt * mp ]{S_VOWELS_WN}   --> 2,1,3 -->  [ TINCO TILD_SUP_S * PARMA TILD_SUP_S  ]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
     {S_VOWELS_WN}[ nċ * nc ]{S_VOWELS_WN}   --> 2,1,3 -->  [ CALMA TILD_SUP_S * QUESSE TILD_SUP_S ]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
@@ -159,7 +176,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     
 
     {S_VOWELS_WN}[{L2_KER}]{S_VOWELS_WN}            --> 2,1,3 --> [{L2_IMG}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L2_KER_GEMS}]                        --> 2,1   --> [{L2_IMG_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L2_KER_GEMS}]                    --> 2,1   --> [{L2_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
     {S_VOWELS_WN}[ nd * mb * nġ * ng ]{S_VOWELS_WN} --> 2,1,3 -->  [ ANDO TILD_SUP_L * UMBAR TILD_SUP_L * ANGA TILD_SUP_L * UNGWE TILD_SUP_L ]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
 
@@ -177,9 +194,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L3_IMG_2_GEMS} === AHA GEMINATE_DOUBLE  * HWESTA GEMINATE_DOUBLE
 
     {S_VOWELS_WN}[{L3_KER_1}]{S_VOWELS_WN}  --> 2,1,3 --> [{L3_IMG_1}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L3_KER_1_GEMS}]              --> 2,1   --> [{L3_IMG_1_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L3_KER_1_GEMS}]          --> 2,1   --> [{L3_IMG_1_GEMS}]{_S_VOWELS_UP_WN_}
     {S_VOWELS_WN}[{L3_KER_2}]{S_VOWELS_WN}  --> 2,1,3 --> [{L3_IMG_2}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L3_KER_2_GEMS}]              --> 2,1   --> [{L3_IMG_2_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L3_KER_2_GEMS}]          --> 2,1   --> [{L3_IMG_2_GEMS}]{_S_VOWELS_UP_WN_}
 
   
     \** ## 4th Line (Voiced fricatives) **\
@@ -193,7 +210,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     
 
     {S_VOWELS_WN}[{L4_KER}]{S_VOWELS_WN}  --> 2,1,3 --> [{L4_IMG}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L4_KER_GEMS}]              --> 2,1   --> [{L4_IMG_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L4_KER_GEMS}]          --> 2,1   --> [{L4_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
 
     \** ## 5th Line (Nasals) **\
@@ -203,7 +220,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L5_IMG}        === NUMEN * MALTA
 
     {S_VOWELS_WN}[{L5_KER}]{S_VOWELS_WN}  --> 2,1,3 --> [{L5_IMG}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[ nn * mm ]{S_VOWELS_WN}       --> 2,1,3 --> [ NUMEN TILD_SUP_L * MALTA TILD_SUP_L ]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
+    {S_VOWELS_WN}[ nn * mm ]{S_VOWELS_WN} --> 2,1,3 --> [ NUMEN TILD_SUP_L * MALTA TILD_SUP_L ]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
 
 
     \** ## 6th Line (Approximants == fr : Spirantes) **\
@@ -215,7 +232,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L6_IMG_GEMS}   === ORE GEMINATE_DOUBLE * ANNA GEMINATE_DOUBLE
 
     {S_VOWELS_WN}[{L6_KER}]{S_VOWELS_WN}  --> 2,1,3 --> [{L6_IMG}]{_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}[{L6_KER_GEMS}]              --> 2,1   --> [{L6_IMG_GEMS}]{_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}[{L6_KER_GEMS}]          --> 2,1   --> [{L6_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
 
     \** ## Liquids **\
@@ -261,7 +278,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** ## Various **\
     \** ## **\
     {S_VOWELS_WN}h{S_VOWELS_WN}   --> 2,1,3 --> HYARMEN {_S_VOWELS_UP_WN_}{_S_VOWELS_DN_WN_}
-    {S_VOWELS_WN}hh                   --> 2,1   --> HYARMEN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
+    {S_VOWELS_WN}hh               --> 2,1   --> HYARMEN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
 
 
     \** ## X **\

data/lib/api/charset.rb

@@ -50,6 +50,8 @@ module Glaemscribe
         attr_accessor :names
         attr_accessor :classes
         attr_accessor :charset
+        attr_accessor :reversed
+        attr_accessor :default
         
         class VirtualClass
           attr_accessor :target
@@ -57,12 +59,20 @@ module Glaemscribe
         end
         
         def initialize
-          @classes = {} # result_char_1 => [trigger_char_1, trigger_char_2 ...] , result_char_1 => ...
+          @classes      = {} # result_char_1 => [trigger_char_1, trigger_char_2 ...] , result_char_1 => ...
           @lookup_table = {}
+          @reversed     = false
+          @default      = nil
         end
         
         def str
-          VIRTUAL_CHAR_OUTPUT
+          
+          # Will be called if the virtual char could not be replaced and still exists at the end of the transcription chain
+          if @default
+            @charset[@default].str
+          else
+            VIRTUAL_CHAR_OUTPUT
+          end
         end
         
         def finalize
@@ -83,9 +93,7 @@ module Glaemscribe
                 if rc.nil?
                   @charset.errors << Glaeml::Error.new(@line, "Trigger char #{trigger_char} points to unknown result char #{result_char}.")
                 elsif tc.nil?
-                  @charset.errors << Glaeml::Error.new(@line, "Unknown trigger char #{trigger_char}.")
-                elsif tc.class == VirtualChar
-                  @charset.errors << Glaeml::Error.new(@line, "Trigger char #{trigger_char} is virtual. This is not supported!")    
+                  @charset.errors << Glaeml::Error.new(@line, "Unknown trigger char #{trigger_char}.")  
                 elsif rc.class == VirtualChar
                   @charset.errors << Glaeml::Error.new(@line, "Trigger char #{trigger_char} points to another virtual char #{result_char}. This is not supported!")
                 else
@@ -96,6 +104,14 @@ module Glaemscribe
               end              
             }
           }
+          if @default
+            c = @charset[@default]
+            if !c
+              @charset.errors << Glaeml::Error.new(@line, "Default char #{@default} does not match any real character in the charset.")             
+            elsif c.virtual?
+              @charset.errors << Glaeml::Error.new(@line, "Default char #{@default} is virtual, it should be real only.")
+            end
+          end
         end
         
         def [](trigger_char_name)
@@ -127,14 +143,16 @@ module Glaemscribe
         @chars << c
       end
       
-      def add_virtual_char(line, classes, names)
+      def add_virtual_char(line, classes, names, reversed = false, default = nil)
         return if names.empty? || names.include?("?") # Ignore characters with '?'
         
-        c         = VirtualChar.new
-        c.line    = line
-        c.names   = names
-        c.classes = classes # We'll check errors in finalize
-        c.charset = self
+        c           = VirtualChar.new
+        c.line      = line
+        c.names     = names
+        c.classes   = classes # We'll check errors in finalize
+        c.charset   = self
+        c.reversed  = reversed
+        c.default   = default
         @chars << c   
       end
       

data/lib/api/charset_parser.rb

@@ -40,6 +40,8 @@ module Glaemscribe
           return @charset
         end
         
+        # TODO : verify charset glaeml like we do with modes
+        
         doc.root_node.gpath("char").each { |char_element|
           code   = char_element.args[0].hex
           names  = char_element.args[1..-1].map{|cname| cname.strip }.reject{ |cname| cname.empty? }
@@ -47,15 +49,25 @@ module Glaemscribe
         }
         
         doc.root_node.gpath("virtual").each { |virtual_element|
-          names   = virtual_element.args
-          classes = []
+          names     = virtual_element.args
+          reversed  = false        
+          default   = nil
+          classes   = []
+          
           virtual_element.gpath("class").each { |class_element|
             vc =  Charset::VirtualChar::VirtualClass.new
             vc.target    = class_element.args[0]
             vc.triggers  = class_element.args[1..-1].map{|cname| cname.strip }.reject{ |cname| cname.empty? }     
             classes << vc
           }
-          @charset.add_virtual_char(virtual_element.line,classes,names)
+          virtual_element.gpath("reversed").each { |reversed_element| 
+            reversed = true
+          }
+          virtual_element.gpath("default").each { |default_element| 
+            default  = default_element.args[0]
+          }
+          
+          @charset.add_virtual_char(virtual_element.line,classes,names,reversed,default)
         }
         
         @charset.finalize