glaemscribe 1.1.7 → 1.1.8

data/lib/api/mode_parser.rb

@@ -213,6 +213,8 @@ module Glaemscribe
         @mode.authors       = doc.root_node.gpath('authors').first.args.first
         @mode.version       = doc.root_node.gpath('version').first.args.first
         @mode.raw_mode_name = doc.root_node.gpath('raw_mode').first.args.first if doc.root_node.gpath('raw_mode').first
+        @mode.invention     = doc.root_node.gpath('invention').first.args.first if doc.root_node.gpath('invention').first
+        @mode.world         = doc.root_node.gpath('world').first.args.first if doc.root_node.gpath('world').first
                 
         doc.root_node.gpath("options.option").each{ |option_element|
           values      = {}

data/lib/api/rule.rb

@@ -62,7 +62,7 @@ module Glaemscribe
       
         srcp = srccounter.prototype
         dstp = dstcounter.prototype
-            
+        
         if srcp != dstp
           @mode.errors << Glaeml::Error.new(@line, "Source and destination are not compatible (#{srcp} vs #{dstp})")
           return

data/lib/api/rule_group.rb

@@ -140,6 +140,9 @@ module Glaemscribe
         @rules            = []
         
         add_var("NULL","")
+  
+        add_var("UNDERSCORE", SPECIAL_CHAR_UNDERSCORE)
+        add_var("NBSP",       SPECIAL_CHAR_NBSP)
         
         descend_if_tree(@root_code_block, trans_options)
                             

data/lib/api/sheaf_chain_iterator.rb

@@ -56,7 +56,8 @@ module Glaemscribe
         }
 
         @cross_array = identity_cross_array
-        @prototype   = prototype_array.join('x') || 'CONST'  
+        @prototype   = prototype_array.join('x')
+        @prototype   = 'CONST'  if @prototype.empty?
  
         # Construct the cross array
         if cross_schema
@@ -87,7 +88,8 @@ module Glaemscribe
         end  
         
         # Recalculate prototype
-        @prototype = prototype_array.join('x') || 'CONST'  
+        @prototype = prototype_array.join('x')
+        @prototype   = 'CONST'  if @prototype.empty?
       end
   
       def iterate

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glaemscribe
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Benjamin 'Talagan' Babut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -48,12 +48,13 @@ files:
 - glaemresources/charsets/unicode_runes.cst
 - glaemresources/modes/adunaic.glaem
 - glaemresources/modes/blackspeech.glaem
-- glaemresources/modes/english-ipa.glaem
-- glaemresources/modes/french-ipa.glaem
+- glaemresources/modes/english-ipa.glaem.ignored
+- glaemresources/modes/french-ipa.glaem.ignored
 - glaemresources/modes/futhark-runicus.glaem
 - glaemresources/modes/futhark-younger.glaem
 - glaemresources/modes/futhorc.glaem
 - glaemresources/modes/gothic.glaem
+- glaemresources/modes/japanese-tengwar.glaem.ignored
 - glaemresources/modes/khuzdul.glaem
 - glaemresources/modes/mercian.glaem
 - glaemresources/modes/quenya-sarati.glaem
@@ -117,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Glǽmscribe

data/glaemresources/modes/english-ipa.glaem

