Preserve \inputencoding value when switching to non-TeX fonts.

[lyx.git] / src / mathed / MathStream.cpp

diff --git a/src/mathed/MathStream.cpp b/src/mathed/MathStream.cpp
index b2d01cfb688612637c0f27f16abad0cd2355353c..9a6c32ca219f087a91ad0e2ad1d16c05877cb579 100644 (file)
--- a/src/mathed/MathStream.cpp
+++ b/src/mathed/MathStream.cpp
@@ -128,10 +128,10 @@ WriteStream & operator<<(WriteStream & ws, docstring const & s)
 WriteStream::WriteStream(otexrowstream & os, bool fragile, bool latex,
                                                 OutputType output, Encoding const * encoding)
        : os_(os), fragile_(fragile), firstitem_(false), latex_(latex),
-         output_(output), insidemacro_(false), pendingspace_(false),
-         pendingbrace_(false), textmode_(false), locked_(0), ascii_(0),
-         canbreakline_(true), mathsout_(false), ulemcmd_(NONE), line_(0),
-         encoding_(encoding), row_entry_(TexRow::row_none)
+         output_(output), pendingspace_(false), pendingbrace_(false),
+         textmode_(false), locked_(0), ascii_(0), canbreakline_(true),
+         mathsout_(false), ulemcmd_(NONE), line_(0), encoding_(encoding),
+         row_entry_(TexRow::row_none)
 {}
 
 
@@ -708,6 +708,12 @@ docstring convertDelimToXMLEscape(docstring const & name)
                        return from_ascii("&gt;");
                else
                        return name;
+       } else if (name.size() == 2 && name[0] == '\\') {
+               char_type const c = name[1];
+               if (c == '{')
+                       return from_ascii("&#123;");
+               else if (c == '}')
+                       return from_ascii("&#125;");
        }
        MathWordList const & words = mathedWordList();
        MathWordList::const_iterator it = words.find(name);