commit bcb002039b1a0e4893f18a032e02b6f6368924f9
Merge: 156cfe5 10335b9
Author: Richard Heck <rgh...@lyx.org>
Date:   Sat Apr 14 23:52:31 2018 -0400

    Merge branch '2.3.2-staging' into 2.3.x

 3rdparty/hunspell/Makefile.am                      |    2 +-
 INSTALL                                            |    3 +
 config/lyxinclude.m4                               |    1 +
 config/spell.m4                                    |   25 +
 development/PAINTING_ANALYSIS                      |   88 +-
 development/cmake/ConfigureChecks.cmake            |   30 +
 development/cmake/configCompiler.h.cmake           |    3 +
 lib/CREDITS                                        |    3 +
 lib/RELEASE-NOTES                                  |    4 +
 lib/configure.py                                   |   12 +-
 lib/doc/Customization.lyx                          |   62 +-
 lib/doc/UserGuide.lyx                              |   19 +
 lib/doc/de/Customization.lyx                       |   27 +-
 lib/generate_contributions.py                      |    8 +
 lib/layouts/IEEEtran.layout                        |    1 +
 lib/layouts/aguplus.inc                            |    1 +
 lib/layouts/agutex.layout                          |    1 +
 lib/layouts/amsdefs.inc                            |    1 +
 lib/layouts/beamer.layout                          |    1 +
 lib/layouts/cl2emult.layout                        |    1 +
 lib/layouts/egs.layout                             |    1 +
 lib/layouts/elsarticle.layout                      |    1 +
 lib/layouts/ijmpc.layout                           |    1 +
 lib/layouts/ijmpd.layout                           |    1 +
 lib/layouts/iopart.layout                          |    1 +
 lib/layouts/jasatex.layout                         |    1 +
 lib/layouts/kluwer.layout                          |    1 +
 lib/layouts/llncs.layout                           |    1 +
 lib/layouts/moderncv.layout                        |    1 +
 lib/layouts/powerdot.layout                        |    3 +-
 lib/layouts/siamltex.layout                        |    1 +
 lib/layouts/simplecv.layout                        |    1 +
 lib/layouts/stdstruct.inc                          |    1 +
 lib/layouts/svcommon.inc                           |    1 +
 lib/syntax.default                                 |    1 -
 lib/ui/stdcontext.inc                              |    1 +
 src/Buffer.cpp                                     |   46 +-
 src/BufferParams.cpp                               |    9 +-
 src/BufferView.cpp                                 |  342 +-
 src/BufferView.h                                   |   27 +-
 src/Converter.cpp                                  |   14 +
 src/Converter.h                                    |    6 +
 src/Cursor.cpp                                     |   13 -
 src/Cursor.h                                       |    2 -
 src/CutAndPaste.cpp                                |   11 +
 src/Font.cpp                                       |   16 +-
 src/FuncCode.h                                     |    4 +
 src/HunspellChecker.cpp                            |   16 +
 src/Layout.cpp                                     |    2 +-
 src/LyXAction.cpp                                  |   49 +-
 src/LyXRC.cpp                                      |   16 +
 src/LyXRC.h                                        |    3 +
 src/MetricsInfo.h                                  |    2 +-
 src/OutputParams.h                                 |    4 +
 src/PDFOptions.cpp                                 |    4 +
 src/Paragraph.cpp                                  |   52 +-
 src/Paragraph.h                                    |    4 +
 src/ParagraphMetrics.cpp                           |   38 -
 src/ParagraphMetrics.h                             |    3 -
 src/Row.cpp                                        |   30 +-
 src/Row.h                                          |   36 +-
 src/RowPainter.cpp                                 |   14 +-
 src/Spacing.cpp                                    |   22 +
 src/Spacing.h                                      |    3 +
 src/Text.cpp                                       |    2 +-
 src/Text3.cpp                                      |   12 +
 src/TextMetrics.cpp                                |   97 +-
 src/TextMetrics.h                                  |    5 +
 src/Undo.cpp                                       |   40 +-
 src/Undo.h                                         |   13 +-
 src/frontends/Makefile.am                          |    1 +
 src/frontends/NullPainter.h                        |  109 +
 src/frontends/Painter.h                            |   11 +-
 src/frontends/WorkArea.h                           |    4 +-
 src/frontends/WorkAreaManager.cpp                  |    2 +-
 src/frontends/qt4/FileDialog.cpp                   |  177 +-
 src/frontends/qt4/FindAndReplace.cpp               |    4 +-
 src/frontends/qt4/GuiApplication.cpp               |   34 +-
 src/frontends/qt4/GuiCitation.cpp                  |   13 +-
 src/frontends/qt4/GuiCitation.h                    |    3 -
 src/frontends/qt4/GuiDocument.cpp                  |   92 +-
 src/frontends/qt4/GuiDocument.h                    |    6 +-
 src/frontends/qt4/GuiExternal.cpp                  |    3 +
 src/frontends/qt4/GuiInclude.cpp                   |    2 +-
 src/frontends/qt4/GuiPainter.cpp                   |   34 +-
 src/frontends/qt4/GuiPainter.h                     |    3 +
 src/frontends/qt4/GuiView.cpp                      |   20 +-
 src/frontends/qt4/GuiView.h                        |    2 +-
 src/frontends/qt4/GuiWorkArea.cpp                  |  530 +--
 src/frontends/qt4/GuiWorkArea.h                    |   18 +-
 src/frontends/qt4/GuiWorkArea_Private.h            |  130 +-
 src/frontends/qt4/ui/GraphicsUi.ui                 |  682 ++--
 src/frontends/qt4/ui/MathsUi.ui                    |  331 +-
 src/frontends/qt4/ui/PreambleUi.ui                 |   42 +-
 src/insets/InsetBibitem.cpp                        |    4 +
 src/insets/InsetCitation.cpp                       |    6 +
 src/insets/InsetCitation.h                         |    4 +
 src/insets/InsetGraphics.cpp                       |    4 +-
 src/insets/InsetLabel.cpp                          |    4 +-
 src/insets/RenderGraphic.cpp                       |    5 +
 src/mathed/InsetMathMacroTemplate.cpp              |   18 +-
 src/mathed/InsetMathRoot.cpp                       |  101 +-
 src/mathed/InsetMathRoot.h                         |    5 +
 src/mathed/InsetMathSqrt.cpp                       |   25 +-
 src/mathed/MathSupport.cpp                         |   40 +-
 src/mathed/MathSupport.h                           |    2 +
 src/output_latex.cpp                               |  132 +-
 src/output_latex.h                                 |    3 +-
 src/support/filetools.cpp                          |   11 +-
 src/support/filetools.h                            |    3 +-
 src/tex2lyx/Context.cpp                            |    2 +
 src/tex2lyx/Context.h                              |    4 +
 src/tex2lyx/Makefile.am                            |    2 +
 src/tex2lyx/Parser.cpp                             |   47 +-
 src/tex2lyx/Parser.h                               |   13 +-
 src/tex2lyx/Preamble.cpp                           |  426 ++-
 src/tex2lyx/Preamble.h                             |   11 +
 src/tex2lyx/TODO.txt                               |  103 +-
 src/tex2lyx/test/CJK.lyx.lyx                       |   24 +-
 src/tex2lyx/test/CJKutf8.lyx.lyx                   |    2 +-
 src/tex2lyx/test/CMakeLists.txt                    |    1 +
 src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx         |    2 +-
 src/tex2lyx/test/beamer.lyx.lyx                    | 4411 ++++++++++++++++++++
 src/tex2lyx/test/beamer.tex                        |  706 ++++
 .../test/box-color-size-space-align.lyx.lyx        |   42 +-
 src/tex2lyx/test/runtests.py                       |    1 +
 src/tex2lyx/test/test-insets-basic.lyx.lyx         |  170 +-
 src/tex2lyx/test/test-insets.lyx.lyx               |  174 +-
 src/tex2lyx/test/test-minted.lyx.lyx               |   24 +-
 src/tex2lyx/test/test-structure.lyx.lyx            |   14 +-
 src/tex2lyx/tex2lyx.cpp                            |   40 +-
 src/tex2lyx/tex2lyx.h                              |   23 +-
 src/tex2lyx/text.cpp                               | 1800 ++++++---
 src/update_flags.h                                 |   14 +-
 status.23x                                         |  121 +-
 135 files changed, 9588 insertions(+), 2477 deletions(-)

