xlsxrb 0.1.16 → 0.1.17

data/lib/xlsxrb/ooxml/writer/features_xml.rb

@@ -322,13 +322,21 @@ module Xlsxrb
               rpr << "<i/>" if font[:italic]
               rpr << "<strike/>" if font[:strike]
               if font[:underline]
-                rpr << if font[:underline] == true
-                         "<u/>"
-                       else
-                         %(<u val="#{font[:underline]}"/>)
-                       end
+                u_val = font[:underline]
+                if u_val == true || u_val.to_s == "single"
+                  rpr << "<u/>"
+                else
+                  mapped_u = StyleBuilder::UNDERLINE_MAP[u_val.to_sym] || u_val
+                  rpr << %(<u val="#{mapped_u}"/>)
+                end
+              end
+              va_val = font[:vert_align] || font[:vertical_align]
+              va_val ||= "superscript" if font[:superscript]
+              va_val ||= "subscript" if font[:subscript]
+              if va_val
+                mapped_va = StyleBuilder::VERT_ALIGN_MAP[va_val.to_sym] || va_val
+                rpr << %(<vertAlign val="#{mapped_va}"/>)
               end
-              rpr << %(<vertAlign val="#{font[:vert_align]}"/>) if font[:vert_align]
               rpr << %(<sz val="#{font[:sz]}"/>) if font[:sz]
               rpr << emit_color_xml(font)
               rpr << %(<rFont val="#{xml_escape(font[:name])}"/>) if font[:name]
@@ -378,7 +386,12 @@ module Xlsxrb
               t_attr = ' t="b"'
               cached_val_str = "0"
             end
-            parts = %(<c r="#{cell_ref}"#{t_attr}#{s_attr}#{ph_attr}><f#{f_attrs}>#{xml_escape(value.expression)}</f>)
+            f_tag = if value.expression && !value.expression.empty?
+                      "<f#{f_attrs}>#{xml_escape(value.expression)}</f>"
+                    else
+                      "<f#{f_attrs}/>"
+                    end
+            parts = %(<c r="#{cell_ref}"#{t_attr}#{s_attr}#{ph_attr}>#{f_tag})
             parts << "<v>#{xml_escape(cached_val_str)}</v>" unless value.cached_value.nil?
             parts << "</c>"
             parts
@@ -538,13 +551,17 @@ module Xlsxrb
           rule_attrs << %( percent="1") if rule[:percent]
           rule_attrs << %( bottom="1") if rule[:bottom]
           rule_attrs << %( text="#{xml_escape(rule[:text])}") if rule[:text]
-          rule_attrs << %( timePeriod="#{rule[:time_period]}") if rule[:time_period]
+          if rule[:time_period]
+            tp = rule[:time_period]
+            tp_str = DslHelpers::CF_TIME_PERIODS[tp.to_sym] || tp.to_s
+            rule_attrs << %( timePeriod="#{tp_str}")
+          end
           rule_attrs << %( stdDev="#{rule[:std_dev]}") if rule[:std_dev]
 
           case type
           when :cell_is, :expression, :above_average, :top10, :duplicate_values, :unique_values,
                :contains_text, :not_contains_text, :begins_with, :ends_with,
-               :contains_blanks, :not_contains_blanks, :time_period
+               :contains_blanks, :not_contains_blanks, :contains_errors, :not_contains_errors, :time_period
             formulas = rule[:formulas] || [rule[:formula]].compact
             if formulas.empty?
               parts << "<cfRule #{rule_attrs}/>"

data/lib/xlsxrb/ooxml/writer/styles_xml.rb

@@ -231,21 +231,35 @@ module Xlsxrb
         # : (untyped font) -> untyped
         def emit_font_xml(font)
           parts = ["<font>"]
-          parts << "<b/>" if font[:bold]
-          parts << "<i/>" if font[:italic]
-          parts << "<strike/>" if font[:strike]
+          if font.key?(:bold)
+            parts << (font[:bold] ? "<b/>" : '<b val="0"/>')
+          end
+          if font.key?(:italic)
+            parts << (font[:italic] ? "<i/>" : '<i val="0"/>')
+          end
+          if font.key?(:strike)
+            parts << (font[:strike] ? "<strike/>" : '<strike val="0"/>')
+          end
           parts << "<shadow/>" if font[:shadow]
           parts << "<outline/>" if font[:outline]
           parts << "<condense/>" if font[:condense]
           parts << "<extend/>" if font[:extend]
           if font[:underline]
-            parts << if font[:underline] == true
-                       "<u/>"
-                     else
-                       %(<u val="#{font[:underline]}"/>)
-                     end
+            u_val = font[:underline]
+            if u_val == true || u_val.to_s == "single"
+              parts << "<u/>"
+            else
+              mapped_u = StyleBuilder::UNDERLINE_MAP[u_val.to_sym] || u_val
+              parts << %(<u val="#{mapped_u}"/>)
+            end
+          end
+          va_val = font[:vert_align] || font[:vertical_align]
+          va_val ||= "superscript" if font[:superscript]
+          va_val ||= "subscript" if font[:subscript]
+          if va_val
+            mapped_va = StyleBuilder::VERT_ALIGN_MAP[va_val.to_sym] || va_val
+            parts << %(<vertAlign val="#{mapped_va}"/>)
           end
-          parts << %(<vertAlign val="#{font[:vert_align]}"/>) if font[:vert_align]
           parts << %(<sz val="#{font[:sz]}"/>) if font[:sz]
           parts << emit_color_xml(font)
           parts << %(<name val="#{xml_escape(font[:name])}"/>) if font[:name]

data/lib/xlsxrb/ooxml/writer.rb

@@ -33,10 +33,10 @@ module Xlsxrb
       MAX_ROW = 1_048_576
       MAX_COLUMN_INDEX = 16_384 # XFD
 
-      attr_reader :fonts, :fills, :borders, :xf_entries, :num_fmts
+      attr_reader :fonts, :fills, :borders, :xf_entries, :num_fmts, :dxfs
 
-      # : () -> void
-      def initialize
+      # : (?default_font: untyped?) -> void
+      def initialize(default_font: nil)
         @sheets = { "Sheet1" => {} }
         @column_widths = { "Sheet1" => {} }
         @column_attrs = { "Sheet1" => {} }
@@ -50,6 +50,7 @@ module Xlsxrb
         @sort_state = { "Sheet1" => nil }
         @num_fmts = []
         @fonts = [{ sz: 11, name: "Calibri" }]
+        default_font(default_font) if default_font
         @fills = [{ pattern: "none" }, { pattern: "gray125" }]
         @borders = [{ left: nil, right: nil, top: nil, bottom: nil }]
         @xf_entries = [{ num_fmt_id: 0, font_id: 0, fill_id: 0, border_id: 0 }]
@@ -96,6 +97,9 @@ module Xlsxrb
         @charts_data = { "Sheet1" => [] }
         @shapes_data = { "Sheet1" => [] }
         @comments_data = { "Sheet1" => [] }
+        @threaded_comments_data = { "Sheet1" => [] }
+        @threaded_comment_count = 0
+        @persons_data = []
         @pivot_tables_data = { "Sheet1" => [] }
         @extra_entries = {}
         @extra_ct_defaults = {}
@@ -146,6 +150,7 @@ module Xlsxrb
         @charts_data[name] = []
         @shapes_data[name] = []
         @comments_data[name] = []
+        @threaded_comments_data[name] = []
         @pivot_tables_data[name] = []
         @sheet_protection[name] = nil
         @protected_ranges[name] = []
@@ -542,6 +547,36 @@ module Xlsxrb
         @dxfs.size - 1
       end
 
+      # Sets the workbook-wide default font (font 0).
+      #
+      # @param name [String, Hash, nil] Font name or font options Hash.
+      # @param size [Float, Integer, nil] Font size in points.
+      # @param opts [Hash] Additional font options (e.g. `bold:`, `italic:`, `family:`, `charset:`, `color:`).
+      # @return [void]
+      # @api public
+      #: (?String | Hash[Symbol, untyped]? name, ?Float | Integer | nil size, **untyped opts) -> void
+      def default_font(name = nil, size = nil, **opts)
+        if name.is_a?(Hash)
+          opts = name.merge(opts)
+          name = opts[:name]
+        end
+
+        font = @fonts[0] ? @fonts[0].dup : { name: "Calibri", sz: 11 }
+        font[:name] = (name || opts[:name]).to_s if name || opts[:name]
+        font[:sz] = size || opts[:size] || opts[:sz] if size || opts[:size] || opts[:sz]
+        font[:family] = opts[:family] if opts.key?(:family)
+        font[:charset] = opts[:charset] if opts.key?(:charset)
+        font[:scheme] = opts[:scheme].to_s if opts.key?(:scheme)
+        font[:color] = opts[:color] if opts.key?(:color)
+        font[:bold] = opts[:bold] if opts.key?(:bold)
+        font[:italic] = opts[:italic] if opts.key?(:italic)
+        font[:strike] = opts[:strike] if opts.key?(:strike)
+        font[:underline] = opts[:underline] if opts.key?(:underline)
+
+        @fonts[0] = font
+      end
+      alias set_default_font default_font
+
       # Sets the indexed colors palette (array of ARGB hex strings, e.g. ["FF000000", "FFFFFFFF"]).
       # rubocop:disable Naming/AccessorMethodName
       # : (untyped colors) -> untyped
@@ -883,12 +918,19 @@ module Xlsxrb
       # Adds a conditional formatting rule to the specified range.
       # Options: type (:cell_is, :expression, :color_scale, :data_bar, :icon_set),
       # operator, priority, formula/formulas, format_id, color_scale, data_bar, icon_set.
-      # : (untyped sqref, ?sheet: untyped?, **untyped opts) -> untyped
-      def add_conditional_format(sqref, sheet: nil, **opts)
+      # : (?untyped sqref, ?sheet: untyped?, **untyped opts) ?{ (ConditionalFormatBuilder) -> void } -> untyped
+      def add_conditional_format(sqref = nil, sheet: nil, **opts, &)
         sheet_name = sheet || @sheet_order.first
         raise ArgumentError, "unknown sheet: #{sheet_name}" unless @conditional_formats.key?(sheet_name)
 
-        @conditional_formats[sheet_name] << opts.merge(sqref: sqref)
+        normalized_list = DslHelpers.normalize_conditional_format(sqref, **opts, &)
+        normalized_list.each do |rule|
+          if (rule[:dxf] || rule[:font_color] || rule[:fill_color] || rule[:bold] || rule[:italic]) && rule[:format_id].nil?
+            dxf = rule.delete(:dxf) || DslHelpers.extract_dxf_from_rule!(rule)
+            rule[:format_id] = @dxfs.index(dxf) || add_dxf(**dxf) if dxf
+          end
+          @conditional_formats[sheet_name] << rule
+        end
       end
 
       # Returns conditional formatting rules for the first (or given) sheet.
@@ -916,7 +958,8 @@ module Xlsxrb
         %i[header_row_count published comment insert_row insert_row_shift
            header_row_dxf_id data_dxf_id totals_row_dxf_id
            header_row_border_dxf_id table_border_dxf_id totals_row_border_dxf_id
-           header_row_cell_style totals_row_cell_style connection_id table_type].each do |key|
+           header_row_cell_style totals_row_cell_style connection_id table_type
+           auto_filter show_first_column show_last_column show_row_stripes show_column_stripes].each do |key|
           tbl[key] = opts[key] if opts.key?(key)
         end
         @tables[sheet_name] << tbl
@@ -1278,8 +1321,8 @@ module Xlsxrb
       # Adds a chart to the given sheet.
       # type: :bar, :line, :pie. title: chart title string.
       # data_ref: e.g. "Sheet1!$A$1:$B$4". cat_ref/val_ref for explicit series.
-      # : (?type: ::Symbol, ?title: untyped?, ?title_overlay: untyped?, ?title_font: untyped?, ?title_fill_color: untyped?, ?title_no_fill: untyped?, ?title_line_color: untyped?, ?title_line_width: untyped?, ?title_line_dash: untyped?, ?title_rotation: untyped?, ?auto_title_deleted: untyped?, ?cat_ref: untyped?, ?val_ref: untyped?, ?series: untyped?, ?legend: untyped?, ?data_labels: untyped?, ?cat_axis_title: untyped?, ?val_axis_title: untyped?, ?cat_axis_title_font: untyped?, ?cat_axis_title_fill: untyped?, ?cat_axis_title_no_fill: untyped?, ?cat_axis_title_line_color: untyped?, ?cat_axis_title_line_width: untyped?, ?cat_axis_title_line_dash: untyped?, ?cat_axis_title_rotation: untyped?, ?val_axis_title_font: untyped?, ?val_axis_title_fill: untyped?, ?val_axis_title_no_fill: untyped?, ?val_axis_title_line_color: untyped?, ?val_axis_title_line_width: untyped?, ?val_axis_title_line_dash: untyped?, ?val_axis_title_rotation: untyped?, ?cat_axis_tick_lbl_pos: untyped?, ?val_axis_tick_lbl_pos: untyped?, ?cat_axis_major_gridlines: untyped?, ?val_axis_major_gridlines: untyped?, ?cat_axis_minor_gridlines: untyped?, ?val_axis_minor_gridlines: untyped?, ?cat_axis_delete: untyped?, ?val_axis_delete: untyped?, ?cat_axis_orientation: untyped?, ?val_axis_orientation: untyped?, ?cat_axis_num_fmt: untyped?, ?val_axis_num_fmt: untyped?, ?cat_axis_major_tick_mark: untyped?, ?cat_axis_minor_tick_mark: untyped?, ?val_axis_major_tick_mark: untyped?, ?val_axis_minor_tick_mark: untyped?, ?cat_axis_crosses: untyped?, ?val_axis_crosses: untyped?, ?cat_axis_crosses_at: untyped?, ?val_axis_crosses_at: untyped?, ?cat_axis_tick_lbl_skip: untyped?, ?cat_axis_tick_mark_skip: untyped?, ?cat_axis_lbl_offset: untyped?, ?cat_axis_auto: untyped?, ?cat_axis_lbl_algn: untyped?, ?cat_axis_no_multi_lvl_lbl: untyped?, ?val_axis_cross_between: untyped?, ?val_axis_major_unit: untyped?, ?val_axis_minor_unit: untyped?, ?cat_axis_scaling_max: untyped?, ?cat_axis_scaling_min: untyped?, ?val_axis_scaling_max: untyped?, ?val_axis_scaling_min: untyped?, ?cat_axis_log_base: untyped?, ?val_axis_log_base: untyped?, ?val_axis_disp_units: untyped?, ?gap_width: untyped?, ?gap_depth: untyped?, ?overlap: untyped?, ?first_slice_ang: untyped?, ?hole_size: untyped?, ?smooth: untyped?, ?marker: untyped?, ?scatter_style: untyped?, ?radar_style: untyped?, ?bar_shape: untyped?, ?bubble_3d: untyped?, ?bubble_scale: untyped?, ?show_neg_bubbles: untyped?, ?size_represents: untyped?, ?wireframe: untyped?, ?grouping: untyped?, ?bar_dir: untyped?, ?vary_colors: untyped?, ?style: untyped?, ?rounded_corners: untyped?, ?view_3d: untyped?, ?cat_axis_pos: untyped?, ?val_axis_pos: untyped?, ?name: untyped?, ?description: untyped?, ?frame_title: untyped?, ?frame_hidden: untyped?, ?frame_macro: untyped?, ?frame_no_grp: untyped?, ?from_col: ::Integer, ?from_row: ::Integer, ?to_col: ::Integer, ?to_row: ::Integer, ?from_col_off: untyped?, ?from_row_off: untyped?, ?to_col_off: untyped?, ?to_row_off: untyped?, ?edit_as: untyped?, ?published: untyped?, ?locks_with_sheet: untyped?, ?prints_with_sheet: untyped?, ?plot_vis_only: untyped?, ?disp_blanks_as: untyped?, ?show_d_lbls_over_max: untyped?, ?data_table: untyped?, ?plot_area_fill: untyped?, ?plot_area_no_fill: untyped?, ?plot_area_line_color: untyped?, ?plot_area_line_width: untyped?, ?plot_area_line_dash: untyped?, ?plot_area_layout: untyped?, ?floor: untyped?, ?side_wall: untyped?, ?back_wall: untyped?, ?drop_lines: untyped?, ?hi_low_lines: untyped?, ?ser_lines: untyped?, ?up_down_bars: untyped?, ?band_fmts: untyped?, ?of_pie_type: untyped?, ?split_type: untyped?, ?split_pos: untyped?, ?cust_split: untyped?, ?second_pie_size: untyped?, ?cat_axis_label_rotation: untyped?, ?val_axis_label_rotation: untyped?, ?cat_axis_font: untyped?, ?val_axis_font: untyped?, ?cat_axis_line_color: untyped?, ?cat_axis_line_width: untyped?, ?cat_axis_line_dash: untyped?, ?val_axis_line_color: untyped?, ?val_axis_line_width: untyped?, ?val_axis_line_dash: untyped?, ?cat_axis_fill: untyped?, ?cat_axis_no_fill: untyped?, ?val_axis_fill: untyped?, ?val_axis_no_fill: untyped?, ?cat_axis_type: untyped?, ?cat_axis_base_time_unit: untyped?, ?cat_axis_major_time_unit: untyped?, ?cat_axis_minor_time_unit: untyped?, ?cat_axis_major_unit: untyped?, ?cat_axis_minor_unit: untyped?, ?chart_fill: untyped?, ?chart_no_fill: untyped?, ?chart_line_color: untyped?, ?chart_line_width: untyped?, ?chart_line_dash: untyped?, ?protection: untyped?, ?print_settings: untyped?, ?chart_font: untyped?, ?sheet: untyped?) -> untyped
-      def add_chart(type: :bar, title: nil, title_overlay: nil, title_font: nil, title_fill_color: nil, title_no_fill: nil, title_line_color: nil, title_line_width: nil, title_line_dash: nil, title_rotation: nil, auto_title_deleted: nil, cat_ref: nil, val_ref: nil, series: nil, legend: nil, data_labels: nil, cat_axis_title: nil, val_axis_title: nil, cat_axis_title_font: nil, cat_axis_title_fill: nil, cat_axis_title_no_fill: nil, cat_axis_title_line_color: nil, cat_axis_title_line_width: nil, cat_axis_title_line_dash: nil, cat_axis_title_rotation: nil, val_axis_title_font: nil, val_axis_title_fill: nil, val_axis_title_no_fill: nil, val_axis_title_line_color: nil, val_axis_title_line_width: nil, val_axis_title_line_dash: nil, val_axis_title_rotation: nil, cat_axis_tick_lbl_pos: nil, val_axis_tick_lbl_pos: nil, cat_axis_major_gridlines: nil, val_axis_major_gridlines: nil, cat_axis_minor_gridlines: nil, val_axis_minor_gridlines: nil, cat_axis_delete: nil, val_axis_delete: nil, cat_axis_orientation: nil, val_axis_orientation: nil, cat_axis_num_fmt: nil, val_axis_num_fmt: nil, cat_axis_major_tick_mark: nil, cat_axis_minor_tick_mark: nil, val_axis_major_tick_mark: nil, val_axis_minor_tick_mark: nil, cat_axis_crosses: nil, val_axis_crosses: nil, cat_axis_crosses_at: nil, val_axis_crosses_at: nil, cat_axis_tick_lbl_skip: nil, cat_axis_tick_mark_skip: nil, cat_axis_lbl_offset: nil, cat_axis_auto: nil, cat_axis_lbl_algn: nil, cat_axis_no_multi_lvl_lbl: nil, val_axis_cross_between: nil, val_axis_major_unit: nil, val_axis_minor_unit: nil, cat_axis_scaling_max: nil, cat_axis_scaling_min: nil, val_axis_scaling_max: nil, val_axis_scaling_min: nil, cat_axis_log_base: nil, val_axis_log_base: nil, val_axis_disp_units: nil, gap_width: nil, gap_depth: nil, overlap: nil, first_slice_ang: nil, hole_size: nil, smooth: nil, marker: nil, scatter_style: nil, radar_style: nil, bar_shape: nil, bubble_3d: nil, bubble_scale: nil, show_neg_bubbles: nil, size_represents: nil, wireframe: nil, grouping: nil, bar_dir: nil, vary_colors: nil, style: nil, rounded_corners: nil, view_3d: nil, cat_axis_pos: nil, val_axis_pos: nil, name: nil, description: nil, frame_title: nil, frame_hidden: nil, frame_macro: nil, frame_no_grp: nil, from_col: 0, from_row: 0, to_col: 10, to_row: 15, from_col_off: nil, from_row_off: nil, to_col_off: nil, to_row_off: nil, edit_as: nil, published: nil, locks_with_sheet: nil, prints_with_sheet: nil, plot_vis_only: nil, disp_blanks_as: nil, show_d_lbls_over_max: nil, data_table: nil, plot_area_fill: nil, plot_area_no_fill: nil, plot_area_line_color: nil, plot_area_line_width: nil, plot_area_line_dash: nil, plot_area_layout: nil, floor: nil, side_wall: nil, back_wall: nil, drop_lines: nil, hi_low_lines: nil, ser_lines: nil, up_down_bars: nil, band_fmts: nil, of_pie_type: nil, split_type: nil, split_pos: nil, cust_split: nil, second_pie_size: nil, cat_axis_label_rotation: nil, val_axis_label_rotation: nil, cat_axis_font: nil, val_axis_font: nil, cat_axis_line_color: nil, cat_axis_line_width: nil, cat_axis_line_dash: nil, val_axis_line_color: nil, val_axis_line_width: nil, val_axis_line_dash: nil, cat_axis_fill: nil, cat_axis_no_fill: nil, val_axis_fill: nil, val_axis_no_fill: nil, cat_axis_type: nil, cat_axis_base_time_unit: nil, cat_axis_major_time_unit: nil, cat_axis_minor_time_unit: nil, cat_axis_major_unit: nil, cat_axis_minor_unit: nil, chart_fill: nil, chart_no_fill: nil, chart_line_color: nil, chart_line_width: nil, chart_line_dash: nil, protection: nil, print_settings: nil, chart_font: nil, sheet: nil)
+      # : (?type: ::Symbol, ?title: untyped?, ?title_overlay: untyped?, ?title_font: untyped?, ?title_fill_color: untyped?, ?title_no_fill: untyped?, ?title_line_color: untyped?, ?title_line_width: untyped?, ?title_line_dash: untyped?, ?title_rotation: untyped?, ?auto_title_deleted: untyped?, ?cat_ref: untyped?, ?val_ref: untyped?, ?series: untyped?, ?legend: untyped?, ?data_labels: untyped?, ?cat_axis_title: untyped?, ?val_axis_title: untyped?, ?cat_axis_title_font: untyped?, ?cat_axis_title_fill: untyped?, ?cat_axis_title_no_fill: untyped?, ?cat_axis_title_line_color: untyped?, ?cat_axis_title_line_width: untyped?, ?cat_axis_title_line_dash: untyped?, ?cat_axis_title_rotation: untyped?, ?val_axis_title_font: untyped?, ?val_axis_title_fill: untyped?, ?val_axis_title_no_fill: untyped?, ?val_axis_title_line_color: untyped?, ?val_axis_title_line_width: untyped?, ?val_axis_title_line_dash: untyped?, ?val_axis_title_rotation: untyped?, ?cat_axis_tick_lbl_pos: untyped?, ?val_axis_tick_lbl_pos: untyped?, ?cat_axis_major_gridlines: untyped?, ?val_axis_major_gridlines: untyped?, ?cat_axis_minor_gridlines: untyped?, ?val_axis_minor_gridlines: untyped?, ?cat_axis_delete: untyped?, ?val_axis_delete: untyped?, ?cat_axis_orientation: untyped?, ?val_axis_orientation: untyped?, ?cat_axis_num_fmt: untyped?, ?val_axis_num_fmt: untyped?, ?cat_axis_major_tick_mark: untyped?, ?cat_axis_minor_tick_mark: untyped?, ?val_axis_major_tick_mark: untyped?, ?val_axis_minor_tick_mark: untyped?, ?cat_axis_crosses: untyped?, ?val_axis_crosses: untyped?, ?cat_axis_crosses_at: untyped?, ?val_axis_crosses_at: untyped?, ?cat_axis_tick_lbl_skip: untyped?, ?cat_axis_tick_mark_skip: untyped?, ?cat_axis_lbl_offset: untyped?, ?cat_axis_auto: untyped?, ?cat_axis_lbl_algn: untyped?, ?cat_axis_no_multi_lvl_lbl: untyped?, ?val_axis_cross_between: untyped?, ?val_axis_major_unit: untyped?, ?val_axis_minor_unit: untyped?, ?cat_axis_scaling_max: untyped?, ?cat_axis_scaling_min: untyped?, ?val_axis_scaling_max: untyped?, ?val_axis_scaling_min: untyped?, ?cat_axis_log_base: untyped?, ?val_axis_log_base: untyped?, ?val_axis_disp_units: untyped?, ?gap_width: untyped?, ?gap_depth: untyped?, ?overlap: untyped?, ?first_slice_ang: untyped?, ?hole_size: untyped?, ?smooth: untyped?, ?marker: untyped?, ?scatter_style: untyped?, ?radar_style: untyped?, ?bar_shape: untyped?, ?bubble_3d: untyped?, ?bubble_scale: untyped?, ?show_neg_bubbles: untyped?, ?size_represents: untyped?, ?wireframe: untyped?, ?grouping: untyped?, ?bar_dir: untyped?, ?vary_colors: untyped?, ?style: untyped?, ?rounded_corners: untyped?, ?view_3d: untyped?, ?cat_axis_pos: untyped?, ?val_axis_pos: untyped?, ?name: untyped?, ?description: untyped?, ?frame_title: untyped?, ?frame_hidden: untyped?, ?frame_macro: untyped?, ?frame_no_grp: untyped?, ?from_col: ::Integer, ?from_row: ::Integer, ?to_col: ::Integer, ?to_row: ::Integer, ?from_col_off: untyped?, ?from_row_off: untyped?, ?to_col_off: untyped?, ?to_row_off: untyped?, ?edit_as: untyped?, ?published: untyped?, ?locks_with_sheet: untyped?, ?prints_with_sheet: untyped?, ?plot_vis_only: untyped?, ?disp_blanks_as: untyped?, ?show_d_lbls_over_max: untyped?, ?data_table: untyped?, ?plot_area_fill: untyped?, ?plot_area_no_fill: untyped?, ?plot_area_line_color: untyped?, ?plot_area_line_width: untyped?, ?plot_area_line_dash: untyped?, ?plot_area_layout: untyped?, ?floor: untyped?, ?side_wall: untyped?, ?back_wall: untyped?, ?drop_lines: untyped?, ?hi_low_lines: untyped?, ?ser_lines: untyped?, ?up_down_bars: untyped?, ?band_fmts: untyped?, ?of_pie_type: untyped?, ?split_type: untyped?, ?split_pos: untyped?, ?cust_split: untyped?, ?second_pie_size: untyped?, ?cat_axis_label_rotation: untyped?, ?val_axis_label_rotation: untyped?, ?cat_axis_font: untyped?, ?val_axis_font: untyped?, ?cat_axis_line_color: untyped?, ?cat_axis_line_width: untyped?, ?cat_axis_line_dash: untyped?, ?val_axis_line_color: untyped?, ?val_axis_line_width: untyped?, ?val_axis_line_dash: untyped?, ?cat_axis_fill: untyped?, ?cat_axis_no_fill: untyped?, ?val_axis_fill: untyped?, ?val_axis_no_fill: untyped?, ?cat_axis_type: untyped?, ?cat_axis_base_time_unit: untyped?, ?cat_axis_major_time_unit: untyped?, ?cat_axis_minor_time_unit: untyped?, ?cat_axis_major_unit: untyped?, ?cat_axis_minor_unit: untyped?, ?chart_fill: untyped?, ?chart_no_fill: untyped?, ?chart_line_color: untyped?, ?chart_line_width: untyped?, ?chart_line_dash: untyped?, ?protection: untyped?, ?print_settings: untyped?, ?chart_font: untyped?, ?secondary_value_axis: untyped?, ?secondary_axis: untyped?, ?category_axis: untyped?, ?value_axis: untyped?, ?sheet: untyped?, **untyped extra_options) -> untyped
+      def add_chart(type: :bar, title: nil, title_overlay: nil, title_font: nil, title_fill_color: nil, title_no_fill: nil, title_line_color: nil, title_line_width: nil, title_line_dash: nil, title_rotation: nil, auto_title_deleted: nil, cat_ref: nil, val_ref: nil, series: nil, legend: nil, data_labels: nil, cat_axis_title: nil, val_axis_title: nil, cat_axis_title_font: nil, cat_axis_title_fill: nil, cat_axis_title_no_fill: nil, cat_axis_title_line_color: nil, cat_axis_title_line_width: nil, cat_axis_title_line_dash: nil, cat_axis_title_rotation: nil, val_axis_title_font: nil, val_axis_title_fill: nil, val_axis_title_no_fill: nil, val_axis_title_line_color: nil, val_axis_title_line_width: nil, val_axis_title_line_dash: nil, val_axis_title_rotation: nil, cat_axis_tick_lbl_pos: nil, val_axis_tick_lbl_pos: nil, cat_axis_major_gridlines: nil, val_axis_major_gridlines: nil, cat_axis_minor_gridlines: nil, val_axis_minor_gridlines: nil, cat_axis_delete: nil, val_axis_delete: nil, cat_axis_orientation: nil, val_axis_orientation: nil, cat_axis_num_fmt: nil, val_axis_num_fmt: nil, cat_axis_major_tick_mark: nil, cat_axis_minor_tick_mark: nil, val_axis_major_tick_mark: nil, val_axis_minor_tick_mark: nil, cat_axis_crosses: nil, val_axis_crosses: nil, cat_axis_crosses_at: nil, val_axis_crosses_at: nil, cat_axis_tick_lbl_skip: nil, cat_axis_tick_mark_skip: nil, cat_axis_lbl_offset: nil, cat_axis_auto: nil, cat_axis_lbl_algn: nil, cat_axis_no_multi_lvl_lbl: nil, val_axis_cross_between: nil, val_axis_major_unit: nil, val_axis_minor_unit: nil, cat_axis_scaling_max: nil, cat_axis_scaling_min: nil, val_axis_scaling_max: nil, val_axis_scaling_min: nil, cat_axis_log_base: nil, val_axis_log_base: nil, val_axis_disp_units: nil, gap_width: nil, gap_depth: nil, overlap: nil, first_slice_ang: nil, hole_size: nil, smooth: nil, marker: nil, scatter_style: nil, radar_style: nil, bar_shape: nil, bubble_3d: nil, bubble_scale: nil, show_neg_bubbles: nil, size_represents: nil, wireframe: nil, grouping: nil, bar_dir: nil, vary_colors: nil, style: nil, rounded_corners: nil, view_3d: nil, cat_axis_pos: nil, val_axis_pos: nil, name: nil, description: nil, frame_title: nil, frame_hidden: nil, frame_macro: nil, frame_no_grp: nil, from_col: 0, from_row: 0, to_col: 10, to_row: 15, from_col_off: nil, from_row_off: nil, to_col_off: nil, to_row_off: nil, edit_as: nil, published: nil, locks_with_sheet: nil, prints_with_sheet: nil, plot_vis_only: nil, disp_blanks_as: nil, show_d_lbls_over_max: nil, data_table: nil, plot_area_fill: nil, plot_area_no_fill: nil, plot_area_line_color: nil, plot_area_line_width: nil, plot_area_line_dash: nil, plot_area_layout: nil, floor: nil, side_wall: nil, back_wall: nil, drop_lines: nil, hi_low_lines: nil, ser_lines: nil, up_down_bars: nil, band_fmts: nil, of_pie_type: nil, split_type: nil, split_pos: nil, cust_split: nil, second_pie_size: nil, cat_axis_label_rotation: nil, val_axis_label_rotation: nil, cat_axis_font: nil, val_axis_font: nil, cat_axis_line_color: nil, cat_axis_line_width: nil, cat_axis_line_dash: nil, val_axis_line_color: nil, val_axis_line_width: nil, val_axis_line_dash: nil, cat_axis_fill: nil, cat_axis_no_fill: nil, val_axis_fill: nil, val_axis_no_fill: nil, cat_axis_type: nil, cat_axis_base_time_unit: nil, cat_axis_major_time_unit: nil, cat_axis_minor_time_unit: nil, cat_axis_major_unit: nil, cat_axis_minor_unit: nil, chart_fill: nil, chart_no_fill: nil, chart_line_color: nil, chart_line_width: nil, chart_line_dash: nil, protection: nil, print_settings: nil, chart_font: nil, secondary_value_axis: nil, secondary_axis: nil, category_axis: nil, value_axis: nil, sheet: nil, **extra_options)
         sheet_name = sheet || @sheet_order.first
         raise ArgumentError, "unknown sheet: #{sheet_name}" unless @charts_data.key?(sheet_name)
 
@@ -1438,6 +1481,73 @@ module Xlsxrb
         chart[:protection] = protection if protection
         chart[:print_settings] = print_settings if print_settings
         chart[:chart_font] = chart_font if chart_font
+        chart[:category_axis] = category_axis if category_axis
+        chart[:value_axis] = value_axis if value_axis
+        chart[:secondary_value_axis] = secondary_value_axis || secondary_axis if secondary_value_axis || secondary_axis
+        chart.merge!(extra_options) if extra_options && !extra_options.empty?
+
+        if chart[:category_axis].is_a?(Hash)
+          ca = chart[:category_axis]
+          chart[:cat_axis_title] ||= ca[:title]
+          chart[:cat_axis_num_fmt] ||= ca[:num_fmt]
+          chart[:cat_axis_pos] ||= ca[:pos]
+          chart[:cat_axis_major_gridlines] = ca[:major_gridlines] if chart[:cat_axis_major_gridlines].nil? && !ca[:major_gridlines].nil?
+          chart[:cat_axis_minor_gridlines] = ca[:minor_gridlines] if chart[:cat_axis_minor_gridlines].nil? && !ca[:minor_gridlines].nil?
+          chart[:cat_axis_font] ||= ca[:font]
+          chart[:cat_axis_line_color] ||= ca[:line_color]
+          chart[:cat_axis_line_width] ||= ca[:line_width]
+          chart[:cat_axis_line_dash] ||= ca[:line_dash]
+          chart[:cat_axis_scaling_min] ||= ca[:min]
+          chart[:cat_axis_scaling_max] ||= ca[:max]
+          chart[:cat_axis_label_rotation] ||= ca[:label_rotation] || ca[:rotation]
+        end
+
+        if chart[:value_axis].is_a?(Hash)
+          va = chart[:value_axis]
+          chart[:val_axis_title] ||= va[:title]
+          chart[:val_axis_num_fmt] ||= va[:num_fmt]
+          chart[:val_axis_pos] ||= va[:pos]
+          chart[:val_axis_major_gridlines] = va[:major_gridlines] if chart[:val_axis_major_gridlines].nil? && !va[:major_gridlines].nil?
+          chart[:val_axis_minor_gridlines] = va[:minor_gridlines] if chart[:val_axis_minor_gridlines].nil? && !va[:minor_gridlines].nil?
+          chart[:val_axis_font] ||= va[:font]
+          chart[:val_axis_line_color] ||= va[:line_color]
+          chart[:val_axis_line_width] ||= va[:line_width]
+          chart[:val_axis_line_dash] ||= va[:line_dash]
+          chart[:val_axis_scaling_min] ||= va[:min]
+          chart[:val_axis_scaling_max] ||= va[:max]
+          chart[:val_axis_major_unit] ||= va[:major_unit]
+          chart[:val_axis_minor_unit] ||= va[:minor_unit]
+          chart[:val_axis_label_rotation] ||= va[:label_rotation] || va[:rotation]
+        end
+
+        if chart[:secondary_value_axis].is_a?(Hash)
+          sva = chart[:secondary_value_axis]
+          chart[:sec_val_axis_title] ||= sva[:title]
+          chart[:sec_val_axis_num_fmt] ||= sva[:num_fmt]
+          chart[:sec_val_axis_pos] ||= sva[:pos] || "r"
+          chart[:sec_val_axis_major_gridlines] = sva[:major_gridlines] unless sva[:major_gridlines].nil?
+          chart[:sec_val_axis_minor_gridlines] = sva[:minor_gridlines] unless sva[:minor_gridlines].nil?
+          chart[:sec_val_axis_font] ||= sva[:font]
+          chart[:sec_val_axis_line_color] ||= sva[:line_color]
+          chart[:sec_val_axis_line_width] ||= sva[:line_width]
+          chart[:sec_val_axis_line_dash] ||= sva[:line_dash]
+          chart[:sec_val_axis_scaling_min] ||= sva[:min]
+          chart[:sec_val_axis_scaling_max] ||= sva[:max]
+          chart[:sec_val_axis_major_unit] ||= sva[:major_unit]
+          chart[:sec_val_axis_minor_unit] ||= sva[:minor_unit]
+          chart[:sec_val_axis_label_rotation] ||= sva[:label_rotation] || sva[:rotation]
+          chart[:sec_val_axis_crosses] ||= sva[:crosses] || "max"
+          chart[:sec_val_axis_crosses_at] ||= sva[:crosses_at]
+          chart[:sec_val_axis_cross_between] ||= sva[:cross_between]
+          chart[:sec_val_axis_delete] = sva[:delete] unless sva[:delete].nil?
+          chart[:sec_val_axis_orientation] ||= sva[:orientation]
+          chart[:sec_val_axis_log_base] ||= sva[:log_base]
+          chart[:sec_val_axis_disp_units] ||= sva[:disp_units]
+          chart[:sec_val_axis_major_tick_mark] ||= sva[:major_tick_mark]
+          chart[:sec_val_axis_minor_tick_mark] ||= sva[:minor_tick_mark]
+          chart[:sec_val_axis_tick_lbl_pos] ||= sva[:tick_lbl_pos]
+        end
+
         @charts_data[sheet_name] << chart
       end
 
@@ -1571,6 +1681,81 @@ module Xlsxrb
         @comments_data[sheet_name] || []
       end
 
+      # Adds a threaded comment to a cell in the given sheet.
+      # : (String | Integer cell_address, String text, ?author: untyped, ?timestamp: untyped, ?id: String?, ?parent_id: String?, ?done: bool?, ?user_id: String?, ?provider_id: String?, ?sheet: untyped?) -> Hash[Symbol, untyped]
+      def add_threaded_comment(cell_address, text, author: "Author", timestamp: nil, id: nil, parent_id: nil, done: false, user_id: nil, provider_id: nil, sheet: nil)
+        sheet_name = sheet || @sheet_order.first
+        raise ArgumentError, "unknown sheet: #{sheet_name}" unless @threaded_comments_data.key?(sheet_name)
+
+        person = if author.is_a?(Hash)
+                   add_person(author[:display_name] || author[:name] || "Author", id: author[:id], user_id: author[:user_id], provider_id: author[:provider_id])
+                 else
+                   add_person(author, user_id: user_id, provider_id: provider_id)
+                 end
+
+        dt = case timestamp
+             when Time, DateTime
+               timestamp.to_time.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+             when String
+               timestamp
+             else
+               Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ")
+             end
+
+        comment_id = format_guid(id)
+        parent_guid = parent_id ? format_guid(parent_id) : nil
+
+        entry = {
+          cell: cell_address.to_s.upcase,
+          ref: cell_address.to_s.upcase,
+          text: text.to_s,
+          author: person[:display_name],
+          person_id: person[:id],
+          id: comment_id,
+          parent_id: parent_guid,
+          timestamp: dt,
+          dt: dt,
+          done: done ? true : false
+        }.compact
+        @threaded_comments_data[sheet_name] << entry
+        entry
+      end
+      alias threaded_comment add_threaded_comment
+
+      # Returns threaded comments for the first (or given) sheet.
+      # : (?sheet: untyped?) -> Array[Hash[Symbol, untyped]]
+      def threaded_comments(sheet: nil)
+        sheet_name = sheet || @sheet_order.first
+        @threaded_comments_data[sheet_name] || []
+      end
+
+      # Registers a person in the workbook person list.
+      # : (String name, ?id: String?, ?user_id: String?, ?provider_id: String?) -> Hash[Symbol, untyped]
+      def add_person(name, id: nil, user_id: nil, provider_id: nil)
+        person_name = name.to_s
+        person_id = id ? format_guid(id) : nil
+        existing = @persons_data.find do |p|
+          (person_id && p[:id] == person_id) || p[:display_name] == person_name
+        end
+        return existing if existing
+
+        person = {
+          id: person_id || format_guid(nil),
+          display_name: person_name,
+          user_id: user_id || "AD:#{person_name}",
+          provider_id: provider_id || "AD"
+        }
+        @persons_data << person
+        person
+      end
+
+      # Returns the workbook person list.
+      # : () -> Array[Hash[Symbol, untyped]]
+      def persons
+        @persons_data
+      end
+      alias person_list persons
+
       # Adds a pivot table to the given sheet.
       # source_ref: data source range (e.g. "Sheet1!A1:C4").
       # row_fields: array of 0-based field indices for row axis.
@@ -1717,13 +1902,16 @@ module Xlsxrb
           sheet_charts = @charts_data[sheet_name] || []
           sheet_shapes = @shapes_data[sheet_name] || []
           sheet_comments = @comments_data[sheet_name] || []
+          sheet_threaded_comments = @threaded_comments_data[sheet_name] || []
           sheet_pivots = @pivot_tables_data[sheet_name] || []
           has_drawing = sheet_images.any? || sheet_charts.any? || sheet_shapes.any?
           has_comments = sheet_comments.any?
+          has_tc = sheet_threaded_comments.any?
 
           # Pre-increment counters so rels reference correct paths.
           sheet_drawing_idx = has_drawing ? (@drawing_count += 1) : nil
           sheet_comment_idx = has_comments ? (@comment_count += 1) : nil
+          sheet_tc_idx = has_tc ? (@threaded_comment_count += 1) : nil
           sheet_pivot_start = @pivot_table_count
           sheet_cache_start = @pivot_cache_count
           sheet_pivots.each do
@@ -1736,7 +1924,8 @@ module Xlsxrb
           sheet_rels_parts = build_sheet_rels_parts_v2(
             sheet_name, sheet_tables, table_index,
             sheet_drawing_idx, sheet_comment_idx,
-            sheet_pivot_start, sheet_pivots.size
+            sheet_pivot_start, sheet_pivots.size,
+            sheet_tc_idx
           )
 
           # Calculate the legacyDrawing rId if comments exist.
@@ -1805,6 +1994,9 @@ module Xlsxrb
             entries["xl/drawings/vmlDrawing#{sheet_comment_idx}.vml"] = generate_vml_drawing_xml(sheet_comments)
           end
 
+          # Generate threaded comments XML.
+          entries["xl/threadedComments/threadedComment#{sheet_tc_idx}.xml"] = generate_threaded_comments_xml(sheet_threaded_comments) if has_tc
+
           # Generate pivot table + cache entries.
           sheet_pivots.each_with_index do |pt, pi|
             cache_idx = sheet_cache_start + pi + 1
@@ -1836,6 +2028,9 @@ module Xlsxrb
           entries["xl/externalLinks/_rels/externalLink#{link_num}.xml.rels"] = generate_external_link_rels(el)
         end
 
+        # Generate persons entry if any persons registered.
+        entries["xl/persons/person.xml"] = generate_persons_xml(@persons_data) if @persons_data.any?
+
         # Generate workbook rels (needs to know pivot cache count).
         entries["xl/_rels/workbook.xml.rels"] = generate_workbook_rels(has_calc_chain: entries.key?("xl/calcChain.xml"))
 
@@ -1866,6 +2061,8 @@ module Xlsxrb
         ends_with: "endsWith",
         contains_blanks: "containsBlanks",
         not_contains_blanks: "notContainsBlanks",
+        contains_errors: "containsErrors",
+        not_contains_errors: "notContainsErrors",
         time_period: "timePeriod"
       }.freeze
 
