X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=3cf53983e0bd4b650ecc91a6e92f3709a873e4a6;hb=e6b93f7489fc0738b6097d49cb7b16eed2b4fb1e;hp=73edb5d24045feeee4c64c35afbaca45747fe3df;hpb=6c735efb1fa34e167f0ae9f4a40f8127631200c3;p=features.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 73edb5d240..3cf53983e0 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2908,9 +2908,14 @@ void Paragraph::latex(BufferParams const & bparams,
 					column += Changes::latexMarkChange(os, bparams,
 						Change(Change::UNCHANGED), change, rp);
 				}
-			} else {
+			} else {// if fontswitch_inset
+				if (current_font != running_font || !langClosed)
+					// font is still open in fontswitch_insets if we have
+					// a non-lang font difference or if the language
+					// is the only difference but has not been forcedly
+					// closed meanwhile
+					open_font = true;
 				running_font = current_font;
-				open_font &= !langClosed;
 			}
 		}
 
@@ -4012,6 +4017,8 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 					       runparams, i);
 			if (c == ' ' && (style.free_spacing || runparams.free_spacing))
 				xs << XMLStream::ESCAPE_NONE << "&nbsp;";
+			else if (c == '\'')
+				xs << XMLStream::ESCAPE_NONE << "&#8217;";
 			else
 				xs << c;
 		}