glaemscribe 1.1.7 → 1.1.8

data/glaemresources/modes/khuzdul.glaem

@@ -22,22 +22,20 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 **\
 
-\** Khuzdul mode for glaemscribe **\
+\beg changelog
+  \entry "0.0.2", "Moved outspace character to general element"
+\end
 
 \language "Khuzdul"
 \writing  "Cirth"
-\mode     "Angerthas Moria"
+\mode     "Khuzdul Cirth - Angerthas Moria"
 \version  "0.0.2"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
-\charset  cirth_ds true
+\world      arda
+\invention  jrrt
 
-\** Changelog **\
-\**
-\beg changelog
-  \entry "0.0.2", "Moved outspace character to general element"
-\end
-**\
+\charset  cirth_ds true
 
 \** We redefine the output space to have something beautiful, especially with erebor1 and erebor2 **\ 
 \outspace CIRTH_SPACE_BIG

data/glaemresources/modes/mercian.glaem

@@ -25,18 +25,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \beg changelog
   \entry "0.0.2" "Porting to virtual chars"
   \entry "0.1.1" "Added support for inlined raw tengwar"
+  \entry "0.1.2" "Doing some cleaning"
+  \entry "0.1.3" "Added support for non-breaking spaces"     
 \end
 
 \language "Old English"
 \writing  "Tengwar"
-\mode     "Mercian"
-\version  "0.1.1"
+\mode     "Old English Tengwar - 'Mercian' Usage"
+\version  "0.1.3"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
+\world      primary_related_to_arda
+\invention  jrrt
+
 \raw_mode "raw-tengwar"
 
+\charset  tengwar_ds_annatar false
 \charset  tengwar_ds_eldamar true
-\** Other charsets cannot handle all diacritics we are using here ... **\
+\charset  tengwar_ds_parmaite false
+\charset  tengwar_ds_annatar  false
+\charset  tengwar_ds_elfica   false
+
+\** List of features that would prevent use of other charsets 
+\charset  tengwar_freemono    false
+ Free Mono Tengwar : missing [OLD_ENGLISH_AND,SHOOK_BEAUTIFUL] / sa-rince management not accurate
+**\
+
 
 \beg options
   \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_WAVE
@@ -75,10 +89,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
   \beg    rules litteral
   
+    {_GEMINATE_} === E_TEHTA_DOUBLE_INF
+    
     \if "consonant_modification_style == CONSONANT_MODIFICATION_STYLE_WAVE"
-      {NASAL}    === NASALIZE_SIGN_TILD
+      {_NASAL_}    === NASALIZE_SIGN_TILD
     \else
-      {NASAL}    === NASALIZE_SIGN
+      {_NASAL_}    === NASALIZE_SIGN
     \endif
   
     {A}   === a
@@ -160,11 +176,11 @@ 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_IMG_1_GEMS} === TINCO GEMINATE_DOUBLE  * PARMA GEMINATE_DOUBLE
+    {L1_KER_1_GEMS} === tt                  * pp   
+    {L1_IMG_1_GEMS} === TINCO {_GEMINATE_}  * PARMA {_GEMINATE_}
 
-    {L1_KER_2_GEMS} === ċċ                      * cc                      * kk 
-    {L1_IMG_2_GEMS} === CALMA GEMINATE_DOUBLE  * QUESSE GEMINATE_DOUBLE * QUESSE GEMINATE_DOUBLE
+    {L1_KER_2_GEMS} === ċċ                  * cc                  * kk 
+    {L1_IMG_2_GEMS} === CALMA {_GEMINATE_}  * QUESSE {_GEMINATE_} * QUESSE {_GEMINATE_}
   
     \** C, CV, CVV. Rules are declared to avoid conflicts between [C, NULLV, V] and [C, V, NULLV] **\
     \** We also have rules for long vowels **\
@@ -185,12 +201,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 {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}
+    [ nt * mp ]                                       -->  [ TINCO * PARMA  ] {_NASAL_} 
+    [ nċ * nc ]                                       -->  [ CALMA * QUESSE ] {_NASAL_} 
+    [ nt * mp ]{S_VOWELS}{S_VOWELS_WN}                -->  [ TINCO * PARMA  ] {_NASAL_} {_S_VOWELS_UP_} {_S_VOWELS_DN_WN_}
+    [ nċ * nc ]{S_VOWELS}{S_VOWELS_WN}                -->  [ CALMA * QUESSE ] {_NASAL_} {_S_VOWELS_UP_} {_S_VOWELS_DN_WN_}
+    [ nt * mp ][{LVOWELS}]                            -->  [ TINCO * PARMA  ] {_NASAL_} [{TEHTAR_UP_NP}] {LVOWEL_MARKER}
+    [ nċ * nc ][{LVOWELS}]                            -->  [ CALMA * QUESSE ] {_NASAL_} [{TEHTAR_UP_NP}] {LVOWEL_MARKER}
 
     \** ========== **\
     \** 2nd Line (Voiced occlusives) **\
