From: Richard Heck Date: Sun, 15 Apr 2018 03:52:31 +0000 (-0400) Subject: Merge branch '2.3.2-staging' into 2.3.x X-Git-Tag: 2.3.1~133 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bcb002039b1a0e4893f18a032e02b6f6368924f9;p=features.git Merge branch '2.3.2-staging' into 2.3.x --- bcb002039b1a0e4893f18a032e02b6f6368924f9 diff --cc config/spell.m4 index 2a030264b5,152e485ad7..d686a82951 --- 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 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 3201e83a2c,ca96d1d56b..1d079c26cd --- 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 a3206797f7,47f5b13e6b..f4002b044a --- 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 5820acae70,265657be5b..6f5cec884a --- 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