[LyX/master] Recent multirow finally allows multiple paragraphs

[Juergen Spitzmueller]

commit 9dd71b9e4adc702c5e0bd231ac63b8e5e4984c89
Author: Juergen Spitzmueller <spitz at lyx.org>
Date:   Sat Jan 30 09:15:14 2021 +0100

    Recent multirow finally allows multiple paragraphs
---
 lib/chkconfig.ltx           |    4 ++++
 src/insets/InsetTabular.cpp |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index 33ff0fa..3c0f051 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -577,7 +577,11 @@
 %%% Specific package versions
 % This only works if the package has been loaded before
 \IfFileExists{babel.sty}{\RequirePackage{babel}}{}
+% This introduces \babelfonts
 \TestPackageVersion{babel}{2017/11/03}
+\IfFileExists{multirow.sty}{\RequirePackage{multirow}}{}
+% This introduces multiple paragraphs in multirows
+\TestPackageVersion{multirow}{2021/01/29}
 
 %%% Document classes
 % The list of layout files has been put in this file here by the
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index ded3d3a..a959a56 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3198,7 +3198,7 @@ void Tabular::TeXRow(otexstream & os, row_type row,
 		} else if (!isPartOfMultiRow(row, c)) {
 			if (!runparams.nice)
 				os.texrow().start(par.id(), 0);
-			if (isMultiRow(cell))
+			if (isMultiRow(cell) && !LaTeXFeatures::isAvailable("multirow-2021/01/29"))
 				newrp.isNonLong = true;
 			inset->latex(os, newrp);
 		}