diff --cc config/spell.m4
index 2a03026,152e485..d686a82
--- a/config/spell.m4
+++ b/config/spell.m4
@@@ -45,21 -31,36 +45,39 @@@ AC_DEFUN([CHECK_WITH_ENCHANT]
        test "$with_enchant" = "no" && lyx_use_enchant=false
  
        if $lyx_use_enchant; then
 -      PKG_CHECK_MODULES([ENCHANT], [enchant], [], [lyx_use_enchant=false])
 -      AC_MSG_CHECKING([whether to use enchant])
 -      if $lyx_use_enchant ; then
 -          AC_MSG_RESULT(yes)
 -          AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant library])
 -          lyx_flags="$lyx_flags use-enchant"
 -      else
 -          AC_MSG_RESULT(no)
 -      fi
 -    fi
 +              PKG_CHECK_MODULES([ENCHANT], [enchant-2], [],
 +                  [PKG_CHECK_MODULES([ENCHANT], [enchant], [],
 +                      [lyx_use_enchant=false])])
 +              AC_MSG_CHECKING([whether to use enchant])
 +              if $lyx_use_enchant ; then
 +                  AC_MSG_RESULT(yes)
 +                  AC_DEFINE(USE_ENCHANT, 1, [Define as 1 to use the enchant 
library])
 +                  LYX_HAVE_ENCHANT2
 +                  lyx_flags="$lyx_flags use-enchant"
 +              else
 +                  AC_MSG_RESULT(no)
 +              fi
 +      fi
      ])
  
