rsyntaxtree 0.8.8 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1d573e0201c4374f3fc497b12eb34856fcedeb3513b7d17e403c3d85dbb4d1c
-  data.tar.gz: 60b26c37bd71b6f89f6a048a8e594945783d2486def18e4b9b170e89a68bf91c
+  metadata.gz: 69c3a36921d2441f35c9729197aaea3ded204780b7033361a3434605e17e70cb
+  data.tar.gz: 342c7b8e779e2fca098d441f11ea7a458e050e42b49957369a7af3ac9ffd5ce8
 SHA512:
-  metadata.gz: f9bc21b39ead52c96d917d799354b84b1c99c1f9d0a7078611e2213086d31d16c3bbb416ce856c874a0563a018b2df8452da1bdaad056348c86905d7a914a40f
-  data.tar.gz: e44c03daee5602becb706539f4035d8272d6096d1a26a7e79b0b0c0e439e579a24b85d04717bc1794704c19df24f47d0f95b6f2f05c66abe955f568ac52b189c
+  metadata.gz: ddffb304231af332a8de21e29a97943570b8297749c7368c536b0f15103a392c4f10f1b6c77c79c0ab8b48a3fbe05ccfcc09da69b20b53c0f5a41692245d5137
+  data.tar.gz: 0c6a91490bdf0a26bcfed5cdad68bc25fdd9252577b86a638a8a6ce72a4c5c297324dda81e9e0f1852bee545d437d16f625ec312141fd8a56868b691d9bd05b6

data/lib/rsyntaxtree/element.rb

@@ -24,7 +24,7 @@ class Element
       @width = 0               # Width of the element in pixels
       @indent = 0              # Drawing offset
       content = content.strip
-      if /\A.+\^\z/ =~ content
+      if /\A.+\^\z/m =~ content
         @content = content.gsub("^"){""} # The actual element content
         @triangle = true # draw triangle instead of stright bar when in auto mode
       else

data/lib/rsyntaxtree/error_message.rb

@@ -23,7 +23,7 @@ class ErrorMessage
     @filename = filename
     @format = format
 
-    metrics = img_get_txt_metrics(text, font, font_size, true)
+    metrics = img_get_txt_metrics(text, font, font_size, NoDecoration, true)
 
     @im = Image.new(metrics.width, metrics.height)
     @gc = Draw.new

data/lib/rsyntaxtree/graph.rb

@@ -66,6 +66,9 @@ class Graph
       gc.pointsize = font_size
       gc.gravity = CenterGravity
       gc.stroke = 'none'
+      gc.kerning = 0
+      gc.interline_spacing = 0
+      gc.interword_spacing = 0
     end
 
     if multiline
@@ -81,18 +84,19 @@ class Graph
   # for all child elements.
   def calc_element_width(e)
     w = 0
+    content = e.content.gsub("<>", " ")
 
     children = @e_list.get_children(e.id)
 
     if(children.length == 0)
-      w = img_get_txt_width(e.content, @font, @font_size) + @font_size
+      w = img_get_txt_width(content, @font, @font_size) + @font_size
     else
       children.each do |child|
         child_e = @e_list.get_id(child)
         w += calc_element_width(child_e)
       end
 
-      tw = img_get_txt_width(e.content, @font, @font_size) + @font_size
+      tw = img_get_txt_width(content, @font, @font_size) + @font_size
       if(tw > w)
         fix_child_size(e.id, w, tw)
         w = tw
@@ -186,13 +190,13 @@ class Graph
       end
     end
     return true if !@symmetrize
-    
+
     elements_to_draw = {}
     triangles_to_draw = []
     lines_to_draw = []
 
     lmost = {:level => nil, :value => nil, :type => nil}
-    rmost = nil 
+    rmost = nil
     h.times do |i|
       curlevel = h - i - 1
       e_arr.each_with_index do |j, idx|
@@ -299,8 +303,9 @@ class Graph
     return text
   end
 
-  def img_get_txt_height(text, font, font_size, multiline = false)
+  def img_get_txt_height(text, font, font_size, multiline = true)
     metrics = img_get_txt_metrics(text, font, font_size, multiline)
+    # y = (metrics.bounds.y2 - metrics.bounds.y1).round
     y = metrics.height
     return y
   end

data/lib/rsyntaxtree/string_parser.rb

