mergeron 2024.739105.6__tar.gz → 2024.739123.0__tar.gz

{mergeron-2024.739105.6 → mergeron-2024.739123.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergeron
-Version: 2024.739105.6
+Version: 2024.739123.0
 Summary: Merger Policy Analysis using Python
 License: MIT
 Keywords: merger policy analysis,merger guidelines,merger screening,policy presumptions,concentration standards,upward pricing pressure,GUPPI
@@ -29,10 +29,9 @@ Requires-Dist: matplotlib (>=3.8)
 Requires-Dist: mpmath (>=1.3)
 Requires-Dist: msgpack (>=1.0)
 Requires-Dist: msgpack-numpy (>=0.4)
-Requires-Dist: numpy (>=1.26,<2)
 Requires-Dist: scipy (>=1.12)
 Requires-Dist: sympy (>=1.12)
-Requires-Dist: tables (>=3.8)
+Requires-Dist: tables (>=3.10.1)
 Requires-Dist: types-beautifulsoup4 (>=4.11.2)
 Requires-Dist: urllib3 (>=2.2.2,<3.0.0)
 Requires-Dist: xlrd (>=2.0.1,<3.0.0)

{mergeron-2024.739105.6 → mergeron-2024.739123.0}/pyproject.toml

@@ -13,7 +13,7 @@ keywords = [
     "upward pricing pressure",
     "GUPPI",
 ]
-version = "2024.739105.6"
+version = "2024.739123.0"
 
 # Classifiers list: https://pypi.org/classifiers/
 classifiers = [
@@ -48,11 +48,10 @@ matplotlib = ">=3.8"
 mpmath = ">=1.3"
 msgpack = ">=1.0"
 msgpack-numpy = ">=0.4"
-numpy = ">=1.26, <2"
 python = "^3.12"
 scipy = ">=1.12"
 sympy = ">=1.12"
-tables = ">=3.8"
+tables = ">=3.10.1"
 xlsxwriter = ">=3.1"
 certifi = ">=2023.11.17"
 types-beautifulsoup4 = ">=4.11.2"

{mergeron-2024.739105.6 → mergeron-2024.739123.0}/src/mergeron/__init__.py

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

mergeron-2024.739123.0/src/mergeron/data/jinja2_LaTeX_templates/ftcinvdata_summarypaired_table_template.tex.jinja2

@@ -0,0 +1,130 @@
+\begin{table}[bt]
+
+
+((* if tmpl_data.test_regime == 'Enforcement' *))
+	((* set prop_title = "Proportion Enforced" *))
+((* else *))
+	((* set prop_title = "Proportion Cleared" *))
+((* endif *))
+((* set prop_title = prop_title|replace(" ", "\\\\") *))
+
+((* 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{- obs_summary_type }}
+	{\footnotesize \JINVAR{ obs_summary_type_title }  \\
+		Grouped by Entry Conditions and Reporting Period \\[0.5\baselineskip]}
+	\begin{tikzpicture}[auto, font = \sffamily]
+		\begin{pgfonlayer}{background}
+			\matrix[
+                datatable,
+                nodes = {text width = 27pt,},
+                column 1/.style = {nodes = {
+                    hdrtext,
+                    text width=\JINVAR{ hdrcol_width -}, fill=OBSHDRFill,
+                    },},
+                record matrix dimensions,
+            ] (invres_rate_raw) {
+                \JINVAR{ tmpl_data.invdata_datstr -}
+        };
+			% Horizontal scoring for totals
+			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-\the\tnr-1.north west) -- (invres_rate_raw-\the\tnr-\the\tnc.north east);
+			% Vertical scoring for column groups
+			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-3.north east) -- (invres_rate_raw-\the\tnr-3.south east);
+			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-5.north east) -- (invres_rate_raw-\the\tnr-5.south east);
+			\draw[color = OBSHDRFill, line width = 1pt] (invres_rate_raw-1-7.north east) -- (invres_rate_raw-\the\tnr-7.south east);
+		\end{pgfonlayer}
+
+
+        %% Header column - row heads - description
+        \matrix[
+            hcol,
+            above right=0pt of invres_rate_raw.north west,
+            nodes = {
+                text width=\JINVAR{- tmpl_data.hdrcol_width -},
+                text depth=10pt,
+            },
+        ] (hdrcol_desc) {
+            \node[align = center,] { \JINVAR{- tmpl_data.hdrcol_desc_text } \\ }; \\
+        };
+
+        % Header row - column heads
+		\matrix[
+            hrow,
+			above right = 0 pt of hdrcol_desc.south east,
+			nodes = {
+                rotate = 90,
+                minimum height = 33pt,
+                text depth = 10pt,
+                align = left,
+            },  %
+        ] (hdrrow_raw) {
+            {Relative \\ Frequency} &
+			{\JINVAR{ prop_title }} &
+			{Relative \\ Frequency} &
+			{\JINVAR{ prop_title }} &
+			{Relative \\ Frequency} &
+			{\JINVAR{ prop_title }} &
+			{Relative \\ Frequency} &
+			{\JINVAR{ prop_title }} \\
+			};
+
+        %% Header row - columns description -- Markets 0 - period 1-2
+		\matrix[hrow, above right = 0pt of hdrrow_raw.north west, nodes = {minimum height = 12.5pt, text width = 59.6pt,},] (descrow_pds) {
+			\JINVAR{ tmpl_data.obs_periods_str } & \JINVAR{ tmpl_data.obs_periods_str } \\
+			\JINVAR{ tmpl_data.mkt_counts_str_class_0 } & \JINVAR{ tmpl_data.mkt_counts_str_class_1 } \\
+			};
+
+		% Header row - Market-1
+		\matrix[hrow, above right = 0pt of descrow_pds.north west, nodes = {minimum height = 12.5pt, text width = 124.8pt},] (descrow_mkts) {
+            \JINVAR{ obs_merger_class_0 } & \JINVAR{ obs_merger_class_1 } \\
+			};
+		% Header row - columns description
+		\matrix[hrow, above right = 0pt of descrow_mkts.north west, nodes = {minimum height = 12.5pt, text width = 255.2pt},] (descrow_obs) {
+			Observed Data \\
+			};
+
+		%% Vertical scoring delineating column groups
+		\draw[color = white, line width = 1pt] (descrow_pds-1-1.north east) -- (invres_rate_raw-1-3.north east);
+		\draw[color = white, line width = 1pt] (descrow_mkts-1-1.north east) -- (invres_rate_raw-1-5.north east);
+		\draw[color = white, line width = 1pt] (descrow_pds-1-3.north east) -- (invres_rate_raw-1-7.north east);
+
+        %% Fill along header
+		\draw[color = OBSHDRFill, fill = OBSHDRFill,]
+		(hdrcol_desc.north west |- descrow_obs.north west)
+		rectangle
+		(hdrcol_desc.north east)
+		;
+
+	\end{tikzpicture}
+
+    \setlist{nosep}
+    \vspace{\baselineskip}
+    {\raggedright\sffamily\tiny%
+    %
+    % NOTES:
+    % \begin{itemize}
+    %     \item Data for period, 2004--2011 calculated by subtracting reported figures for 1996--2003 from reported figures for 1996--2011
+    %     \item Ranges of $\Delta HHI$ are defined as half-open intervals with \(\Delta_L \leqslant \Delta HHI < \Delta_H\), except that \(2500 \text{ pts.} \leqslant \Delta HHI \leqslant 5000 \text{ pts.}\) in the closed interval [2500, 5000] pts.
+    % \end{itemize}
+
+    % SOURCES:
+    % \begin{itemize}
+    %     % \item \fullcite{FTCInvData2003}, Table~4.1 and Table~10.2
+    %     \item Fed. Trade Comm'n (2003), at note~\cref{fn:FTCInvData1996to2003}
+    %     \item Fed. Trade Comm'n (2011), at note~\cref{fn:FTCInvData1996to2011}
+    % \end{itemize}
+    \JINVAR{- tmpl_data.invdata_notestr -}
+    \vspace{\baselineskip}
+    \JINVAR{ tmpl_data.invdata_sourcestr -}
+    }
+    \vspace{\baselineskip}
+\end{table}
+
+

