]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
The "I want this in now" patch.
[lyx.git] / src / paragraph.C
index a86af064cc8880b94fa838fc6d464de5605a8ee0..06cc0b128221cefae0c45733057b71769af67526 100644 (file)
 
 #include "paragraph.h"
 #include "paragraph_pimpl.h"
-#include "lyxrc.h"
-#include "layout.h"
-#include "language.h"
+
 #include "buffer.h"
 #include "bufferparams.h"
-#include "debug.h"
-#include "texrow.h"
 #include "BufferView.h"
+#include "changes.h"
 #include "encoding.h"
-#include "ParameterStruct.h"
+#include "debug.h"
 #include "gettext.h"
-#include "changes.h"
+#include "language.h"
+#include "latexrunparams.h"
+#include "layout.h"
+#include "lyxrc.h"
+#include "paragraph_funcs.h"
+#include "ParameterStruct.h"
+#include "texrow.h"
+
+#include "Lsstream.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
+#include "insets/insetenv.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -70,6 +76,9 @@ Paragraph::Paragraph()
 #ifndef NO_NEXT
        next_ = 0;
        previous_ = 0;
+#else
+       next_par_ = 0;
+       prev_par_ = 0;
 #endif
        enumdepth = 0;
        itemdepth = 0;
@@ -77,28 +86,6 @@ Paragraph::Paragraph()
 }
 
 
-#ifndef NO_NEXT
-// This constructor inserts the new paragraph in a list.
-// It is placed after par.
-Paragraph::Paragraph(Paragraph * par)
-       : pimpl_(new Paragraph::Pimpl(this))
-{
-       enumdepth = 0;
-       itemdepth = 0;
-
-       // double linked list begin
-       next_ = par->next_;
-       if (next_)
-               next_->previous_ = this;
-       previous_ = par;
-       previous_->next_ = this;
-       // end
-
-       params().clear();
-}
-#endif
-
-
 Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
        : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
 {
@@ -107,6 +94,9 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 #ifndef NO_NEXT
        next_     = 0;
        previous_ = 0;
+#else
+       next_par_ = 0;
+       prev_par_ = 0;
 #endif
        // this is because of the dummy layout of the paragraphs that
        // follow footnotes
@@ -209,10 +199,6 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                                }
                }
                break;
-               case META_NEWLINE:
-                       os << "\n\\newline \n";
-                       column = 0;
-                       break;
                case '\\':
                        os << "\n\\backslash \n";
                        column = 0;
@@ -327,13 +313,13 @@ void Paragraph::eraseIntern(lyx::pos_type pos)
 }
 
 
-void Paragraph::erase(pos_type pos)
+bool Paragraph::erase(pos_type pos)
 {
-       pimpl_->erase(pos);
+       return pimpl_->erase(pos);
 }
 
 
-bool Paragraph::erase(pos_type start, pos_type end)
+int Paragraph::erase(pos_type start, pos_type end)
 {
        return pimpl_->erase(start, end);
 }
@@ -437,10 +423,8 @@ LyXFont const Paragraph::getFirstFontSettings() const
 // The difference is that this one is used for generating the LaTeX file,
 // and thus cosmetic "improvements" are disallowed: This has to deliver
 // the true picture of the buffer. (Asger)
-// If position is -1, we get the layout font of the paragraph.
-// If position is -2, we get the font of the manual label of the paragraph.
-LyXFont const Paragraph::getFont(BufferParams const & bparams,
-                                pos_type pos) const
+LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
+                                LyXFont const & outerfont) const
 {
        lyx::Assert(pos >= 0);
 
@@ -456,30 +440,35 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
 
        LyXFont tmpfont = getFontSettings(bparams, pos);
        tmpfont.realize(layoutfont);
+       tmpfont.realize(outerfont);
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       return realizeFont(tmpfont, bparams);
 }
 
 
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
+                                     LyXFont const & outerfont) const
 {
        LyXLayout_ptr const & lout = layout();
 
        LyXFont tmpfont = lout->labelfont;
        tmpfont.setLanguage(getParLanguage(bparams));
+       tmpfont.realize(outerfont);
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       return realizeFont(tmpfont, bparams);
 }
 
 
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
+                                      LyXFont const & outerfont) const
 {
        LyXLayout_ptr const & lout = layout();
 
        LyXFont tmpfont = lout->font;
        tmpfont.setLanguage(getParLanguage(bparams));
+       tmpfont.realize(outerfont);
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       return realizeFont(tmpfont, bparams);
 }
 
 
@@ -664,11 +653,11 @@ Paragraph const * Paragraph::previous() const
 #endif
 
 
-void Paragraph::makeSameLayout(Paragraph const * par)
+void Paragraph::makeSameLayout(Paragraph const & par)
 {
-       layout(par->layout());
+       layout(par.layout());
        // move to pimpl?
-       params() = par->params();
+       params() = par.params();
 }
 
 
@@ -687,40 +676,11 @@ int Paragraph::stripLeadingSpaces()
 }
 
 
