Merge branch 'breakspace'

This branch improves handling of spaces on display (see #10117):
* caret is correctly shown in the middle of double spaces in justified rows;

* sequence spaces are correctly shown at the end of rows before
  automatic row breaks.

Moreover, this branch:
* streamlines the code that handles spaces in row breaking

* improves display in Qt4 : although the improvements outlined above
  are not present in Qt4 for monospaced fonts, some dsplay glitches
  are resolved.

* improves performance for very long paragraphs (#12598).

diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt
index 39beb96fbf66bed6be220d51f89f5209a5aca07b..12d5446a129d4b3437455ccb1c272e8abd1087e2 100644 (file)
--- a/3rdparty/libiconv/CMakeLists.txt
+++ b/3rdparty/libiconv/CMakeLists.txt
@@ -14,6 +14,9 @@ if (POLICY CMP0069)
     set(LYX_IPO_SUPPORTED YES)
   endif()
 endif()
+if (POLICY CMP0075)
+  cmake_policy(SET CMP0075 NEW)
+endif()
 
 set(CMAKE_MODULE_PATH .)
 include ( configure.cmake )

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index e11d0a5becbe9e7f9675dcf6eb68dffd080ea01c..2ee2ada56acfa00fbbb8b30f84cc83d7f6391f17 100644 (file)
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3742,7 +3742,7 @@ void parse_text(Parser & p, ostream & os, unsigned flags, bool outer,
                        continue;
                }
 
-               if (t.cs() == "appendix") {
+               if (t.cs() == "appendix" && !context.in_list_preamble) {
                        context.add_par_extra_stuff("\\start_of_appendix\n");
                        // We need to start a new paragraph. Otherwise the
                        // appendix in 'bla\appendix\chapter{' would start