glaemscribe 1.0.16 → 1.0.17

data/glaemresources/modes/adunaic.glaem

@@ -34,7 +34,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \version  0.0.3
 \authors  "Talagan (Benjamin Babut)"
 
-\charset  tengwar_ds true
+\charset  tengwar_ds         true
+\charset  tengwar_ds_eldamar false
 
 \beg      options
   \option reverse_numbers true

data/glaemresources/modes/blackspeech-annatar.glaem

@@ -30,7 +30,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \version  "0.0.1"
 \authors  "Talagan (Benjamin Babut)"
 
-\charset  tengwar_ds true
+\** TODO : NEEDS PORTING TO VIRTUAL CHARS, BUT NEEDS A NEW CHARSET FOR ANNATAR FOR THAT **\
+
+\charset  tengwar_ds         true
 
 \beg      options
   \option reverse_numbers true

data/glaemresources/modes/blackspeech.glaem

@@ -24,13 +24,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \** BlackSpeech ring mode for glaemscribe (MAY BE INCOMPLETE) **\
 
+\beg changelog
+  \entry 0.0.1 "First version"
+  \entry 0.0.2 "Ported to virtual chars."
+\end
+
 \language "Black Speech"
 \writing  "Tengwar"
 \mode     "General Use"
-\version  "0.0.1"
+\version  "0.0.2"
 \authors  "Talagan (Benjamin Babut)"
  
-\charset  tengwar_ds true
+\charset  tengwar_ds         true
+\charset  tengwar_ds_eldamar false
 
 \beg      options
   \option reverse_numbers true
@@ -83,77 +89,68 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     
     {K}                 === (c,k)
     
-    {VOWELS}            === {A}             * {E}             * {I}            * {O}          * {U}
-    {LVOWELS}           === {AA}            * {EE}            * {II}           * {OO}         * {UU}
+    {VOWELS}            === {A}          * {E}          * {I}         * {O}       * {U}
+    {LVOWELS}           === {AA}         * {EE}         * {II}        * {OO}      * {UU}
     
     \** Revers o and u **\
-    {TEHTA_XS}          === A_TEHTA_XS      * E_TEHTA_XS      * I_TEHTA_XS     *  U_TEHTA_XS  * O_TEHTA_XS      
-    {TEHTA__S}          === A_TEHTA_S       * E_TEHTA_S       * I_TEHTA_S      *  U_TEHTA_S   * O_TEHTA_S     
-    {TEHTA__L}          === A_TEHTA_L       * E_TEHTA_L       * I_TEHTA_L      *  U_TEHTA_L   * O_TEHTA_L     
-    {TEHTA_XL}          === A_TEHTA_XL      * E_TEHTA_XL      * I_TEHTA_XL     *  U_TEHTA_XL  * O_TEHTA_XL      
+    {TEHTAR}            === A_TEHTA      * E_TEHTA      * I_TEHTA     *  U_TEHTA  * O_TEHTA      
      
-    {DIPHTHONGS}         === {AI}              * {AU}              *  {OI}              
-    {DIPHTHENGS}         === YANTA A_TEHTA_L    * URE A_TEHTA_L     * YANTA U_TEHTA_L   
-     
-    {V_D_KER}           === [ {VOWELS}   * {DIPHTHONGS} ]
-    {V_D_IMG_XS}        === [ {TEHTA_XS} * {DIPHTHENGS} ]
-    {V_D_IMG__S}        === [ {TEHTA__L} * {DIPHTHENGS} ]
-    {V_D_IMG__L}        === [ {TEHTA__S} * {DIPHTHENGS} ]
-    {V_D_IMG_XL}        === [ {TEHTA_XL} * {DIPHTHENGS} ]
-    
-    [{VOWELS}]        -->   TELCO [{TEHTA_XS}]  \** Replace isolated short vowels **\
-    [{LVOWELS}]       -->   ARA [{TEHTA_XS}]  \**  Replace long vowels **\
-    [{DIPHTHONGS}]     -->  [{DIPHTHENGS}]  \**  Replace diphthongs **\
+    {DIPHTHONGS}         === {AI}            * {AU}            *  {OI}              
+    {_DIPHTHONGS_}         === YANTA A_TEHTA   * URE A_TEHTA     * YANTA U_TEHTA  
+         
+    [{VOWELS}]        -->   TELCO [{TEHTAR}]  \** Replace isolated short vowels **\
+    [{LVOWELS}]       -->   ARA [{TEHTAR}]  \**  Replace long vowels **\
+    [{DIPHTHONGS}]    -->  [{_DIPHTHONGS_}]  \**  Replace diphthongs **\
 
     b             --> UMBAR
-    [{VOWELS}] b  --> UMBAR [{TEHTA_XL}]
+    [{VOWELS}] b  --> UMBAR [{TEHTAR}]
 
     d             --> ANDO
-    [{VOWELS}] d  --> ANDO [{TEHTA_XL}]
+    [{VOWELS}] d  --> ANDO [{TEHTAR}]
     
     f             --> FORMEN 
-    [{VOWELS}] f  --> FORMEN_EXT [{TEHTA__S}] \** Beware. **\ 
+    [{VOWELS}] f  --> FORMEN_EXT [{TEHTAR}] \** Beware. **\ 
 
     g             --> UNGWE