{mergeron-2024.739105.6 → mergeron-2024.739123.0}/src/mergeron/data/jinja2_LaTeX_templates/mergeron.cls

@@ -1,23 +1,19 @@
-%% https://tex.stackexchange.com/questions/638194/
-\ExplSyntaxOn             % Switch on expl3 syntax
-\sys_ensure_backend:      % load the backend code
-\pdf_version_gset:n{1.7}  % Use provided expl3 function
-\ExplSyntaxOff            % Switch off expl3 syntax
+\ProvidesClass{mergeron}
 
 \LoadClass{scrartcl}
 \RequirePackage[singlespacing=true]{scrlayer-scrpage}
 \KOMAoptions{
-	draft=off,
-	fontsize=12pt,
-	paper=letter,
-	DIV=12,
-	footnotes=multiple,
-	numbers=withendperiod,
-	headsepline=on,
-	footsepline=off,
-	abstract=on,
-	headheight=36pt,
-	footheight=36pt,
+    draft=off,
+    fontsize=12pt,
+    paper=letter,
+    DIV=12,
+    footnotes=multiple,
+    numbers=withendperiod,
+    headsepline=on,
+    footsepline=off,
+    abstract=on,
+    headheight=36pt,
+    footheight=48pt,
 }
 \RequirePackage[l2tabu, orthodox]{nag}
 
