oo2md2tex 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f66a21735bad0d49f64f38ccb929b6689889320
-  data.tar.gz: ea9b18b7b1a9635b372f7d7f5e654d6b39f6a3c9
+  metadata.gz: dcefce26c1579dbab1f2ad123c00f5156e28ad2a
+  data.tar.gz: 4ce51bf87b6fee82a67e317be912432eac2b3b2a
 SHA512:
-  metadata.gz: 7bfb984938eb696d137939e85be91e4c91bc6a0413d24180d20b074917c53f4668c5750311cec448a244ce8ace8631da4d516f4f72edb318e83785589e05a384
-  data.tar.gz: 84bdb11e919e10560144bc05d78f8b2b21f40c1cb735bee69113219e3c7a480403f7c6bb4479e1aff5da8fcf8cfca4757332780b29d0daa28ace01e2264f0b90
+  metadata.gz: 463b2a47a0f322fb896898230bc415b7449f52f3ed4f76efba013f01061720e553621cc25a9301d109795c23142c850f701ca1d95203fbffb719d455f15c3216
+  data.tar.gz: b28cb87f9c0c1cbac7c62e5e339b4cb857c3b45b197e4be319eaea23a7b15b7993d93898c7543343271d11861720c65611a82e68c1b4e0be179e378ea09e6245

data/bin/oo2text

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # -*- mode: ruby -*-
 #
-#    Copyright (c)2012 Shigeya Suzuki
+#    Copyright (c)2012,2017 Shigeya Suzuki
 #
 #    Permission to use, copy, modify, and/or distribute this software for any
 #    purpose with or without fee is hereby granted, provided that the above
@@ -21,57 +21,116 @@ require 'nokogiri'
 require 'zlib'
 require 'zip'
 require 'stringio'
-require 'awesome_print'
-require 'pry-byebug'
 
 module OmniOutliner
 
-  class V3
-    class Document < Nokogiri::XML::SAX::Document
-      def initialize
-        @in_column = false
-        @in_lit = false
-        @in_item = false
-        @in_style = false
-        @in_root = false
-        @str = ""
-        super
+  # Common Classes
+  class ParseContext
+    attr_accessor :parent, :name, :attrs, :column, :lit, :item, :style, :root, :str, :id, :is_root
+
+    def initialize(parent, name, attrs_a)
+      @parent = parent
+      @name = name
+      @column = @lit = @item = @style = @root = @is_root = false
+      @id = nil
+      @str = ""
+
+      @attrs = {}
+      if attrs_a.size != 0
+        attrs_a.each {|k,v| @attrs[k] = v}
+        @id = @attrs["id"] if @attrs.has_key?("id")
+        @is_root = @attrs["is-root"] if @attrs.has_key?("is-root")
       end
+    end
 
-      def characters(s)
-        @str += s if @in_lit && (!@in_style && !@in_column)
+    def start_element(name, attrs)
+      @column = name == "column"
+      @item = name == "item"
+      @style = name == "style"
+      @lit = name == "lit"
+      @root = name == "root"
+      if name == "cell"
+        # if it is a hyperlink, use name part as part of output
+        @str += @attrs["name"] if @attrs.has_key?("name")
       end
+    end
 
-      def start_element(name, attrs)
-        @in_column = true if name == "column"
-        @in_item = true if name == "item"
-        @in_style = true if name == "style"
-        @in_lit = true if name == "lit"
-        if name == "root"
-          @in_root = true
-          @str = ""
-        end
-        if name == "cell"
-          # if it is a hyperlink, use name part as part of output
-          if n = attrs.find{|a| a[0] == "name"}
-            @str += n[1]
-          end
-        end
+    def end_element(name)
+      if name == "lit"
+        @str += "\n" if in_body_text
+      end
+      if name == "values"
+        @str.gsub(/\n/, '')
       end
+    end
 
-      def end_element(name)
-        @in_column = false if name == "column"
-        @in_item = false if name == "item"
-        @in_style = false if name == "style"
-        if name == "lit"
-          @str += "\n"
-          @in_lit = false
-        end
-        if name == "values"
-          @str.gsub(/\n/, '')
-          puts @str if @in_root
-          @str = ""
+    def in_body_text
+      if @item
+        true
+      elsif @style || @column
+        false
+      else
+        if @in_body_text == nil
+          @in_body_text = @parent.nil? ? false : @parent.in_body_text
         end
