Update toolbar and properly reset focus when find widget is closed (#12396)

[lyx.git] / src / Paragraph.cpp

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index a327f15d4bd9c5ce844e90db2592377677836e1f..6b1e118697cabbd6a2b099f8a5d11a4ac894fdfa 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -37,6 +37,7 @@
 #include "output_xhtml.h"
 #include "output_docbook.h"
 #include "ParagraphParameters.h"
+#include "Session.h"
 #include "SpellChecker.h"
 #include "texstream.h"
 #include "TexRow.h"
@@ -70,8 +71,8 @@
 using namespace std;
 using namespace lyx::support;
 
-// OSX clang, gcc < 4.8.0, and msvc < 2015 do not support C++11 thread_local
-#if defined(__APPLE__) || (defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 8)
+// OSX clang and msvc < 2015 do not support C++11 thread_local
+#if defined(__APPLE__)
 #define THREAD_LOCAL_STATIC static __thread
 #elif defined(_MSC_VER) && (_MSC_VER < 1900)
 #define THREAD_LOCAL_STATIC static __declspec(thread)
@@ -832,6 +833,11 @@ void Paragraph::Private::insertChar(pos_type pos, char_type c,
 
        // Update list of misspelled positions
        speller_state_.increasePosAfterPos(pos);
+
+       // Update bookmarks
+       if (inset_owner_ && inset_owner_->isBufferValid())
+               theSession().bookmarks().adjustPosAfterPos(inset_owner_->buffer().fileName(),
+                                                      id_, pos, 1);
 }
 
 
@@ -916,6 +922,11 @@ bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
        d->speller_state_.decreasePosAfterPos(pos);
        d->speller_state_.refreshLast(size());
 
+       // Update bookmarks
+       if (d->inset_owner_ && d->inset_owner_->isBufferValid())
+               theSession().bookmarks().adjustPosAfterPos(d->inset_owner_->buffer().fileName(),
+                                                      d->id_, pos, -1);
+
        return true;
 }
 
@@ -1137,6 +1148,7 @@ void Paragraph::Private::latexInset(BufferParams const & bparams,
                bool const cprotect = textinset
                        ? textinset->hasCProtectContent(runparams.moving_arg)
                          && !textinset->text().isMainText()
+                         && inset->lyxCode() != BRANCH_CODE
                        : false;
                unsigned int count2 = basefont.latexWriteStartChanges(os, bparams,
                                                      rp, running_font,
@@ -2256,6 +2268,16 @@ bool Paragraph::isPassThru() const
        return inInset().isPassThru() || d->layout_->pass_thru;
 }
 
+
+bool Paragraph::isPartOfTextSequence() const
+{
+       for (pos_type i = 0; i < size(); ++i) {
+               if (!isInset(i) || getInset(i)->isPartOfTextSequence())
+                       return true;
+       }
+       return false;
+}
+
 namespace {
 
 // paragraphs inside floats need different alignment tags to avoid
@@ -2327,13 +2349,31 @@ int Paragraph::Private::startTeXParParams(BufferParams const & bparams,
                        (layout_->toggle_indent != ITOGGLE_NEVER) :
                        (layout_->toggle_indent == ITOGGLE_ALWAYS);
 
-       if (canindent && params_.noindent() && !layout_->pass_thru) {
-               os << "\\noindent ";
-               column += 10;
-       }
-
        LyXAlignment const curAlign = params_.align();
 
+       // Do not output \\noindent for paragraphs
+       // 1. that cannot have indentation or are indented always,
+       // 2. that are not part of the immediate text sequence (e.g., contain only floats),
+       // 3. that are PassThru,
+       // 4. or that are centered.
+       if (canindent && params_.noindent()
+           && owner_->isPartOfTextSequence()
+           && !layout_->pass_thru
+           && curAlign != LYX_ALIGN_CENTER) {
+               if (!owner_->empty()
+                   && (owner_->isInset(0)
+                       && owner_->getInset(0)->lyxCode() == VSPACE_CODE))
+                       // If the paragraph starts with a vspace, the \\noindent
+                       // needs to come after that (as it leaves vmode).
+                       // If the paragraph consists only of the vspace,
+                       // \\noindent is not needed at all.
+                       runparams.need_noindent = owner_->size() > 1;
+               else {
+                       os << "\\noindent" << termcmd;
+                       column += 10;
+               }
+       }
+
        if (curAlign == layout_->align)
                return column;
 
@@ -2683,7 +2723,12 @@ void Paragraph::latex(BufferParams const & bparams,
                                && getInset(i)
                                && getInset(i)->allowMultiPar()
                                && getInset(i)->lyxCode() != ERT_CODE
-                               && getInset(i)->producesOutput();
+                               && (getInset(i)->producesOutput()
+                                   // FIXME Something more general?
+                                   // Comments do not "produce output" but are still
+                                   // part of the TeX source and require font switches
+                                   // to be closed (otherwise LaTeX fails).
+                                   || getInset(i)->layoutName() == "Note:Comment");
 
                bool closeLanguage = false;
                bool lang_switched_at_inset = false;
@@ -2807,6 +2852,7 @@ void Paragraph::latex(BufferParams const & bparams,
                                bool const cprotect = textinset
                                        ? textinset->hasCProtectContent(runparams.moving_arg)
                                          && !textinset->text().isMainText()
+                                         && inInset().lyxCode() != BRANCH_CODE
                                        : false;
                                column += current_font.latexWriteStartChanges(ots, bparams,
                                                                              runparams, basefont, last_font, false,