@@ -25,12 +21,12 @@
 \setdefaultlanguage[variant=american]{english}
 % Appendix prefix for scrartcl
 \newcommand*{\appendixmore}{%
-	\renewcommand*{\sectionformat}{%
-		\appendixname~\thesection\autodot\enskip%
-	}%
-	\renewcommand*{\sectionmarkformat}{%
-		\appendixname~\thesection\autodot\enskip%
-	}%
+    \renewcommand*{\sectionformat}{%
+        \appendixname~\thesection\autodot\enskip%
+    }%
+    \renewcommand*{\sectionmarkformat}{%
+        \appendixname~\thesection\autodot\enskip%
+    }%
 }
 
 \RequirePackage[doublespacing]{setspace}
@@ -59,24 +55,24 @@
 
 % Fonts and math
 \RequirePackage{fontspec}
-\setmonofont[Scale=MatchLowercase,]{Fira Mono}
-\setsansfont{Fira Sans}
-\setmainfont{STIX Two Text}
+\setmonofont[Scale=MatchLowercase,]{Roboto Mono}
+\setsansfont{Roboto}
+\setmainfont{STIXTwoText}
 
 \RequirePackage[standard]{ntheorem}
 \RequirePackage{mathtools}
 \RequirePackage{unicode-math}
-\setmathfont[math-style=ISO]{STIX Two Math}
+\setmathfont{STIXTwoMath}[math-style=ISO]
 % Separate \mathscr from \mathcal
-\setmathfont{STIX Two Math}[range={scr,bfscr},StylisticSet=01]
+\setmathfont{STIXTwoMath}[range={scr,bfscr},StylisticSet=01]
 
 \defaultfontfeatures[\rmfamily,\sffamily]{
-	Ligatures={TeX, Common},
-	Numbers={proportional, lining}
+    Ligatures={TeX, Common},
+    Numbers={proportional, lining}
 }
 \RequirePackage[
-	activate={true,nocompatibility},
-	tracking=true,
+    activate={true,nocompatibility},
+    tracking=true,
 ]{microtype}
 
 \RequirePackage{tabularray}
@@ -85,9 +81,9 @@
 %% https://tex.stackexchange.com/questions/286733/change-content-font-in-tabular-environments
 \makeatletter
 \appto\@floatboxreset{%
-	\ifx\@captype\andy@table
-		\sffamily\addfontfeatures{Numbers={Monospaced, Lining},}
-	\fi
+    \ifx\@captype\andy@table
+        \sffamily\addfontfeatures{Numbers={Monospaced, Lining},}
+    \fi
 }
 \def\andy@table{table}
 \makeatother
@@ -109,7 +105,7 @@
 %% Read KOMA-Script documentation
 \setfootnoterule[0.4pt]{\linewidth}
 \deffootnote{2.5em}{2.5em}{%
-	\makebox[2.5em][l]{\hspace{1ex}\thefootnotemark.}%
+    \makebox[2.5em][l]{\hspace{1ex}\thefootnotemark.}%
 }
 
 %% For highlighting text with a colored background, soul
@@ -119,7 +115,7 @@
 %% Properly typset intervals, and avoid messages about unmatched parentheses
 \RequirePackage{interval}
 \intervalconfig{
-	soft open fences,
+    soft open fences,
 }
 
 %%% custom commands, environments and symbols
@@ -133,7 +129,7 @@
 \DeclarePairedDelimiter\set\{\}
 %% http://mirrors.ctan.org/macros/latex/contrib/mathtools/mathtools.pdf, 27--28
 \DeclarePairedDelimiterX\SetSuchThat[2]{\lbrace}{\rbrace}{%
-	#1 \, \delimsize\vert \, \mathopen{}#2
+    #1 \, \delimsize\vert \, \mathopen{}#2
 }
 
 %% Sometimes, you just want to comment out several lies of text
