glaemscribe 1.1.9 → 1.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75221aacc5c80300ac5f8b758830d3b5eb0d61db
-  data.tar.gz: 7f79f88695484bfb0f4b2c66a85a88bb86176722
+  metadata.gz: 1c925a9a514e78b260c133356a6fb6f2c74a0604
+  data.tar.gz: ad4f4f17e164af4c096387babf85995f6dc9303e
 SHA512:
-  metadata.gz: b1057b205737b740f5e07d4c39976d457d7c2678b8af04fce69c4313080e5918c98fec50d12fd4c6e73aeaf4e139308d1b41df0d5497979dcbda2bf2289c8f3e
-  data.tar.gz: a507dff439ef8361b2d2ddd24dcf72bfa6f043a34f7eb8967e664bb03430ce8972e00784c3640b38d150a218806c84d7a08da0e55216b83b6c01fa430dba244c
+  metadata.gz: 34713507c8c624cdd3b98a31fc33e72b486544ab50026bd29ec608030401d1645f912059f934c91b19c7d239c4ceca9b6bc294294087d4e72f5a8c02606e1d4c
+  data.tar.gz: ca5d1ce433c25646d263e3afd19ac172803819a82ac98cee76cd8ecc7c2493d8fa990747832faed4db7d20bc766d4251af2f7b130b72ae945dc625c46524945f

data/glaemresources/modes/mercian.glaem