+ AC_DEFUN([LYX_HAVE_HUNSPELL_CXXABI],
+ [
+   AC_MSG_CHECKING([whether hunspell C++ (rather than C) ABI is provided])
+   save_CXXFLAGS=$CXXFLAGS
+   CXXFLAGS="$ENCHANT_CFLAGS $AM_CXXFLAGS $CXXFLAGS"
+ 
+ # in the C++ ABI, stem() returns a vector, in the C ABI, it returns an int
+   AC_TRY_COMPILE([#include <hunspell/hunspell.hxx>],
+       [Hunspell sp("foo", "bar");
+        int i = sp.stem("test").size();],
+       [AC_MSG_RESULT(yes)
+        AC_DEFINE(HAVE_HUNSPELL_CXXABI, 1, [Define to 1 if hunspell C++ 
(rather than C) ABI is detected])
+        have_hunspell_cxx_abi=yes
+       ],
+       [AC_MSG_RESULT(no)])
+   CXXFLAGS=$save_CXXFLAGS
+ ])
+ 
  # Macro to add for using hunspell spellchecker libraries!     -*- sh -*-
  AC_DEFUN([CHECK_WITH_HUNSPELL],
  [
diff --cc src/insets/InsetCitation.cpp
index 3201e83,ca96d1d..1d079c2
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@@ -59,10 -62,14 +59,16 @@@ InsetCitation::~InsetCitation(
  }
  
  
+ // May well be over-ridden when session settings are loaded
+ // in GuiCitation. Unfortunately, that will not happen until
+ // such a dialog is created.
+ bool InsetCitation::last_literal = true;
+ 
+ 
  ParamInfo const & InsetCitation::findInfo(string const & /* cmdName */)
  {
 +      static ParamInfo param_info_;
 +
        // standard cite does only take one argument, but biblatex, jurabib
        // and natbib extend this to two arguments, so
        // we have to allow both here. InsetCitation takes care that
diff --cc src/tex2lyx/text.cpp
index a320679,47f5b13..f4002b0
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@@ -2473,11 -2638,14 +2638,16 @@@ void parse_text(Parser & p, ostream & o
        // nocite{*} option (needed for bibtex inset)
        string btprint;
        string contentslineContent;
 -      string bibliographystyle = "default";
 +      // Some classes provide a \bibliographystyle, so do not output
 +      // any if none is explicitly set.
 +      string bibliographystyle;
        bool const use_natbib = isProvided("natbib");
        bool const use_jurabib = isProvided("jurabib");
+       bool const use_biblatex = isProvided("biblatex")
+                       && preamble.citeEngine() != "biblatex-natbib";
+       bool const use_biblatex_natbib = isProvided("biblatex-natbib")
+                       || (isProvided("biblatex") && preamble.citeEngine() == 
"biblatex-natbib");
+       need_commentbib = use_biblatex || use_biblatex_natbib;
        string last_env;
  
        // it is impossible to determine the correct encoding for non-CJK 
Japanese.
diff --cc status.23x
index 5820aca,265657b..6f5cec8
--- a/status.23x
+++ b/status.23x
@@@ -15,22 -15,83 +15,83 @@@ What's ne
  
  * DOCUMENT INPUT/OUTPUT
  
 +- Updated Arabic, Russian and Slovakian user interface localization.
 +
+ - It possible to anonymize document's content for bug submissions
+   via buffer-anonymize lfun (bug 7259).
+ 
  
  * TEX2LYX IMPROVEMENTS
  
 -- Add support for biblatex.
 -
 -- Add support for beamer overlay arguments (bug 11068).
  
 -- Add support for chapterbib.
 +* USER INTERFACE
  
 -- Add support for \includeonly.
++- Add support for beamer overlay arguments (bug 11068).
+ 
+ - Update tex2lyx quotation marks detection:
+   * Consider new quote styles of LyX 2.3.
+   * Consider changed quote styles in LYX 2.3.
+   * Try to be a bit smarter with ambiguous quotation marks,
+     depending on the main quote style and the local context.
+ 
+ - Consider options passed via \PassOptionsToPackage.
+ 
+ - Add support for URW Classico, MinionPro and the new Libertine fonts.
+ 
+ - Add support for \lstinputlisting and \inputminted.
+ 
+ - Add support for the \t*{} (bottomtiebar) macro of TIPA.
+ 
+ - Implement better parsing of some command options (via "literate"
+   function of some insets) (bug 9563).
+ 
+ - Add support for alignment pseudo-environments as used inside floats
+   (bug 7857).
+ 
+ 
+ * USER INTERFACE
+ 
+ - Overhaul the document painting mechanism. Now the screen is updated
+   asyncronously (as all normal applications do), which makes LyX
+   snappier, especially on repeated events. As an added bonus, subpixel
+   aliasing is honored in the work area.
+ 
+ - Use native file dialogs on all platforms by default. It is now
+   possible to switch to LyX custom dialogs (which have extra shortcuts
+   to relevant directories) by setting the preference
+   \use_native_filedialog true
+ 
+ - Handle properly top/bottom of inset with mac-like cursor movement
+   (bug 10701).
+ 
+ - Respect the last setting of the 'literal' checkbox when adding citations
+   via the LyX server (e.g., from JabRef).
+ 
+ - Allow unification of graphic groups inside marked block via context
+   menu.
+ 
+ - Cosmetic polishment of the "Math Options" pane of Document Settings
+   (bug 10777).
+ 
+ - UI improvements in the graphics dialog (bug 10771).
+ 
+ - Set tab stop in preamble editor to four characters.
+ 
+ - Provide simple search functionality in preamble (bug 11099).
+ 
+ - Change Settings -> Local Layout to Fixed-width Font and Nowrap (bug 10992).
+ 
  
  * DOCUMENTATION AND LOCALIZATION
  
  
 -
  * BUILD/INSTALLATION
  
 +- Add support for v.2 of the enchant spell checker (bug 10986).
 +
+ - Support new hunspell C++ ABI if LyX is built against hunspell >= 1.5
+   (bug 10547).
+ 
  
  
  ** Bug fixes:
@@@ -38,56 -99,56 +99,98 @@@
  
  * DOCUMENT INPUT/OUTPUT
  
 +- Properly escape labels entered for included program listings in Insert > 
File
 +  > Child Document (part of bug 10544).
 +
 +- Fix the implementation of new libertine font package.
 +
 +- Properly escape braces in non-literate context in insets.
 +
 +- Fix output of citation commands in child documents (bug 11083).
 +
 +- Use normal footnote (rather than \tablefootnote) for tables in minipages.
 +
 +- Fix detection of Open Document files.
 +
+ - Fix language settings and line spacing in InPreamble-titles
+   (bug 9332, 1049).
+ 
+ - Respect 'literal' setting when calculating longest bibitem (bug 10817).
+ 
+ - Do not embrace numbers in \beginL ... \endL with polyglossia in Right-
+   to-Left languages, since bidi handles the numbers automatically.
+ 
+ - Fix polyglossia language switches for Arabic (bug 11057).
+ 
+ - Set correct path to (biblatex) bibliography databases that are entered
+   relative to child documents (bug 11105).
+ 
+ - Load hyperref with a suitable driver (bug 6418).
+ 
  
  * LYX2LYX
  
  
 -
  * USER INTERFACE
  
 +- Fix "Paste from LaTeX" on Windows (bug 9139).
 +
- - Disable BUFFER_EXPORT and BUFFER_EXPORT_AS while buffer is processed (bug 
8338).
++- Disable BUFFER_EXPORT and BUFFER_EXPORT_AS while buffer is processed
++  (bug 8338).
 +
 +- Disable CheckTeX while buffer is processed (bug 7434).
 +
 +- Do not use English, but the context language, when pasting from LaTeX
 +  (bug 9199).
 +
 +- Do not use English, but the context language, when pasting from math
 +  (bug 2596).
 +
 +- Fix ChkTeX on Windows (requires ChkTeX 1.7.7 at least) (bug 9989).
 +
 +- When entering a math macro name, Escape properly cancels the
 +  operation (bug 9251).
 +
 +- Fix list of viewable formats in view/update menu (bug 11044).
 +
 +- Fix encoding problems with listings insets and non-TeX fonts (bug
 +  11056).
 +
 +- When only Enchant is configured as a spell checker, configure it
 +  properly as default.
 +
 +- Do not show errors from master when compiling child (bug 11106).
 +
+ - Fix crash with server-get-xy and tall inset (bug 8120).
+ 
+ - Improve Undo for operations that act on several buffers (bug 10823).
+ 
+ - Improve rendering of square roots in math editor (bug 10814).
+ 
+ - Fix display of citation labels when pasting from a document
+   with other citation type (bug 10829).
+ 
+ - Save the list of recent files when a file is open/saved so that it
+   is up to date after a crash (bug 10712).
+ 
+ - Only show header for bibliography in outliner (bug 11045).
+ 
+ - Take actual font height into account when drawing placeholder box
+   for graphics (bug 11048).
+ 
+ - Correctly set default bibliography style in the Document Settings
+   dialog (bug 11088).
+ 
+ - Assure that the External Inset dialog is opened at first tab for
+   new insets (bug 11081).
+ 
+ - Ignore deleted material when generating a proposed label (bug 11102).
+ 
  
  * INTERNALS
  
- - Fix bug that TeX files were not detected when reconfiguring LyX (bug 11053).
++- Fix bug that TeX files were not detected when reconfiguring LyX 
++  (bug 11053).
  
  
  * DOCUMENTATION AND LOCALIZATION
@@@ -99,14 -158,23 +202,28 @@@
  * LYXHTML
  
  
 -
  * TEX2LYX
  
 +- Do not force default bibliography style if none is set (bug 10673).
 +
 +- Handle whitespace in table column declaration (bug 10804).
 +
 +- Fix import of flalign* environment (bug 10501).
 +
+ - Fix import of subfloats without caption (bug 10385).
+ 
+ - Import straight quotations marks (e.g. babel shorthands) as ERT (bug 75).
+ 
+ - Do not add duplicate \makebeamertitle.
+ 
+ - Keep empty paragraph it keepempty is true (bug 11078).
+ 
+ - Fix parsing issue in nested CJK (bug 9562).
+ 
+ - Fix import of package options with comments (bug 5737).
+ 
+ - Fix import of xymatrix (bug 10638).
+ 
  
  * ADVANCED FIND AND REPLACE
  

Reply via email to