Natbib authoryear uses (Ref1; Ref2) by default.

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

diff --git a/src/mathed/InsetMathString.cpp b/src/mathed/InsetMathString.cpp
index d3fb9842413219bf95b842656374436a50d72cf2..53aba589899135ca2131cb21841f310af8c56422 100644 (file)
--- a/src/mathed/InsetMathString.cpp
+++ b/src/mathed/InsetMathString.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,15 +11,20 @@
 #include <config.h>
 
 #include "InsetMathString.h"
+#include "MathFactory.h"
 #include "MathStream.h"
 #include "MathSupport.h"
 
 #include "Encoding.h"
 
+#include "support/debug.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
+using lyx::support::escape;
+
 
 namespace lyx {
 
@@ -86,25 +91,17 @@ void InsetMathString::octave(OctaveStream & os) const
 }
 
 
-void InsetMathString::mathmlize(MathStream & os) const
+void InsetMathString::mathmlize(MathStream &) const
 {
-/*
-       if (code_ == LM_TC_VAR)
-               os << "<mi> " << str_ << " </mi>";
-       else if (code_ == LM_TC_CONST)
-               os << "<mn> " << str_ << " </mn>";
-       else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
-               os << "<mtext> " << str_ <<  " </mtext>";
-       else
-*/
-               os << str_;
+       // useless, no doubt, but we should not be here
+       LATTEST(false);
 }
 
 
 void InsetMathString::write(WriteStream & os) const
 {
-       if (!os.latex()) {
-               os << str_;
+       if (!os.latex() || os.lockedMode()) {
+               os << (os.asciiOnly() ? escape(str_) : str_);
                return;
        }
 
@@ -118,10 +115,13 @@ void InsetMathString::write(WriteStream & os) const
        os.pendingBrace(false);
 
        while (cit != end) {
+               bool mathmode = in_forced_mode ? os.textMode() : !os.textMode();
                char_type const c = *cit;
+               docstring command(1, c);
                try {
-                       docstring command(1, c);
-                       if (c < 0x80 || Encodings::latexMathChar(c, command)) {
+                       bool termination = false;
+                       if (isASCII(c) ||
+                           Encodings::latexMathChar(c, mathmode, os.encoding(), command, termination)) {
                                if (os.textMode()) {
                                        if (in_forced_mode) {
                                                // we were inside \lyxmathsym
@@ -129,12 +129,12 @@ void InsetMathString::write(WriteStream & os) const
                                                os.textMode(false);
                                                in_forced_mode = false;
                                        }
-                                       if (c >= 0x80) {
+                                       if (!isASCII(c) && os.textMode()) {
                                                os << "\\ensuremath{";
                                                os.textMode(false);
                                                in_forced_mode = true;
                                        }
-                               } else if (c < 0x80 && in_forced_mode) {
+                               } else if (isASCII(c) && in_forced_mode) {
                                        // we were inside \ensuremath
                                        os << '}';
                                        os.textMode(true);
@@ -154,18 +154,27 @@ void InsetMathString::write(WriteStream & os) const
                        os << command;
                        // We may need a space if the command contains a macro
                        // and the last char is ASCII.
-                       if (lyx::support::contains(command, '\\')
-                           && isAlphaASCII(command[command.size() - 1]))
+                       if (termination)
                                os.pendingSpace(true);
-               } catch (EncodingException & e) {
-                       if (os.dryrun()) {
-                               // FIXME: this is OK for View->Source
-                               // but math preview will likely fail.
+               } catch (EncodingException const & e) {
+                       switch (os.output()) {
+                       case WriteStream::wsDryrun: {
                                os << "<" << _("LyX Warning: ")
                                   << _("uncodable character") << " '";
                                os << docstring(1, e.failed_char);
                                os << "'>";
-                       } else {
+                               break;
+                       }
+                       case WriteStream::wsPreview: {
+                               // indicate the encoding error by a boxed '?'
+                               os << "{\\fboxsep=1pt\\fbox{?}}";
+                               LYXERR0("Uncodable character" << " '"
+                                       << docstring(1, e.failed_char)
+                                       << "'");
+                               break;
+                       }
+                       case WriteStream::wsDefault:
+                       default:
                                // throw again
                                throw(e);
                        }