-    [{VOWELS}] g  --> UNGWE [{TEHTA_XL}]
+    [{VOWELS}] g  --> UNGWE [{TEHTAR}]
 
     gh            --> UNGWE_EXT
-    [{VOWELS}] gh --> UNGWE_EXT [{TEHTA_XL}]
+    [{VOWELS}] gh --> UNGWE_EXT [{TEHTAR}]
 
     h             --> HYARMEN
-    [{VOWELS}] h  --> HYARMEN [{TEHTA_XS}]
+    [{VOWELS}] h  --> HYARMEN [{TEHTAR}]
 
     \** ======================== **\
 
     {K}             --> QUESSE
-    [{VOWELS}]{K}   --> QUESSE [{TEHTA__L}] 
+    [{VOWELS}]{K}   --> QUESSE [{TEHTAR}] 
 
     {K}h            --> HWESTA
-    [{VOWELS}]{K}h  --> HWESTA_EXT [{TEHTA__L}] \** Take care. **\  
+    [{VOWELS}]{K}h  --> HWESTA_EXT [{TEHTAR}] \** Take care. **\  
 
     \** ======================== **\
 
     l             --> LAMBE
-    [{VOWELS}] l  --> LAMBE [{TEHTA__L}] 
+    [{VOWELS}] l  --> LAMBE [{TEHTAR}] 
 
     \** ======================== **\
 
     m             --> MALTA
-    [{VOWELS}] m  --> MALTA [{TEHTA_XL}]
+    [{VOWELS}] m  --> MALTA [{TEHTAR}]
 
-    mb            --> UMBAR TILD_SUP_L
-    [{VOWELS}] mb --> UMBAR TILD_SUP_L [{TEHTA_XL}]
+    mb            --> UMBAR NASALIZE_SIGN_TILD
+    [{VOWELS}] mb --> UMBAR NASALIZE_SIGN_TILD [{TEHTAR}]
 
-    mp            --> PARMA TILD_SUP_S
-    [{VOWELS}] mp --> PARMA TILD_SUP_S [{TEHTA__L}]
+    mp            --> PARMA NASALIZE_SIGN_TILD
+    [{VOWELS}] mp --> PARMA NASALIZE_SIGN_TILD [{TEHTAR}]
 
     \** ======================== **\
     
     n               --> NUMEN
-    [{VOWELS}]n     --> NUMEN [{TEHTA_XL}] 
+    [{VOWELS}]n     --> NUMEN [{TEHTAR}] 
 
-    n{K}            --> QUESSE TILD_SUP_S
-    [{VOWELS}]n{K}  --> QUESSE TILD_SUP_S [{TEHTA__S}] 
+    n{K}            --> QUESSE NASALIZE_SIGN_TILD
+    [{VOWELS}]n{K}  --> QUESSE NASALIZE_SIGN_TILD [{TEHTAR}] 
 
     \** ======================== **\
     
@@ -161,13 +158,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     r             --> ROMEN
     r_            --> ORE
-    [{VOWELS}]r   --> ORE [{TEHTA__S}]
+    [{VOWELS}]r   --> ORE [{TEHTAR}]
 
-    [{VOWELS}]rb  --> ORE [{TEHTA__L}] UMBAR
-    [{LVOWELS}]rb --> ARA [{TEHTA_XS}] ORE UMBAR
+    [{VOWELS}]rb  --> ORE [{TEHTAR}] UMBAR
+    [{LVOWELS}]rb --> ARA [{TEHTAR}] ORE UMBAR
 
-    [{VOWELS}]rz  --> ORE [{TEHTA__L}] ESSE
-    [{LVOWELS}]rz --> ARA [{TEHTA_XS}] ORE ESSE
+    [{VOWELS}]rz  --> ORE [{TEHTAR}] ESSE
+    [{LVOWELS}]rz --> ARA [{TEHTAR}] ORE ESSE
     
     \** ======================== **\
 
@@ -176,17 +173,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** ======================== **\
 
     sh            --> AHA             
-    [{VOWELS}] sh --> AHA_EXT [{TEHTA__L}] \** BEWARE. **\
+    [{VOWELS}] sh --> AHA_EXT [{TEHTAR}] \** BEWARE. **\
     
     t             --> TINCO
-    [{VOWELS}]t   --> TINCO [{TEHTA__L}]
+    [{VOWELS}]t   --> TINCO [{TEHTAR}]
 
     th            --> SULE
     
     y             --> ANNA
     
     z             --> ESSE    
-    [{VOWELS}] z  --> ESSE_NUQUERNA [{TEHTA__L}]
+    [{VOWELS}] z  --> ESSE_NUQUERNA [{TEHTAR}]
 
   \end
   
@@ -256,5 +253,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
 \end
 
-
- 
+\beg postprocessor
+  \resolve_virtuals
+\end

data/glaemresources/modes/mercian.glaem

@@ -22,13 +22,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 **\
 
+\beg changelog
+  \entry 0.0.2 "Porting to virtual chars"
+\end
+
 \language "Old English"
 \writing  "Tengwar"
 \mode     "Mercian"
-\version  "0.0.1"
+\version  "0.0.2"
 \authors  "Talagan (Benjamin Babut)"
 