-bool Paragraph::hasSameLayout(Paragraph const * par) const
+bool Paragraph::hasSameLayout(Paragraph const & par) const
 {
        return
-               par->layout() == layout() &&
-               params().sameLayout(par->params());
-}
-
-
-int Paragraph::getEndLabel() const
-{
-       Paragraph const * par = this;
-       depth_type par_depth = getDepth();
-       while (par) {
-               LyXLayout_ptr const & layout = par->layout();
-               int const endlabeltype = layout->endlabeltype;
-
-               if (endlabeltype != END_LABEL_NO_LABEL) {
-                       if (!next_)
-                               return endlabeltype;
-
-                       depth_type const next_depth = next_->getDepth();
-                       if (par_depth > next_depth ||
-                           (par_depth == next_depth
-                            && layout != next_->layout()))
-                               return endlabeltype;
-                       break;
-               }
-               if (par_depth == 0)
-                       break;
-               par = par->outerHook();
-               if (par)
-                       par_depth = par->getDepth();
-       }
-       return END_LABEL_NO_LABEL;
+               par.layout() == layout() &&
+               params().sameLayout(par.params());
 }
 
 
@@ -787,19 +747,22 @@ int Paragraph::beginningOfBody() const
        // and remember the previous character to
        // remove unnecessary GetChar() calls
        pos_type i = 0;