@@ -1,245 +0,0 @@
-\**
-
-Glǽmscribe (also written Glaemscribe) is a software dedicated to
-the transcription of texts between writing systems, and more 
-specifically dedicated to the transcription of J.R.R. Tolkien's 
-invented languages to some of his devised writing systems.
-
-Copyright (C) 2015 Benjamin Babut (Talagan).
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-**\
-
-\** FOR NOW THIS IS JUST A TEMPLATE **\
-
-\beg changelog
-\end
-
-\language "English"
-\writing  "Tengwar"
-\mode     "Phonemic IPA"
-\version  "0.0.1"
-\authors  "J.R.R. Tolkien, impl. Talagan (Benjamin Babut)"
- 
-\charset  tengwar_ds_sindarin false
-\charset  tengwar_ds_parmaite false
-\charset  tengwar_ds_eldamar  false
-\charset  tengwar_ds_annatar  true
-\charset  tengwar_freemono    false
-
-\beg options
-  \beg option espeak_voice ESPEAK_VOICE_EN_GB_JRRT
-    \value ESPEAK_VOICE_EN_GB_JRRT 0
-    \value ESPEAK_VOICE_EN_US_JRRT 1
-  \end
-  \beg option ancient_voiceless_labiovelar_fricative_wh WH_VLVF_HWESTA_SINDARINWA
-    \value WH_VLVF_HWESTA_SINDARINWA 0
-    \value WH_VLVF_WHINE_MERGER 1
-  \end
-\end
-
-\beg  preprocessor
-  \downcase
-  
-  \** Remove phonetics accentuation marks **\
-  \substitute "[ˈˌ]" ""
-  
-  \** Normalize ɚ : with or without ə ? **\
-  \** Option "remove schwas ?" with and without unutixe ? **\
-  \substitute "ɚ" "əɹ"
-  
-  \** Next sounds will all use unutixe. **\
-  \** Long versions should resolve to short version + ore **\
-  \** Only ɜː would normally exist but let's be large **\
-  \rxsubstitute "([ʌɜəɐ])ː" "\\1ɹ"
-  
-  \** Too much ore kills ore **\
-  \rxsubstitute "ɹ+" "əɹ"
-  
-\end
-
-\beg  processor
-
-  \beg rules litteral
-       
-    \** e (accent) : e * ɛ **\
-    \** æ (trois points pointe en bas): æ **\
-    \** ʌ (unutixe) : ʌ * ɜ * ə (schwa du e) * ɐ (schwa du a) **\
-    \** a : a * ɑ (stop/rob/swan) **\ 
-    \** o : o * ɒ (lot anglais) / ɔ (lord)  **\
-    \** u : u * ʊ **\
-    \** i (amatixe) : i * ɪ * ᵻ  **\
-    
-    {A}  === (a,ɑ) 
-    {AE} === (æ)
-    {E}  === (e,ɛ) 
-    
-    \** TODO : CASSER EN DEUX LES SCHWAS ET LES NON SCHWA pour avoir potentiellement un traitement différent en fonction de l'activation de l'option qui vire les schwa **\
-    {ER} === (ʌ,ɜ,ə,ɐ) \** ɚ **\
-    {I}  === (i,ɪ,ᵻ)
-    {O}  === (o,ɒ,ɔ)
-    {U}  === (u,ʊ)
-
-    
-    \** GB DIPHTONGS **\
-    \** +dˈeɪ +skˈaɪ +bˈɔɪ +bˈiə +bˈeə +tˈʊə +ɡˌəʊ +kˈaʊ **\
-    \** US DIPHTONGS **\
-    \** =dˈeɪ =skˈaɪ =bˈɔɪ -bˈɪɹ -bˈɛɹ -tˈʊɹ +ɡˌoʊ =kˈaʊ **\
-    
-    \** Principe **\
-    \** 3 Diphtongues en ʊ :    aʊ (cow) / əʊ (GB : go) / oʊ (US : go) . Utiliser VALA **\
-    \** 3 Diphtongues en i/ɪ :  eɪ (day) / aɪ (sky) / ɔɪ (boy) . Utiliser ANNA (et pas YANTA!!)  **\
-    \** 3 Diphtongues en ə :    iə (GB : beer) / eə (GB: bear) / ʊə (US: tour) . Utiliser ? **\
-    
-    {AU} === (aʊ) \** cow **\
-    {OU} === (oʊ) \** US most / mˈoʊst **\
-    {EU} === (əʊ) \** GB go **\
-    
-    {AJ} === (aɪ) \** nine / nˈaɪn **\
-    {EJ} === (eɪ) \** game / ɡˈeɪm **\
-    {OJ} === (ɔɪ) \** boy **\
-    
-    {IER} === (iə) \** GB Beer **\
-    {EAR} === (eə) \** GB Bear **\
-    {UER} === (ʊə) \** GB Tour **\
-    
-        
-    \** ᵻ == schwi, pourrait avoir une option i ou schwa ou rien ou peut être autre **\
-    	  
-		{VOWELS}            ===  {A}
-	
-  
-    {_WH_} === HWESTA_SINDARINWA
-    \if "ancient_voiceless_labiovelar_fricative_wh == WH_VLVF_WHINE_MERGER"
-      {_WH_} === VALA
-    \endif
-  
-	  
-    t --> TINCO
-    p --> PARMA
-    tʃ --> CALMA
-    k --> QUESSE
-    
-    d --> ANDO
-    b --> UMBAR
-    dʒ --> ANGA
-    ɡ --> UNGWE
-    
-    θ --> SULE
-    f --> FORMEN
-    ʃ --> AHA
-    x --> HWESTA
-    
-    ð --> ANTO
-    v --> AMPA
-    ʒ --> ANCA
-    ɣ --> UNQUE
-    
-    n --> NUMEN
-    m --> MALTA
-    nj --> NOLDO
-    ŋ --> NWALME
-    
-    ɹ --> ORE 
-    w --> VALA 
-    j --> ANNA 
-    \** VILYA **\
-    
-    ɹ --> ROMEN \** != ORE **\
-    \** ARDA **\
-    l --> LAMBE
-    \** ALDA **\
-    
-    s --> SILME
-    s --> SILME_NUQUERNA
-    z --> ESSE
-    z --> ESSE_NUQUERNA
-    
-    h --> HYARMEN 
-    ʍ --> {_WH_}
-    \** YANTA **\
-    \** URE **\
-    
-    \** US : left : ɾ ʔ n̩  **\
-    
-  \end
-
-  \beg rules punctuation	
-    . --> PUNCT_DDOT
-    .. --> PUNCT_DOT PUNCT_DDOT PUNCT_DOT
-    ... --> PUNCT_TILD
-    …   --> PUNCT_TILD
-    .... --> PUNCT_TILD
-    ..... --> PUNCT_TILD
-    ...... --> PUNCT_TILD
-    ....... --> PUNCT_TILD
-    
-    , --> PUNCT_DOT
-    : --> PUNCT_DOT
-    ; --> PUNCT_DOT
-    ! --> PUNCT_EXCLAM
-    ? --> PUNCT_INTERR
-    · --> {NULL}
-
-    - --> {NULL} 
-    – --> PUNCT_TILD  
-    — --> PUNCT_TILD
-
-    \** Apostrophe **\
-
-    ' --> {NULL}
-    ’ --> {NULL}
-
-    \** Quotes **\
-
-    “ --> DQUOT_OPEN
-    ” --> DQUOT_CLOSE
-    « --> DQUOT_OPEN 
-    » --> DQUOT_CLOSE 
-
-    [ --> PUNCT_PAREN_L
-    ] --> PUNCT_PAREN_R
-    ( --> PUNCT_PAREN_L
-    ) --> PUNCT_PAREN_R
-    { --> PUNCT_PAREN_L
-    } --> PUNCT_PAREN_R
-    < --> PUNCT_PAREN_L
-    > --> PUNCT_PAREN_R
-
-    \** Not universal between fonts ... **\
-    $ --> BOOKMARK_SIGN
-    ≤ --> RING_MARK_L \** Ring inscription left beautiful stuff **\
-    ≥ --> RING_MARK_R \** Ring inscription right beautiful stuff **\
-  \end
-
-  \beg rules numbers
-    0 --> NUM_0
-    1 --> NUM_1
-    2 --> NUM_2
-    3 --> NUM_3
-    4 --> NUM_4
-    5 --> NUM_5
-    6 --> NUM_6
-    7 --> NUM_7
-    8 --> NUM_8
-    9 --> NUM_9
-    A --> NUM_10
-    B --> NUM_11      
-  \end
-\end
-
-\beg  postprocessor
-  \resolve_virtuals
-\end