oo2md2tex 0.1.6 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4607a4b601cdd8cc4915ef11331d6967b2f543d12b99065f27703325142c0dbe
-  data.tar.gz: f536e11320fdcca1c5cc791d3b99d2cb8fa88e077c70e2264658b596307c9230
+  metadata.gz: 68bebed3d6cc51b61c48f592122ea2e518da3b126f8bd38f572fccec9609ec98
+  data.tar.gz: b7857afae528a8e2c8c8d208d4ed87fe80ba1dab222b93750b87deabfc3a8821
 SHA512:
-  metadata.gz: a13471447b718ca701d859d6345c5576771ee5dd89396a824a0afce7db9e7997c8844a81bcdd00750c764f7d220bf903f4cb7403b1d3b15f8809059bec1b802e
-  data.tar.gz: 5b260c491cc5017c7cbfdf2aad161b75cf964520a04d579579e4978d13e6f538d5d55b73c4799d745b69fcc6abd13423da7ef87b8834b689d1bb2d2f0ff17bad
+  metadata.gz: d9e331d5ea8eecb0f28f4c6e5b62fb2842926914f8ed9297211d7b94c74d0415ab00504820d6e9847ea614f6f9a11b860ae4d236b98ace3cd16f2c0db8adbb39
+  data.tar.gz: c709a34c324172a969910624820d8eb92472c3b411fc5199b16c5cdf693ad5fb4bd401df0544ef730b6165aae054c6f7f0459f21d5e55102645b21cad3e5511c

data/bin/ja-count

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 #
 #    Copyright (c)2014 Shigeya Suzuki
 #
@@ -16,10 +16,6 @@
 #    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-if RUBY_VERSION >= "1.9"  # encoding only supported in Ruby 1.9.x
-  Encoding.default_external = "UTF-8"
-end
-
 #####
 
 puts "(#{ARGF.read.size} characters)"

data/bin/ja-ten-maru-normalize

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 #
 #    Copyright (c)2012 Shigeya Suzuki
 #
@@ -18,10 +18,6 @@
 
 require 'optparse'
 
-if RUBY_VERSION >= "1.9"  # encoding only supported in Ruby 1.9.x
-  Encoding.default_external = "UTF-8"
-end
-
 #####
 
 opts = {
@@ -54,8 +50,8 @@ end
 #####
 
 def text_tweak(str, opts)
-  str.tr!('、。', '，．') if opts[:ja_comma_subst_cp]
-  str.tr!('，. ', '、。') if opts[:ja_comma_subst_tm]
+  str = str.tr('、。', '，．') if opts[:ja_comma_subst_cp]
+  str = str.tr('，. ', '、。') if opts[:ja_comma_subst_tm]
 	str
 end
 

data/bin/md2tex

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- coding: utf-8 -*-
+# frozen_string_literal: true
 #
 #    Copyright (c)2012 Shigeya Suzuki
 #
@@ -16,10 +16,6 @@
 #    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #
 
-if RUBY_VERSION >= "1.9"  # encoding only supported in Ruby 1.9.x
-  Encoding.default_external = "UTF-8"
-end
-
 $script_base_dir = File.dirname(__FILE__)+"/../lib"
 $:.unshift($script_base_dir)
 
@@ -50,10 +46,10 @@ all = processor.process(ARGF.read)
 puts processor.job_signature
 puts all
 
-all.gsub!(/%.*/, '')
-all.gsub!(/\s+/, ' ')
-all.gsub!(/\\(begin|end){[^}]+}/, '')
-all.gsub!(/\\([A-Za-z]+)/, '')
-all.gsub!(/\s+/, '')
-all.gsub!(/\{|\}/, '')
+all = all.gsub(/%.*/, '')
+all = all.gsub(/\s+/, ' ')
+all = all.gsub(/\\(begin|end){[^}]+}/, '')
+all = all.gsub(/\\([A-Za-z]+)/, '')
+all = all.gsub(/\s+/, '')
+all = all.gsub(/\{|\}/, '')
 puts "% Text length: #{all.size} chars"

data/bin/oo2text

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# -*- mode: ruby -*-
+# frozen_string_literal: true
 #
 #    Copyright (c)2012,2017 Shigeya Suzuki
 #