-       if (i < size() && getChar(i) != Paragraph::META_NEWLINE) {
+       if (i < size() && !isNewline(i)) {
                ++i;
                char previous_char = 0;
                char temp = 0;
-               if (i < size()
-                   && (previous_char = getChar(i)) != Paragraph::META_NEWLINE) {
-                       // Yes, this  ^ is supposed to be "= " not "=="
-                       ++i;
-                       while (i < size()
-                              && previous_char != ' '
-                              && (temp = getChar(i)) != Paragraph::META_NEWLINE) {
+               if (i < size()) {
+                       previous_char = getChar(i);
+                       if (!isNewline(i)) {
                                ++i;
-                               previous_char = temp;
+                               while (i < size() && previous_char != ' ') {
+                                       temp = getChar(i);
+                                       if (isNewline(i))
+                                               break;
+
+                                       ++i;
+                                       previous_char = temp;
+                               }
                        }
                }
        }
@@ -808,60 +771,6 @@ int Paragraph::beginningOfBody() const
 }
 
 
-Paragraph * Paragraph::depthHook(depth_type depth)
-{
-       Paragraph * newpar = this;
-
-       do {
-               newpar = newpar->previous();
-       } while (newpar && newpar->getDepth() > depth);
-
-       if (!newpar) {
-               if (previous() || getDepth())
-                       lyxerr << "ERROR (Paragraph::DepthHook): "
-                               "no hook." << endl;
-               newpar = this;
-       }
-
-       return newpar;
-}
-
-
-Paragraph const * Paragraph::depthHook(depth_type depth) const
-{
-       Paragraph const * newpar = this;
-
-       do {
-               newpar = newpar->previous();
-       } while (newpar && newpar->getDepth() > depth);
-
-       if (!newpar) {
-               if (previous() || getDepth())
-                       lyxerr << "ERROR (Paragraph::DepthHook): "
-                               "no hook." << endl;
-               newpar = this;
-       }
-
-       return newpar;
-}
-
-
-Paragraph * Paragraph::outerHook()
-{
-       if (!getDepth())
-               return 0;
-       return depthHook(depth_type(getDepth() - 1));
-}
-
-
-Paragraph const * Paragraph::outerHook() const
-{
-       if (!getDepth())
-               return 0;
-       return depthHook(depth_type(getDepth() - 1));
-}
-
-
 // returns -1 if inset not found
 int Paragraph::getPositionOfInset(Inset const * inset) const
 {
@@ -1004,7 +913,9 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
 // This one spits out the text of the paragraph
 bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                BufferParams const & bparams,
+                               LyXFont const & outerfont,
                                ostream & os, TexRow & texrow,
+                               LatexRunParams const & runparams,
                                bool moving_arg)
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
@@ -1044,9 +955,9 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        if (body_pos > 0) {
                os << '[';
                ++column;
-               basefont = getLabelFont(bparams);
+               basefont = getLabelFont(bparams, outerfont);
        } else {
-               basefont = getLayoutFont(bparams);
+               basefont = getLayoutFont(bparams, outerfont);
        }
 
        moving_arg |= style->needprotect;
@@ -1058,7 +969,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
        Change::Type running_change = Change::UNCHANGED;
 
-       texrow.start(this, 0);
+       texrow.start(id(), 0);
 
        // if the paragraph is empty, the loop will not be entered at all
        if (empty()) {
@@ -1080,7 +991,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                        column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
-                               basefont = getLayoutFont(bparams);
+                               basefont = getLayoutFont(bparams, outerfont);
                                running_font = basefont;
                                os << ']';
                                ++column;
@@ -1098,7 +1009,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                value_type c = getChar(i);
 
                // Fully instantiated font
-               LyXFont font = getFont(bparams, i);
+               LyXFont font = getFont(bparams, i, outerfont);
 
                LyXFont const last_font = running_font;
 
@@ -1106,7 +1017,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                // outside font change, i.e. we write "\textXX{text} "
                // rather than "\textXX{text }". (Asger)
                if (open_font && c == ' ' && i <= size() - 2) {
-                       LyXFont const & next_font = getFont(bparams, i + 1);
+                       LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
                        if (next_font != running_font
                            && next_font != font) {
                                font = next_font;
@@ -1150,38 +1061,14 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                column += Changes::latexMarkChange(os, running_change, change);
                running_change = change;
 
-               if (c == Paragraph::META_NEWLINE) {
-                       // 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 = getLayoutFont(bparams);
-                               running_font = basefont;
-                               if (font.family() ==
-                                   LyXFont::TYPEWRITER_FAMILY) {
-                                       os << '~';
-                               }
-                               if (moving_arg)
-                                       os << "\\protect ";
-
-                               os << "\\\\\n";
-                       }
-                       texrow.newline();
-                       texrow.start(this, i + 1);
-                       column = 0;
-               } else {
-                       pimpl_->simpleTeXSpecialChars(buf, bparams,
-                                                     os, texrow, moving_arg,
-                                                     font, running_font,
-                                                     basefont, open_font,
-                                                     running_change,
-                                                     *style, i, column, c);
-               }
+               LatexRunParams rp = runparams;
+               rp.fragile = moving_arg;
+               pimpl_->simpleTeXSpecialChars(buf, bparams,
+                                             os, texrow, runparams,
+                                             font, running_font,
+                                             basefont, outerfont, open_font,
+                                             running_change,
+                                             *style, i, column, c);
        }
 
        column += Changes::latexMarkChange(os,
@@ -1194,7 +1081,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        running_font
                                .latexWriteEndChanges(os, basefont,
                                                      next_->getFont(bparams,
-                                                     0));
+                                                     0, outerfont));
                } else {
                        running_font.latexWriteEndChanges(os, basefont,
                                                          basefont);
@@ -1229,7 +1116,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 bool Paragraph::isHfill(pos_type pos) const
 {
        return IsInsetChar(getChar(pos))
-                                       && getInset(pos)->lyxCode() == Inset::HFILL_CODE;
+              && getInset(pos)->lyxCode() == Inset::HFILL_CODE;
 }
 
 
@@ -1241,7 +1128,8 @@ bool Paragraph::isInset(pos_type pos) const
 
 bool Paragraph::isNewline(pos_type pos) const
 {
-       return pos >= 0 && IsNewlineChar(getChar(pos));
+       return IsInsetChar(getChar(pos))
+              && getInset(pos)->lyxCode() == Inset::NEWLINE_CODE;
 }
 
 
@@ -1291,9 +1179,12 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 {
        if (!empty()) {
                return getFirstFontSettings().language();
-       } else if (previous_)
+#warning FIXME we should check the prev par as well (Lgb)
+#if 0
+       } else if (previous_) {
                return previous_->getParLanguage(bparams);
-       else
+#endif
+       }else
                return bparams.language;
 }
 
@@ -1308,7 +1199,7 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 
 
 void Paragraph::changeLanguage(BufferParams const & bparams,
-                                 Language const * from, Language const * to)
+                              Language const * from, Language const * to)
 {
        for (pos_type i = 0; i < size(); ++i) {
                LyXFont font = getFontSettings(bparams, i);
@@ -1371,9 +1262,7 @@ string const Paragraph::asString(Buffer const * buffer,
                value_type const c = getUChar(buffer->params, i);
                if (IsPrintable(c))
                        os << c;
-               else if (c == META_NEWLINE)
-                       os << '\n';
-               else if (c == META_INSET) 
+               else if (c == META_INSET)
                        getInset(i)->ascii(buffer, os);
        }
 
@@ -1386,7 +1275,7 @@ void Paragraph::setInsetOwner(Inset * i)
        pimpl_->inset_owner = i;
        InsetList::iterator it = insetlist.begin();
        InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) 
+       for (; it != end; ++it)
                if (it.getInset())
                        it.getInset()->setOwner(i);
 }
@@ -1406,7 +1295,7 @@ void Paragraph::resizeInsetsLyXText(BufferView * bv)
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph * par)
+void Paragraph::setContentsFromPar(Paragraph const & par)
 {
        pimpl_->setContentsFromPar(par);
 }
@@ -1507,6 +1396,9 @@ int Paragraph::id() const
 
 LyXLayout_ptr const & Paragraph::layout() const
 {
+       Inset * inset = inInset();
+       if (inset && inset->lyxCode() == Inset::ENVIRONMENT_CODE)
+               return static_cast<InsetEnvironment*>(inset)->layout();
        return layout_;
 }
 
@@ -1517,15 +1409,6 @@ void Paragraph::layout(LyXLayout_ptr const & new_layout)
 }
 
 
-bool Paragraph::isFirstInSequence() const
-{
-       Paragraph const * dhook = depthHook(getDepth());
-       return (dhook == this
-               || dhook->layout() != layout()
-               || dhook->getDepth() != getDepth());
-}
-
-
 Inset * Paragraph::inInset() const
 {
        return pimpl_->inset_owner;