zotica 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abf224bc0d1fbdb888f065696a6ae147d51aa015a1de4b30dd5b68da1c66098c
-  data.tar.gz: d53b42428e061719d32fd63e0be9d6f47ac528649d36de2444e4b4a650f51d2c
+  metadata.gz: cf856113458672fe1b16b7a882da99623e3b4bbe2d2fd7c8ddced1067959f321
+  data.tar.gz: bbbda892621bda4fd6b09bc428d3717d42dcff4d86937ae9864c91ded6b6423a
 SHA512:
-  metadata.gz: f59be65b74729aff605a4a8f3e30d6d75bd6e97b96ccfa428492c87617325bc15ec1bc62f2450d4c37a1876fd96bc6e70441bcff83b87054772168e04c40da6a
-  data.tar.gz: 2d7de037552bab343a12b4c7cf73c5f23384d8d53c8b14ac246b538fd08b79d689340e1841365611f3347c97c3557e5d1a1c48215c921a75e1214043ba465843
+  metadata.gz: 8ddb1692a5a1d5e596f0064a0dd6a11f7c233eb3929448f03931ea746f54c81e0a05a6f4e4d1af43fde3edfbab75e67686c491fc75e08b5f0ac4642f50feaad5
+  data.tar.gz: be8380c9230fa235375096c0f249c5ede3cc7a5e78e210e7e8aad35ed227666379c625939fb6106e2c485bd004b91f2457c9c634e2de023173b35af9ed0740ee

data/source/zotica.rb

@@ -3,7 +3,7 @@
 
 module Zenithal
 
-  ZOTICA_VERSION = "1.1.0"
+  ZOTICA_VERSION = "1.2.0"
   ZOTICA_VERSION_ARRAY = ZOTICA_VERSION.split(/\./).map(&:to_i)
 
 end

data/source/zotica/parser.rb

@@ -6,6 +6,8 @@ module Zenithal::ZoticaSingleParserMethod
   SPACE_ALTERNATIVES = {"sfun" => "afun", "sbin" => "abin", "srel" => "arel", "ssbin" => "asbin", "ssrel" => "asrel", "scas" => "acas", "quad" => "sgl", "qquad" => "dbl"}
   PHANTOM_TYPES = {"ph" => "bth", "vph" => "ver", "hph" => "hor"}
 
+  private
+
   def parse
     if @block
       inner_element = parse_math_root
@@ -17,8 +19,6 @@ module Zenithal::ZoticaSingleParserMethod
     return nodes
   end
 
-  private
-
   def create_math_element(name, attributes, children_list, options = {})
     this = REXML::Nodes[]
     options[:role] = determine_role(attributes)
@@ -461,41 +461,29 @@ class Zenithal::ZoticaParser < Zenithal::ZenithalParser
 
   def initialize(source)
     super(source)
-    @raw_macro_names = []
-    @math_macros = {}
-    @fonts = {}
+    @inner_parser = Zenithal::ZoticaSingleParser.new(source)
   end
 
   def load_font(path)
-    if path
-      @fonts[:main] = JSON.parse(File.read(path))
-    end
+    @inner_parser.load_font(path)
   end
 
   def register_math_macro(name, &block)
     outer_self = self
     register_plugin(name) do |attributes|
-      parser = Zenithal::ZoticaSingleParser.new(@source)
-      @raw_macro_names.each do |raw_macro_name|
-        parser.register_plugin(raw_macro_name) do |_|
-          raw_parser = outer_self.clone
-          raw_parser.exact = false
-          raw_parser.whole = false
-          next raw_parser
-        end
-      end
-      @math_macros.each do |math_macro_name, math_macro_block|
-        parser.register_plugin(math_macro_name) do |_|
-          math_parser = parser.clone
-          math_parser.setup(attributes, math_macro_block)
-          next math_parser
-        end
-      end
+      parser = @inner_parser.clone
+      parser.version = outer_self.instance_variable_get("@version")
+      parser.update(@source)
+      parser.setup(attributes, block)
+      next parser
+    end
+    @inner_parser.register_plugin(name) do |attributes|
+      parser = @inner_parser.clone
+      parser.version = outer_self.instance_variable_get("@version")
+      parser.update(@source)
       parser.setup(attributes, block)
-      parser.fonts = @fonts
       next parser
     end
-    @math_macros[name] = block
   end
 
   def register_simple_math_macro(name)
@@ -510,7 +498,13 @@ class Zenithal::ZoticaParser < Zenithal::ZenithalParser
   end
 
   def register_raw_macro(name)
-    @raw_macro_names << name
+    outer_self = self
+    @inner_parser.register_plugin(name) do |_|
+      raw_parser = outer_self.clone
+      raw_parser.exact = false
+      raw_parser.whole = false
+      next raw_parser
+    end
   end
 
   def raw_macro_name=(name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zotica
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Ziphil
 autorequire: 
 bindir: exec
 cert_chain: []
-date: 2020-04-16 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zenml
@@ -19,7 +19,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: sassc
   requirement: !ruby/object:Gem::Requirement