@@ -17,7 +17,7 @@
 #
 
 require 'optparse'
-require 'nokogiri'
+require 'rexml/parsers/sax2parser'
 require 'zlib'
 require 'zip'
 require 'stringio'
@@ -37,7 +37,7 @@ module OmniOutliner
       @name = name
       @column = @lit = @item = @style = @root = @is_root = false
       @id = nil
-      @str = ""
+      @str = +""
 
       @attrs = {}
       if attrs_a.size != 0
@@ -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
@@ -123,8 +157,7 @@ module OmniOutliner
 
       def end_element(name)
         if name == "values"
-          @context.str.gsub!(/\n/, '')
-          @context.str += "\n"
+          @context.str = @context.str.gsub(/\n/, '') + "\n"
         end
         @context.end_element(name)
         pop_context
@@ -136,7 +169,7 @@ module OmniOutliner
       end
     end
 
-    class Parser < Nokogiri::XML::SAX::Parser
+    class Parser
       def initialize(fn)
         @file = nil
         if fn =~ /\.oo3$/
@@ -149,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
@@ -165,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
 
@@ -196,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
 
@@ -214,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"
@@ -235,7 +272,7 @@ module OmniOutliner
       end
     end
 
-    class Parser < Nokogiri::XML::SAX::Parser
+    class Parser
       def initialize(fn)
         @file = nil
         if fn =~ /\.ooutline$/
@@ -251,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

data/lib/markdown_to_tex/processor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 #    Copyright (c)2012 Shigeya Suzuki
 #
@@ -35,7 +36,7 @@ module MarkdownToTeX
 							@git_branch_name = $2
 							@git_wd_hash_long = $3
 							@git_wd_hash = @git_wd_hash_long[0,6]
-							@git_commit_line = $4
+							@git_commit_line = $4.dup
 							@git_commit_line.gsub!(/\#/, '\#')
 							@git_commit_line.gsub!(/\%/, '\%')
 							@git_commit_line.gsub!(/\[ahead.*\] /, '')

data/lib/markdown_to_tex/renderer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 #    Copyright (c)2012 Shigeya Suzuki
 #

data/lib/markdown_to_tex/text_processor.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #
 #    Copyright (c)2012 Shigeya Suzuki
 #
@@ -24,7 +25,7 @@ module MarkdownToTeX
 
     # Process a paragraph
     def self.process_paragraph(text)
-      text.gsub!(/\(\((.*)\)\)/, '\\ITEM{\1}') # description format
+      text = text.gsub(/\(\((.*)\)\)/, '\\ITEM{\1}') # description format
       self.reference(text)
     end
 
@@ -79,8 +80,9 @@ module MarkdownToTeX
 
     def self.label_split(s)
       label = ""
-      if s.sub!(/\s*\[([^\]]+)\]/, '')
+      if s =~ /\s*\[([^\]]+)\]/
         label = $1
+        s = s.sub(/\s*\[([^\]]+)\]/, '')
       end
       [s, label]
     end
@@ -117,7 +119,7 @@ module MarkdownToTeX
 
     def self.process_final(text, macros)
       # Macro expansions
-      macros.each {|m, v| text.gsub!(m, v) }
+      macros.each {|m, v| text = text.gsub(m, v) }
       text
     end
 

data/lib/markdown_to_tex.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'markdown_to_tex/renderer'
 require_relative 'markdown_to_tex/text_processor'
 require_relative 'markdown_to_tex/processor'

metadata

@@ -1,22 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: oo2md2tex
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.3.0
 platform: ruby
 authors:
 - Shigeya Suzuki
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2026-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.5.1
@@ -24,47 +20,44 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.5'
     - - ">="
       - !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.2
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.13.2
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.0'
 description: A barebone Markdown to TeX/LaTeX converter kit via OmniOutliner
 email: shigeya@wide.ad.jp
 executables:
-- oo2text
-- md2tex
-- ja-ten-maru-normalize
 - ja-count
+- ja-ten-maru-normalize
+- md2tex
+- oo2text
 extensions: []
 extra_rdoc_files:
 - Format.md
@@ -82,7 +75,6 @@ homepage: http://github.com/shigeya/oo2md2tex
 licenses:
 - ISC
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,15 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: oo2text and md2tex
 test_files: []