-\charset  tengwar_ds true
+\charset  tengwar_ds_eldamar true
 
 \beg      preprocessor
   \** Work exclusively downcase **\
@@ -81,64 +85,42 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** Diphtongs are always splitted, so consider we don't have any. **\
     \** @ is the phantom vowel added by the preprocessor **\
 
-    {S_VOWELS_NP}   === {A} * {AE} * {OE} * {E} * {I}   * {O} * {U} * {Y}
-    {S_VOWELS}      === {S_VOWELS_NP} * @                           
+    {S_VOWELS_NP_KERNEL}   === {A} * {AE} * {OE} * {E} * {I}   * {O} * {U} * {Y}
+    {S_VOWELS_WP_KERNEL}      === {S_VOWELS_NP_KERNEL} * @                           
 
     \** UP TEHTAS **\    
-    {UTEHTA_NP_XS}  === A_TEHTA_XS    * Y_TEHTA_XS     * E_TEHTA_DOUBLE_XS   * E_TEHTA_XS   *   I_TEHTA_XS    * O_TEHTA_XS    * U_TEHTA_XS    * THSUP_SEV_XS  
-    {UTEHTA_NP__S}  === A_TEHTA_S     * Y_TEHTA_S      * E_TEHTA_DOUBLE_S    * E_TEHTA_S    *   I_TEHTA_S     * O_TEHTA_S     * U_TEHTA_S     * THSUP_SEV_S 
-    {UTEHTA_NP__L}  === A_TEHTA_L     * Y_TEHTA_L      * E_TEHTA_DOUBLE_L    * E_TEHTA_L    *   I_TEHTA_L     * O_TEHTA_L     * U_TEHTA_L     * THSUP_SEV_L 
-    {UTEHTA_NP_XL}  === A_TEHTA_XL    * Y_TEHTA_XL     * E_TEHTA_DOUBLE_XL   * E_TEHTA_XL   *   I_TEHTA_XL    * O_TEHTA_XL    * U_TEHTA_XL    * THSUP_SEV_XL 
-    {UTEHTA_XS}     === {UTEHTA_NP_XS}  * {NULL}
-    {UTEHTA__S}     === {UTEHTA_NP__S}  * {NULL}  
-    {UTEHTA__L}     === {UTEHTA_NP__L}  * {NULL}  
-    {UTEHTA_XL}     === {UTEHTA_NP_XL}  * {NULL}
+    {TEHTAR_UP_NP}  === A_TEHTA    * Y_TEHTA     * E_TEHTA_DOUBLE   * E_TEHTA   *   I_TEHTA    * O_TEHTA    * U_TEHTA   * SEV_TEHTA 
+ 
+    {TEHTAR_UP}     === {TEHTAR_UP_NP}  * {NULL}
 
     \** FOR LONG VOWELS **\
