oo2md2tex 0.0.17 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dcefce26c1579dbab1f2ad123c00f5156e28ad2a
-  data.tar.gz: 4ce51bf87b6fee82a67e317be912432eac2b3b2a
+SHA256:
+  metadata.gz: dc832543f020810fa7a596cc9b594f59c4653615554aa45ab18e14acd63cc09d
+  data.tar.gz: 342ee375b6bc9d9c45bfb99b787d02651ec73b43f2cdbfa8b59a4b7ff5f96b52
 SHA512:
-  metadata.gz: 463b2a47a0f322fb896898230bc415b7449f52f3ed4f76efba013f01061720e553621cc25a9301d109795c23142c850f701ca1d95203fbffb719d455f15c3216
-  data.tar.gz: b28cb87f9c0c1cbac7c62e5e339b4cb857c3b45b197e4be319eaea23a7b15b7993d93898c7543343271d11861720c65611a82e68c1b4e0be179e378ea09e6245
+  metadata.gz: 519745ae071798cde6d66818edd0f849daa01f5e1410cfd0fdaf59d62568d8410035d51f7f2ff543b6b6cf818a0fcc7d6980a90906746849e104074b1804b887
+  data.tar.gz: 7385ac0f860ef7db202a717957d82534ab652f60cd3f9dfeada09fb2b399653692377c7558abe2688cc4253b340e7024d9d0303d1f348498363b372fd1787d1e

data/bin/oo2text

@@ -22,6 +22,10 @@ require 'zlib'
 require 'zip'
 require 'stringio'
 
+$OO2DBG = false
+require 'awesome_print' if $OO2DBG
+require 'pry-byebug' if $OO2DBG
+
 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,21 +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 == ""
-        @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
@@ -189,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
@@ -205,9 +226,9 @@ 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
         @root.print_all #unless @root.nil?
@@ -237,7 +258,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.17
+  version: 0.1.2
 platform: ruby
 authors:
 - Shigeya Suzuki
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 description: A barebone Markdown to TeX/LaTeX converter kit via OmniOutliner
 email: shigeya@wide.ad.jp
 executables:
@@ -76,7 +76,7 @@ homepage: http://github.com/shigeya/oo2md2tex
 licenses:
 - ISC
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,9 +91,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: oo2text and md2tex
 test_files: []