From: Thibaut Cuvelier <tcuvelier@lyx.org>
Date: Fri, 9 Dec 2022 19:17:58 +0000 (+0100)
Subject: Amend d4095dc0
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=0e2513a0e8b400cbbb368412eb910789d6147054;p=features.git

Amend d4095dc0

Apostrophes were being converted inside code-like areas, like LilyPond insets. This patch fixes tests that started to fail:

  Processing `./60/lily-95ee389a.ly'
  Parsing...
  ././60/lily-95ee389a.ly:7:12: error: undefined character or shorthand: &
  \relative c
             &#8217;&#8217; {  g a b c}
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 3f1f814b47..063bf324de 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3649,7 +3649,7 @@ std::tuple<std::vector<docstring>, std::vector<docstring>, std::vector<docstring
 					delayedChars.emplace_back(1, c);
 				}
 			} else { // No need to delay the character.
-				if (c == '\'')
+				if (c == '\'' && !ignore_fonts)
 					*xs << XMLStream::ESCAPE_NONE << "&#8217;";
 				else
 					*xs << c;