-    {L_VOWELS}      === {AA}              * {AEAE}          * {OEOE}                * {EE}            * {II}            * {OO}              * {UU}            * {YY}  
-    {L_PTEHTAS}     === ARA A_TEHTA_XS    * ARA Y_TEHTA_XS  * ARA E_TEHTA_DOUBLE_XS * ARA E_TEHTA_XS  * ARA I_TEHTA_XS  * ARA O_TEHTA_XS    * ARA U_TEHTA_XS  * ARA THSUP_SEV_XS    
-
-    {LVOWEL_MARKER_XS}  === THINF_STROKE_XS
-    {LVOWEL_MARKER__S}  === THINF_STROKE_S
-    {LVOWEL_MARKER__L}  === THINF_STROKE_L
-    {LVOWEL_MARKER_XL}  === THINF_STROKE_XL
+    {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    
 
+    {LVOWEL_MARKER}  === SEV_TEHTA_INF
+  
     \** DOWN TEHTAS **\
-    {DTEHTA_XS}         === THINF_TDOT_XS   * THINF_DDOT_XS    * TH_SUB_CIRC_XS    * THINF_ACCENT_XS  * THINF_DOT_XS  * THINF_CURL_XS   * THINF_CURL_INV_XS   * THINF_STROKE_XS   * {NULL}
-    {DTEHTA__S}         === THINF_TDOT_S    * THINF_DDOT_S     * TH_SUB_CIRC_S     * THINF_ACCENT_S   * THINF_DOT_S   * THINF_CURL_S    * THINF_CURL_INV_S    * THINF_STROKE_S    * {NULL}  
-    {DTEHTA__L}         === THINF_TDOT_L    * THINF_DDOT_L     * TH_SUB_CIRC_L     * THINF_ACCENT_L   * THINF_DOT_L   * THINF_CURL_L    * THINF_CURL_INV_L    * THINF_STROKE_L    * {NULL}  
-    {DTEHTA_XL}         === THINF_TDOT_XL   * THINF_DDOT_XL    * TH_SUB_CIRC_XL    * THINF_ACCENT_XL  * THINF_DOT_XL  * THINF_CURL_XL   * THINF_CURL_INV_XL   * THINF_STROKE_XL   * {NULL}  
+    {DTEHTAR}        === A_TEHTA_INF   * Y_TEHTA_INF  * CIRC_TEHTA_INF     * E_TEHTA_INF  * I_TEHTA_INF  * O_TEHTA_INF  * U_TEHTA_INF   * SEV_TEHTA_INF   * {NULL}
+  
 
-    {S_VOWELS_NP_KER}       === [ {S_VOWELS_NP} ]
-    {S_VOWELS_NP_KER_WN}    === [ {S_VOWELS_NP} * {NULL} ]
-    {S_VOWELS_KER}          === [ {S_VOWELS} ]
-    {S_VOWELS_KER_WN}       === [ {S_VOWELS} * {NULL} ]
+    {S_VOWELS_NP}       === [ {S_VOWELS_NP_KERNEL} ]
+    {S_VOWELS_NP_WN}    === [ {S_VOWELS_NP_KERNEL} * {NULL} ]
+    {S_VOWELS}          === [ {S_VOWELS_WP_KERNEL} ]
+    {S_VOWELS_WN}       === [ {S_VOWELS_WP_KERNEL} * {NULL} ]
 
     \** IMG Sheaves for all vowels **\
-    {SU_VOWELS_IMG_XS}        === [ {UTEHTA_XS} ]
-    {SU_VOWELS_IMG__S}        === [ {UTEHTA__S} ]
-    {SU_VOWELS_IMG__L}        === [ {UTEHTA__L} ]
-    {SU_VOWELS_IMG_XL}        === [ {UTEHTA_XL} ]
-    {SD_VOWELS_IMG_XS}        === [ {DTEHTA_XS} ]
-    {SD_VOWELS_IMG__S}        === [ {DTEHTA__S} ]
-    {SD_VOWELS_IMG__L}        === [ {DTEHTA__L} ]
-    {SD_VOWELS_IMG_XL}        === [ {DTEHTA_XL} ]
-
-    {SU_VOWELS_IMG_XS_WN}     === [ {UTEHTA_XS} * {NULL} ]
-    {SU_VOWELS_IMG__S_WN}     === [ {UTEHTA__S} * {NULL} ]
-    {SU_VOWELS_IMG__L_WN}     === [ {UTEHTA__L} * {NULL} ]
-    {SU_VOWELS_IMG_XL_WN}     === [ {UTEHTA_XL} * {NULL} ]
-    {SD_VOWELS_IMG_XS_WN}     === [ {DTEHTA_XS} * {NULL} ]
-    {SD_VOWELS_IMG__S_WN}     === [ {DTEHTA__S} * {NULL} ]
-    {SD_VOWELS_IMG__L_WN}     === [ {DTEHTA__L} * {NULL} ]
-    {SD_VOWELS_IMG_XL_WN}     === [ {DTEHTA_XL} * {NULL} ]
+    {_S_VOWELS_UP_}        === [ {TEHTAR_UP} ]
+    {_S_VOWELS_DN_}        === [ {DTEHTAR} ]
+
+    {_S_VOWELS_UP_WN_}     === [ {TEHTAR_UP} * {NULL} ]
+    {_S_VOWELS_DN_WN_}     === [ {DTEHTAR} * {NULL} ]
 
     \** Fallback rule for all vowels **\
-    [ {L_VOWELS} ] --> [ {L_PTEHTAS} ]            \** If found alone, long vowel will have a long carrier **\
+    [ {LVOWELS} ] --> [ {LTEHTAR} ]            \** If found alone, long vowel will have a long carrier **\
 
     \** Fallback rule for short vowels **\
     @                   --> {NULL}                     \**  If found alone, put nothing **\
-    [ {S_VOWELS_NP} ]   --> TELCO [ {UTEHTA_NP_XS} ]   \**  If found alone, a vowel will have a short carrier **\
+    [ {S_VOWELS_NP_KERNEL} ]   --> TELCO [ {TEHTAR_UP_NP} ]   \**  If found alone, a vowel will have a short carrier **\
     _{A}                --> VILYA                      \**  We don't want a short carrier for _a **\
     (w,u)_              --> VALA                       \**  Only resolved after vowels **\
 
@@ -161,36 +143,36 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L1_IMG_2}      === CALMA * QUESSE  * QUESSE
     
     {L1_KER_1_GEMS} === tt                      * pp   
-    {L1_IMG_1_GEMS} === TINCO THINF_DSTROKE_XS  * PARMA THINF_DSTROKE_XS
+    {L1_IMG_1_GEMS} === TINCO GEMINATE_DOUBLE  * PARMA GEMINATE_DOUBLE
 
     {L1_KER_2_GEMS} === ċċ                      * cc                      * kk 
-    {L1_IMG_2_GEMS} === CALMA THINF_DSTROKE_XL  * QUESSE THINF_DSTROKE_XL * QUESSE THINF_DSTROKE_XL
+    {L1_IMG_2_GEMS} === CALMA GEMINATE_DOUBLE  * QUESSE GEMINATE_DOUBLE * QUESSE GEMINATE_DOUBLE
   
     \** C, CV, CVV. Rules are declared to avoid conflicts between [C, NULLV, V] and [C, V, NULLV] **\
     \** We also have rules for long vowels **\
     [{L1_KER_1}]                                  --> [{L1_IMG_1}]
     [{L1_KER_2}]                                  --> [{L1_IMG_2}]