@@ -171,8 +171,15 @@ class StringParser
         end
       when "\\"
         escape = true
-      when /[\n\r]/
-        gottoken = false # same as do nothing  
+      when "n", " ", "+", "-", "=", "~", "#", "*"
+        if escape
+          token += "\\#{ch}"
+          escape = false
+        else
+          token += ch
+        end
+      # when /[\n\r]/
+      #   gottoken = false # same as do nothing
       else
         token += ch
         escape = false if escape

data/lib/rsyntaxtree/svg_graph.rb

@@ -27,17 +27,23 @@ class SVGGraph < Graph
 
     case fontstyle
     when /(?:sans|cjk)/
-      @fontstyle  = "sans-serif"
-    when /(?:serif|math)/
-      @fontstyle  = "serif"
+      @fontstyle = "\"'Noto Sans JP', 'Noto Sans', sans-serif\""
+      @fontcss = "http://fonts.googleapis.com/earlyaccess/notosansjp.css"
+    when /(?:serif)/
+      @fontstyle = "\"'Noto Serif JP', 'Noto Serif', serif\""
+      @fontcss = "https://fonts.googleapis.com/css?family=Noto+Serif+JP"
+    when /(?:math)/
+      @fontstyle = "\"Latin Modern Roman', sans-serif\""
+      @fontcss = "https://cdn.jsdelivr.net/gh/sugina-dev/latin-modern-web@1.0.1/style/latinmodern-roman.css"
     end
+
     @margin     = margin.to_i
 
-    super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @font, @font_size)
+    super(e_list, metrics, symmetrize, color, leafstyle, multibyte, @fontstyle, @font_size)
 
     @line_styles  = "<line style='stroke:black; stroke-width:#{FONT_SCALING};' x1='X1' y1='Y1' x2='X2' y2='Y2' />\n"
     @polygon_styles  = "<polygon style='fill: none; stroke: black; stroke-width:#{FONT_SCALING};' points='X1 Y1 X2 Y2 X3 Y3' />\n"
-    @text_styles  = "<text style='fill: COLOR; font-size: FONT_SIZEpx; ST; WA;' x='X_VALUE' y='Y_VALUE' TD font-family='#{@fontstyle}'>CONTENT</text>\n"
+    @text_styles  = "<text letter-spacing='0' word-spacing='0' kerning='0' style='fill: COLOR; font-size: FONT_SIZE ST WA' x='X_VALUE' y='Y_VALUE' TD font-family=#{@fontstyle}>CONTENT</text>\n"
     @tree_data  = String.new
   end
 