@@ -199,8 +215,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L2_KER}        === d     * b     * ġ     * g
     {L2_IMG}        === ANDO  * UMBAR * ANGA  * UNGWE
     
-    {L2_KER_GEMS}   === dd                    * bb                    * (ċġ,ġġ)               * (cg,gg)
-    {L2_IMG_GEMS}   === ANDO GEMINATE_DOUBLE  * UMBAR GEMINATE_DOUBLE * ANGA GEMINATE_DOUBLE  * UNGWE GEMINATE_DOUBLE
+    {L2_KER_GEMS}   === dd                 * bb                 * (ċġ,ġġ)            * (cg,gg)
+    {L2_IMG_GEMS}   === ANDO {_GEMINATE_}  * UMBAR {_GEMINATE_} * ANGA {_GEMINATE_}  * UNGWE {_GEMINATE_}
 
     \** C, CV, CVV **\
     [{L2_KER}]                                        --> [{L2_IMG}]
@@ -211,9 +227,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 {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}
+    [ nd * mb * nġ * ng ]                             -->  [ {L2_IMG} ] {_NASAL_}
+    [ nd * mb * nġ * ng ]{S_VOWELS}{S_VOWELS_WN}      -->  [ {L2_IMG} ] {_NASAL_} {_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [ nd * mb * nġ * ng ][{LVOWELS}]                  -->  [ {L2_IMG} ] {_NASAL_} [{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** ========== **\
     \** 3rd Line (Voiceless fricatives) **\
@@ -224,11 +240,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L3_KER_2}      === ç     * (χ,ħ)
     {L3_IMG_2}      === AHA   * HWESTA
     
-    {L3_KER_1_GEMS} === þþ                    * ff
-    {L3_IMG_1_GEMS} === SULE GEMINATE_DOUBLE * FORMEN GEMINATE_DOUBLE
+    {L3_KER_1_GEMS} === þþ                * ff
+    {L3_IMG_1_GEMS} === SULE {_GEMINATE_} * FORMEN {_GEMINATE_}
     
-    {L3_KER_2_GEMS} === çç                    * (χχ,ħħ)
-    {L3_IMG_2_GEMS} === AHA GEMINATE_DOUBLE  * HWESTA GEMINATE_DOUBLE
+    {L3_KER_2_GEMS} === çç                * (χχ,ħħ)
+    {L3_IMG_2_GEMS} === AHA {_GEMINATE_}  * HWESTA {_GEMINATE_}
 
     [{L3_KER_1}]                              --> [{L3_IMG_1}]
     [{L3_KER_2}]                              --> [{L3_IMG_2}]
@@ -249,8 +265,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L4_KER}        === ð     * v     * j     * ȝ
     {L4_IMG}        === ANTO  * AMPA  * ANCA  * UNQUE
     
-    {L4_KER_GEMS}   === ðð                    * vv                    * jj                    * ȝȝ
-    {L4_IMG_GEMS}   === ANTO GEMINATE_DOUBLE  * AMPA GEMINATE_DOUBLE  * ANCA GEMINATE_DOUBLE  * UNQUE GEMINATE_DOUBLE
+    {L4_KER_GEMS}   === ðð                 * vv                 * jj                 * ȝȝ
+    {L4_IMG_GEMS}   === ANTO {_GEMINATE_}  * AMPA {_GEMINATE_}  * ANCA {_GEMINATE_}  * UNQUE {_GEMINATE_}
 
     [{L4_KER}]                                --> [{L4_IMG}]
     [{L4_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L4_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
@@ -274,9 +290,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 {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}
+    [ nn * mm ]                               --> [{L5_IMG}] {_NASAL_} 
+    [ nn * mm ]{S_VOWELS}{S_VOWELS_WN}        --> [{L5_IMG}] {_NASAL_} {_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
+    [ nn * mm ][{LVOWELS}]                    --> [{L5_IMG}] {_NASAL_} [{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** ========== **\
     \** 6th Line (Approximants == fr : Spirantes) **\
@@ -285,7 +301,7 @@ 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 GEMINATE_DOUBLE * ANNA GEMINATE_DOUBLE
+    {L6_IMG_GEMS}   === ORE {_GEMINATE_} * ANNA {_GEMINATE_}
 
     [{L6_KER}]                                --> [{L6_IMG}]
     [{L6_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L6_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
@@ -302,10 +318,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     w[{LVOWELS}]                              --> ROMEN [{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    ww{S_VOWELS_WN}                           --> ROMEN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
+    ww{S_VOWELS_WN}                           --> ROMEN {_GEMINATE_} {_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_WN}               --> [LAMBE * LAMBE GEMINATE_DOUBLE * ALDA] {_S_VOWELS_UP_WN_}
+    [l * ll * ld] {S_VOWELS_WN}               --> [LAMBE * LAMBE {_GEMINATE_} * ALDA] {_S_VOWELS_UP_WN_}
 
     \** ========== **\
     \** Alveolar (sifflantes) **\
@@ -313,7 +329,7 @@ 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 GEMINATE_DOUBLE * ESSE_NUQUERNA GEMINATE_DOUBLE
+    {L8_IMG_GEMS} ===  SILME_NUQUERNA {_GEMINATE_} * ESSE_NUQUERNA {_GEMINATE_}
 
     [{L8_KER}]                                --> [{L8_IMG}]
     [{L8_KER}]{S_VOWELS}{S_VOWELS_WN}         --> [{L8_IMG}]{_S_VOWELS_UP_}{_S_VOWELS_DN_WN_}
@@ -355,15 +371,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     h[{LVOWELS}]                                 --> HYARMEN [{TEHTAR_UP_NP}]{LVOWEL_MARKER}
 
     \** Geminated sign below, cannot treat diphthongs or long vowels **\
-    hh{S_VOWELS_WN}                              --> HYARMEN GEMINATE_DOUBLE {_S_VOWELS_UP_WN_}
+    hh{S_VOWELS_WN}                              --> HYARMEN {_GEMINATE_} {_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_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 {NASAL} {_S_VOWELS_UP_WN_}     
+    xx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN {_GEMINATE_} {_S_VOWELS_UP_WN_}
+    nx{S_VOWELS_WN}                              --> QUESSE ALVEOLAR_SIGN {_NASAL_} {_S_VOWELS_UP_WN_}     
+    
+    
   \end
   
   \beg    rules punctuation 
@@ -389,7 +407,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     ' --> {NULL}
     ’ --> {NULL}
-
+    
+    \** NBSP **\
+    {NBSP} --> NBSP
+    
     \** Quotes **\
 
     “ --> DQUOT_OPEN

data/glaemresources/modes/quenya-sarati.glaem

@@ -31,10 +31,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \language "Quenya"
 \writing  "Sarati"
-\mode     "Quenya Usage"
+\mode     "Quenya Sarati - Quenya Usage"
 \version  "0.0.3"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
+\world      arda
+\invention  jrrt
+
 \beg changelog
   \entry "0.0.1" "Initial version"
   \entry "0.0.2" "Adding quotes handling"

data/glaemresources/modes/quenya.glaem

@@ -43,6 +43,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   \entry "0.9.2" "Added support for the Tengwar Elfica font"
   \entry "0.9.4" "Adding Vanyarin ldy, rdy, lg, rg, ff"
   \entry "0.9.5" "Added support for inlined raw tengwar"
+  \entry "0.9.6" "Added support for non-breaking spaces"     
 \end
 
 \**
@@ -52,11 +53,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \language "Quenya"
 \writing  "Tengwar"
-\mode     "Classical"
-\version  "0.9.5"
+\mode     "Quenya Tengwar - Classical"
+\version  "0.9.6"
 \authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
 
-\raw_mode "raw-tengwar"
+\world      arda
+\invention  jrrt
 
 \charset  tengwar_ds_sindarin true
 \charset  tengwar_ds_parmaite false
@@ -65,6 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 \charset  tengwar_ds_elfica   false
 \charset  tengwar_freemono    false
 
+\raw_mode "raw-tengwar"
 
 \beg      options
   \option implicit_a false
@@ -468,7 +471,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     ' --> {NULL}
     ’ --> {NULL}
-
+    
+    \** NBSP **\
+    {NBSP} --> NBSP
+    
     \** Quotes **\
 
     “ --> DQUOT_OPEN

data/glaemresources/modes/raw-tengwar.glaem

@@ -24,14 +24,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 \beg changelog
   \entry "0.0.1" "Initial version."
+  \entry "0.0.2" "Added missing extended tengwar."
+  \entry "0.0.3" "Added support for non-breaking spaces"     
 \end
 
 \language "Raw Tengwar"
 \writing  "Tengwar"
-\mode     "Raw"
-\version  "0.0.1"
+\mode     "Raw Tengwar"
+\version  "0.0.3"
 \authors  "Talagan (Benjamin Babut)"
 
+\world      arda
+\invention  experimental
+
 \metamode true
 
 \charset  tengwar_ds_sindarin true
@@ -58,7 +63,7 @@ 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
@@ -66,101 +71,110 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       {GEMINATE} === GEMINATE_SIGN
       {NASAL}    === NASALIZE_SIGN
     \endif
-		
+
     _a_      --> A_TEHTA
-		_acirc_  --> A_TEHTA_CIRCUM
+    _acirc_  --> A_TEHTA_CIRCUM
     _arev_   --> A_TEHTA_REVERSED
 
     _e_      --> E_TEHTA
     _i_      --> I_TEHTA
     _o_      --> O_TEHTA
     _u_      --> U_TEHTA
-    
+
     _a<_     --> A_TEHTA_INF
     _e<_     --> E_TEHTA_INF
     _i<_     --> I_TEHTA_INF
     _o<_     --> O_TEHTA_INF
     _u<_     --> U_TEHTA_INF
-    
+
     _unutixe_ --> I_TEHTA_INF
-		
+
     _ee_    --> E_TEHTA_DOUBLE
     _ii_    --> I_TEHTA_DOUBLE
     _oo_    --> O_TEHTA_DOUBLE
     _uu_    --> U_TEHTA_DOUBLE
-    
+
     _ee<_    --> E_TEHTA_DOUBLE_INF
     _ii<_    --> I_TEHTA_DOUBLE_INF
 
     _(tinco,tw11)_   --> TINCO
-		_(parma,tw12)_   --> PARMA
-		_(calma,tw13)_   --> CALMA
-		_(quesse,tw14)_  --> QUESSE
+    _(parma,tw12)_   --> PARMA
+    _(calma,tw13)_   --> CALMA
+    _(quesse,tw14)_  --> QUESSE
 
     _(ando,tw21)_    --> ANDO
-		_(umbar,tw22)_   --> UMBAR
-		_(anga,tw23)_    --> ANGA
-		_(ungwe,tw24)_   --> UNGWE
-		
-		_(sule,súle,thule,thúle,tw31)_    --> SULE
-		_(formen,tw32)_                   --> FORMEN
-		_(aha,harma,tw33)_                --> AHA
-		_(hwesta,tw34)_                   --> HWESTA
-		
-		_(anto,tw41)_   --> ANTO
-		_(ampa,tw42)_   --> AMPA
-		_(anca,tw43)_   --> ANCA
-		_(unque,tw44)_  --> UNQUE
-		
-		_(numen,númen,tw51)_     --> NUMEN
-		_(malta,tw52)_           --> MALTA
-		_(noldo,ñoldo,tw53)_     --> NOLDO
-		_(nwalme,ñwalme,tw54)_   --> NWALME
-		
-		_(ore,óre,tw61)_          --> ORE
-		_(vala,tw62)_             --> VALA
-		_(anna,tw63)_             --> ANNA
-		_(vilya,wilya,tw64)_      --> VILYA	
-		
-		_(romen,rómen,tw71)_      --> ROMEN
-		_(arda,tw72)_             --> ARDA
-		_(lambe,tw73)_            --> LAMBE
-		_(alda,tw74)_             --> ALDA
-		
-		_(silme,tw81)_                  --> SILME
-		_(silmenuquerna,silmen,tw82)_   --> SILME_NUQUERNA
-		_(esse,tw83)_                   --> ESSE
-		_(essenuquerna,essen,tw84)_     --> ESSE_NUQUERNA
-		
-		_(hyarmen,tw91)_                   --> HYARMEN
-		_(hwestasindarinwa,hwestas,tw92)_  --> HWESTA_SINDARINWA
-		_(yanta,tw93)_                     --> YANTA
-		_(ure,úre,tw94)_                   --> URE
-		
-    
-		_(osse)_  --> OSSE
-		_(halla)_ --> HALLA
-	  _(vaia,vaiya)_  --> VAIA
-    
-    
+    _(umbar,tw22)_   --> UMBAR
+    _(anga,tw23)_    --> ANGA
+    _(ungwe,tw24)_   --> UNGWE
+
+    _(sule,súle,thule,thúle,tw31)_    --> SULE
+    _(formen,tw32)_                   --> FORMEN
+    _(aha,harma,tw33)_                --> AHA
+    _(hwesta,tw34)_                   --> HWESTA
+
+    _(anto,tw41)_   --> ANTO
+    _(ampa,tw42)_   --> AMPA
+    _(anca,tw43)_   --> ANCA
+    _(unque,tw44)_  --> UNQUE
+
+    _(numen,númen,tw51)_     --> NUMEN
+    _(malta,tw52)_           --> MALTA
+    _(noldo,ñoldo,tw53)_     --> NOLDO
+    _(nwalme,ñwalme,tw54)_   --> NWALME
+
+    _(ore,óre,tw61)_          --> ORE
+    _(vala,tw62)_             --> VALA
+    _(anna,tw63)_             --> ANNA
+    _(vilya,wilya,tw64)_      --> VILYA
+
+    _(romen,rómen,tw71)_      --> ROMEN
+    _(arda,tw72)_             --> ARDA
+    _(lambe,tw73)_            --> LAMBE
+    _(alda,tw74)_             --> ALDA
+
+    _(silme,tw81)_                  --> SILME
+    _(silmenuquerna,silmen,tw82)_   --> SILME_NUQUERNA
+    _(esse,tw83)_                   --> ESSE
+    _(essenuquerna,essen,tw84)_     --> ESSE_NUQUERNA
+
+    _(hyarmen,tw91)_                   --> HYARMEN
+    _(hwestasindarinwa,hwestas,tw92)_  --> HWESTA_SINDARINWA
+    _(yanta,tw93)_                     --> YANTA
+    _(ure,úre,tw94)_                   --> URE
+
+    \** Extended tengwar **\
+    _(xtinco,xsule,xsúle,xthule,xthúle,xtw11)_        --> TW_EXT_11
+    _(xparma,xformen,xtw12)_                          --> TW_EXT_12
+    _(xcalma,xaha,xharma,xtw13)_                      --> TW_EXT_13
+    _(xquesse,xhwesta,xtw14)_                         --> TW_EXT_14
+    _(xando,xanto,xtw21)_                             --> TW_EXT_21
+    _(xumbar,xampa,xtw22)_                            --> TW_EXT_22
+    _(xanga,xanca,xtw23)_                             --> TW_EXT_23
+    _(xungwe,xunque,xtw24)_                           --> TW_EXT_24
+
+    \** Others more exotic tengwar **\
+    _(osse)_              --> OSSE
+    _(vaia,vaiya)_        --> VAIA
     _(mh)_                --> TW_MH
     _(mhbeleriandic,mhb)_ --> TW_MH_BELERIANDIC
     _(hwlowdham,hwl)_     --> TW_HW_LOWDHAM
-    
-		
-		\** ligatures **\
+
+    \** ligatures **\
     _(harmasilme,ahasilme,silmeharma,silmeaha)_ --> ANCA_CLOSED
     _(hwestatinco,tincohwesta)_                 --> HWESTA_TINCO
     _(harmatinco,ahatinco,tincoharma,tincoaha)_ --> AHA_TINCO
-    
+
+    \** bearers **\
     _(telco)_   --> TELCO
-		_(ara,ára)_ --> ARA
-		
-		_(geminate)_  --> {GEMINATE}
-		_(nasal)_     --> {NASAL}
-		_(palatal)_   --> PALATAL_SIGN
-		
-		_0_ --> NUM_0
+    _(ara,ára)_ --> ARA
+    _(halla)_ --> HALLA
+
+    \** consonant modifiers **\
+    _(geminate)_  --> {GEMINATE}
+    _(nasal)_     --> {NASAL}
+    _(palatal)_   --> PALATAL_SIGN
+
+    _0_ --> NUM_0
     _1_ --> NUM_1
     _2_ --> NUM_2
     _3_ --> NUM_3
@@ -172,12 +186,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     _9_ --> NUM_9
     _10_ --> NUM_10
     _11_ --> NUM_11
-    
+
   \end
 
   \beg    rules punctuation
-	  / --> {NULL}
-	
+    / --> {NULL}
+
     . --> PUNCT_DDOT
     .. --> PUNCT_DOT PUNCT_DDOT PUNCT_DOT
     …  --> PUNCT_TILD
@@ -193,14 +207,17 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     ! --> PUNCT_EXCLAM
     ? --> PUNCT_INTERR
     · --> PUNCT_DOT
-    
+
     :: --> PUSTA_3
 
     \** Apostrophe **\
 
     ' --> {NULL}
     ’ --> {NULL}
-
+    
+    \** NBSP **\
+    {NBSP} --> NBSP
+    
     \** Quotes **\
 
     “ --> DQUOT_OPEN