-    [{L1_KER_1}]{S_VOWELS_KER}{S_VOWELS_KER_WN}   --> [{L1_IMG_1}]{SU_VOWELS_IMG__L}{SD_VOWELS_IMG__S_WN}
-    [{L1_KER_2}]{S_VOWELS_KER}{S_VOWELS_KER_WN}   --> [{L1_IMG_2}]{SU_VOWELS_IMG__L}{SD_VOWELS_IMG_XL_WN}
-    [{L1_KER_1}][{L_VOWELS}]                      --> [{L1_IMG_1}][{UTEHTA_NP__L}]{LVOWEL_MARKER__S}
-    [{L1_KER_2}][{L_VOWELS}]                      --> [{L1_IMG_2}][{UTEHTA_NP__L}]{LVOWEL_MARKER_XL}
+    [{L1_KER_1}]{S_VOWELS}{S_VOWELS_WN}           --> [{L1_IMG_1}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L1_KER_2}]{S_VOWELS}{S_VOWELS_WN}           --> [{L1_IMG_2}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L1_KER_1}][{LVOWELS}]                       --> [{L1_IMG_1}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [{L1_KER_2}][{LVOWELS}]                       --> [{L1_IMG_2}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminateds (double sign below) **\
     \** C², C²V **\
     \** NOT C²V² (cannot put second tehta below due to gemination sign) **\
     \** NOT C²L (long vowel not possible with gemination sign) **\
-    [{L1_KER_1_GEMS}]{S_VOWELS_KER_WN}          --> [{L1_IMG_1_GEMS}]{SU_VOWELS_IMG__L_WN}
-    [{L1_KER_2_GEMS}]{S_VOWELS_KER_WN}          --> [{L1_IMG_2_GEMS}]{SU_VOWELS_IMG__L_WN}
+    [{L1_KER_1_GEMS}]{S_VOWELS_WN}          --> [{L1_IMG_1_GEMS}]{_S_VOWELS_UP_WN_}
+    [{L1_KER_2_GEMS}]{S_VOWELS_WN}          --> [{L1_IMG_2_GEMS}]{_S_VOWELS_UP_WN_}
 
     \** Nasals (tild above) **\
     \** nC, nCV, nCVV **\
     \** We also have rules for long vowels **\
-    [ nt * mp ]                                       -->  [ TINCO TILD_SUP_S * PARMA TILD_SUP_S ]
-    [ nċ * nc ]                                       -->  [ CALMA TILD_SUP_S * QUESSE TILD_SUP_S ]
-    [ nt * mp ]{S_VOWELS_KER}{S_VOWELS_KER_WN}        -->  [ TINCO TILD_SUP_S * PARMA TILD_SUP_S ]{SU_VOWELS_IMG__L}{SD_VOWELS_IMG__S_WN}
-    [ nċ * nc ]{S_VOWELS_KER}{S_VOWELS_KER_WN}        -->  [ CALMA TILD_SUP_S * QUESSE TILD_SUP_S ]{SU_VOWELS_IMG__L}{SD_VOWELS_IMG_XL_WN}
-    [ nt * mp ][{L_VOWELS}]                           -->  [ TINCO TILD_SUP_S * PARMA TILD_SUP_S ][{UTEHTA_NP__L}]{LVOWEL_MARKER__S}
-    [ nċ * nc ][{L_VOWELS}]                           -->  [ CALMA TILD_SUP_S * QUESSE TILD_SUP_S ][{UTEHTA_NP__L}]{LVOWEL_MARKER_XL}
+    [ 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}
 
     \** ========== **\
     \** 2nd Line (Voiced occlusives) **\
@@ -200,20 +182,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L2_IMG}        === ANDO  * UMBAR * ANGA  * UNGWE
     
     {L2_KER_GEMS}   === dd                    * bb                    * (ċġ,ġġ)               * (cg,gg)
-    {L2_IMG_GEMS}   === ANDO THINF_DSTROKE_L  * UMBAR THINF_DSTROKE_L * ANGA THINF_DSTROKE_L  * UNGWE THINF_DSTROKE_L
+    {L2_IMG_GEMS}   === ANDO GEMINATE_DOUBLE  * UMBAR GEMINATE_DOUBLE * ANGA GEMINATE_DOUBLE  * UNGWE GEMINATE_DOUBLE
 
     \** C, CV, CVV **\
     [{L2_KER}]                                        --> [{L2_IMG}]
-    [{L2_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}         --> [{L2_IMG}]{SU_VOWELS_IMG_XL}{SD_VOWELS_IMG_XL_WN}
-    [{L2_KER}][{L_VOWELS}]                            --> [{L2_IMG}][{UTEHTA_NP_XL}]{LVOWEL_MARKER_XL}
+    [{L2_KER}]{S_VOWELS}{S_VOWELS_WN}                 --> [{L2_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L2_KER}][{LVOWELS}]                             --> [{L2_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    [{L2_KER_GEMS}]{S_VOWELS_KER_WN}                  --> [{L2_IMG_GEMS}]{SU_VOWELS_IMG_XL_WN}
+    [{L2_KER_GEMS}]{S_VOWELS_WN}                      --> [{L2_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
     \** Nasals, with diphthongs! **\
-    [ nd * mb * nġ * ng ]                                   -->  [ ANDO TILD_SUP_L * UMBAR TILD_SUP_L * ANGA TILD_SUP_L * UNGWE TILD_SUP_L ]
-    [ nd * mb * nġ * ng ]{S_VOWELS_KER}{S_VOWELS_KER_WN}    -->  [ ANDO TILD_SUP_L * UMBAR TILD_SUP_L * ANGA TILD_SUP_L * UNGWE TILD_SUP_L ]{SU_VOWELS_IMG_XL}{SD_VOWELS_IMG_XL_WN}
-    [ nd * mb * nġ * ng ][{L_VOWELS}]                       -->  [ ANDO TILD_SUP_L * UMBAR TILD_SUP_L * ANGA TILD_SUP_L * UNGWE TILD_SUP_L ][{UTEHTA_NP_XL}]{LVOWEL_MARKER_XL}
+    [ 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}
 
     \** ========== **\
     \** 3rd Line (Voiceless fricatives) **\
@@ -225,21 +207,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L3_IMG_2}      === AHA   * HWESTA
     
     {L3_KER_1_GEMS} === þþ                    * ff
-    {L3_IMG_1_GEMS} === SULE THINF_DSTROKE_XS * FORMEN THINF_DSTROKE_XS
+    {L3_IMG_1_GEMS} === SULE GEMINATE_DOUBLE * FORMEN GEMINATE_DOUBLE
     
     {L3_KER_2_GEMS} === çç                    * (χχ,ħħ)
-    {L3_IMG_2_GEMS} === AHA THINF_DSTROKE_XS  * HWESTA THINF_DSTROKE_XS
+    {L3_IMG_2_GEMS} === AHA GEMINATE_DOUBLE  * HWESTA GEMINATE_DOUBLE
 
-    [{L3_KER_1}]                                      --> [{L3_IMG_1}]
-    [{L3_KER_2}]                                      --> [{L3_IMG_2}]
-    [{L3_KER_1}]{S_VOWELS_KER}{S_VOWELS_KER_WN}       --> [{L3_IMG_1}]{SU_VOWELS_IMG__S}{SD_VOWELS_IMG__L_WN}
-    [{L3_KER_2}]{S_VOWELS_KER}{S_VOWELS_KER_WN}       --> [{L3_IMG_2}]{SU_VOWELS_IMG__L}{SD_VOWELS_IMG_XL_WN}
-    [{L3_KER_1}][{L_VOWELS}]                           --> [{L3_IMG_1}][{UTEHTA_NP__S}]{LVOWEL_MARKER__L}
-    [{L3_KER_2}][{L_VOWELS}]                           --> [{L3_IMG_2}][{UTEHTA_NP__L}]{LVOWEL_MARKER_XL}
+    [{L3_KER_1}]                              --> [{L3_IMG_1}]
+    [{L3_KER_2}]                              --> [{L3_IMG_2}]
+    [{L3_KER_1}]{S_VOWELS}{S_VOWELS_WN}       --> [{L3_IMG_1}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L3_KER_2}]{S_VOWELS}{S_VOWELS_WN}       --> [{L3_IMG_2}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L3_KER_1}][{LVOWELS}]                   --> [{L3_IMG_1}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [{L3_KER_2}][{LVOWELS}]                   --> [{L3_IMG_2}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    [{L3_KER_1_GEMS}]{S_VOWELS_KER_WN}                --> [{L3_IMG_1_GEMS}]{SU_VOWELS_IMG__S_WN}
-    [{L3_KER_2_GEMS}]{S_VOWELS_KER_WN}                --> [{L3_IMG_2_GEMS}]{SU_VOWELS_IMG__L_WN}
+    [{L3_KER_1_GEMS}]{S_VOWELS_WN}            --> [{L3_IMG_1_GEMS}]{_S_VOWELS_UP_WN_}
+    [{L3_KER_2_GEMS}]{S_VOWELS_WN}            --> [{L3_IMG_2_GEMS}]{_S_VOWELS_UP_WN_}
   
   
     \** ========== **\
@@ -250,14 +232,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L4_IMG}        === ANTO  * AMPA  * ANCA  * UNQUE
     
     {L4_KER_GEMS}   === ðð                    * vv                    * jj                    * ȝȝ
-    {L4_IMG_GEMS}   === ANTO THINF_DSTROKE_L  * AMPA THINF_DSTROKE_L  * ANCA THINF_DSTROKE_L  * UNQUE THINF_DSTROKE_L
+    {L4_IMG_GEMS}   === ANTO GEMINATE_DOUBLE  * AMPA GEMINATE_DOUBLE  * ANCA GEMINATE_DOUBLE  * UNQUE GEMINATE_DOUBLE
 
-    [{L4_KER}]                                        --> [{L4_IMG}]
-    [{L4_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}         --> [{L4_IMG}]{SU_VOWELS_IMG_XL}{SD_VOWELS_IMG_XL_WN}
-    [{L4_KER}][{L_VOWELS}]                            --> [{L4_IMG}][{UTEHTA_NP_XL}]{LVOWEL_MARKER_XL}
+    [{L4_KER}]                                --> [{L4_IMG}]
+    [{L4_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L4_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L4_KER}][{LVOWELS}]                     --> [{L4_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    [{L4_KER_GEMS}]{S_VOWELS_KER_WN}                  --> [{L4_IMG_GEMS}]{SU_VOWELS_IMG_XL_WN}
+    [{L4_KER_GEMS}]{S_VOWELS_WN}              --> [{L4_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
 
     \** ========== **\
@@ -267,16 +249,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L5_KER}        === n * m
     {L5_IMG}        === NUMEN * MALTA
 
-    [{L5_KER}]                                        --> [{L5_IMG}]
-    [{L5_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}         --> [{L5_IMG}]{SU_VOWELS_IMG_XL}{SD_VOWELS_IMG_XL_WN}
-    [{L5_KER}][{L_VOWELS}]                            --> [{L5_IMG}][{UTEHTA_NP_XL}]{LVOWEL_MARKER_XL}
+    [{L5_KER}]                                --> [{L5_IMG}]
+    [{L5_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L5_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L5_KER}][{LVOWELS}]                     --> [{L5_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Gemination === nasalisation **\
     \** So prefer using tild to put tehtas up and down for diphthongs and long vowels **\
 
-    [ nn * mm ]                                       --> [ NUMEN TILD_SUP_L * MALTA TILD_SUP_L ]
-    [ nn * mm ]{S_VOWELS_KER}{S_VOWELS_KER_WN}        --> [ NUMEN TILD_SUP_L * MALTA TILD_SUP_L ]{SU_VOWELS_IMG_XL}{SD_VOWELS_IMG_XL_WN}
-    [ nn * mm ][{L_VOWELS}]                           --> [ NUMEN TILD_SUP_L * MALTA TILD_SUP_L ][{UTEHTA_NP_XL}]{LVOWEL_MARKER_XL}
+    [ 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}
 
     \** ========== **\
     \** 6th Line (Approximants == fr : Spirantes) **\
@@ -285,27 +267,27 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L6_KER}        === r * ĭ
     {L6_IMG}        === ORE * ANNA
     {L6_KER_GEMS}   === rr * ĭĭ
-    {L6_IMG_GEMS}   === ORE THINF_DSTROKE_XS * ANNA THINF_DSTROKE_XS
+    {L6_IMG_GEMS}   === ORE GEMINATE_DOUBLE * ANNA GEMINATE_DOUBLE
 
-    [{L6_KER}]                                        --> [{L6_IMG}]
-    [{L6_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}         --> [{L6_IMG}]{SU_VOWELS_IMG__S}{SD_VOWELS_IMG__L_WN}
-    [{L6_KER}][{L_VOWELS}]                            --> [{L6_IMG}][{UTEHTA_NP__S}]{LVOWEL_MARKER__L}
+    [{L6_KER}]                                --> [{L6_IMG}]
+    [{L6_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L6_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L6_KER}][{LVOWELS}]                     --> [{L6_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    [{L6_KER_GEMS}]{S_VOWELS_KER_WN}                  --> [{L6_IMG_GEMS}]{SU_VOWELS_IMG__S_WN}
+    [{L6_KER_GEMS}]{S_VOWELS_WN}              --> [{L6_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
     \** ========== **\
     \** Liquids **\
 
-    w                                                      --> ROMEN
-    w{S_VOWELS_KER}{S_VOWELS_KER_WN}                       --> ROMEN {SU_VOWELS_IMG__L}{SD_VOWELS_IMG_XS_WN}
-    w[{L_VOWELS}]                                          --> ROMEN [{UTEHTA_NP__L}]{LVOWEL_MARKER_XS}
+    w                                         --> ROMEN
+    w{S_VOWELS}{S_VOWELS_WN}                  --> ROMEN {_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    w[{LVOWELS}]                              --> ROMEN [{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    ww{S_VOWELS_KER_WN}                                    --> ROMEN THINF_DSTROKE_XS {SU_VOWELS_IMG__L_WN}
+    ww{S_VOWELS_WN}                           --> ROMEN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
 
     \** L and LL and ld are too big to receive tehtas under, so no diphthongs, no long vowels **\
-    [l * ll * ld] {S_VOWELS_KER_WN}                        --> [LAMBE * LAMBE THINF_DSTROKE_FOR_LAMBE * ALDA] {SU_VOWELS_IMG__L_WN}
+    [l * ll * ld] {S_VOWELS_WN}               --> [LAMBE * LAMBE GEMINATE_DOUBLE * ALDA] {_S_VOWELS_UP_WN_}
 
     \** ========== **\
     \** Alveolar (sifflantes) **\
@@ -313,19 +295,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L8_KER}      ===  s * z 
     {L8_IMG}      ===  SILME_NUQUERNA * ESSE_NUQUERNA 
     {L8_KER_GEMS} ===  ss * zz 
-    {L8_IMG_GEMS} ===  SILME_NUQUERNA THINF_DSTROKE_XS * ESSE_NUQUERNA THINF_DSTROKE_L
+    {L8_IMG_GEMS} ===  SILME_NUQUERNA GEMINATE_DOUBLE * ESSE_NUQUERNA GEMINATE_DOUBLE
 
-    [{L8_KER}]                                       --> [{L8_IMG}]
-    [{L8_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}        --> [{L8_IMG}]{SU_VOWELS_IMG__S}{SD_VOWELS_IMG__S_WN}
-    [{L8_KER}][{L_VOWELS}]                           --> [{L8_IMG}][{UTEHTA_NP__S}]{LVOWEL_MARKER__S}
+    [{L8_KER}]                                --> [{L8_IMG}]
+    [{L8_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L8_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{L8_KER}][{LVOWELS}]                     --> [{L8_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign under, cannot treat diphthongs or long vowels **\
-    [{L8_KER_GEMS}]{S_VOWELS_KER_WN}                 --> [{L8_IMG_GEMS}]{SU_VOWELS_IMG__S_WN}
+    [{L8_KER_GEMS}]{S_VOWELS_WN}              --> [{L8_IMG_GEMS}]{_S_VOWELS_UP_WN_}
 
     \**  Final s (Challenging!) **\
     s_                --> SHOOK_BEAUTIFUL                             \** Final rule for s **\
-    {S_VOWELS_KER}s_  --> TELCO {SU_VOWELS_IMG_XS} SILME_NUQUERNA     \** Rule es_ **\
-    [{L_VOWELS}]s_    --> [{L_PTEHTAS}] SILME_NUQUERNA                \** Rule és_ **\
+    {S_VOWELS}s_      --> TELCO {_S_VOWELS_UP_} SILME_NUQUERNA     \** Rule es_ **\
+    [{LVOWELS}]s_     --> [{LTEHTAR}] SILME_NUQUERNA                \** Rule és_ **\
 
     s --> SILME    \** Overload lonely s **\
     z --> ESSE    \** Overload lonely z **\
@@ -338,32 +320,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {LINE_VARIOUS_2_KER}      ===  hw * çt * (χt,ħt)
     {LINE_VARIOUS_2_IMG}      ===  HARP_SHAPED  * AHA_TINCO  * HWESTA_TINCO  
 
-    [{LINE_VARIOUS_1_KER}]                                 --> [{LINE_VARIOUS_1_IMG}]
-    [{LINE_VARIOUS_2_KER}]                                 --> [{LINE_VARIOUS_2_IMG}]
-    [{LINE_VARIOUS_1_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}  --> [{LINE_VARIOUS_1_IMG}]{SU_VOWELS_IMG_XL}{SD_VOWELS_IMG_XL_WN}
-    [{LINE_VARIOUS_2_KER}]{S_VOWELS_KER}{S_VOWELS_KER_WN}  --> [{LINE_VARIOUS_2_IMG}]{SU_VOWELS_IMG__S}{SD_VOWELS_IMG__S_WN}
-    [{LINE_VARIOUS_1_KER}][{L_VOWELS}]                     --> [{LINE_VARIOUS_1_IMG}][{UTEHTA_NP_XL}]{LVOWEL_MARKER_XL}
-    [{LINE_VARIOUS_2_KER}][{L_VOWELS}]                     --> [{LINE_VARIOUS_2_IMG}][{UTEHTA_NP__S}]{LVOWEL_MARKER__S}
+    [{LINE_VARIOUS_1_KER}]                                --> [{LINE_VARIOUS_1_IMG}]
+    [{LINE_VARIOUS_2_KER}]                                --> [{LINE_VARIOUS_2_IMG}]
+    [{LINE_VARIOUS_1_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{LINE_VARIOUS_1_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{LINE_VARIOUS_2_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{LINE_VARIOUS_2_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [{LINE_VARIOUS_1_KER}][{LVOWELS}]                     --> [{LINE_VARIOUS_1_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
+    [{LINE_VARIOUS_2_KER}][{LVOWELS}]                     --> [{LINE_VARIOUS_2_IMG}][{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** No nasals, no geminated **\
 
     \** ========== **\
     \** Various **\
    
-    h                                                    --> HYARMEN
-    h{S_VOWELS_KER}{S_VOWELS_KER_WN}                     --> HYARMEN {SU_VOWELS_IMG_XS}{SD_VOWELS_IMG__L_WN}
-    h[{L_VOWELS}]                                        --> HYARMEN [{UTEHTA_NP_XS}]{LVOWEL_MARKER__L}
+    h                                            --> HYARMEN
+    h{S_VOWELS}{S_VOWELS_WN}                     --> HYARMEN {_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    h[{LVOWELS}]                                 --> HYARMEN [{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    hh{S_VOWELS_KER_WN}                                  --> HYARMEN THINF_DSTROKE_XL {SU_VOWELS_IMG_XS_WN}
+    hh{S_VOWELS_WN}                              --> HYARMEN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
 
     \** ========== **\
     \** 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_KER_WN}                                  --> QUESSE SHOOK_LEFT_L {SU_VOWELS_IMG__S_WN}
-    xx{S_VOWELS_KER_WN}                                 --> QUESSE SHOOK_LEFT_L THINF_DSTROKE_XL {SU_VOWELS_IMG__S_WN}
-    nx{S_VOWELS_KER_WN}                                 --> QUESSE SHOOK_LEFT_L TILD_SUP_S {SU_VOWELS_IMG__S_WN}     
+    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_}     
   \end
   
   \beg    rules punctuation 
@@ -417,3 +399,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \end  
 \end
 
+\beg postprocessor
+  \resolve_virtuals
+\end