]> git.lyx.org Git - lyx.git/blobdiff - src/Paragraph.cpp
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Further to r26743, add CustomPars and ForcePlain layout tags to InsetLayout,
[lyx.git] / src / Paragraph.cpp
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 98cd13d81111472f215798c961f263024c70b6d5..ba3ee8e0d8d16fbcf4642675b1ad1e5a0d4c1293 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -52,6 +52,7 @@
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/ExceptionMessage.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/Messages.h"
@@ -112,11 +113,11 @@ public:
 
        /// This could go to ParagraphParameters if we want to.
        int startTeXParParams(BufferParams const &, odocstream &, TexRow &,
-                             bool) const;
+                             OutputParams const &) const;
 
        /// This could go to ParagraphParameters if we want to.
        int endTeXParParams(BufferParams const &, odocstream &, TexRow &,
-                           bool) const;
+                           OutputParams const &) const;
 
        ///
        void latexInset(BufferParams const &,
@@ -175,7 +176,7 @@ public:
        Paragraph * owner_;
 
        /// In which Inset?
-       Inset * inset_owner_;
+       Inset const * inset_owner_;
 
        ///
        FontList fontlist_;
@@ -278,6 +279,13 @@ Paragraph::Private::Private(Private const & p, Paragraph * owner,
 }
 
 
+void Paragraph::addChangesToToc(DocIterator const & cdit,
+       Buffer const & buf) const
+{
+       d->changes_.addToToc(cdit, buf);
+}
+
+
 bool Paragraph::isChanged(pos_type start, pos_type end) const
 {
        LASSERT(start >= 0 && start <= size(), /**/);
@@ -457,7 +465,7 @@ void Paragraph::insertInset(pos_type pos, Inset * inset,
 
 bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
 {
-       LASSERT(pos >= 0 && pos <= size(), /**/);
+       LASSERT(pos >= 0 && pos <= size(), return false);
 
        // keep the logic here in sync with the logic of isMergedOnEndOfParDeletion()
 
@@ -1656,28 +1664,19 @@ void Paragraph::setBeginOfBody()
 
 bool Paragraph::forcePlainLayout() const
 {
-       Inset const * const inset = inInset();
-       if (!inset)
-               return true;
-       return inset->forcePlainLayout();
+       return inInset().forcePlainLayout();
 }
 
 
 bool Paragraph::allowParagraphCustomization() const
 {
-       Inset const * const inset = inInset();
-       if (!inset)
-               return true;
-       return inset->allowParagraphCustomization();
+       return inInset().allowParagraphCustomization();
 }
 
 
 bool Paragraph::usePlainLayout() const
 {
-       Inset const * const inset = inInset();
-       if (!inset)
-               return false;
-       return inset->usePlainLayout();
+       return inInset().usePlainLayout();
 }
 
 
@@ -1688,7 +1687,9 @@ namespace {
 
 bool noTrivlistCentering(InsetCode code)
 {
-       return code == FLOAT_CODE || code == WRAP_CODE;
+       return code == FLOAT_CODE
+              || code == WRAP_CODE
+              || code == CELL_CODE;
 }
 
 
@@ -1705,12 +1706,19 @@ string correction(string const & orig)
 
 
 string const corrected_env(string const & suffix, string const & env,
-       InsetCode code)
+       InsetCode code, bool const lastpar)
 {
        string output = suffix + "{";
-       if (noTrivlistCentering(code))
+       if (noTrivlistCentering(code)) {
+               if (lastpar) {
+                       // the last paragraph in non-trivlist-aligned
+                       // context is special (to avoid unwanted whitespace)
+                       if (suffix == "\\begin")
+                               return "\\" + correction(env) + "{}";
+                       return string();
+               }
                output += correction(env);
-       else
+       } else
                output += env;
        output += "}";
        if (suffix == "\\begin")
@@ -1735,7 +1743,7 @@ void adjust_row_column(string const & str, TexRow & texrow, int & column)
 
 int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
                                 odocstream & os, TexRow & texrow,
-                                bool moving_arg) const
+                                OutputParams const & runparams) const
 {
        int column = 0;
 
@@ -1758,13 +1766,17 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_LEFT:
        case LYX_ALIGN_RIGHT:
        case LYX_ALIGN_CENTER:
-               if (moving_arg) {
+               if (runparams.moving_arg) {
                        os << "\\protect";
                        column += 8;
                }
                break;
        }
 
+       string const begin_tag = "\\begin";
+       InsetCode code = owner_->ownerCode();
+       bool const lastpar = runparams.isLastPar;
+
        switch (curAlign) {
        case LYX_ALIGN_NONE:
        case LYX_ALIGN_BLOCK:
@@ -1774,24 +1786,24 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_LEFT: {
                string output;
                if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-                       output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
+                       output = corrected_env(begin_tag, "flushleft", code, lastpar);
                else
-                       output = corrected_env("\\begin", "flushright", owner_->ownerCode());
+                       output = corrected_env(begin_tag, "flushright", code, lastpar);
                os << from_ascii(output);
                adjust_row_column(output, texrow, column);
                break;
        } case LYX_ALIGN_RIGHT: {
                string output;
                if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-                       output = corrected_env("\\begin", "flushright", owner_->ownerCode());
+                       output = corrected_env(begin_tag, "flushright", code, lastpar);
                else
-                       output = corrected_env("\\begin", "flushleft", owner_->ownerCode());
+                       output = corrected_env(begin_tag, "flushleft", code, lastpar);
                os << from_ascii(output);
                adjust_row_column(output, texrow, column);
                break;
        } case LYX_ALIGN_CENTER: {
                string output;
-               output = corrected_env("\\begin", "center", owner_->ownerCode());
+               output = corrected_env(begin_tag, "center", code, lastpar);
                os << from_ascii(output);
                adjust_row_column(output, texrow, column);
                break;
@@ -1804,7 +1816,7 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
 
 int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
                               odocstream & os, TexRow & texrow,
-                              bool moving_arg) const
+                              OutputParams const & runparams) const
 {
        int column = 0;
 
@@ -1817,13 +1829,17 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_LEFT:
        case LYX_ALIGN_RIGHT:
        case LYX_ALIGN_CENTER:
-               if (moving_arg) {
+               if (runparams.moving_arg) {
                        os << "\\protect";
                        column = 8;
                }
                break;
        }
 
+       string const end_tag = "\n\\par\\end";
+       InsetCode code = owner_->ownerCode();
+       bool const lastpar = runparams.isLastPar;
+
        switch (params_.align()) {
        case LYX_ALIGN_NONE:
        case LYX_ALIGN_BLOCK:
@@ -1833,24 +1849,24 @@ int Paragraph::Private::endTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_LEFT: {
                string output;
                if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-                       output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
+                       output = corrected_env(end_tag, "flushleft", code, lastpar);
                else
-                       output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
+                       output = corrected_env(end_tag, "flushright", code, lastpar);
                os << from_ascii(output);
                adjust_row_column(output, texrow, column);
                break;
        } case LYX_ALIGN_RIGHT: {
                string output;
                if (owner_->getParLanguage(bparams)->babel() != "hebrew")
-                       output = corrected_env("\n\\par\\end", "flushright", owner_->ownerCode());
+                       output = corrected_env(end_tag, "flushright", code, lastpar);
                else
-                       output = corrected_env("\n\\par\\end", "flushleft", owner_->ownerCode());
+                       output = corrected_env(end_tag, "flushleft", code, lastpar);
                os << from_ascii(output);
                adjust_row_column(output, texrow, column);
                break;
        } case LYX_ALIGN_CENTER: {
                string output;
-               output = corrected_env("\n\\par\\end", "center", owner_->ownerCode());
+               output = corrected_env(end_tag, "center", code, lastpar);
                os << from_ascii(output);
                adjust_row_column(output, texrow, column);
                break;
@@ -1916,7 +1932,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                }
                if (!asdefault)
                        column += d->startTeXParParams(bparams, os, texrow,
-                                                   runparams.moving_arg);
+                                                   runparams);
        }
 
        for (pos_type i = 0; i < size(); ++i) {
@@ -1947,7 +1963,7 @@ bool Paragraph::latex(BufferParams const & bparams,
                        if (!asdefault)
                                column += d->startTeXParParams(bparams, os,
                                                            texrow,
-                                                           runparams.moving_arg);
+                                                           runparams);
                }
 
                Change const & change = runparams.inDeletedInset ? runparams.changeOfDeletedInset
@@ -2124,7 +2140,7 @@ bool Paragraph::latex(BufferParams const & bparams,
 
        if (!asdefault) {
                column += d->endTeXParParams(bparams, os, texrow,
-                                         runparams.moving_arg);
+                                         runparams);
        }
 
        LYXERR(Debug::LATEX, "SimpleTeXOnePar...done " << this);
@@ -2380,7 +2396,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
 
        for (pos_type i = beg; i < end; ++i) {
                char_type const c = d->text_[i];
-               if (isPrintable(c))
+               if (isPrintable(c) || c == '\t')
                        os.put(c);
                else if (c == META_INSET && options & AS_STR_INSETS)
                        getInset(i)->textString(os);
@@ -2390,7 +2406,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options) const
 }
 
 
-void Paragraph::setInsetOwner(Inset * inset)
+void Paragraph::setInsetOwner(Inset const * inset)
 {
        d->inset_owner_ = inset;
 }
@@ -2423,9 +2439,11 @@ void Paragraph::setPlainOrDefaultLayout(DocumentClass const & tclass)
 }
 
 
-Inset * Paragraph::inInset() const
+Inset const & Paragraph::inInset() const
 {
-       return d->inset_owner_;
+       LASSERT(d->inset_owner_, throw ExceptionMessage(BufferException,
+               _("Memory problem"), _("Paragraph not properly initiliazed")));
+       return *d->inset_owner_;
 }
 
 
The LyX Source Repository