oo2md2tex 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51dcd05d8ba14f620580f79c30ec4affea5b3c89
-  data.tar.gz: 6038b3084acaed875cdbad5b905895853b956f3b
+  metadata.gz: 9083374a98ee729448d3ae40727b77aa2759678b
+  data.tar.gz: 1b2c3b5cb0f2ddccc9a38f6694f7e90661451a42
 SHA512:
-  metadata.gz: 0710d42c8c84375ea3ab87f2325c8bccf2ce39f73b67fdb38a1c56ddbaae7fa70079362bb9a7af1be35fd05ce5240544264590257fcbae6c760e1a73c234c830
-  data.tar.gz: '064208e1b1b84f32d77c1634137bf921a26fcd5d29e6112d7066866885776be12989c284efdb53b5f8d6f61b2831b52d790099371318e44e6253146815635869'
+  metadata.gz: 6e9075b8a6e9807e107c6a41e58aa1429dbefacc71f6bf92fe1b6b32ec084ab7606801abad1b75821e1da0155ccd83274692c625e75337eba68ee34ca089c054
+  data.tar.gz: edf4dc0f7a5ef2b6bf0254fb3fcbc52858786445d101d28cdffad661574c19f076e23ce76525fcbeef713eb051533f4bcc8db18769d86685cb538738f23cc4d9

data/bin/oo2text

@@ -22,6 +22,10 @@ require 'zlib'
 require 'zip'
 require 'stringio'
 
+$DBG = true
+require 'awesome_print' if $DBG
+require 'pry-byebug' if $DBG
+
 module OmniOutliner
 
   # Common Classes
@@ -56,9 +60,6 @@ module OmniOutliner
     end
 
     def end_element(name)
-      if name == "lit"
-        @str += "\n" if in_body_text
-      end
       if name == "values"
         @str.gsub(/\n/, '')
       end
@@ -88,8 +89,8 @@ module OmniOutliner
 
   class DocumentCommon < Nokogiri::XML::SAX::Document
     def initialize
-      @contexts = []
-      @context = nil
+      @context = ParseContext.new(nil, "ROOT", {})
+      @contexts = [@context]
       super
     end
 
@@ -104,23 +105,9 @@ module OmniOutliner
       @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
@@ -129,6 +116,21 @@ module OmniOutliner
   # https://www.omnigroup.com/namespace/OmniOutliner/xmloutline-v3.dtd
   class V3
     class Document < DocumentCommon
+      def start_element(name, attrs)
+        push_context(name, attrs)
+        @context.start_element(name, attrs)
+      end
+
+      def end_element(name)
+        if name == "values"
+          @context.str.gsub!(/\n/, '')
+          @context.str += "\n"
+        end
+        @context.end_element(name)
+        pop_context
+        final_output if name == "outline"
+      end
+
       def final_output
         puts @context.str
       end
@@ -163,22 +165,36 @@ module OmniOutliner
   # https://www.omnigroup.com/namespace/OmniOutliner/xmloutline-editors-v1.rng
   class V5
     class Item
-      attr_reader :attrs
-      attr_accessor :is_root
+      attr_reader :attrs, :rank, :id, :parent_id
+      attr_accessor :is_root, :parent
 
       def initialize(attrs, text)
         @attrs = attrs
+        @id = @attrs["id"]
+        @parent = nil
+        @parent_id = @attrs["parent-id"]
+        @rank = @attrs["rank"]
+        @rank = "0" if @rank.nil? || @rank == ""
+        @rank += "00" if @rank.size == 4
         @text = text
         @children = {}
       end
 
-      def add(rank, item)
-        rank = "0" if rank.nil? || rank == ""
-        rank += "00" if rank.size == 4
-        @children[rank.hex] = item
+      def add_child(item)
+        @children[item.rank.hex] = item
+        item.parent = self
+      end
+
+      def parent_chain
+        if @parent == nil
+          return ["ROOT"]
+        else
+          @parent.parent_chain + [self.id]
+        end
       end
 
       def print_all
+        puts "%% " + parent_chain.join(" < ") + " (#{@rank}) #{@attrs}\n" if $DBG
         puts @text unless @is_root
         @children.keys.sort.each {|k| @children[k].print_all}
       end
@@ -190,14 +206,18 @@ module OmniOutliner
         super
       end
 
+      def start_element(name, attrs)
+        push_context(name, attrs)
+        @context.start_element(name, attrs)
+      end
+
       def end_element(name)
+        @context.end_element(name)
         if name == "item"
-          str = @context.str
-          str.gsub(/\n/, '')
-          @items[@context.id] = Item.new(@context.attrs, str)
-          @context.str = ""
+          @items[@context.id] = Item.new(@context.attrs, @context.str + "\n")
         end
-        super
+        pop_context
+        final_output if name == "outline"
       end
 
       def final_output
@@ -206,11 +226,12 @@ module OmniOutliner
             @root = item
             @root.is_root = true
           elsif pid = item.attrs["parent-id"]
-            @items[pid].add(item.attrs["rank"], item)
+            @items[pid].add_child(item)
           else
-            @root.add(item.attrs["rank"], item)
+            @root.add_child(item)
           end
         end
+        #binding.pry
         @root.print_all #unless @root.nil?
       end
     end
@@ -238,7 +259,7 @@ module OmniOutliner
         super(@file) if @file
       end
     end
-  end # v3
+  end # v5
 end
 
 ARGV.options do |o|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oo2md2tex
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Shigeya Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet