mergeron 2024.739123.8__tar.gz → 2024.739125.2__tar.gz

{mergeron-2024.739123.8 → mergeron-2024.739125.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.739123.8
+Version: 2024.739125.2
 Summary: Merger Policy Analysis using Python
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI

{mergeron-2024.739123.8 → mergeron-2024.739125.2}/pyproject.toml

@@ -13,7 +13,7 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2024.739123.8"
+version = "2024.739125.2"
 
 # Classifiers list: https://pypi.org/classifiers/
 classifiers = [

{mergeron-2024.739123.8 → mergeron-2024.739125.2}/src/mergeron/__init__.py

@@ -9,7 +9,7 @@ from numpy.typing import NDArray
 
 _PKG_NAME: str = Path(__file__).parent.stem
 
-VERSION = "2024.739123.8"
+VERSION = "2024.739125.2"
 
 __version__ = VERSION
 

{mergeron-2024.739123.8 → mergeron-2024.739125.2}/src/mergeron/core/ftc_merger_investigations_data.py

@@ -95,7 +95,7 @@ class INVTableData(NamedTuple):
     data_array: ArrayBIGINT
 
 
-INVData: TypeAlias = Mapping[str, dict[str, dict[str, INVTableData]]]
+INVData: TypeAlias = Mapping[str, Mapping[str, Mapping[str, INVTableData]]]
 
 
 def construct_data(
@@ -228,7 +228,7 @@ def _construct_no_evidence_data(_invdata: INVData, _data_period: str, /) -> None
             _invdata_sub_evid_cond_conc = _invdata[_data_period][_stats_grp]
 
             _dtn = _table_nos_map[_invdata_evid_cond]["ByHHIandDelta"]
-            _stn0 = "Table 3.1" if _stats_grp == "ByHHIandDelta" else "Table 4.1"
+            _stn0 = "Table 4.1" if _stats_grp == "ByFirmCount" else "Table 3.1"
             _stn1, _stn2 = (_dtn.replace(".X", f".{_i}") for _i in ("1", "2"))
 
             _invdata_sub_evid_cond_conc[_dtn] = INVTableData(

mergeron-2024.739125.2/src/mergeron/data/jinja2_LaTeX_templates/ftcinvdata_summarypaired_table_template_tabularray.tex.jinja2

@@ -0,0 +1,81 @@
+\begin{table}[t]
+
+((* if tmpl_data.obs_merger_class_0 == 'All Markets' *))
+	((* set obs_merger_class_0 = "All Markets" *))
+((* else *))
+	((* set obs_merger_class_0 = "Markets with, ``" + tmpl_data.obs_merger_class_0 + "''" *))
+((* endif *))
+
+((* set obs_merger_class_1 = "Markets with, ``" + tmpl_data.obs_merger_class_1 + "''" *))
+
+    \centering
+    \caption{FTC Merger Investigations Data}\label{tbl:FTCInvData_\JINVAR{- tmpl_data.obs_summary_type }_alt}
+    {\footnotesize
+        \JINVAR{ tmpl_data.obs_summary_type_title } \\
+        Grouped by Entry Conditions and Reporting Period \\[0.5\baselineskip]
+    }
+
+    \sffamily\scriptsize\addfontfeatures{Numbers={Monospaced,Lining}}
+    \SetTblrInner{stretch=0, rowsep=3pt, colsep=3pt, hspan=even}
+    \begin{tikzpicture}[auto, font = \sffamily]
+    \begin{tblr}{
+        baseline=T,
+        width=\textwidth,
+        colspec = {%
+            Q[c,m,wd=\JINVAR{ tmpl_data.hdrcol_width }]%
+            Q[r,m]%
+            Q[r,m]%
+            Q[r,m]%
+            Q[r,m]%
+            Q[r,m]%
+            Q[r,m]%
+            Q[r,m]%
+            Q[r,m]%
+        },
+        row{odd[6]} = {bg=table_bar_green},
+        row{1-5} = {fg=white, bg=OBSHDRFill},
+        column{1} = {fg=white, bg=OBSHDRFill},
+        cell{1}{1} = {r=5, c=1}{c, f},
+        cell{1}{2} = {r=1, c=8}{c},
+        cell{2}{2,6} = {r=1, c=4}{c},
+        cell{3,4}{2,4,6,8} = {r=1, c=2}{c},
+        cell{5}{2-9} = {r, m, cmd=\rothead},
+        vline{4,8} = {3-5}{1pt, white},
+        vline{6} = {2-5}{1pt, white},
+        vline{4,6,8} = {6-Z}{1pt, OBSHDRFill},
+        hline{Y} = {1-Z}{1pt, OBSHDRFill},
+    }
+        { \JINVAR{- tmpl_data.hdrcol_desc_text } } &
+        Observed Data & & & & & & & \\
+        sp0 &
+        \JINVAR{ obs_merger_class_0 } & sp0 & sp0 & sp0 &
+        \JINVAR{ obs_merger_class_1 } & sp0 & sp0 & sp0 \\
+        sp0 &
+        \JINVAR{ tmpl_data.obs_periods_str|replace(" & ", " & sp0 & ") } & sp0 &
+        \JINVAR{ tmpl_data.obs_periods_str|replace(" & ", " & sp0 & ") } & sp0 \\
+        sp0 &
+        \JINVAR{ tmpl_data.mkt_counts_str_class_0|replace(" & ", " & sp0 & ") } & sp0 &
+        \JINVAR{ tmpl_data.mkt_counts_str_class_0|replace(" & ", " & sp0 & ") } & sp0 \\
+        sp0 &
+        {Relative \\ Frequency} &
+        {Proportion \\ Enforced} &
+        {Relative \\ Frequency} &
+        {Proportion \\ Enforced} &
+        {Relative\\ Frequency} &
+        {Proportion \\ Enforced} &
+        {Relative \\ Frequency} &
+        {Proportion \\ Enforced} \\
+        %
+        \JINVAR{ tmpl_data.invdata_datstr -}
+    \end{tblr}
+    \end{tikzpicture}
+
+    \setlist{nosep}
+    \vspace{\baselineskip}
+    {\raggedright\sffamily\tiny
+        \JINVAR{ tmpl_data.invdata_notestr }
+        \vspace{\baselineskip}
+        \JINVAR{ tmpl_data.invdata_sourcestr }
+    }
+    \vspace{\baselineskip}
+\end{table}

mergeron-2024.739125.2/src/mergeron/data/jinja2_LaTeX_templates/setup_tikz_tables.sty

@@ -0,0 +1,129 @@
+% Tables in tikz, but first we need to define some colors for nonwhite text backgrounds
+\definecolor{OBSHDRFill}{HTML}{0a6c97}
+\definecolor{SIMHDRFill}{HTML}{646464}
+\definecolor{DataFill}{HTML}{dfeadf}
+% The below are definition's from Paul Tol's website, https://personal.sron.nl/~pault/
+\definecolor{VibrBlue}{HTML}{0077bb}
+\definecolor{BrightGreen}{HTML}{228833}
+\definecolor{HiCoYellow}{HTML}{ddaa33}
+\definecolor{VibrRed}{HTML}{cc3311}
+
+%% Rotating text in a tabularray cell
+%% https://tex.stackexchange.com/questions/101686/rotating-text-in-a-cell
+%%https://tex.stackexchange.com/questions/464170/how-to-rotate-text-in-table
+\usepackage{rotating}
+\usepackage{makecell}
+
+%% https://github.com/lvjr/tabularray/discussions/85#discussioncomment-3397197
+\setlength\rotheadsize{1.5cm}
+\renewcommand\theadfont{}
+
+
+
+\newcount\tnr
+\newcount\tnc
+% \makeatletter
+% \tikzset{record matrix dimensions/.style={execute at end matrix={
+%                     \global\tnc=\pgf@matrix@numberofcolumns
+%                     \global\tnr=\pgfmatrixcurrentrow
+%                 }}}
+% \makeatother
+
+% Some useful documents from grokking various options used below
+% https://courses.helsinki.fi/sites/default/files/course-material/4611024/LaTeXandFriendsCourseInHelsinki_9_v2.pdf
+% https://tug.org/TUGboat/tb39-1/tb121duck-tikz.pdf
+% https://tug.org/TUGboat/tb41-1/tb127duck-matrix.pdf
+% https://tex.stackexchange.com/questions/22286/coloring-every-other-row-of-a-table-with-vertical-lines
+% https://tex.stackexchange.com/questions/354043/swot-matrix-with-multicolumn-and-multirow
+% https://tex.stackexchange.com/questions/20599/horizontal-row-separation-line-in-tikz-matrix-like-hline-in-tabular
+% https://tex.stackexchange.com/questions/63560/how-to-use-x-coordinate-of-a-point-and-y-coordinate-of-other-point
+% https://tex.stackexchange.com/questions/167944/auto-word-wrapping-in-a-node-in-tikz
+% https://tex.stackexchange.com/questions/132741/typewriter-in-tikz-node
+\tikzset{
+    green_bar_filler/.code={
+            \pgfmathtruncatemacro{\itest}{ifthenelse(%
+                \pgfmatrixcurrentcolumn==1,0,%
+                ifthenelse(iseven(\pgfmatrixcurrentrow),1,3))}
+            %\typeout{\the\pgfmatrixcurrentcolumn,\pgfmatrixcurrentrow->\itest}
+            \ifcase\itest
+                \tikzset{fill=none}%
+            \or
+                \tikzset{fill=DataFill}%
+            \else
+                \tikzset{fill=white}%
+            \fi
+        },
+    get_matrix_dims/.code={
+            \global\tnc=\pgf@matrix@numberofcolumns
+            \global\tnr=\pgfmatrixcurrentrow
+        },
+    record matrix dimensions/.style={
+            execute at end matrix={get_matrix_dims},
+            % execute at end matrix={
+            %         \global\tnc=\pgf@matrix@numberofcolumns
+            %         \global\tnr=\pgfmatrixcurrentrow
+            %     }
+        },
+    % If you only have numbers, text depth = 0ex; if text, text depth = 0.25ex, (may need tweaking for alignment across cells)
+    anytext/.style = {
+            font = \sffamily\scriptsize\addfontfeatures{Numbers={Monospaced,Lining}},
+            align = center,
+            inner sep = 3pt,
+            text depth = 0pt,
+        },
+    hdrtext/.style = {
+            anytext,
+            text = white,
+            fill = OBSHDRFill,
+        },
+    notetext/.style = {
+            anytext,
+            font = \sffamily\tiny,
+            align = left,
+        },
+    anytable/.style = {
+            matrix of nodes,
+            nodes in empty cells,
+            column sep = -1.0\pgflinewidth,
+            row sep = -1.0\pgflinewidth,
+            inner sep = -0.25\pgflinewidth,
+            outer sep = -0.25\pgflinewidth,
+            nodes = {anchor = center, minimum height = 12.5pt,}
+        },
+    datatable/.style = {
+            anytable,
+            nodes = {
+                    anytext,
+                    align = right,
+                    draw = none,
+                    fill = none,
+                    green_bar_filler,
+                },
+            % execute at end matrix={
+            %         \global\tnc=\pgf@matrix@numberofcolumns
+            %         \global\tnr=\pgfmatrixcurrentrow
+            %     },
+        },
+    hdrtable/.style = {
+            anytable,
+            nodes = {
+                    hdrtext,
+                    draw = none,
+                    fill = OBSHDRFill,
+                },
+        },
+    hrow/.style = {
+            hdrtable,
+            nodes = {text width = 40pt,},
+        },
+    hcol/.style = {
+            hdrtable,
+            nodes = {text width = 60pt,},
+        },
+}
+% Define layers for later reference
+% https://tex.stackexchange.com/questions/40840/put-a-node-behind-another-in-a-tikz-diagram
+\pgfdeclarelayer{background}
+\pgfsetlayers{background,main}
+
+

{mergeron-2024.739123.8 → mergeron-2024.739125.2}/src/mergeron/gen/enforcement_stats.py

@@ -6,7 +6,7 @@ Methods to format and print summary statistics on merger enforcement patterns.
 import enum
 import shutil
 import subprocess
-from collections.abc import Mapping, Sequence
+from collections.abc import Mapping
 from importlib import resources
 from pathlib import Path
 from types import SimpleNamespace
@@ -94,36 +94,53 @@ moe_tmpl = Template(R"""
     """)
 
 # Define the LaTeX jinja environment
-_tmpl_resource = resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
-_tmpl_folder = DATA_DIR.joinpath(_tmpl_resource.name)
+_template_resource = resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
+_template_folder = DATA_DIR.joinpath(_template_resource.name)
 with resources.as_file(
     resources.files(f"{_PKG_NAME}.data.jinja2_LaTeX_templates")
 ) as _tmpl_src:
-    if not _tmpl_folder.is_dir():
-        shutil.copytree(_tmpl_src, _tmpl_folder)
-
-LaTeX_jinja_env = Environment(
-    block_start_string=R"((*",
-    block_end_string="*))",
-    variable_start_string=R"\JINVAR{",
-    variable_end_string="}",
-    comment_start_string=R"((#",  # r'#{',
-    comment_end_string=R"#))",  # '}',
-    line_statement_prefix="##",
-    line_comment_prefix="%#",
-    trim_blocks=True,
-    lstrip_blocks=True,
-    autoescape=select_autoescape(disabled_extensions=("tex.jinja2",)),
-    loader=FileSystemLoader(_tmpl_folder),
-)
+    if not _template_folder.is_dir():
+        shutil.copytree(_tmpl_src, _template_folder)
 
 # Place files related to rendering LaTeX in output data directory
 if not (_out_path := DATA_DIR.joinpath(f"{_PKG_NAME}.cls")).is_file():
-    shutil.move(_tmpl_folder / _out_path.name, _out_path)
+    shutil.move(_template_folder / _out_path.name, _out_path)
 
 # Write to LaTeX table settings file
-if not (_DOTTEX := DATA_DIR / Rf"{_PKG_NAME}_TikZTableSettings.tex").is_file():
-    shutil.move(_tmpl_folder.joinpath("setup_tikz_tables.tex"), _DOTTEX)
+if not (_DOTTEX := DATA_DIR / Rf"{_PKG_NAME}_TikZTableSettings.sty").is_file():
+    shutil.move(_template_folder / "setup_tikz_tables.sty", _DOTTEX)
+
+
+def create_jinja_env(_tmpl_folder: Path = _template_folder, /) -> Environment:
+    """Create jinja2 environment
+
+    Loader is the FileSystemLoader initialized with the given path as
+    template folder
+
+    Parameters
+    ----------
+    _tmpl_folder : Path
+        Path to template folder
+
+    Returns
+    -------
+    Environment
+        jinja2 environment
+    """
+    return Environment(
+        block_start_string=R"((*",
+        block_end_string="*))",
+        variable_start_string=R"\JINVAR{",
+        variable_end_string="}",
+        comment_start_string=R"((#",  # r'#{',
+        comment_end_string=R"#))",  # '}',
+        line_statement_prefix="##",
+        line_comment_prefix="%#",
+        trim_blocks=True,
+        lstrip_blocks=True,
+        autoescape=select_autoescape(disabled_extensions=("tex.jinja2",)),
+        loader=FileSystemLoader(_tmpl_folder),
+    )
 
 
 LTX_ARRAY_LINEEND = "\\\\\n"
@@ -207,13 +224,20 @@ ZONE_DETAIL_STRINGS_DELTA = {
     4: Rf"ΔHHI ⩾ {HHI_DELTA_KNOTS[2]} pts.",
 }
 
-ZONE_STRINGS_LATEX = {
+ZONE_STRINGS_LATEX_TIKZ = {
     0: R"\node[align = left, fill=BrightGreen] {Green Zone (Safeharbor)};",
     1: R"\node[align = left, fill=HiCoYellow] {Yellow Zone};",
     2: R"\node[align = left, fill=VibrRed] {Red Zone (SLC Presumption)};",
     fid.TTL_KEY: R"\node[align = left, fill=OBSHDRFill] {TOTAL};",
 }
 
+ZONE_STRINGS_LATEX_TBLR = {
+    0: R"\SetCell{l, bg=BrightGreen} {Green Zone (Safeharbor)}",
+    1: R"\SetCell{l, bg=HiCoYellow} {Yellow Zone}",
+    2: R"\SetCell{l, bg=VibrRed} {Red Zone (SLC Presumption)}",
+    fid.TTL_KEY: R"\SetCell{l, bg=OBSHDRFill} {TOTAL}",
+}
+
 ZONE_DETAIL_STRINGS_HHI_LATEX = {
     0: Rf"HHI_{{post}} < \text{{{HHI_POST_ZONE_KNOTS[1]} pts.}}",
     1: R"HHI_{{post}} \in \text{{[{}, {}) pts. and }} ".format(
@@ -231,7 +255,7 @@ ZONE_DETAIL_STRINGS_DELTA_LATEX = {
 }
 
 
-def enf_stats_output(
+def enf_stats_obs(
     _data_array_dict: fid.INVData,
     _data_period: str = "1996-2003",
     _table_ind_group: IndustryGroup = IndustryGroup.ALL,
@@ -242,6 +266,7 @@ def enf_stats_output(
     *,
     return_type_sel: StatsReturnSelector = StatsReturnSelector.RPT,
     sort_order: SortSelector = SortSelector.UCH,
+    print_format: Literal["text", "LaTeX", "LaTeX+TikZ"] = "LaTeX",
     print_to_screen: bool = True,
 ) -> tuple[list[str], list[list[str]]]:
     if _data_period not in _data_array_dict:
@@ -262,7 +287,7 @@ def enf_stats_output(
                 'Statistics formatted, "{_stats_group}" not available here.'
             )
 
-    _enf_stats_cnts = enf_stats_listing_by_group(
+    _enf_stats_cnts = enf_cnts_obs_by_group(
         _data_array_dict,
         _data_period,
         _table_ind_group,
@@ -271,13 +296,12 @@ def enf_stats_output(
         _enf_spec,
     )
 
-    _print_format: Literal["text", "LaTeX"] = "text" if print_to_screen else "LaTeX"
     _enf_stats_hdr_list, _enf_stats_dat_list = _enf_stats_table_func(
         _enf_stats_cnts,
         None,
         return_type_sel=return_type_sel,
         sort_order=sort_order,
-        print_format=_print_format,
+        print_format=print_format,
     )
 
     if print_to_screen:
@@ -289,13 +313,13 @@ def enf_stats_output(
             _table_evid_cond,
         )
         stats_print_rows(
-            _enf_stats_hdr_list, _enf_stats_dat_list, print_format=_print_format
+            _enf_stats_hdr_list, _enf_stats_dat_list, print_format=print_format
         )
 
     return _enf_stats_hdr_list, _enf_stats_dat_list
 
 
-def enf_stats_listing_by_group(
+def enf_cnts_obs_by_group(
     _invdata_array_dict: Mapping[str, Mapping[str, Mapping[str, fid.INVTableData]]],
     _study_period: str,
     _table_ind_grp: IndustryGroup,
@@ -312,13 +336,13 @@ def enf_stats_listing_by_group(
     match _stats_group:
         case StatsGrpSelector.FC:
             _cnts_func = enf_cnts_byfirmcount
-            _cnts_listing_func = enf_cnts_listing_byfirmcount
+            _cnts_listing_func = enf_cnts_obs_byfirmcount
         case StatsGrpSelector.DL:
             _cnts_func = enf_cnts_bydelta
-            _cnts_listing_func = enf_cnts_listing_byhhianddelta
+            _cnts_listing_func = enf_cnts_obs_byhhianddelta
         case StatsGrpSelector.ZN:
             _cnts_func = enf_cnts_byconczone
-            _cnts_listing_func = enf_cnts_listing_byhhianddelta
+            _cnts_listing_func = enf_cnts_obs_byhhianddelta
 
     return _cnts_func(
         _cnts_listing_func(
@@ -331,7 +355,7 @@ def enf_stats_listing_by_group(
     )
 
 
-def enf_cnts_listing_byfirmcount(
+def enf_cnts_obs_byfirmcount(
     _data_array_dict: Mapping[str, Mapping[str, Mapping[str, fid.INVTableData]]],
     _data_period: str = "1996-2003",
     _table_ind_group: IndustryGroup = IndustryGroup.ALL,
@@ -367,7 +391,7 @@ def enf_cnts_listing_byfirmcount(
     ])
 
 
-def enf_cnts_listing_byhhianddelta(
+def enf_cnts_obs_byhhianddelta(
     _data_array_dict: Mapping[str, Mapping[str, Mapping[str, fid.INVTableData]]],
     _data_period: str = "1996-2003",
     _table_ind_group: IndustryGroup = IndustryGroup.ALL,
@@ -529,7 +553,7 @@ def enf_stats_table_onedim(
     *,
     return_type_sel: StatsReturnSelector = StatsReturnSelector.CNT,
     sort_order: SortSelector = SortSelector.UCH,
-    print_format: Literal["text", "LaTeX"] = "LaTeX",
+    print_format: Literal["text", "LaTeX", "LaTeX+TikZ"] = "LaTeX",
 ) -> tuple[list[str], list[list[str]]]:
     _ndim_in: int = 1
     _dim_hdr_dict = {_v: _k for _k, _v in fid.CNT_FCOUNT_DICT.items()} | {
@@ -562,7 +586,9 @@ def enf_stats_table_onedim(
     for _stats_row in _inparr:
         _stats_hdr_str = _dim_hdr_dict[_stats_row[0]]
         _stats_hdr_list += [
-            f"{{{_stats_hdr_str}}}" if print_format == "LaTeX" else _stats_hdr_str
+            f"{{{_stats_hdr_str}}}"
+            if print_format in ("LaTeX", "LaTeX+TikZ")
+            else _stats_hdr_str
         ]
 
         _stats_cnt = _stats_row[_ndim_in:]
@@ -582,11 +608,15 @@ def enf_stats_table_byzone(
     *,
     return_type_sel: StatsReturnSelector = StatsReturnSelector.CNT,
     sort_order: SortSelector = SortSelector.UCH,
-    print_format: Literal["text", "LaTeX"] = "LaTeX",
+    print_format: Literal["text", "LaTeX", "LaTeX+TikZ"] = "LaTeX",
 ) -> tuple[list[str], list[list[str]]]:
     _ndim_in: int = ZONE_VALS.shape[1]
 
-    _zone_str_dict = ZONE_STRINGS_LATEX if print_format == "LaTeX" else ZONE_STRINGS
+    _zone_str_dict = (
+        ZONE_STRINGS_LATEX_TIKZ
+        if print_format == "LaTeX+TikZ"
+        else (ZONE_STRINGS_LATEX_TBLR if print_format == "LaTeX" else ZONE_STRINGS)
+    )
     _zone_str_keys = list(_zone_str_dict)
 
     if sort_order == SortSelector.REV:
@@ -620,17 +650,20 @@ def enf_stats_table_byzone(
         for _stats_byzone_detail in _stats_byzone_it:
             # Only two sets of subtotals detail, so
             # a conditional expression will do here
-            if print_format == "LaTeX":
+            if print_format in ("LaTeX", "LaTeX+TikZ"):
                 _stats_text_color = "HiCoYellow" if _conc_zone == 1 else "BrightGreen"
                 _stats_hdr_list += [
-                    R"{} {{\null\hfill \({}{}\) }};".format(
-                        rf"\node[text = {_stats_text_color}, fill = white, align = right]",
+                    R"{} {{\null\hfill \({}{}\) }}{}".format(
+                        rf"\node[text = {_stats_text_color}, fill = white, align = right]"
+                        if print_format == "LaTeX+TikZ"
+                        else rf"\SetCell{{r, fg={_stats_text_color}, bg=white}}",
                         ZONE_DETAIL_STRINGS_HHI_LATEX[_stats_byzone_detail[1]],
                         (
                             ""
                             if _stats_byzone_detail[2] == 0
                             else Rf"{ZONE_DETAIL_STRINGS_DELTA_LATEX[_stats_byzone_detail[2]]}"
                         ),
+                        ";" if print_format == "LaTeX+TikZ" else "",
                     )
                 ]
             else:
@@ -703,14 +736,14 @@ def stats_print_rows(
     _enf_stats_dat_list: list[list[str]],
     /,
     *,
-    print_format: Literal["text", "LaTeX"] = "text",
+    print_format: Literal["text", "LaTeX", "LaTeX+TikZ"] = "text",
 ) -> None:
     for _idx, _hdr in enumerate(_enf_stats_hdr_list):
-        if print_format == "LaTeX":
+        if print_format in ("LaTeX", "LaTeX+TikZ"):
             _hdr_str = (
                 _hdr
                 if _hdr == "TOTAL"
-                else re.fullmatch(r".*?\{(.*)\};?", _hdr)[1].strip()
+                else re.fullmatch(r".*\{.*\}\{(.*)\};?", _hdr)[1].strip()
             )
             print(
                 _hdr_str,
@@ -829,25 +862,33 @@ def propn_ci(
 
 
 def render_table_pdf(
-    _table_dottex_pathlist: Sequence[str], _table_coll_path: str, /
+    _table_collection_design: Template,
+    _table_collection_content: StatsContainer,
+    _output_tex_path: Path,
+    /,
 ) -> None:
-    _table_collection_design = LaTeX_jinja_env.get_template(
-        "mergeron_table_collection_template.tex.jinja2"
-    )
-    _table_collection_content = StatsContainer()
+    """Render table collection to PDF
+
+    Parameters
+    ----------
+    _table_collection_design
+        A jinja2 template for generating the LaTeX file to render
+
+    _table_collection_content
+        Content for jinja2 template
 
-    _table_collection_content.path_list = _table_dottex_pathlist
+    _output_tex_path
+        Path to LaTeX output file to render to PDF
+    """
 
-    with Path(DATA_DIR / _table_coll_path).open(
-        "w", encoding="utf8"
-    ) as _table_coll_file:
-        _table_coll_file.write(
+    with _output_tex_path.open("w", encoding="utf8") as _output_tex_file:
+        _output_tex_file.write(
             _table_collection_design.render(tmpl_data=_table_collection_content)
         )
-        print("\n", file=_table_coll_file)
+        print("\n", file=_output_tex_file)
 
     _run_rc = subprocess.run(  # noqa: S603
-        f"latexmk -f -quiet -synctex=0 -interaction=nonstopmode -file-line-error -pdflua {_table_coll_path}".split(),
+        f"latexmk -f -quiet -synctex=0 -interaction=nonstopmode -file-line-error -pdflua {_output_tex_path}".split(),
         check=True,
         cwd=DATA_DIR,
     )
@@ -855,9 +896,7 @@ def render_table_pdf(
         subprocess.run("latexmk -quiet -c".split(), check=True, cwd=DATA_DIR)  # noqa: S603
     del _run_rc
 
-    print(
-        f"Tables rendered to path, {f"{Path(DATA_DIR / _table_coll_path).with_suffix(".pdf")}"}"
-    )
+    print(f"Tables rendered to path, {_output_tex_path.with_suffix(".pdf")}")
 
 
 if __name__ == "__main__":

mergeron-2024.739123.8/src/mergeron/data/jinja2_LaTeX_templates/setup_tikz_tables.tex

@@ -1,96 +0,0 @@
-% Tables in tikz, but first we need to define some colors for nonwhite text backgrounds
-\definecolor{OBSHDRFill}{HTML}{0a6c97}
-\definecolor{SIMHDRFill}{HTML}{646464}
-\definecolor{DataFill}{HTML}{dfeadf}
-% The below are definition's from Paul Tol's website, https://personal.sron.nl/~pault/
-\definecolor{VibrBlue}{HTML}{0077bb}
-\definecolor{BrightGreen}{HTML}{228833}
-\definecolor{HiCoYellow}{HTML}{ddaa33}
-\definecolor{VibrRed}{HTML}{cc3311}
-% Some useful documents from grokking various options used below
-% https://courses.helsinki.fi/sites/default/files/course-material/4611024/LaTeXandFriendsCourseInHelsinki_9_v2.pdf
-% https://tug.org/TUGboat/tb39-1/tb121duck-tikz.pdf
-% https://tug.org/TUGboat/tb41-1/tb127duck-matrix.pdf
-% https://tex.stackexchange.com/questions/22286/coloring-every-other-row-of-a-table-with-vertical-lines
-% https://tex.stackexchange.com/questions/354043/swot-matrix-with-multicolumn-and-multirow
-% https://tex.stackexchange.com/questions/20599/horizontal-row-separation-line-in-tikz-matrix-like-hline-in-tabular
-% https://tex.stackexchange.com/questions/63560/how-to-use-x-coordinate-of-a-point-and-y-coordinate-of-other-point
-% https://tex.stackexchange.com/questions/167944/auto-word-wrapping-in-a-node-in-tikz
-% https://tex.stackexchange.com/questions/132741/typewriter-in-tikz-node
-\tikzset{
-    green_bar_filler/.code={%
-        \pgfmathtruncatemacro{\itest}{ifthenelse(%
-            \pgfmatrixcurrentcolumn==1,0,%
-            ifthenelse(iseven(\pgfmatrixcurrentrow),1,3))}
-        %\typeout{\the\pgfmatrixcurrentcolumn,\pgfmatrixcurrentrow->\itest}
-        \ifcase\itest
-        \tikzset{fill=none}%
-        \or
-        \tikzset{fill=DataFill}%
-        \else
-        \tikzset{fill=white}%
-        \fi
-    },
-    get matrix dims/.code={
-        \global\tnc=\pgf@matrix@numberofcolumns
-        \global\tnr=\pgfmatrixcurrentrow
-    },
-    % If you only have numbers, text depth = 0ex; if text, text depth = 0.25ex, (may need tweaking for alignment across cells)
-    anytext/.style = {
-        font = \sffamily\scriptsize\addfontfeatures{Numbers={Monospaced,Lining}},
-        align = center,
-        inner sep = 3pt,
-        text depth = 0pt,
-    },
-    hdrtext/.style = {
-        anytext,
-        text = white,
-        fill = OBSHDRFill,
-    },
-    notetext/.style = {
-        anytext,
-        font = \sffamily\tiny,
-        align = left,
-    },
-    anytable/.style = {
-        matrix of nodes,
-        nodes in empty cells,
-        column sep = -1.0\pgflinewidth,
-        row sep = -1.0\pgflinewidth,
-        inner sep = -0.25\pgflinewidth,
-        outer sep = -0.25\pgflinewidth,
-        nodes = {anchor = center, minimum height = 12.5pt,}
-    },
-    datatable/.style = {
-        anytable,
-        nodes = {
-            anytext,
-            align = right,
-            draw = none,
-            fill = none,
-            green_bar_filler,
-        },
-    },
-    hdrtable/.style = {
-        anytable,
-        nodes = {
-            hdrtext,
-            draw = none,
-            fill = OBSHDRFill,
-        },
-    },
-    hrow/.style = {
-        hdrtable,
-        nodes = {text width = 40pt,},
-    },
-    hcol/.style = {
-        hdrtable,
-        nodes = {text width = 60pt,},
-    },
-}
-% Define layers for later reference
-% https://tex.stackexchange.com/questions/40840/put-a-node-behind-another-in-a-tikz-diagram
-\pgfdeclarelayer{background}
-\pgfsetlayers{background,main}
-
-