@@ -54,11 +60,17 @@ class SVGGraph < Graph
 
     header =<<EOD
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="#{width}" height="#{height}" viewBox="#{-@margin + lm}, -#{@margin}, #{@width - lm + @margin * 2}, #{@height + @margin * 2}" version="1.1" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<style>
+@import url(#{@fontcss});
+</style>
+</defs>
 EOD
 
+
     rect =<<EOD
 <rect x="#{-@margin + lm}" y="-#{@margin}" width="#{@width - lm + @margin * 2}" height="#{@height + @margin * 2}" stroke="none" fill="white" />"
 EOD
@@ -89,21 +101,21 @@ EOD
   end
 
   :private
- 
+
   # Add the element into the tree (draw it)
   def draw_element(x, y, w, string, type)
-    string = string.sub(/\^\z/){""} 
+    string = string.sub(/\^\z/){""}
     # Calculate element dimensions and position
     if (type == ETYPE_LEAF) and @leafstyle == "nothing"
       top = row2px(y - 1) + (@font_size * 1.5)
-    else 
+    else
       top   = row2px(y)
     end
     left   = x + @m[:b_side]
     bottom = top  + @e_height
     right  = left + w
 
-    # Split the string into the main part and the 
+    # Split the string into the main part and the
     # subscript part of the element (if any)
     parts = string.split("_", 2)
     if(parts.length > 1 )
@@ -148,11 +160,18 @@ EOD
       main = $1
     end
 
-    # Calculate text size for the main and the 
+    # Calculate text size for the main and the
     # subscript part of the element
     # symbols for underline/overline removed temporarily
 
-    main_width = img_get_txt_width(main, @font, @font_size)
+    main_width = 0
+    main_height = 0
+    main.split(/\\n/).each do |l|
+      l_width = img_get_txt_width(l, @font, @font_size)
+      main_width = l_width if main_width < l_width
+      main_height += img_get_txt_height(l, @font, @font_size)
+    end
+
 
     if sub != ""
       if /\A\=(.+)\=\z/ =~ sub
@@ -184,9 +203,11 @@ EOD
         sub_style = ""
         sub_weight = ""
       end
+      sub_height = img_get_txt_height(sub, @font, @font_size)
       sub_width  = img_get_txt_width(sub.to_s,  @font, @sub_size)
     else
       sub_width = 0
+      sub_height = 0
     end
 
     if /\A#(.+)#\z/ =~ sub
@@ -194,14 +215,13 @@ EOD
     end
 
     # Center text in the element
-    txt_width = main_width + sub_width
-    txt_pos   = left + (right - left) / 2 - txt_width / 2
+    txt_pos   = left + (right - left) / 2
 
     # Select apropriate color
     if(type == ETYPE_LEAF)
       col = @col_leaf
     else
-      col = @col_node      
+      col = @col_node
     end
 
     if(main[0].chr == "<" && main[-1].chr == ">")
@@ -210,29 +230,47 @@ EOD
 
     # Draw main text
     main_data  = @text_styles.sub(/COLOR/, col)
-    main_data  = main_data.sub(/FONT_SIZE/, @font_size.to_s)
-    main_x = txt_pos
-    main_y = top + @e_height - @m[:e_padd] * 1.5
+    main_data  = main_data.sub(/FONT_SIZE/, @font_size.to_s + "px;")
+    main_x = txt_pos - (main_width + sub_width) / 2
+    main_y = top + @e_height - @m[:e_padd]
     main_data  = main_data.sub(/X_VALUE/, main_x.to_s)
     main_data  = main_data.sub(/Y_VALUE/, main_y.to_s)
-
+    if /\\n/ =~ main
+      lines = main.split(/\\n/)
+      new_main = ""
+      dy = 0
+      lines.each_with_index do |l, idx|
+        if idx == 0
+          dy = 0
+        else
+          dy = 1
+          main_y += img_get_txt_height(l, @font, @font_size)
+        end
+        this_width = img_get_txt_width(l,  @font, @font_size)
+        this_x = txt_pos - (this_width + sub_width) / 2
+        new_main << "<tspan x='#{this_x}' y='#{main_y}'>#{l}</tspan>"
+        @height = main_y if main_y > @height
+      end
+      main = new_main
+    end
     @tree_data += main_data.sub(/TD/, "text-decoration='#{main_decoration}'")
-      .sub(/ST/, main_style)
-      .sub(/WA/, main_weight)
+      .sub(/ST/, main_style + ";")
+      .sub(/WA/, main_weight + ";")
       .sub(/CONTENT/, main)
 
     # Draw subscript text
-    sub_data  = @text_styles.sub(/COLOR/, col)
-    sub_data  = sub_data.sub(/FONT_SIZE/, @sub_size.to_s)
-    sub_x = main_x + main_width
-    sub_y = top + (@e_height - @m[:e_padd] + @sub_size / 10)
-    if (sub.length > 0 )
-      sub_data   = sub_data.sub(/X_VALUE/, sub_x.ceil.to_s)
-      sub_data   = sub_data.sub(/Y_VALUE/, sub_y.ceil.to_s)
+    if sub && sub != ""
+      sub_data  = @text_styles.sub(/COLOR/, col)
+      sub_data  = sub_data.sub(/FONT_SIZE/, @sub_size.to_s)
+      sub_x  = right - sub_width
+      sub_y = main_y + sub_height / 4
+      sub_data   = sub_data.sub(/X_VALUE/, sub_x.to_s)
+      sub_data   = sub_data.sub(/Y_VALUE/, sub_y.to_s)
       @tree_data += sub_data.sub(/TD/, "text-decoration='#{sub_decoration}'")
         .sub(/ST/, sub_style)
         .sub(/WA/, sub_weight)
-        .sub(/CONTENT/, sub)
+        .sub(/CONTENT/,   sub)
+      @height += sub_height / 4
     end
   end
 
@@ -248,10 +286,10 @@ EOD
     toBot    = (row2px(fromY - 1 ) + @e_height)
     toLeft  = (toX + toW / 2 + @m[:b_side])
 
-    line_data   = @line_styles.sub(/X1/, fromLeft.ceil.to_s)
-    line_data   = line_data.sub(/Y1/, fromTop.ceil.to_s)
-    line_data   = line_data.sub(/X2/, toLeft.ceil.to_s)
-    @tree_data += line_data.sub(/Y2/, toBot.ceil.to_s)
+    line_data   = @line_styles.sub(/X1/, fromLeft.to_s)
+    line_data   = line_data.sub(/Y1/, fromTop.to_s)
+    line_data   = line_data.sub(/X2/, toLeft.to_s)
+    @tree_data += line_data.sub(/Y2/, toBot.to_s)
 
   end
 
@@ -264,9 +302,9 @@ EOD
     toX = fromX
     fromCenter = (fromX + fromW / 2 + @m[:b_side])
 
-    fromTop  = row2px(fromY).ceil
-    fromLeft1 = (fromCenter + textW / 2).ceil
-    fromLeft2 = (fromCenter - textW / 2).ceil
+    fromTop  = row2px(fromY)
+    fromLeft1 = (fromCenter + textW / 2)
+    fromLeft2 = (fromCenter - textW / 2)
     toBot    = (row2px(fromY - 1) + @e_height)
 
     if symmetrize
@@ -275,12 +313,12 @@ EOD
       toLeft   = (toX + textW / 2 + @m[:b_side] * 3)
     end
 
-    polygon_data = @polygon_styles.sub(/X1/, fromLeft1.ceil.to_s)
-    polygon_data = polygon_data.sub(/Y1/, fromTop.ceil.to_s)
-    polygon_data = polygon_data.sub(/X2/, fromLeft2.ceil.to_s)
-    polygon_data = polygon_data.sub(/Y2/, fromTop.ceil.to_s)
-    polygon_data = polygon_data.sub(/X3/, toLeft.ceil.to_s)
-    @tree_data  += polygon_data.sub(/Y3/, toBot.ceil.to_s)
+    polygon_data = @polygon_styles.sub(/X1/, fromLeft1.to_s)
+    polygon_data = polygon_data.sub(/Y1/, fromTop.to_s)
+    polygon_data = polygon_data.sub(/X2/, fromLeft2.to_s)
+    polygon_data = polygon_data.sub(/Y2/, fromTop.to_s)
+    polygon_data = polygon_data.sub(/X3/, toLeft.to_s)
+    @tree_data  += polygon_data.sub(/Y3/, toBot.to_s)
   end
 
   # If a node element text is wider than the sum of it's
@@ -292,9 +330,9 @@ EOD
     children = @e_list.get_children(id)
     @e_list.set_element_width(id, target)
 
-    if(children.length > 0 ) 
+    if(children.length > 0 )
       delta = target - current
-      target_delta = delta / children.length 
+      target_delta = delta / children.length
 
       children.each do |child|
         child_width = @e_list.get_element_width(child)
@@ -303,7 +341,7 @@ EOD
     end
   end
 
-  def img_get_txt_width(text, font, font_size, multiline = false)
+  def img_get_txt_width(text, font, font_size, multiline = true)
     parts = text.split("_", 2)
     main_before = parts[0].strip
     sub = parts[1]
@@ -311,9 +349,15 @@ EOD
     main_metrics = img_get_txt_metrics(main, font, font_size, multiline)
     width = main_metrics.width
     if sub
-      sub_metrics = img_get_txt_metrics(sub, font, font_size * SUBSCRIPT_CONST, multiline)
+      sub_metrics = img_get_txt_metrics(sub.strip, font, font_size * SUBSCRIPT_CONST, multiline)
       width += sub_metrics.width
     end
     return width
   end
+
+  def img_get_txt_height(text, font, font_size)
+    main_metrics = img_get_txt_metrics(text, font, font_size, false)
+    main_metrics.height
+  end
+
 end

data/lib/rsyntaxtree/tree_graph.rb

@@ -53,7 +53,8 @@ class TreeGraph < Graph
     if @transparent
       @im.matte_reset!
     end
-    @im.interlace = PlaneInterlace
+    # @im.interlace = PlaneInterlace
+    @im.interlace = LineInterlace
     @gc.draw(@im)
   end
 
@@ -81,7 +82,6 @@ class TreeGraph < Graph
 
   # Add the element into the tree (draw it)
   def draw_element(x, y, w, string, type)
-    numlines = string.count("\n")
     string = string.sub(/\^\z/){""}
     # Calculate element dimensions and position
     if (type == ETYPE_LEAF) and @leafstyle == "nothing"
@@ -90,7 +90,6 @@ class TreeGraph < Graph
       top   = row2px(y)
     end
     left   = x + @m[:b_side]
-    bottom = top  + @e_height * numlines
     right  = left + w
 
     # Split the string into the main part and the
@@ -144,7 +143,14 @@ class TreeGraph < Graph
     # Calculate text size for the main and the
     # subscript part of the element
 
-    main_width = img_get_txt_width(main, main_font, @font_size)
+
+    main_width = 0
+    main_height = 0
+    main.split(/\\n/).each do |l|
+      l_width = img_get_txt_width(l, main_font, @font_size)
+      main_width = l_width if main_width < l_width
+      main_height += img_get_txt_height(l, @font, @font_size)
+    end
 
     if /\A\=(.+)\=\z/ =~ sub
       sub = $1
@@ -183,15 +189,16 @@ class TreeGraph < Graph
     end
 
     if sub != ""
+      # add a separation of the width of "M"
       sub_width  = img_get_txt_width(sub.to_s, sub_font, @sub_size)
+      sub_height  = img_get_txt_height(sub.to_s, sub_font, @sub_size)
     else
       sub_width = 0
+      sub_height = 0
     end
 
     # Center text in the element
-    txt_width = main_width + sub_width
-
-    txt_pos   = left + (right - left) / 2 - txt_width / 2
+    txt_pos   = left + (right - left) / 2
 
     # Select apropriate color
     if(type == ETYPE_LEAF)
@@ -209,22 +216,33 @@ class TreeGraph < Graph
 
     # Draw main text
     @gc.pointsize(@font_size)
-    main_x = txt_pos
+    @gc.kerning = 0
+    @gc.interline_spacing = 0
+    @gc.interword_spacing = 0
+
+    main_x = txt_pos - sub_width / 2
     main_y = top + @e_height - @m[:e_padd]
 
-    @gc.interline_spacing = -(@main_height / 3)
+    # @gc.interline_spacing = -(@main_height / 3)
     @gc.font(main_font)
     @gc.decorate(main_decoration)
-    @gc.text(main_x.ceil, main_y.ceil, main)
+    numlines = main.count("\\n")
+    if numlines > 1
+      @height = @height + @main_height * numlines
+    end
+    @gc.text_align(CenterAlign)
+    @gc.text(main_x.ceil, main_y.ceil, main.gsub("\\n", "\n"))
 
     # Draw subscript text
-    if (sub.length > 0 )
+    if (sub != "" )
       @gc.pointsize(@sub_size)
-      sub_x = txt_pos + main_width + @sub_space_width
-      sub_y = top + (@e_height - @m[:e_padd] + @sub_size / 2)
+      sub_x = main_x + (main_width / 2) + (sub_width / 2)
+      sub_y = top + main_height + sub_height / 4
+      @height += sub_height / 4
       @gc.font(sub_font)
       @gc.decorate(sub_decoration)
-      @gc.text(sub_x.ceil, sub_y.ceil, sub)
+      @gc.text_align(CenterAlign)
+      @gc.text(sub_x.ceil, sub_y.ceil, " " + sub.gsub("\\n", "\n"))
     end
   end
 
@@ -259,6 +277,7 @@ class TreeGraph < Graph
     fromLeft1 = (fromCenter + textW / 2).ceil
     fromLeft2 = (fromCenter - textW / 2).ceil
     toBot    = (row2px(fromY - 1) + @e_height)
+
     if symmetrize
       toLeft   = (toX + textW / 2 + @m[:b_side])
     else

data/lib/rsyntaxtree/version.rb

@@ -1,4 +1,4 @@
 module RSyntaxTree
-  VERSION = "0.8.8"
+  VERSION = "0.9.1"
 end
 

data/lib/rsyntaxtree.rb

@@ -40,7 +40,8 @@ class RSGenerator
       key = keystr.to_sym
       case key
       when :data
-        data = CGI.unescape(value)
+        data = value
+        # data = CGI.unescape(value)
         data  = data.gsub('-AMP-', '&')
           .gsub('-PERCENT-', "%")
           .gsub('-PRIME-', "'")
@@ -64,7 +65,7 @@ class RSGenerator
           new_params[:font_bd] = FONT_DIR + "/NotoSans-Bold.ttf"
           new_params[:font_bdit] = FONT_DIR + "/NotoSans-BoldItalic.ttf"
           new_params[:font_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
-          new_params[:font_cjk] = FONT_DIR + "/NotoSansCJKjp-Regular.otf"
+          new_params[:font_cjk] = FONT_DIR + "/NotoSansJP-Regular.otf"
           new_params[:fontstyle] = "sans"
         elsif value == "noto-serif" || value == "serif"
           new_params[:font] = FONT_DIR + "/NotoSerif-Regular.ttf"
@@ -72,7 +73,7 @@ class RSGenerator
           new_params[:font_bd] = FONT_DIR + "/NotoSerif-Bold.ttf"
           new_params[:font_bdit] = FONT_DIR + "/NotoSerif-BoldItalic.ttf"
           new_params[:font_math] = FONT_DIR + "/NotoSansMath-Regular.ttf"
-          new_params[:font_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
+          new_params[:font_cjk] = FONT_DIR + "/NotoSerifJP-Regular.otf"
           new_params[:fontstyle] = "serif"
         elsif value == "cjk zenhei" || value == "cjk"
           new_params[:font] = FONT_DIR + "/wqy-zenhei.ttf"
@@ -88,7 +89,7 @@ class RSGenerator
           new_params[:font_bd] = FONT_DIR + "/lmroman10-bold.otf"
           new_params[:font_bdit] = FONT_DIR + "/lmroman10-bolditalic.otf"
           new_params[:font_math] = FONT_DIR + "/latinmodern-math.otf"
-          new_params[:font_cjk] = FONT_DIR + "/NotoSerifCJKjp-Regular.otf"
+          new_params[:font_cjk] = FONT_DIR + "/NotoSerifJP-Regular.otf"
           new_params[:fontstyle] = "math"
         end
       else
@@ -110,19 +111,25 @@ class RSGenerator
       :margin      => 0,
       :vheight     =>  1.0,
       :fontstyle   => "sans",
-      :font        => "/NotoSansCJKjp-Regular.otf",
+      :font        => "/NotoSansJP-Regular.otf",
       :font_it     => "/NotoSans-Italic.ttf",
       :font_bd     => "/NotoSans-Bold.ttf",
       :font_bdit   => "/NotoSans-BoldItalic.ttf",
       :font_math   => "/NotoSansMath-Regular.ttf"
     }
     @metrics = {
-      :e_width  => 120,
-      :e_padd   => 14,
-      :v_space  => 20,
-      :h_space  => 20,
-      :b_side   => 10,
-      :b_topbot => 10
+      :e_width  => 0,
+      :e_padd   => 20,
+      :v_space  => 0,
+      :h_space  => 0,
+      :b_side   => 0,
+      :b_topbot => 0
+      # :e_width  => 120,
+      # :e_padd   => 14,
+      # :v_space  => 20,
+      # :h_space  => 20,
+      # :b_side   => 10,
+      # :b_topbot => 10
     }
 
     @params.merge! new_params

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rsyntaxtree
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.1
 platform: ruby
 authors:
 - Yoichiro Hasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-04 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rmagick
@@ -67,13 +67,15 @@ files:
 - fonts/NotoSans-BoldItalic.ttf
 - fonts/NotoSans-Italic.ttf
 - fonts/NotoSans-Regular.ttf
-- fonts/NotoSansCJKjp-Regular.otf
+- fonts/NotoSansJP-Bold.otf
+- fonts/NotoSansJP-Regular.otf
 - fonts/NotoSansMath-Regular.ttf
 - fonts/NotoSerif-Bold.ttf
 - fonts/NotoSerif-BoldItalic.ttf
 - fonts/NotoSerif-Italic.ttf
 - fonts/NotoSerif-Regular.ttf
-- fonts/NotoSerifCJKjp-Regular.otf
+- fonts/NotoSerifJP-Bold.otf
+- fonts/NotoSerifJP-Regular.otf
 - fonts/latinmodern-math.otf
 - fonts/lmroman10-bold.otf
 - fonts/lmroman10-bolditalic.otf