tex2id 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4dad00dd189b68420286a665d46d5747c7354e05b9daa9bfad36208e30732da2
-  data.tar.gz: 32f88f87b3bc74c14b0d465b70a8770ee9956cd35de5a0f54b7115a22a7c7c08
+  metadata.gz: 5476eb432da2d0c6cc135bd2da0b1eb491cca009cedb50cebab2d080a364ab10
+  data.tar.gz: 87a8fe6641b5af03bca1a94971c41cda500babee9a275b5585a157b73935f1fd
 SHA512:
-  metadata.gz: 4d2d8a3771820624223bbbaaf080d9ad8bfba91994fcf368997bedba2e28885c29fcfad493b0b4c897073ebf8b6c13b6b6dd466ad1ad449bc23b49e599456aec
-  data.tar.gz: b1118c58521ca06af0727d433f01cfa6c73329520c5bb921e6807301568d559cf2c8807eac70a580ac8988bcb1b56e7d5e6151c09718c85712ed281c2c85b2f3
+  metadata.gz: c6c3ae76103f434fdbd860bd7feb9bb4eabd11eb197ea5c9d0a180f4255bdede2a2d21f8d8e7bfed499f8e4dd375f2c903ced8d5c3a8bea5a94d69e3dd9880a5
+  data.tar.gz: 484d9c8d0fb4670ce06f819da0a966b130b48f31327b5536254d8d423da114f858c1e635bee9b2732af4b19ecaaa51b8f4f9e7362d6607d8ccf9b889b1e5047d

data/lib/tex2id/cli.rb

@@ -43,27 +43,22 @@ Usage: #{$0} <source_file> [<output_file>]
   def source
     case source_file
     when "-"
-      $stdin.set_encoding("Windows-31J:UTF-8")
       $stdin.read
     else
-      IO.read(source_file, mode: 'r:Windows-31J:UTF-8')
+      IO.read(source_file, mode: 'r')
     end
   end
 
   def with_output_file_io
     begin
       io = if output_file
-        File.open(output_file, 'w:Windows-31J:UTF-8')
+        File.open(output_file, 'w')
       else
-        $stdout.set_encoding("Windows-31J")
+        $stdout
       end
       yield io
     ensure
-      if output_file
-        io.close
-      else
-        $stdout.set_encoding("UTF-8")
-      end
+      io.close if output_file
     end
   end
 

data/lib/tex2id/converter/constants.rb

@@ -45,6 +45,7 @@ module Tex2id::Converter::Constants
     'dots'  => '<cstyle:数式>...<cstyle:>',
     'cdots' => '<cstyle:数式><22EF><cstyle:>',
     'times' => '<cstyle:数式>×<cstyle:>',
+    'div'   => '<cstyle:数式>÷<cstyle:>',
     'quad'  => '<cstyle:数式>　<cstyle:>',
     'qquad' => '<cstyle:数式>　　<cstyle:>',
     'alpha' => '<cstyle:数式><03B1><cstyle:>',

data/lib/tex2id/converter.rb

@@ -5,32 +5,13 @@ class Tex2id::Converter
 
   def initialize(source, only_fix_md2inao: false)
     @source = source
-    @use_math = false
     @only_fix_md2inao = only_fix_md2inao
     @state_stack = []
     @token_stack = []
   end
 
-  def use_math? = @use_math
-
   def convert
-    pass1 = check_use_math(@source)
-    if use_math?
-      convert_math(pass1)
-    else
-      pass1
-    end
-  end
-
-  def check_use_math(source)
-    source.sub(/\bUseMath:\s+(true|false)\b/m) {
-      @use_math = (Regexp.last_match[1] == "true")
-      ""
-    }
-  end
-
-  def convert_math(source)
-    pass1 = convert_display_math(source)
+    pass1 = convert_display_math(@source)
     pass2 = convert_inline_math(pass1)
     pass2
   end
@@ -58,7 +39,7 @@ class Tex2id::Converter
         # do nothing
       else
         inline_commands = []
-        line.gsub!(/<CharStyle:コマンド>[^<]+<CharStyle:>/) do |matched|
+        line.gsub!(/<CharStyle:(?:コマンド|コード（文字単位）)>[^<]+<CharStyle:>/) do |matched|
           id = inline_commands.length
           inline_commands << matched
           "<tex2id_inline_commands[#{id}]>"

data/lib/tex2id/version.rb

@@ -1,3 +1,3 @@
 module Tex2id
-  VERSION = "1.4.0"
+  VERSION = "1.6.0"
 end

data/lib/tex2id.rb

@@ -2,7 +2,7 @@ require "tex2id/version"
 
 module Tex2id
   def self.convert(source_filename)
-    source = IO.read(source_filename, mode: 'r:Windows-31J:UTF-8')
+    source = IO.read(source_filename, mode: 'r')
     Converter.new(source).convert
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tex2id
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Kenta Murata
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-06 00:00:00.000000000 Z
+date: 2022-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler