hwp_script_to_latex 1.3.5 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a3677029962b7e0d60b7a7d4d8bb30a474bde6c3cebbfd57aa61f8f5dbcbf190
-  data.tar.gz: cb35a8ae348d5b34d7be5c25fb04a29a27c5b86744f61a21ccfbf93b1b2bfa28
+  metadata.gz: 8a1f7260a320ad6b3be51ded4f0a61b2da7d0143ed340715e37a0ebdcf89f2e1
+  data.tar.gz: 045d8409baaeff28e2803f13f7c5fe152e8f7100749d40a253fef6f2f21f6467
 SHA512:
-  metadata.gz: 3c0e8b2f3814685a934fe5c9a10cc95cd7b7276a1d2a4b450f1dd18324238c0a0facc590dfe785f4779299193abe5b546d6c126db946aaa842c3ac74f7a33aa5
-  data.tar.gz: 56a93a2e78d02fb63bccb150fc68a4a0aa9f500890d0798246bf94ee12a3f877b4e450a968f8a05ae8c04b0f241bbd290d154c147340e3185081f65ff3a73c5d
+  metadata.gz: 020d0e2857c38dbf1aa4ae5051150631bcb4033f075fef06c2229923fce601ca74c9d3058ccaa5e106b3eb2c923528af7b3993802681997a4869d29087333de5
+  data.tar.gz: 5addae0db39cea048c66807b8f1141a31c8206f63dd3788a995bedb3bfb59331096463924eca23f3e2c1c8ba934fab1df9cb007fa5457c185c9e7f0369627b07

data/lib/hwp_script_to_latex/converter.rb

@@ -14,7 +14,7 @@ module HwpScriptToLatex
 
       @rules= JSON.parse(file_content, symbolize_names: true)
       @simple_commands = @rules[:command][:simple].sort_by { |hash| -1 * hash[:script].length }
-      @matrix_commands = @rules[:command][:matrix]
+      @block_commands = @rules[:command][:block]
       @meta_keywords = @rules[:keyword][:meta].sort_by { |hash| -1 * hash[:regex].inspect.length }
       @command_keywords = @rules[:keyword][:command].sort_by { |hash| -1 * hash[:regex].inspect.length }
       @symbol_keywords = @rules[:keyword][:symbol].sort_by { |hash| -1 * hash[:regex].inspect.length }
@@ -24,10 +24,17 @@ module HwpScriptToLatex
     def convert(script, math_mode: false, display_mode: false)
       # Sanitize for starting convert
       result = pre_sanitize(script)
-      # 키워드 치환
+      # 단순 치환 키워드
       result = replace_keywords(result)
-      # Simple Command 치환
+      # 1개의 우항을 가지는 간단한 명령어
       result = replace_simple_commands(result)
+      # 행렬, 케이스등 블록 명령어
+      #   cases {...} => \begin{cases}...\end{cases}
+      #   dmatrix {...} => \begin{vmatrix}...\end{vmatrix}
+      #   bmatrix {...} => \begin{Bmatrix}...\end{Bmatrix}
+      #   pmatrix {...} => \begin{pmatrix}...\end{pmatrix}
+      #   matrix {...} => \begin{matrix}...\end{matrix}
+      result = replace_block_commands(result)
 
       # 특수 형태의 명령어 치환
       # Case 1. 루트 변환
@@ -35,14 +42,8 @@ module HwpScriptToLatex
       #   sqrt A of B => \sqrt [A]{B}
       # Case 2. 분수 변환
       #   A over B => \dfrac {A}{B}
-      # Case 3. 행렬 변환
-      #   dmatrix {...} => \begin{vmatrix}...\end{vmatrix}
-      #   bmatrix {...} => \begin{Bmatrix}...\end{Bmatrix}
-      #   pmatrix {...} => \begin{pmatrix}...\end{pmatrix}
-      #   matrix {...} => \begin{matrix}...\end{matrix}
       result = replace_sqrt(result) # Case 1
       result = replace_fractions(result) # Case 2
-      result = replace_matrix(result) # Case 3
 
       # 전체 수식에 디스플레이 스타일 적용
       result = decorate_displaystyle(result) if display_mode
@@ -65,8 +66,8 @@ module HwpScriptToLatex
       script = script.gsub(jokbo_regex, "")
       # 2개 이상의 공백을 하나의 공백으로 치환
       script = script.gsub(/\s+/, " ").strip
-      # 백슬래시를 rm으로 치환
-      script = script.gsub(/\\/, " \\rm ")
+      # 백슬래시(로만체)를 삭제
+      script = script.gsub(/\\/, "")
       # 꺽쇠 치환
       script = script.gsub(/&lt;/, "<")
       script = script.gsub(/&gt;/, ">")
@@ -103,6 +104,24 @@ module HwpScriptToLatex
       return script
     end
 
+    def replace_block_commands(script)
+      @block_commands.each do |command|
+        command_regex = %r((?<![a-zA-Z])(?i:#{command[:script]})\s*(?<block_content>{(?>[^{}]+|(?:\g<block_content>))*}))
+
+        match_data = script.match(command_regex)
+        while match_data
+          # 시작, 끝 중괄호 제거
+          block_content = remove_curly_brackets(match_data['block_content'])
+          # sub 메서드에 블록 문법을 사용한 이유:
+          #   gsub, sub에서 백슬래시 문제
+          script = script.sub(command_regex) { " \\begin{#{command[:latex]}} %s \\end{#{command[:latex]}} " % block_content }
+          match_data = script.match(command_regex)
+        end
+      end
+
+      return script
+    end
+
     def replace_keywords(script)
       keywords = @meta_keywords + @command_keywords + @symbol_keywords + @reserved_keywords
       matched_count = 0
@@ -150,24 +169,6 @@ module HwpScriptToLatex
       return script
     end
 
-    def replace_matrix(script)
-      @matrix_commands.each do |command|
-        matrix_regex = %r((?<![a-zA-Z])(?i:#{command[:script]})\s*(?<matrix_content>{(?>[^{}]+|(?:\\g<matrix_content>))*}))
-
-        match_data = script.match(matrix_regex)
-        while match_data
-          # 시작, 끝 중괄호 제거
-          matrix_content = remove_curly_brackets(match_data['matrix_content'])
-          # sub 메서드에 블록 문법을 사용한 이유:
-          #   gsub, sub에서 백슬래시 문제
-          script = script.sub(matrix_regex) { " \\begin{#{command[:latex]}} %s \\end{#{command[:latex]}} " % matrix_content }
-          match_data = script.match(matrix_regex)
-        end
-      end
-
-      return script
-    end
-
     def replace_sqrt(script)
       right_term_name1 = 'rt1'
       right_term_name2 = 'rt2'
@@ -217,9 +218,9 @@ module HwpScriptToLatex
     end
 
     def decorate_displaystyle(script)
-      script = "{#{script}}"
-      script = script.gsub(/(?<!\\)\s*{\s*\\displaystyle/, " { ")
-      script = script.gsub(/(?<!\\)\s*{/, " {\\displaystyle ")
+      script = script.gsub(/\\sum/, "\\displaystyle \\sum")
+      script = script.gsub(/\\int/, "\\displaystyle \\int")
+      script = script.gsub(/\\oint/, "\\displaystyle \\oint")
 
       return script
     end

data/lib/hwp_script_to_latex/version.rb

@@ -1,3 +1,3 @@
 module HwpScriptToLatex
-  VERSION = "1.3.5"
+  VERSION = "1.4.0"
 end

data/rules.json

@@ -1,7 +1,7 @@
 {
   "_comments": [
     "command.simple: 1개의 우항을 가지는 간단한 명령어",
-    "command.matrix: 행렬 명령어",
+    "command.block: begin/end 블록을 가지는 명령어(행렬, 케이스)",
     "keyword.meta: 공백, 줄바꿈, left right 등 특수문자",
     "keyword.command: 항이 없는 단순 치환 명령어",
     "keyword.symbol: 기호",
@@ -82,7 +82,11 @@
         "latex": "\\underline"
       }
     ],
-    "matrix": [
+    "block": [
+      {
+        "script": "cases",
+        "latex": "cases"
+      },
       {
         "script": "dmatrix",
         "latex": "vmatrix"
@@ -1098,16 +1102,16 @@
     ],
     "command": [
       {
-        "regex": ["rm", "Rm", "RM"],
-        "latex": " \\rm "
+        "regex": ["eqalign", "Eqalign", "EQALIGN"],
+        "latex": ""
       },
       {
-        "regex": ["it", "It", "IT"],
-        "latex": " \\it "
+        "regex": ["rm", "Rm", "RM"],
+        "latex": ""
       },
       {
-        "regex": ["cases", "Cases", "CASES"],
-        "latex": " \\cases "
+        "regex": ["it", "It", "IT"],
+        "latex": ""
       },
       {
         "regex": ["sum", "Sum", "SUM"],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hwp_script_to_latex
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors:
 - bluesh55