Reduce Michael's buglist.

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 1c4e244197e09cc8a6977f62d9f0a9aeeeb3179b..c28db75b3316c85d8a8a3028c44f0e169b7d6b38 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -16,21 +16,36 @@
 
 #include "paragraph_pimpl.h"
 #include "texrow.h"
+#include "language.h"
 #include "bufferparams.h"
 #include "encoding.h"
 #include "lyxrc.h"
 #include "debug.h"
 #include "support/LAssert.h"
 
+using lyx::pos_type;
+
 extern int tex_code_break_column;
 
 
-// Initialization of the counter for the paragraph id's,
-unsigned int Paragraph::Pimpl::paragraph_id = 0;
-
 // Initialize static member.
 ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
+// Initialization of the counter for the paragraph id's,
+unsigned int Paragraph::Pimpl::paragraph_id = 0;
 
+namespace {
+ 
+string special_phrases[][2] = {
+       { "LyX", "\\LyX{}" },
+       { "TeX", "\\TeX{}" },
+       { "LaTeX2e", "\\LaTeXe{}" },
+       { "LaTeX", "\\LaTeX{}" },
+       };
+ 
+size_t phrases_nr = sizeof(special_phrases)/sizeof(special_phrases[0]);
+ 
+} // namespace anon
+ 
 
 Paragraph::Pimpl::Pimpl(Paragraph * owner)
        : owner_(owner)
@@ -40,8 +55,7 @@ Paragraph::Pimpl::Pimpl(Paragraph * owner)
 }
 
 
-Paragraph::Pimpl::Pimpl(Paragraph::Pimpl const & p, Paragraph * owner,
-                        bool same_ids)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
        : params(p.params), owner_(owner)
 {
        inset_owner = p.inset_owner;
@@ -67,8 +81,7 @@ void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
 }
 
 
-Paragraph::value_type
-Paragraph::Pimpl::getChar(Paragraph::size_type pos) const
+Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 {
        lyx::Assert(pos <= size());
        // This is stronger, and I belive that this is the assertion
@@ -82,15 +95,13 @@ Paragraph::Pimpl::getChar(Paragraph::size_type pos) const
 }
 
 
-void Paragraph::Pimpl::setChar(Paragraph::size_type pos,
-                               Paragraph::value_type c)
+void Paragraph::Pimpl::setChar(pos_type pos, value_type c)
 {
        text[pos] = c;
 }
 
 
-void Paragraph::Pimpl::insertChar(Paragraph::size_type pos,
-                                  Paragraph::value_type c,
+void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
                                   LyXFont const & font)
 {
        lyx::Assert(pos <= size());
@@ -120,7 +131,7 @@ void Paragraph::Pimpl::insertChar(Paragraph::size_type pos,
 }
 
 
-void Paragraph::Pimpl::insertInset(Paragraph::size_type pos,
+void Paragraph::Pimpl::insertInset(pos_type pos,
                                   Inset * inset, LyXFont const & font)
 {
        lyx::Assert(inset);
@@ -146,7 +157,7 @@ void Paragraph::Pimpl::insertInset(Paragraph::size_type pos,
 }
 
 
-void Paragraph::Pimpl::erase(Paragraph::size_type pos)
+void Paragraph::Pimpl::erase(pos_type pos)
 {
        lyx::Assert(pos < size());
        // if it is an inset, delete the inset entry 
@@ -208,7 +219,7 @@ void Paragraph::Pimpl::erase(Paragraph::size_type pos)
 
 
 void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow,
-                                      Paragraph::size_type const i,
+                                      pos_type const i,
                                       int & column, LyXFont const & font,
                                       LyXLayout const & style)
 {
@@ -244,13 +255,16 @@ void Paragraph::Pimpl::simpleTeXBlanks(std::ostream & os, TexRow & texrow,
 }
 
 
-bool Paragraph::Pimpl::isTextAt(string const & str, Paragraph::size_type pos)
+bool Paragraph::Pimpl::isTextAt(BufferParams const & bp, LyXFont & font,
+                               string const & str, pos_type pos)
 {
-       for (int i=0; i < str.length(); ++i) {
-               if (pos + i >= size())
+       for (string::size_type i = 0; i < str.length(); ++i) {
+               if (pos + static_cast<pos_type>(i) >= size())
                        return false;
                if (str[i] != getChar(pos + i))
                        return false;
+               if (owner_->getFont(bp, pos + i) != font)
+                       return false;
        }
        return true;
 }
@@ -266,9 +280,9 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             LyXFont & basefont,
                                             bool & open_font,
                                             LyXLayout const & style,
-                                            Paragraph::size_type & i,
+                                            pos_type & i,
                                             int & column,
-                                            Paragraph::value_type const c)
+                                            value_type const c)
 {
        if (style.pass_thru) {
                if (c != '\0') os << c;
@@ -461,25 +475,25 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                }
                                break;
                        }
-                               
-                       if (isTextAt("LyX", i)) {
-                               os << "\\LyX{}";
-                               i += 2;
-                               column += 5;
-                       } else if (isTextAt("TeX", i)) {
-                               os << "\\TeX{}";
-                               i += 2;
-                               column += 5;
-                       } else if (isTextAt("LaTeX2e", i)) {
-                               os << "\\LaTeXe{}";
-                               i += 6;
-                               column += 8;
-                       } else if (isTextAt("LaTeX", i)) {
-                               os << "\\LaTeX{}";
-                               i += 4;
-                               column += 7;
-                       // do we really try to print out '\0' ?
-                       } else if (c != '\0') {
+               
+                       // LyX, LaTeX etc.
+ 
+                       // FIXME: if we have "LaTeX" with a font change in the middle (before
+                       // the 'T', then the "TeX" part is still special cased. Really we
+                       // should only operate this on "words" for some definition of word
+ 
+                       size_t pnr = 0;
+ 
+                       for (; pnr < phrases_nr; ++pnr) {
+                               if (isTextAt(bparams, font, special_phrases[pnr][0], i)) {
+                                       os << special_phrases[pnr][1];
+                                       i += special_phrases[pnr][0].length() - 1;
+                                       column += special_phrases[pnr][1].length() - 1;
+                                       break;
+                               }
+                       }
+
+                       if (pnr == phrases_nr && c != '\0') {
                                os << c;
                        }
                        break;