commit 956d91a68cea05b034479a33ee66deae6adf3195
Author: Juergen Spitzmueller <sp...@lyx.org>
Date: Fri Mar 14 05:37:49 2025 +0100
Amend 347ad8f3b65
(cherry picked from commit bb60d78be24386134cd164356f9fc0b04d7866a2)
---
src/insets/InsetTabular.cpp | 2 +-
status.24x | 3 +++
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index c2c3391c6c..f8feec922d 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -1296,7 +1296,7 @@ bool Tabular::updateColumnWidths(MetricsInfo & mi)
max_dwidth[c] = max(max_dwidth[c],
cell_info[r][c].decimal_width);
if (!cellInfo(i).align_special.empty() &&
cellInfo(i).multicolumn)
as_mr_col[c] = true;
- if (!getPWidth(i).zero())
+ else if (!getPWidth(i).zero())
max_pwidth[c] = max(max_pwidth[c],
cell_info[r][c].width);
else if (!column_info[c].varwidth)
max_width[c] = max(max_width[c],
cell_info[r][c].width);
diff --git a/status.24x b/status.24x
index e51b37b800..cecef976cf 100644
--- a/status.24x
+++ b/status.24x
@@ -65,6 +65,9 @@ What's new
- Fix crash when attempting to load a corrupted master from a child (bug
13151).
+- Fix crash when adding custom LaTeX argument to multicolumn in varwidth table
+ (bug 13158).
+
- Fix erroneous whitespace before and after math preview (bug 13127).
- Ask to save unsaved changes before closing document dialog via ESC key or
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
https://lists.lyx.org/mailman/listinfo/lyx-cvs