@@ -131,10 +131,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {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
+    {LVOWEL_MARKER}  === THINNAS
   
     \** DOWN TEHTAS **\
-    {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}
+    {DTEHTAR}        === A_TEHTA_INF   * Y_TEHTA_INF  * CIRC_TEHTA_INF     * E_TEHTA_INF  * I_TEHTA_INF  * O_TEHTA_INF  * U_TEHTA_INF   * THINNAS   * {NULL}
   
 
     {S_VOWELS_NP}       === [ {S_VOWELS_NP_KERNEL} ]

data/glaemresources/modes/raw-tengwar.glaem

@@ -48,7 +48,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 \beg      options
-  \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_BAR
+  \beg option consonant_modification_style CONSONANT_MODIFICATION_STYLE_WAVE
     \value CONSONANT_MODIFICATION_STYLE_WAVE 0
     \value CONSONANT_MODIFICATION_STYLE_BAR 1
   \end
@@ -76,7 +76,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     _acirc_  --> A_TEHTA_CIRCUM
     _arev_   --> A_TEHTA_REVERSED
 
-    _e_      --> E_TEHTA
+    _e_       --> E_TEHTA
+    _egrave_  --> E_TEHTA_GRAVE
+    
+    _breve_   --> TEHTA_BREVE
+    
     _i_      --> I_TEHTA
     _o_      --> O_TEHTA
     _u_      --> U_TEHTA
@@ -88,6 +92,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     _u<_     --> U_TEHTA_INF
 
     _unutixe_ --> I_TEHTA_INF
+    
+    _thinnas_ --> THINNAS
 
     _ee_    --> E_TEHTA_DOUBLE
     _ii_    --> I_TEHTA_DOUBLE
@@ -167,13 +173,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     \** bearers **\
     _(telco)_   --> TELCO
     _(ara,ára)_ --> ARA
-    _(halla)_ --> HALLA
+    _(halla,gasdil)_ --> HALLA
 
     \** consonant modifiers **\
     _(geminate)_  --> {GEMINATE}
     _(nasal)_     --> {NASAL}
     _(palatal)_   --> PALATAL_SIGN
-
+    _(labial)_    --> SEV_TEHTA 
+ 
     _0_ --> NUM_0
     _1_ --> NUM_1
     _2_ --> NUM_2
@@ -186,6 +193,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     _9_ --> NUM_9
     _10_ --> NUM_10
     _11_ --> NUM_11
+    
+    _(lsd)_ --> CIRC_TEHTA_INF
 
   \end
 

data/glaemresources/modes/westsaxon.glaem

@@ -132,7 +132,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     {L_TEHTAR}      === ARA E_TEHTA       * ARA A_TEHTA     * ARA E_TEHTA_DOUBLE    * ARA Y_TEHTA     * ARA I_TEHTA     * ARA O_TEHTA       * ARA U_TEHTA     * ARA SEV_TEHTA       
 
     \** DOWN TEHTAS **\
-    {TEHTAR_DN}     === E_TEHTA_INF       * A_TEHTA_INF     * CIRC_TEHTA_INF        * Y_TEHTA_INF     * I_TEHTA_INF     * TELCO O_TEHTA     * TELCO U_TEHTA   * SEV_TEHTA_INF   * VILYA * {NULL}
+    {TEHTAR_DN}     === E_TEHTA_INF       * A_TEHTA_INF     * CIRC_TEHTA_INF        * Y_TEHTA_INF     * I_TEHTA_INF     * TELCO O_TEHTA     * TELCO U_TEHTA   * THINNAS   * VILYA * {NULL}
     
     {S_VOWELS_NP}       === [ {S_VOWELS_NP_KERNEL} ]
     {S_VOWELS_NP_WN}    === [ {S_VOWELS_NP_KERNEL} * {NULL} ]

data/lib/api/glaeml.rb

@@ -153,7 +153,12 @@ module Glaemscribe
                     @document.errors << Error.new(lnum, "Bad element name #{rest}.")
                   else
                     name = $1
-                    args = $'.shellsplit                
+                    begin
+                      args = Shellwords.new.parse $'                
+                    rescue Shellwords::Error => e
+                      @document.errors << Error.new(lnum, "Failed to parse args : #{e}")
+                      args = []
+                    end
                   end
                 
                   n             = Node.new(lnum, Node::Type::ElementBlock, name)
@@ -179,7 +184,13 @@ module Glaemscribe
                   l             = l[1..-1]         
                   l             =~ /^([a-z_]+)/
                   name          = $1
-                  args          = $'.shellsplit
+                  
+                  begin
+                    args = Shellwords.new.parse $'                
+                  rescue Shellwords::Error => e
+                    @document.errors << Error.new(lnum, "Failed to parse args : #{e}")
+                    args = []
+                  end
                 
                   n             = Node.new(lnum, Node::Type::ElementInline, name)
                   n.args        += args

data/lib/api/glaeml_shellwords.rb

@@ -0,0 +1,157 @@
+# encoding: UTF-8
+#
+# 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/>.
+
+module Glaemscribe
+  module API
+    module Glaeml
+      class Shellwords
+  
+        class Error < StandardError
+        end
+  
+        def initialize
+        end
+
+        ESCAPE_MODE_UNICODE = 1
+
+        def reset_state
+          @is_escaping                = false
+          @is_eating_arg              = false
+          @is_eating_arg_between_quotes  = false   
+          @args = []
+          @current_arg = ""
+    
+          @escape_mode            = nil
+          @unicode_escape_counter = 0
+          @unicode_escape_str     = ''
+        end
+  
+        def advance_inside_arg(l,i)
+          if l[i] == "\\"
+            @is_escaping      = true
+            @escape_mode      = nil
+          else
+            @current_arg += l[i]
+          end
+        end
+  
+        def advance_inside_escape(l,i)
+          if !@escape_mode
+            # We don't now yet what to do.
+            case l[i]
+            when 'n'
+              @current_arg << "\n"
+              @is_escaping = false
+              return
+            when "\\"
+              @current_arg << "\\"
+              @is_escaping = false
+            when 't'
+              @current_arg << "\t"
+              @is_escaping = false
+            when "\""
+              @current_arg << "\""
+              @is_escaping = false
+            when "u"
+              @escape_mode            = ESCAPE_MODE_UNICODE
+              @unicode_escape_counter = 0
+              @unicode_escape_str     = ''
+            else
+              raise Error, "Unknown escapment : \\#{l[i]}"
+            end
+          else
+            case @escape_mode
+            when ESCAPE_MODE_UNICODE
+              c = l[i].downcase
+        
+              if !(c =~ /[0-9a-f]/)
+                raise Error, 'Wrong format for unicode escaping, should be \u with 4 hex digits'
+              end
+        
+              @unicode_escape_counter += 1
+              @unicode_escape_str     += c
+              if @unicode_escape_counter == 4
+                @is_escaping = false
+                @current_arg += [@unicode_escape_str.hex].pack("U")
+              end
+        
+            else
+              raise Error, "Unimplemented escape mode"
+            end
+          end
+    
+        end
+
+        def parse(l)
+          reset_state
+    
+          i = 0
+          l.length.times{ |i|
+
+            if !@is_eating_arg
+              next if l[i] =~ /\s/
+              @is_eating_arg             = true
+              @is_eating_arg_between_quotes = (l[i] == "\"")
+              @current_arg << l[i] if !@is_eating_arg_between_quotes
+            else
+              # Eating arg
+              if @is_escaping
+                advance_inside_escape(l,i)
+              else
+                if !@is_eating_arg_between_quotes
+                  if l[i] =~ /[\s"]/
+                    @args << @current_arg
+                    @current_arg = ""
+                    @is_eating_arg             = (l[i] == "\"") # Starting a new arg directly
+                    @is_eating_arg_between_quotes = @is_eating_arg
+                    next
+                  else
+                    advance_inside_arg(l,i)
+                  end
+                else
+                  if l[i] == "\""
+                    @args << @current_arg
+                    @current_arg    = ""
+                    @is_eating_arg  = false
+                  else
+                    advance_inside_arg(l,i)
+                  end
+                end
+              end
+            end
+          }
+    
+          if @is_eating_arg && @is_eating_arg_between_quotes
+            raise Error, "Unmatched quote."
+          end
+  
+          @args << @current_arg if !@current_arg.empty?
+    
+          @args
+        end
+  
+      end
+    end
+  end
+end
+
+      

data/lib/glaemscribe.rb

@@ -57,6 +57,7 @@ module Glaemscribe
     
     require API_PATH + "/api/resource_manager.rb"
     require API_PATH + "/api/glaeml.rb"
+    require API_PATH + "/api/glaeml_shellwords.rb"
     require API_PATH + "/api/mode_parser.rb"
     require API_PATH + "/api/charset_parser.rb"
     

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glaemscribe
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 1.1.10
 platform: ruby
 authors:
 - Benjamin 'Talagan' Babut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-26 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -75,6 +75,7 @@ files:
 - lib/api/eval.rb
 - lib/api/fragment.rb
 - lib/api/glaeml.rb
+- lib/api/glaeml_shellwords.rb
 - lib/api/if_tree.rb
 - lib/api/mode.rb
 - lib/api/mode_parser.rb