@@ -148,14 +144,12 @@
 \RequirePackage{hyperref}
 \ProcessOptions\relax
 \hypersetup{%
-	unicode=true,
-	bookmarksnumbered=false,
-	hidelinks,
-	pdfencoding=auto,
+    bookmarksnumbered=false,
+    hidelinks,
 }
 \RequirePackage[capitalize, noabbrev]{cleveref}
 
 \AtBeginDocument{%
-	\SetBlockEnvironment{quoting}
+    \SetBlockEnvironment{quoting}
 }
 

{mergeron-2024.739105.6 → mergeron-2024.739123.0}/src/mergeron/data/jinja2_LaTeX_templates/mergeron_table_collection_template.tex.jinja2

@@ -1,15 +1,16 @@
+\DocumentMetadata{pdfversion=1.7, lang=en-US, pdfstandard=A-3u}
 \documentclass{mergeron}
 
-\usepackage{luacode}
-\begin{luacode}
-    local function embedfull(tfmdata)
-        tfmdata.embedding = "full"
-    end
+%% Get column- and row-counts for tikz matrix
+\newcount\tnr
+\newcount\tnc
+\makeatletter
+\tikzset{record matrix dimensions/.style={execute at end matrix={
+    \global\tnc=\pgf@matrix@numberofcolumns
+    \global\tnr=\pgfmatrixcurrentrow
+}}}
+\makeatother
 
-    luatexbase.add_to_callback(
-    "luaotfload.patch_font", embedfull, "embedfull"
-    )
-\end{luacode}
 
 %  Specify location for includegraphics files:
 \graphicspath{{~/mergeron}}
@@ -32,6 +33,8 @@
 %% Define colors for tables
 \definecolor{table_bar_green}{HTML}{dfeadf}
 
+\usepackage{enumitem}
+
 %% BibLaTex/APA style citation
 \usepackage[
     sorting=nyt,

{mergeron-2024.739105.6 → mergeron-2024.739123.0}/src/mergeron/data/jinja2_LaTeX_templates/setup_tikz_tables.tex

@@ -18,62 +18,78 @@
 % 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=OBSHDRFill}%
+        \or
+        \tikzset{fill=DataFill}%
+        \else
+        \tikzset{fill=white}%
+        \fi
+    },
     % If you only have numbers, text depth = 0ex; if text, text depth = 0.25ex, (may need tweaking for alignment across cells)
     anytext/.style = {
-            align = center,
-            font = \sffamily\scriptsize,
-            inner sep = 0pt,
-            text depth = 0pt,
-        },  %
+        font = \sffamily\scriptsize\addfontfeatures{Numbers={Monospaced,Lining}},
+        align = center,
+        inner sep = 3pt,
+        text depth = 0pt,
+    },
     hdrtext/.style = {
-            anytext,
-            text = white,
-            fill = OBSHDRFill,
-        }, %
+        anytext,
+        text = white,
+        fill = OBSHDRFill,
+    },
     notetext/.style = {
-            anytext,
-            font = \sffamily\tiny,
-            align = left,
-        },
+        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,}
-        },
+        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 = {
-                    font = \sffamily\scriptsize\addfontfeatures{Numbers={Monospaced,Lining}},
-                    align = right,
-                    inner xsep = 3pt,
-                    inner ysep = 0pt,
-                    text depth = 0pt,
-                    draw = none,
-                    fill = none,
-                },
-            every even row/.style = {
-                    nodes = {fill = DataFill}
-                },
+        anytable,
+        nodes = {
+            anytext,
+            align = right,
+            draw = none,
+            fill = none,
+            green_bar_filler,
         },
-    hrow/.style = {
-            anytable,
-            nodes = {
-                    hdrtext,
-                    draw = none,
-                    fill = OBSHDRFill,
-                    text width = 40pt,
-                },
+        % every even row/.style = {
+        %     nodes = {fill = DataFill}
+        % },
+    },
+    hdrtable/.style = {
+        anytable,
+        nodes = {
+            hdrtext,
+            draw = none,
+            fill = OBSHDRFill,
         },
+    },
+    hrow/.style = {
+        hdrtable,
+        nodes = {text width = 40pt,},
+    },
     hcol/.style = {
-            hrow,
-            nodes = {text width = 60pt,},
-        },
+        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.739105.6 → mergeron-2024.739123.0}/src/mergeron/gen/enforcement_stats.py

@@ -129,7 +129,7 @@ if not (_DOTTEX := DATA_DIR / Rf"{_PKG_NAME}_TikZTableSettings.tex").is_file():
         shutil.copy2(_tex_path, _DOTTEX)
 
 