+        @in_body_text
+      end
+    end
+
+    def characters(s)
+      @str += s if @lit && in_body_text
+    end
+
+    def elevate(context)
+      @str += context.str
+    end
+  end
+
+  class DocumentCommon < Nokogiri::XML::SAX::Document
+    def initialize
+      @contexts = []
+      @context = nil
+      super
+    end
+
+    def push_context(name, attrs)
+      @contexts.push(@context)
+      @context = ParseContext.new(@context, name, attrs)
+    end
+
+    def pop_context
+      old_context = @context
+      @context = @contexts.pop
+      @context.elevate(old_context) if @context
+    end
+
+    def start_element(name, attrs)
+      push_context(name, attrs)
+      @context.start_element(name, attrs)
+    end
+
+    def end_element(name)
+      final_output if name == "outline"
+      @context.end_element(name)
+      pop_context
+    end
+
+    def characters(s)
+      @context.characters(s)
+    end
+
+    def final_output
+    end
+  end
+
+  # Version Dependent Classes for V3
+  #
+  # Format Documenatation can be found at:
+  # https://www.omnigroup.com/namespace/OmniOutliner/xmloutline-v3.dtd
+  class V3
+    class Document < DocumentCommon
+      def final_output
+        puts @context.str
       end
     end
 
@@ -95,8 +154,13 @@ module OmniOutliner
         super(@file)
       end
     end
-  end # v3
+  end
 
+  # Version Dependent Classes for V5
+  #
+  # Format Documenatation can be found at:
+  # https://www.omnigroup.com/namespace/OmniOutliner/xmloutline-v5.rng
+  # https://www.omnigroup.com/namespace/OmniOutliner/xmloutline-editors-v1.rng
   class V5
     class Item
       attr_reader :attrs
@@ -119,80 +183,34 @@ module OmniOutliner
       end
     end
 
-    class Document < Nokogiri::XML::SAX::Document
+    class Document < DocumentCommon
       def initialize
-        @in_column = false
-        @in_lit = false
-        @in_item = false
-        @in_style = false
-        @str = ""
         @items = {}
-        @id_stack = []
-        @attrs_stack = []
-        @in_items = false
         super
       end
 
-      def characters(s)
-        @str += s if @in_lit && (!@in_style && !@in_column)
-      end
-
-      def start_element(name, attrs_a)
-        if attrs_a.size != 0
-          @attrs = {}
-          attrs_a.each {|k,v| @attrs[k] = v}
-          @id = @attrs["id"] if @attrs.has_key?("id")
-          @is_root = @attrs["is-root"] if @attrs.has_key?("is-root")
-        end
-        @in_column = true if name == "column"
-        @in_style = true if name == "style"
-        @in_lit = true if name == "lit"
-        @in_item = true if name == "item"
-        @in_items = true if name == "items"
-        if name == "cell"
-          # if it is a hyperlink, use name part as part of output
-          if @attrs.has_key?("name")
-            @str += @attrs["name"]
-          end
-        end
+      def end_element(name)
         if name == "item"
-           @id_stack.push(@id)
-           @attrs_stack.push(@attrs)
+          str = @context.str
+          str.gsub(/\n/, '')
+          @items[@context.id] = Item.new(@context.attrs, str)
+          @context.str = ""
         end
+        super
       end
 
-      def end_element(name)
-        if name == "item"
-          @id = @id_stack.pop
-          @attrs = @attrs_stack.pop
-        end
-        @in_column = false if name == "column"
-        @in_style = false if name == "style"
-        if name == "item"
-          @in_item = false
-          @str.gsub(/\n/, '')
-          @items[@id] = Item.new(@attrs, @str)
-          @str = ""
-        end
-        if name == "lit"
-          @str += "\n" if @in_items
-          @in_lit = false
-        end
-        if name == "outline" # final output
-          @root = nil
-          puts "#{@items.count} items"
-          @items.each do |id, item|
-            if item.attrs["is-root"] == "yes"
-              @root = item
-              @root.is_root = true
-            elsif pid = item.attrs["parent-id"]
-              @items[pid].add(item.attrs["rank"], item)
-            else
-              @root.add(item.attrs["rank"], item)
-            end
+      def final_output
+        @items.each do |id, item|
+          if item.attrs["is-root"] == "yes"
+            @root = item
+            @root.is_root = true
+          elsif pid = item.attrs["parent-id"]
+            @items[pid].add(item.attrs["rank"], item)
+          else
+            @root.add(item.attrs["rank"], item)
           end
-          @root.print_all #unless @root.nil?
         end
+        @root.print_all #unless @root.nil?
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oo2md2tex
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Shigeya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-12 00:00:00.000000000 Z
+date: 2017-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -42,16 +42,16 @@ dependencies:
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: A barebone Markdown to TeX/LaTeX converter kit via OmniOutliner
 email: shigeya@wide.ad.jp
 executables:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: oo2text and md2tex