merge decDepth(), killing some non-parlist code

[lyx.git] / src / paragraph_pimpl.C

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index dba667654409568b21c428f77345c19a7312a36c..b9adef80c7bd01c2fe7e017b7a72914ece48d006 100644 (file)
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -252,22 +252,24 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 
 Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 {
+#if 1
        // This is in the critical path for loading!
        pos_type const siz = size();
+
        lyx::Assert(pos <= siz);
-       // This is stronger, and I belive that this is the assertion
-       // that we should really use. (Lgb)
-       //Assert(pos < size());
 
-       // Then this has no meaning. (Lgb)
-       if (!siz || pos == siz) {
+       if (pos == siz) {
                lyxerr << "getChar() on pos " << pos << " in par id "
-                       << owner_->id() << " of size " << siz
-                       << "  is a bit silly !" << endl;
+                      << owner_->id() << " of size " << siz
+                      << "  is a bit silly !" << endl;
                return '\0';
        }
 
        return text[pos];
+#else
+       lyx::Assert(pos < size());
+       return text[pos];
+#endif
 }
 
 
@@ -430,7 +432,9 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                                       LyXFont const & font,
                                       LyXLayout const & style)
 {
-       if (style.pass_thru) return;
+       if (style.pass_thru)
+               return;
+
        if (column > lyxrc.ascii_linelen
            && i
            && getChar(i - 1) != ' '
@@ -501,8 +505,13 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             value_type const c)
 {
        if (style.pass_thru) {
-               if (c != '\0')
-                       os << c;
+               if (c != Paragraph::META_INSET) {
+                       if (c != '\0')
+                               os << c;
+               } else {
+                       Inset const * inset = owner_->getInset(i);
+                       inset->ascii(buf, os, 0);
+               }
                return;
        }
 
@@ -517,6 +526,34 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                if (!inset)
                        break;
 
+               // FIXME: move this to InsetNewline::latex
+               if (inset->lyxCode() == Inset::NEWLINE_CODE) {
+                       // newlines are handled differently here than
+                       // the default in simpleTeXSpecialChars().
+                       if (!style.newline_allowed) {
+                               os << '\n';
+                       } else {
+                               if (open_font) {
+                                       column += running_font.latexWriteEndChanges(os, basefont, basefont);
+                                       open_font = false;
+                               }
+                               basefont = owner_->getLayoutFont(bparams);
+                               running_font = basefont;
+
+                               if (font.family() == LyXFont::TYPEWRITER_FAMILY)
+                                       os << '~';
+
+                               if (moving_arg)
+                                       os << "\\protect ";
+
+                               os << "\\\\\n";
+                       }
+                       texrow.newline();
+                       texrow.start(owner_, i + 1);
+                       column = 0;
+                       break;
+               }
+
                if (inset->isTextInset()) {
                        column += Changes::latexMarkChange(os, running_change,
                                Change::UNCHANGED);
@@ -569,17 +606,6 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
        }
        break;
 
-       case Paragraph::META_NEWLINE:
-               if (open_font) {
-                       column += running_font.latexWriteEndChanges(os,
-                                                                   basefont,
-                                                                   basefont);
-                       open_font = false;
-               }
-               basefont = owner_->getLayoutFont(bparams);
-               running_font = basefont;
-               break;
-
        default:
                // And now for the special cases within each mode