rulex 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4415c9c1a3b0a1b94e0a8227b9baa9e3dfd8ca6
-  data.tar.gz: 934a03920ea1d907f2544a5545a6456d1aedb5d8
+  metadata.gz: 5a4320567471b4e3e59824ba257532d95c470aa8
+  data.tar.gz: 425acc9636e13862d28f563a8251f62d55c08f0d
 SHA512:
-  metadata.gz: 841a5ce7e54eb466677677639f643b0eb8dfc17ae0903fa7fa3d6fa8f441f58c8c99e8d98ad2e746d2e42df26ba1200b2c44da5ac7e002bae9823f32589d578a
-  data.tar.gz: 5ba3f8afe690b1b242f4954c6318291f3957ab261ec3f056f8c78322cf898e0d1cd22b58bf838a7133c37efbff827c06420e1b8c4525fdbe1dfce9092fa02c66
+  metadata.gz: fd20d78fd564ec24c2bc9c0252a09d847369da9de5cc55bd41a7ae1cc47ba47d2a5822c41032497e7993513dd9f84ec2a341a571a9f5f3f4e091da37b9157ef7
+  data.tar.gz: 5f1a2eec6be5e5bcbe17e656fd72c6682a4051853e4725229e007708e7f0f22dcb3d56a16ba61796087dc6bff495287b8accd0c04a2a6bd60ee14c83a004a77f

data/examples/count.rex

@@ -34,7 +34,7 @@ document do
   count_from (1..5)
   count_from (10..20)
 
-  raw "Good job, now off to section "; ref :acks;
+  raw "Good job, now off to section #{pure_ref :acks}\n" # #{pure_ref :acks}\n"
 
   section "Acknowledgements"
   label :acks

data/examples/count.tex

@@ -24,6 +24,7 @@ Let's try to count.\begin{itemize}
 \item{20}
 \end{itemize}
 Good job, now off to section \ref{acks}
+
 \section{Acknowledgements}
 \label{acks}
 Finally I would like to thank 

data/lib/rulex/rex/reader.rb

@@ -30,16 +30,29 @@ module Rulex
         @content
       end
 
-      def tex_command(name, params)
-        if params.length == 1
-          add_to_content(type: :command, name: name, arguments: params)
-        elsif params.length == 2
-          opts = params[0]
-          args = params[1]
-          add_to_content(type: :command, name: name, arguments: args, options: opts)
+      def build_tex_command(name, params)
+        case params.length
+        when 1
+          {type: :command, name: name, arguments: params} 
+        when 2
+          first = params[0]
+          second = params[1]
+          if Array === params[0] && Array === params[1]
+            {type: :command, name: name, arguments: second, options: first}
+          elsif String === params[0] && String === params[1]
+            {type: :command, name: name, arguments: [first, second]}
+          else
+            error "something is not quite right with the parameters"
+          end
+        else
+          error "wrong number of params"
         end
       end
 
+      def tex_command(name, params)
+        add_to_content build_tex_command name, params
+      end
+
       def depth
         @content_stack.length - 1
       end
@@ -55,6 +68,9 @@ module Rulex
       def method_missing(m_id, *args, &block) 
         if block
           tex_environment(m_id, args, block)
+        elsif /pure_([a-zA-Z]+)/.match(m_id)
+          Rulex::Tex::Writer.to_str(build_tex_command($1,args))
+          #"\\#{$1}{1}{2}"
         else
           tex_command(m_id, args)
         end

data/lib/rulex/tex/writer.rb

@@ -6,32 +6,35 @@ module Rulex
         @content = ''
       end
 
-      def import arr
-        return unless arr
-        arr.each do |item|
-
-          case item[:type]
-          when :command
-            @content += "\\#{item[:name]}"
-            if opts = item[:options]
-              @content += '[' + opts.join(',') + ']'
-            end
-            item[:arguments].each do |arg|
-              @content += "{#{arg}}"
-            end
-            @content += "\n"
-          when :text
-            @content += item[:text]
-          when :environment
-            @content += "\\begin{#{item[:name]}}\n"
-            import item[:children]
-            @content += "\\end{#{item[:name]}}\n"
-          else
-            import item[:children] if item[:children]
+      def self.to_str item
+        case item[:type]
+        when :command
+          str = "\\#{item[:name]}"
+          if opts = item[:options]
+            str += '[' + opts.join(',') + ']'
+          end
+          item[:arguments].each do |arg|
+            str += "{#{arg}}"
+          end
+          str += "\n"
+        when :text
+          res = item[:text]
+        when :environment
+          str = "\\begin{#{item[:name]}}\n"
+          if children = item[:children]
+            str += item[:children].inject(""){|acc, c| acc += Rulex::Tex::Writer.to_str c} 
           end
+          res = str += "\\end{#{item[:name]}}\n"
+        else
+          str = ""
+          res = str += item[:children].inject(""){|acc, c| acc += Rulex::Tex::Writer.to_str c} if item[:children]
         end
       end
 
+      def import arr
+        arr.each {|i| @content += Rulex::Tex::Writer.to_str i} if arr
+      end
+
       def to_s
         @content
       end

data/lib/rulex/version.rb

@@ -1,3 +1,3 @@
 module Rulex
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rulex
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nicolas Mattia