-LTX_ARRAY_LINEEND = R"\\" "\n"
+LTX_ARRAY_LINEEND = "\\\\\n"
 LaTeX_hrdcoldesc_format_str = "{}\n{}\n{}".format(
     "".join((
         R"\matrix[hcol, above=0pt of {}, nodes = {{",
@@ -173,15 +173,15 @@ ZONE_STRINGS = {
 ZONE_DETAIL_STRINGS_HHI = {
     0: Rf"HHI < {HHI_POST_ZONE_KNOTS[1]} pts.",
     1: R"HHI ∈ [{}, {}) pts. and ".format(*HHI_POST_ZONE_KNOTS[1:3]),
-    2: Rf"HHI ≥ {HHI_POST_ZONE_KNOTS[2]} pts. and ",
+    2: Rf"HHI ⩾ {HHI_POST_ZONE_KNOTS[2]} pts. and ",
 }
 
 ZONE_DETAIL_STRINGS_DELTA = {
     0: "",
     1: Rf"ΔHHI < \text{{{HHI_DELTA_KNOTS[1]} pts.}}",
-    2: Rf"ΔHHI ≥ \text{{{HHI_DELTA_KNOTS[1]} pts.}}",
+    2: Rf"ΔHHI ⩾ \text{{{HHI_DELTA_KNOTS[1]} pts.}}",
     3: R"ΔHHI ∈ \text{{[{}, {}) pts.}}".format(*HHI_DELTA_KNOTS[1:3]),
-    4: Rf"ΔHHI ≥ \text{{{HHI_DELTA_KNOTS[2]} pts.}}",
+    4: Rf"ΔHHI ⩾ \text{{{HHI_DELTA_KNOTS[2]} pts.}}",
 }
 
 ZONE_STRINGS_LATEX = {

mergeron-2024.739105.6/src/mergeron/data/jinja2_LaTeX_templates/ftcinvdata_summarypaired_table_template.tex.jinja2

@@ -1,104 +0,0 @@
-\begin{table}[bt]
-((* if tmpl_data.obs_merger_class_0 == 'All Markets' *))
-	((* set obs_merger_class_0 = tmpl_data.obs_merger_class_0 *))
-((* else *))
-	((* set obs_merger_class_0 = "Markets with, ``" + tmpl_data.obs_merger_class_0 + "''" *))
-((* endif *))
-
-((* if tmpl_data.test_res == 'Enforcement' *))
-	((* set prop_title = "Proportion Enforced" *))
-((* else *))
-	((* set prop_title = "Proportion Cleared" *))
-((* 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|replace(" ", "") -}}
-	{\footnotesize \JINVAR{ tmpl_data.obs_summary_type_title } \\
-		Grouped by Entry Conditions and Reporting Period \\[0.5\baselineskip]}
-	\begin{tikzpicture}[auto, font = \sffamily]
-		\begin{pgfonlayer}{background}
-			\matrix[datatable, nodes = {text width = 27pt,},] (enf_rate_raw) {
-				\JINVAR{ tmpl_data.invdata_datstr -}
-				};
-			% Horizontal scoring for totals
-			\draw[color = OBSHDRFill, line width = 1pt] (enf_rate_raw-\JINVAR{- tmpl_data.invdata_numrows -}-1.north west) -- (enf_rate_raw-\JINVAR{- tmpl_data.invdata_numrows -}-8.north east);
-			% Vertical scoring for column groups
-			\draw[color = OBSHDRFill, line width = 1pt] (enf_rate_raw-1-2.north east) -- (enf_rate_raw-\JINVAR{- tmpl_data.invdata_numrows -}-2.south east);
-			\draw[color = OBSHDRFill, line width = 1pt] (enf_rate_raw-1-4.north east) -- (enf_rate_raw-\JINVAR{- tmpl_data.invdata_numrows -}-4.south east);
-			\draw[color = OBSHDRFill, line width = 1pt] (enf_rate_raw-1-6.north east) -- (enf_rate_raw-\JINVAR{- tmpl_data.invdata_numrows -}-6.south east);
-		\end{pgfonlayer}
-
-		\matrix[hrow,
-			above = 0 pt of enf_rate_raw,
-			nodes = {minimum height = 33pt, text depth = 10pt, text width = 60pt, align = left, inner sep = 3pt,},
-			] (hdrrow_raw) {
-			\node[rotate = 90] {Relative \\ Frequency \\}; &
-			\node[rotate = 90] {\JINVAR{ prop_title|replace(" ", "\\\\") } \\}; &
-			\node[rotate = 90] {Relative \\ Frequency \\}; &
-			\node[rotate = 90] {\JINVAR{ prop_title|replace(" ", "\\\\") } \\}; &
-			\node[rotate = 90] {Relative \\ Frequency \\}; &
-			\node[rotate = 90] {\JINVAR{ prop_title|replace(" ", "\\\\") } \\}; &
-			\node[rotate = 90] {Relative \\ Frequency \\}; &
-			\node[rotate = 90] {\JINVAR{ prop_title|replace(" ", "\\\\") } \\}; \\
-			};
-		% Header row - columns description -- Markets 0 - period 1-2
-		\matrix[hrow, above left = 0pt of hdrrow_raw.north, nodes = {minimum height = 12.5pt, text width = 65.6pt,},] (descrow_raw_pds1) {
-			\JINVAR{ tmpl_data.obs_periods_str }
-			\JINVAR{ tmpl_data.mkt_counts_str_class_0 }
-			};
-		% Header row - columns description -- Markets 1 - period 1-2
-		\matrix[hrow, above right = 0pt of hdrrow_raw.north, nodes = {minimum height = 12.5pt, text width = 65.6pt,},] (descrow_raw_pds2) {
-			\JINVAR{ tmpl_data.obs_periods_str }
-			\JINVAR{ tmpl_data.mkt_counts_str_class_1 }
-			};
-		% Header row - columns description
-		\matrix[hrow, above left = 0pt of descrow_raw_pds1.north east, nodes = {minimum height = 12.5pt, text width = 130.8pt},] (descrow_raw_mkt1) { \JINVAR{ obs_merger_class_0 } \\
-			};
-		% Header row - columns description
-		\matrix[hrow, above right = 0pt of descrow_raw_pds2.north west, nodes = {minimum height = 12.5pt, text width = 130.8pt},] (descrow_raw_mkt2) { \JINVAR{ obs_merger_class_1 } \\
-			};
-		% Header row - columns description
-		\matrix[hrow, above left = 0pt of descrow_raw_mkt2.north east, nodes = {minimum height = 12.5pt, text width = 261.2pt},] (descrow_raw_top) {
-			Observed Data \\
-			};
-		% Vertical scoring for column groups
-		\draw[color = white, line width = 1pt] (descrow_raw_pds1-1-1.north east) -- (enf_rate_raw-1-2.north east);
-		\draw[color = white, line width = 1pt] (descrow_raw_mkt1-1-1.north east) -- (enf_rate_raw-1-4.north east);
-		\draw[color = white, line width = 1pt] (descrow_raw_pds2-1-1.north east) -- (enf_rate_raw-1-6.north east);
-
-		% Header column - row heads
-		\matrix[hcol, left = 0pt of enf_rate_raw, nodes = {
-				text width = \JINVAR{ tmpl_data.hdrcol_raw_width -},
-				inner xsep = 3 pt,
-				},] (hdrcol_raw) {
-			\JINVAR{ tmpl_data.invdata_hdrstr -}
-			};
-		% Header column - row heads - description
-		\JINVAR{ tmpl_data.invdata_hdrcoldescstr }
-
-		% Fill along header
-		\draw[color = OBSHDRFill, fill = OBSHDRFill,]
-		(hdrcoldesc_raw.north west |- descrow_raw_top.north west)
-		rectangle
-		(hdrcoldesc_raw.north east)
-		;
-		((# % Separator for header column
-		\draw[color = white, line width = 1pt] (descrow_raw_mkt1-1-1.north west) -- (enf_rate_raw-1-1.north west); #))
-
-		% Notes below table
-		\matrix[anytable,
-			below right = 4pt and 4pt of hdrcol_raw.south west,
-			nodes = {notetext, minimum height = 8pt, text width = \JINVAR{ tmpl_data.invdata_notewidth -}\linewidth,},
-			] (notestext) {%
-				\JINVAR{ tmpl_data.invdata_notestr -}
-				SOURCES: \\
-				% TODO: Table numbers need updating
-				% \(\cdot\) \fullcite{FTCInvData2003}, Table~4.1 and Table~10.2 \\
-				\JINVAR{ tmpl_data.invdata_sourcestr -}
-				% \(\cdot\) \fullcite{FTCInvData2011}, Table~4.1 and Table~10.2 \\
-			};
-	\end{tikzpicture}
-\end{table}
-