@@ -1879,7 +2076,8 @@ module Xlsxrb
         pie3d: "pie3DChart", area3d: "area3DChart", surface: "surfaceChart",
         surface3d: "surface3DChart",
         stock: "stockChart", bubble: "bubbleChart",
-        of_pie: "ofPieChart"
+        of_pie: "ofPieChart",
+        combo: "comboChart", column: "barChart"
       }.freeze
 
       NO_AXIS_CHARTS = %w[pieChart doughnutChart pie3DChart ofPieChart].freeze
@@ -1959,6 +2157,14 @@ module Xlsxrb
           overrides["/xl/comments#{c}.xml"] = "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml"
         end
 
+        # Threaded comments.
+        (1..@threaded_comment_count.to_i).each do |tc|
+          overrides["/xl/threadedComments/threadedComment#{tc}.xml"] = "application/vnd.ms-excel.threadedcomments+xml"
+        end
+
+        # Persons.
+        overrides["/xl/persons/person.xml"] = "application/vnd.ms-excel.person+xml" if @persons_data.any?
+
         # Pivot tables and cache.
         (1..@pivot_table_count.to_i).each do |p|
           overrides["/xl/pivotTables/pivotTable#{p}.xml"] = "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml"
@@ -2247,6 +2453,10 @@ module Xlsxrb
           parts << %(<Relationship Id="rId#{next_rid}" Type="#{DOC_REL_NS}/calcChain" Target="calcChain.xml"/>)
           next_rid += 1
         end
+        if @persons_data.any?
+          parts << %(<Relationship Id="rId#{next_rid}" Type="http://schemas.microsoft.com/office/2017/10/relationships/person" Target="persons/person.xml"/>)
+          next_rid += 1
+        end
         parts << "</Relationships>"
         parts.join
       end
@@ -2292,8 +2502,17 @@ module Xlsxrb
           sp_attrs << 'published="0"' if sheet_props[:published] == false
           sp_attrs << 'enableFormatConditionsCalculation="0"' if sheet_props[:enable_format_conditions_calculation] == false
           sp_children = []
-          if sheet_props[:tab_color]
-            sp_children << %(<tabColor rgb="#{sheet_props[:tab_color]}"/>)
+          tc = sheet_props[:tab_color]
+          if tc.is_a?(Hash)
+            tc_attrs = []
+            tc_attrs << 'auto="1"' if tc[:auto]
+            tc_attrs << %(indexed="#{tc[:indexed]}") if tc[:indexed]
+            tc_attrs << %(rgb="#{tc[:rgb].to_s.delete_prefix("#")}") if tc[:rgb]
+            tc_attrs << %(theme="#{tc[:theme]}") if tc[:theme]
+            tc_attrs << %(tint="#{tc[:tint]}") if tc[:tint]
+            sp_children << "<tabColor #{tc_attrs.join(" ")}/>" unless tc_attrs.empty?
+          elsif tc
+            sp_children << %(<tabColor rgb="#{tc.to_s.delete_prefix("#")}"/>)
           elsif sheet_props[:tab_color_theme]
             tc_attrs = [%(theme="#{sheet_props[:tab_color_theme]}")]
             tc_attrs << %(tint="#{sheet_props[:tab_color_tint]}") if sheet_props[:tab_color_tint]
@@ -2920,24 +3139,27 @@ module Xlsxrb
         table_attrs << %( tableType="#{xml_escape(tbl[:table_type])}") if tbl[:table_type]
         parts = [
           XML_HEADER,
-          "<table #{table_attrs}>",
-          %(<autoFilter ref="#{tbl[:ref]}"/>),
-          %(<tableColumns count="#{tbl[:columns].size}">)
+          "<table #{table_attrs}>"
         ]
+        parts << %(<autoFilter ref="#{tbl[:ref]}"/>) unless tbl[:auto_filter] == false
+        parts << %(<tableColumns count="#{tbl[:columns].size}">)
         tbl[:columns].each_with_index do |col, i|
           col_name = col.is_a?(Hash) ? col[:name] : col
           col_attrs = %(id="#{i + 1}" name="#{xml_escape(col_name)}")
           if col.is_a?(Hash)
-            col_attrs << %( totalsRowFunction="#{col[:totals_row_function]}") if col[:totals_row_function]
+            calc_formula = col[:calculated_column_formula] || col[:data_formula] || col[:formula]
+            tot_formula = col[:totals_row_formula] || col[:total_row_formula] || col[:total_formula]
+            trf = col[:totals_row_function] || ("custom" if tot_formula)
+            col_attrs << %( totalsRowFunction="#{trf}") if trf
             col_attrs << %( totalsRowLabel="#{xml_escape(col[:totals_row_label])}") if col[:totals_row_label]
             col_attrs << %( dataDxfId="#{col[:data_dxf_id]}") if col[:data_dxf_id]
             col_attrs << %( totalsRowDxfId="#{col[:totals_row_dxf_id]}") if col[:totals_row_dxf_id]
             col_attrs << %( headerRowDxfId="#{col[:header_row_dxf_id]}") if col[:header_row_dxf_id]
             col_attrs << %( dataCellStyle="#{xml_escape(col[:data_cell_style])}") if col[:data_cell_style]
-            if col[:calculated_column_formula] || col[:totals_row_formula]
+            if calc_formula || tot_formula
               parts << "<tableColumn #{col_attrs}>"
-              parts << "<calculatedColumnFormula>#{xml_escape(col[:calculated_column_formula])}</calculatedColumnFormula>" if col[:calculated_column_formula]
-              parts << "<totalsRowFormula>#{xml_escape(col[:totals_row_formula])}</totalsRowFormula>" if col[:totals_row_formula]
+              parts << "<calculatedColumnFormula>#{xml_escape(calc_formula.to_s)}</calculatedColumnFormula>" if calc_formula
+              parts << "<totalsRowFormula>#{xml_escape(tot_formula.to_s)}</totalsRowFormula>" if tot_formula
               parts << "</tableColumn>"
             else
               parts << "<tableColumn #{col_attrs}/>"
@@ -2947,16 +3169,30 @@ module Xlsxrb
           end
         end
         parts << "</tableColumns>"
-        style = tbl[:style] || {}
+        raw_style = tbl[:style]
+        style = if raw_style.is_a?(Hash)
+                  raw_style
+                elsif raw_style
+                  { name: raw_style.to_s }
+                else
+                  {}
+                end
         style_name = style[:name] || "TableStyleMedium2"
-        sfc = style[:show_first_column] ? "1" : "0"
-        slc = style[:show_last_column] ? "1" : "0"
-        srs = if style.key?(:show_row_stripes)
-                style[:show_row_stripes] ? "1" : "0"
-              else
-                "1"
-              end
-        scs = style[:show_column_stripes] ? "1" : "0"
+        show_first_column = style.key?(:show_first_column) ? style[:show_first_column] : tbl[:show_first_column]
+        show_last_column = style.key?(:show_last_column) ? style[:show_last_column] : tbl[:show_last_column]
+        show_row_stripes = if style.key?(:show_row_stripes)
+                             style[:show_row_stripes]
+                           elsif tbl.key?(:show_row_stripes)
+                             tbl[:show_row_stripes]
+                           else
+                             true
+                           end
+        show_column_stripes = style.key?(:show_column_stripes) ? style[:show_column_stripes] : tbl[:show_column_stripes]
+
+        sfc = show_first_column ? "1" : "0"
+        slc = show_last_column ? "1" : "0"
+        srs = show_row_stripes ? "1" : "0"
+        scs = show_column_stripes ? "1" : "0"
         parts << %(<tableStyleInfo name="#{xml_escape(style_name)}" showFirstColumn="#{sfc}" showLastColumn="#{slc}" showRowStripes="#{srs}" showColumnStripes="#{scs}"/>)
         parts << "</table>"
         parts.join
@@ -2983,8 +3219,8 @@ module Xlsxrb
         parts.join
       end
 
-      # : (untyped sheet_name, untyped sheet_tables, untyped table_start_index, untyped drawing_idx, untyped comment_idx, untyped pivot_start, untyped pivot_count) -> untyped
-      def build_sheet_rels_parts_v2(sheet_name, sheet_tables, table_start_index, drawing_idx, comment_idx, pivot_start, pivot_count)
+      # : (untyped sheet_name, untyped sheet_tables, untyped table_start_index, untyped drawing_idx, untyped comment_idx, untyped pivot_start, untyped pivot_count, ?untyped? threaded_comment_idx) -> untyped
+      def build_sheet_rels_parts_v2(sheet_name, sheet_tables, table_start_index, drawing_idx, comment_idx, pivot_start, pivot_count, threaded_comment_idx = nil)
         rels = []
         @hyperlinks[sheet_name].each do |(_cell_ref, link)|
           next unless link[:url]
@@ -2998,6 +3234,7 @@ module Xlsxrb
           rels << { type: "#{DOC_REL_NS}/comments", target: "../comments#{comment_idx}.xml" }
           rels << { type: "#{DOC_REL_NS}/vmlDrawing", target: "../drawings/vmlDrawing#{comment_idx}.vml" }
         end
+        rels << { type: "http://schemas.microsoft.com/office/2017/10/relationships/threadedComment", target: "../threadedComments/threadedComment#{threaded_comment_idx}.xml" } if threaded_comment_idx
         rels << { type: "#{DOC_REL_NS}/drawing", target: "../drawings/drawing#{drawing_idx}.xml" } if drawing_idx
         pivot_count.times do |i|
           pt_idx = pivot_start + i + 1