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

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8a96e6dbdc..3cf53983e0 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1223,6 +1223,9 @@ void Paragraph::Private::latexSpecialChar(otexstream & os,
 			case '}':
 				os << "\\braceright ";
 				return;
+			case '$':
+				os << "\\lyxdollar ";
+				return;
 			case '~':
 				os << "\\lyxtilde ";
 				return;
@@ -2905,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;
 			}
 		}
 
@@ -4009,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;
 		}