From 36096435e5ef605eb851afc270110938f9c4b65f Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Fri, 4 May 2018 19:32:38 +0200
Subject: [PATCH] Fixes for nested ulem commands

1. \uuline must be on top of \sout
2. \uwave in \xout needs a hack to compile

(cherry picked from commit 9fd94a2dd0631a7d408ad013736312a5cf563f2f)
---
 src/Font.cpp | 16 +++++++++++-----
 status.23x   |  2 ++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Font.cpp b/src/Font.cpp
index e81e12449b..b810e454d4 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -441,6 +441,11 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		count += 10;
 		++runparams.inulemcmd;
 	}
+	if (f.uuline() == FONT_ON) {
+		os << "\\uuline{";
+		count += 11;
+		++runparams.inulemcmd;
+	}
 	if (f.strikeout() == FONT_ON) {
 		os << "\\sout{";
 		count += 9;
@@ -451,12 +456,13 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
 		count += 9;
 		++runparams.inulemcmd;
 	}
-	if (f.uuline() == FONT_ON) {
-		os << "\\uuline{";
-		count += 11;
-		++runparams.inulemcmd;
-	}
 	if (f.uwave() == FONT_ON) {
+		if (runparams.inulemcmd) {
+			// needed with nested uwave in xout
+			// see https://tex.stackexchange.com/a/263042
+			os << "\\ULdepth=1000pt";
+			count += 15;
+		}
 		os << "\\uwave{";
 		count += 10;
 		++runparams.inulemcmd;
diff --git a/status.23x b/status.23x
index 4228e96113..a740f49e71 100644
--- a/status.23x
+++ b/status.23x
@@ -143,6 +143,8 @@ What's new
 
 - Load hyperref with a suitable driver (bug 6418).
 
+- Fix LaTeX errors with nested ulem commands.
+
 - Recompile grandchildren when they have updated (bug 11112).
 
 - Output list of bibliography files in the order given in the dialog, rather
-- 
2.39.5