]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph_pimpl.C
merge decDepth(), killing some non-parlist code
[lyx.git] / src / paragraph_pimpl.C
index bcc504112c2e3cb52223a98fca5a01ae34ec9c5e..b9adef80c7bd01c2fe7e017b7a72914ece48d006 100644 (file)
@@ -79,7 +79,7 @@ Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
 void Paragraph::Pimpl::clear()
 {
        text.clear();
-#warning changes ? 
+#warning changes ?
 }
 
 
@@ -99,20 +99,20 @@ void Paragraph::Pimpl::trackChanges(Change::Type type)
                lyxerr[Debug::CHANGES] << "already tracking for par " << id_ << endl;
                return;
        }
+
        lyxerr[Debug::CHANGES] << "track changes for par "
                << id_ << " type " << type << endl;
        changes_.reset(new Changes(type));
        changes_->set(type, 0, size());
 }
 
+
 void Paragraph::Pimpl::untrackChanges()
 {
        changes_.reset(0);
 }
 
+
 void Paragraph::Pimpl::cleanChanges()
 {
        // if we're not tracking, we don't want to reset...
@@ -123,7 +123,7 @@ void Paragraph::Pimpl::cleanChanges()
        changes_->set(Change::INSERTED, 0, size());
 }
 
+
 bool Paragraph::Pimpl::isChanged(pos_type start, pos_type end) const
 {
        if (!tracking())
@@ -141,7 +141,7 @@ bool Paragraph::Pimpl::isChangeEdited(pos_type start, pos_type end) const
        return changes_->isChangeEdited(start, end);
 }
 
+
 void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 {
        if (!tracking())
@@ -150,7 +150,7 @@ void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
        changes_->set(type, pos);
 }
 
+
 Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
 {
        if (!tracking())
@@ -158,7 +158,7 @@ Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
 
        return changes_->lookup(pos);
 }
+
 
 Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 {
@@ -167,8 +167,8 @@ Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 
        return changes_->lookupFull(pos);
 }
+
+
 void Paragraph::Pimpl::markErased()
 {
        lyx::Assert(tracking());
@@ -180,18 +180,18 @@ void Paragraph::Pimpl::markErased()
        changes_->reset(Change::DELETED);
 }
 
+
 void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
 {
        if (!tracking())
                return;
+
        if (!size()) {
                changes_.reset(new Changes(Change::UNCHANGED));
                return;
        }
-       lyxerr << "acceptchange" << endl; 
+
+       lyxerr << "acceptchange" << endl;
        pos_type i = start;
 
        for (; i < end; ++i) {
@@ -212,7 +212,7 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
                }
        }
 
-       lyxerr << "endacceptchange" << endl; 
+       lyxerr << "endacceptchange" << endl;
        changes_->reset(Change::UNCHANGED);
 }
 
@@ -221,12 +221,12 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 {
        if (!tracking())
                return;
+
        if (!size()) {
                changes_.reset(new Changes(Change::UNCHANGED));
                return;
        }
+
        pos_type i = start;
 
        for (; i < end; ++i) {
@@ -249,21 +249,27 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
        changes_->reset(Change::UNCHANGED);
 }
 
+
 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;
                return '\0';
+       }
 
        return text[pos];
+#else
+       lyx::Assert(pos < size());
+       return text[pos];
+#endif
 }
 
 
@@ -339,7 +345,7 @@ bool Paragraph::Pimpl::erasePos(pos_type pos)
 
                // only allow the actual removal if it was /new/ text
                if (changetype != Change::INSERTED) {
-                       if (text[pos] == Paragraph::META_INSET) { 
+                       if (text[pos] == Paragraph::META_INSET) {
                                Inset * i(owner_->getInset(pos));
                                i->markErased();
                        }
@@ -351,7 +357,7 @@ bool Paragraph::Pimpl::erasePos(pos_type pos)
        return true;
 }
 
+
 void Paragraph::Pimpl::eraseIntern(pos_type pos)
 {
        // if it is an inset, delete the inset entry
@@ -401,7 +407,7 @@ void Paragraph::Pimpl::erase(pos_type pos)
        erasePos(pos);
 }
 
+
 bool Paragraph::Pimpl::erase(pos_type start, pos_type end)
 {
        pos_type i = start;
@@ -413,20 +419,22 @@ bool Paragraph::Pimpl::erase(pos_type start, pos_type end)
                        ++i;
                } else {
                        any_erased = true;
-               } 
+               }
                --count;
        }
        return any_erased;
 }
 
+
 void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
                                       pos_type const i,
                                       unsigned int & column,
                                       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) != ' '
@@ -480,7 +488,7 @@ bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
        return true;
 }
 
+
 void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                                             BufferParams const & bparams,
                                             ostream & os,
@@ -497,9 +505,16 @@ 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;
        }
+
        // Two major modes:  LaTeX or plain
        // Handle here those cases common to both modes
        // and then split to handle the two modes separately.
@@ -510,13 +525,41 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
                // FIXME: remove this check
                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);
                        running_change = Change::UNCHANGED;
                }
+
                bool close = false;
                int const len = os.tellp();
                //ostream::pos_type const len = os.tellp();
@@ -563,22 +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;
-
-       case Paragraph::META_HFILL:
-               os << "\\hfill{}";
-               column += 7;
-               break;
-
        default:
                // And now for the special cases within each mode
 
@@ -742,29 +769,6 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 }
 
 
-
-Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf,
-                                       BufferParams const & bparams,
-                                       ostream & os, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
-       Paragraph * par = owner_;
-
-       while (par && par->params().depth() == owner_->params().depth()) {
-               if (par->layout()->isEnvironment()) {
-                       par = par->TeXEnvironment(buf, bparams,
-                                                 os, texrow);
-               } else {
-                       par = par->TeXOnePar(buf, bparams,
-                                            os, texrow, false);
-               }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
-
-       return par;
-}
-
-
 void Paragraph::Pimpl::validate(LaTeXFeatures & features,
                                LyXLayout const & layout) const
 {
@@ -849,19 +853,6 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 }
 
 
-Paragraph * Paragraph::Pimpl::getParFromID(int id) const
-{
-       InsetList::iterator cit = owner_->insetlist.begin();
-       InsetList::iterator lend = owner_->insetlist.end();
-       Paragraph * result;
-       for (; cit != lend; ++cit) {
-               if ((result = cit.getInset()->getParFromID(id)))
-                       return result;
-       }
-       return 0;
-}
-
-
 LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
                                            BufferParams const & bparams) const
 {