oo2md2tex 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24af3aca15b61d730ba88e51a4ba5aa96a85134626ffd2fb2ba587f52179e6e8
-  data.tar.gz: 7b3a3727952522c7c18982680a1c560895ad9b67fb4cbbe67ae675cd72667eab
+  metadata.gz: 68bebed3d6cc51b61c48f592122ea2e518da3b126f8bd38f572fccec9609ec98
+  data.tar.gz: b7857afae528a8e2c8c8d208d4ed87fe80ba1dab222b93750b87deabfc3a8821
 SHA512:
-  metadata.gz: 2948956524bea702af62d7c1932b45bd8010048830e11bc062187eae99e748e0215a54d1f531764edb030d8a0bb7548aa832f7847e9e68fe3b8d625eca63a6d4
-  data.tar.gz: 289167fbeade9c6b0459a4983fc3eee12e1bbb640de9a2fdf1dc2406e5514845d73a880e4e8721399f3fb31b76e725957ca091bf4bba0722b3b200df429f6fde
+  metadata.gz: d9e331d5ea8eecb0f28f4c6e5b62fb2842926914f8ed9297211d7b94c74d0415ab00504820d6e9847ea614f6f9a11b860ae4d236b98ace3cd16f2c0db8adbb39
+  data.tar.gz: c709a34c324172a969910624820d8eb92472c3b411fc5199b16c5cdf693ad5fb4bd401df0544ef730b6165aae054c6f7f0459f21d5e55102645b21cad3e5511c

data/bin/oo2text

@@ -17,7 +17,7 @@
 #
 
 require 'optparse'
-require 'nokogiri'
+require 'rexml/parsers/sax2parser'
 require 'zlib'
 require 'zip'
 require 'stringio'
@@ -87,11 +87,34 @@ module OmniOutliner
     end
   end
 
-  class DocumentCommon < Nokogiri::XML::SAX::Document
+  # Adapter: translate REXML SAX2 callbacks (uri, localname, qname, attrs-hash)
+  # into the parser's (name, attr-pairs) interface used by the Document classes.
+  class Sax2Adapter
+    def initialize(doc)
+      @doc = doc
+    end
+
+    def start_element(_uri, _localname, qname, attributes)
+      @doc.start_element(qname, attributes.to_a)
+    end
+
+    def end_element(_uri, _localname, qname)
+      @doc.end_element(qname)
+    end
+
+    def characters(text)
+      @doc.characters(text)
+    end
+
+    def cdata(text)
+      @doc.characters(text)
+    end
+  end
+
+  class DocumentCommon
     def initialize
       @context = ParseContext.new(nil, "ROOT", {})
       @contexts = [@context]
-      super
     end
 
     def push_context(name, attrs)
@@ -108,6 +131,17 @@ module OmniOutliner
     def characters(s)
       @context.characters(s)
     end
+
+    # Drive a REXML SAX2 parse from an IO/String source through this document.
+    def parse_source(source)
+      parser = REXML::Parsers::SAX2Parser.new(source)
+      adapter = Sax2Adapter.new(self)
+      parser.listen(:start_element) {|*a| adapter.start_element(*a) }
+      parser.listen(:end_element)   {|*a| adapter.end_element(*a) }
+      parser.listen(:characters)    {|text| adapter.characters(text) }
+      parser.listen(:cdata)         {|text| adapter.cdata(text) }
+      parser.parse
+    end
   end
 
   # Version Dependent Classes for V3
@@ -135,7 +169,7 @@ module OmniOutliner
       end
     end
 
-    class Parser < Nokogiri::XML::SAX::Parser
+    class Parser
       def initialize(fn)
         @file = nil
         if fn =~ /\.oo3$/
@@ -148,11 +182,11 @@ module OmniOutliner
         else
           @file = File.open(fn)
         end
-        super(Document.new)
+        @doc = Document.new
       end
 
       def parse
-        super(@file)
+        @doc.parse_source(@file)
       end
     end
   end
@@ -164,23 +198,25 @@ module OmniOutliner
   # https://www.omnigroup.com/namespace/OmniOutliner/xmloutline-editors-v1.rng
   class V5
     class Item
-      attr_reader :attrs, :rank, :id, :parent_id
+      attr_reader :attrs, :rank, :rank_hex, :seq, :id, :parent_id
       attr_accessor :is_root, :parent
 
-      def initialize(attrs, text)
+      def initialize(attrs, text, seq)
         @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
+        @seq = seq                         # document appearance order (tie-break)
+        @rank = @attrs["rank"].to_s
+        rank = @rank.empty? ? "0" : @rank  # empty rank means first (0)
+        rank += "00" if rank.size == 4     # legacy 4-digit -> 6-digit
+        @rank_hex = rank.hex
         @text = text
-        @children = {}
+        @children = []                     # Hash -> Array
       end
 
       def add_child(item)
-        @children[item.rank.hex] = item
+        @children << item
         item.parent = self
       end
 
@@ -195,13 +231,14 @@ module OmniOutliner
       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}
+        @children.sort_by {|c| [c.rank_hex, c.seq]}.each {|c| c.print_all}
       end
     end
 
     class Document < DocumentCommon
       def initialize
         @items = {}
+        @seq = 0
         super
       end
 
@@ -213,7 +250,8 @@ module OmniOutliner
       def end_element(name)
         @context.end_element(name)
         if name == "item"
-          @items[@context.id] = Item.new(@context.attrs, @context.str + "\n")
+          @items[@context.id] = Item.new(@context.attrs, @context.str + "\n", @seq)
+          @seq += 1
         end
         pop_context
         final_output if name == "outline"
@@ -234,7 +272,7 @@ module OmniOutliner
       end
     end
 
-    class Parser < Nokogiri::XML::SAX::Parser
+    class Parser
       def initialize(fn)
         @file = nil
         if fn =~ /\.ooutline$/
@@ -250,11 +288,11 @@ module OmniOutliner
             @file = ""
           end
         end
-        super(Document.new)
+        @doc = Document.new
       end
 
       def parse
-        super(@file) if @file
+        @doc.parse_source(@file) if @file
       end
     end
   end # v5

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: oo2md2tex
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Shigeya Suzuki
 bindir: bin
 cert_chain: []
-date: 2026-03-28 00:00:00.000000000 Z
+date: 2026-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
@@ -24,19 +24,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: oo2text and md2tex
 test_files: []