commit dde4c68c9180d57ccee20820b73ddfc496a2c78c
Merge: c69426d 103bf05
Author: Richard Heck <[email protected]>
Date: Fri Jul 15 13:28:07 2016 -0400
Merge branch '2.2.x' into 2.2.2-staging
.gitattributes | 6 +
3rdparty/hunspell/1.3.3/src/hunspell/hunspell.dsp | 164 -
3rdparty/hunspell/Makefile.am | 1 -
ANNOUNCE | 51 +-
CMakeLists.txt | 6 +-
INSTALL.Win32 | 2 +-
configure.ac | 2 +
.../Win32/packaging/installer/ChangeLog.txt | 35 +-
development/Win32/packaging/installer/Packages.txt | 3 +-
.../installer/ThesaurusDictionaryNames.txt | 2 +
.../packaging/installer/include/declarations.nsh | 6 +-
.../packaging/installer/include/detection.nsh | 12 +-
.../packaging/installer/include/dictionaries.nsh | 6 +-
.../Win32/packaging/installer/include/init.nsh | 44 +-
.../installer/information/WinLangCode.htm | 1160 +-
development/Win32/packaging/installer/settings.nsh | 26 +-
.../Win32/packaging/installer/setup/install.nsh | 16 +-
.../Win32/packaging/installer/setup/uninstall.nsh | 19 +-
development/Win32/vld/src/crtmfcpatch.h | 1930 +-
development/Win32/vld/src/resource.h | 28 +-
development/Win32/vld/src/vld.h | 194 +-
development/cmake/build5-2015-x64.bat | 2 +-
development/cmake/build5-2015.bat | 91 +
development/tools/mergepo.py | 63 +-
development/tools/separator-convert.sh | 21 +
lib/CREDITS | 3 +
lib/Makefile.am | 124 +-
lib/RELEASE-NOTES | 22 +-
lib/configure.py | 57 +-
lib/doc/Additional.lyx | 80 +-
lib/doc/Changelog-Customization-LyX_22x.txt | 24 +
lib/doc/Changelog-EmbeddedObjects-LyX_22x.txt | 21 +
lib/doc/Changelog-Math-LyX_22.txt | 23 +
lib/doc/Changelog-Tutorial-LyX_22x.txt | 3 +
lib/doc/Changelog-UserGuide-LyX_22x.txt | 38 +
lib/doc/Customization.lyx | 52 +-
lib/doc/EmbeddedObjects.lyx | 114 +-
lib/doc/Makefile.am | 1 +
lib/doc/Math.lyx | 50 +
lib/doc/Tutorial.lyx | 201 +-
lib/doc/UserGuide.lyx | 90 +-
lib/doc/attic/Changelog-Customization-LyX_22x.txt | 17 -
.../attic/Changelog-EmbeddedObjects-LyX_22x.txt | 21 -
lib/doc/attic/Changelog-Math-LyX_22.txt | 18 -
lib/doc/attic/Changelog-UserGuide-LyX_22x.txt | 33 -
lib/doc/clipart/label.png | Bin 281 -> 627 bytes
lib/doc/clipart/reference.png | Bin 288 -> 736 bytes
lib/doc/de/Additional.lyx | 527 +-
lib/doc/de/Customization.lyx | 76 +-
lib/doc/de/EmbeddedObjects.lyx | 111 +-
lib/doc/de/Math.lyx | 50 +
lib/doc/de/Tutorial.lyx | 414 +-
lib/doc/de/UserGuide.lyx | 1899 +--
lib/doc/de/clipart/Marke.png | Bin 335 -> 726 bytes
lib/doc/de/clipart/Querverweis.png | Bin 379 -> 836 bytes
lib/doc/es/Additional.lyx | 131 +-
lib/doc/es/Customization.lyx | 148 +-
lib/doc/es/EmbeddedObjects.lyx | 112 +-
lib/doc/es/Math.lyx | 46 +
lib/doc/es/Tutorial.lyx | 197 +-
lib/doc/es/UserGuide.lyx | 30 +-
lib/doc/es/clipart/etiqueta.png | Bin 329 -> 674 bytes
lib/doc/es/clipart/referencia.png | Bin 364 -> 781 bytes
lib/doc/fr/Additional.lyx | 275 +-
lib/doc/fr/Customization.lyx | 142 +-
lib/doc/fr/EmbeddedObjects.lyx | 116 +-
lib/doc/fr/Math.lyx | 46 +
lib/doc/fr/Tutorial.lyx | 364 +-
lib/doc/fr/UserGuide.lyx | 37 +-
lib/doc/fr/clipart/label.png | Bin 1146 -> 694 bytes
lib/doc/fr/clipart/reference.png | Bin 0 -> 806 bytes
lib/doc/it/Intro.lyx | 4 +-
lib/doc/ja/Additional.lyx | 5369 +++---
lib/doc/ja/Customization.lyx | 3455 ++--
lib/doc/ja/DummyDocument1.lyx | 2 +-
lib/doc/ja/DummyDocument2.lyx | 2 +-
lib/doc/ja/EmbeddedObjects.lyx | 3455 ++--
lib/doc/ja/Formula-numbering.lyx | 22 +-
lib/doc/ja/Intro.lyx | 528 +-
lib/doc/ja/LaTeXConfig.lyx | 1202 +-
lib/doc/ja/Math.lyx | 3036 ++--
lib/doc/ja/MergedManuals.lyx | 2 +-
lib/doc/ja/Shortcuts.lyx | 2 +-
lib/doc/ja/Tutorial.lyx | 1459 +-
lib/doc/ja/UserGuide.lyx | 6986 +++---
lib/doc/ja/clipart/label.png | Bin 224 -> 555 bytes
lib/doc/ja/clipart/reference.png | Bin 2712 -> 688 bytes
lib/examples/FeynmanDiagrams.lyx | 4 -
lib/examples/Foils.lyx | 14 +-
lib/examples/ItemizeBullets.lyx | 16 -
lib/examples/aa_sample.lyx | 4 -
lib/examples/beamer.lyx | 299 +-
lib/examples/beamerlyxexample1.lyx | 268 +-
lib/examples/beamerposter.lyx | 39 +-
lib/examples/ca/ItemizeBullets.lyx | 16 -
lib/examples/de/FeynmanDiagrams.lyx | 4 -
lib/examples/de/ItemizeBullets.lyx | 16 -
lib/examples/de/Lebenslauf.lyx | 4 -
lib/examples/de/beamer.lyx | 408 +-
lib/examples/de/linguistics.lyx | 70 +-
lib/examples/de/tufte-handout.lyx | 24 +-
lib/examples/es/ItemizeBullets.lyx | 16 -
lib/examples/es/modernCV.lyx | 2 +-
lib/examples/es/tufte-handout.lyx | 24 +-
lib/examples/fr/FeynmanDiagrams.lyx | 4 -
lib/examples/fr/Foils.lyx | 14 +-
lib/examples/fr/ListesPuces.lyx | 16 -
lib/examples/fr/beamer.lyx | 298 +-
lib/examples/fr/exemple-powerdot.lyx | 12 -
lib/examples/fr/seminar.lyx | 49 +-
lib/examples/fr/simplecv.lyx | 4 -
lib/examples/fr/xypic.lyx | 10 -
lib/examples/it/ItemizeBullets.lyx | 24 -
lib/examples/ja/splash.lyx | 52 +-
lib/examples/linguistics.lyx | 121 +-
lib/examples/localization_test.lyx | 4 -
lib/examples/modernCV.lyx | 2 +-
lib/examples/nl/opsommingstekens.lyx | 16 -
lib/examples/powerdot-example.lyx | 28 -
lib/examples/simplecv.lyx | 4 -
lib/examples/tufte-handout.lyx | 24 +-
lib/examples/xypic.lyx | 26 -
lib/generate_contributions.py | 8 +
lib/layouts/InStar.module | 28 +
lib/layouts/europasscv.layout | 1 +
lib/layouts/europecv.layout | 1 +
lib/layouts/linguistics.module | 18 +-
lib/lyx2lyx/lyx_2_2.py | 7 +-
lib/scripts/convertDefault.py | 16 +-
lib/templates/IEEEtran-CompSoc.lyx | 2 +-
lib/templates/IEEEtran-Conference.lyx | 2 +-
lib/templates/IEEEtran-Journal.lyx | 2 +-
lib/templates/IEEEtran-TransMag.lyx | 2 +-
lib/templates/JSS-article.lyx | 16 +-
lib/templates/beamer-conference-ornate-20min.lyx | 67 +-
.../de_beamer-conference-ornate-20min.lyx | 67 +-
lib/templates/elsarticle.lyx | 2 +-
.../es_beamer-conference-ornate-20min.lyx | 67 +-
.../fr_beamer-conference-ornate-20min.lyx | 73 +-
lib/templates/koma-letter2.lyx | 28 +-
lib/templates/poster-a0poster-colored.lyx | 4 -
lib/templates/poster-beamerposter.lyx | 47 +-
lib/templates/revtex4-1.lyx | 4 -
po/ar.gmo | Bin 362054 -> 361933
bytes
po/ar.po | 1679 +-
po/bg.po |14147 +++++++------
po/ca.gmo | Bin 162393 -> 162393
bytes
po/ca.po | 1667 +-
po/cs.gmo | Bin 420203 -> 420067
bytes
po/cs.po | 1680 +-
po/da.gmo | Bin 211610 -> 211610
bytes
po/da.po | 1669 +-
po/de.gmo | Bin 489426 -> 490433
bytes
po/de.po | 4171 +++--
po/el.gmo | Bin 278232 -> 278232
bytes
po/el.po | 1663 +-
po/en.gmo | Bin 1139 -> 1139 bytes
po/en.po | 1633 +-
po/es.gmo | Bin 481692 -> 481556
bytes
po/es.po | 1672 +-
po/eu.gmo | Bin 345945 -> 345945
bytes
po/eu.po | 1675 +-
po/fi.gmo | Bin 218125 -> 242882
bytes
po/fi.po | 3254 ++--
po/fr.gmo | Bin 492608 -> 493690
bytes
po/fr.po |22276 ++++++++++----------
po/gl.gmo | Bin 170426 -> 170426
bytes
po/gl.po | 1669 +-
po/he.gmo | Bin 252022 -> 259770
bytes
po/he.po | 1958 +-
po/hu.gmo | Bin 283469 -> 283469
bytes
po/hu.po | 1669 +-
po/ia.gmo | Bin 444249 -> 444082
bytes
po/ia.po | 2780 ++--
po/id.gmo | Bin 350610 -> 350474
bytes
po/id.po | 1670 +-
po/it.gmo | Bin 481895 -> 482929
bytes
po/it.po | 2292 +--
po/ja.gmo | Bin 507847 -> 509579
bytes
po/ja.po | 3571 ++--
po/ko.po |13124 +++++++------
po/lyx_pot.py | 7 +
po/nb.gmo | Bin 451242 -> 452460
bytes
po/nb.po | 1752 +-
po/nl.gmo | Bin 152471 -> 152471
bytes
po/nl.po | 1668 +-
po/nn.gmo | Bin 360441 -> 360305
bytes
po/nn.po | 1670 +-
po/pl.gmo | Bin 314370 -> 359150
bytes
po/pl.po | 3390 ++--
po/pt_BR.gmo | Bin 486386 -> 487543
bytes
po/pt_BR.po | 4379 +++--
po/pt_PT.gmo | Bin 439327 -> 439188
bytes
po/pt_PT.po | 1672 +-
po/ro.gmo | Bin 151306 -> 151306
bytes
po/ro.po | 1665 +-
po/ru.gmo | Bin 294850 -> 294850
bytes
po/ru.po | 1669 +-
po/sk.gmo | Bin 480581 -> 480030
bytes
po/sk.po | 1667 +-
po/sl.po |13400 +++++++------
po/sr.gmo | Bin 161875 -> 161875
bytes
po/sr.po | 1665 +-
po/sv.gmo | Bin 467488 -> 468962
bytes
po/tr.gmo | Bin 224008 -> 224008
bytes
po/tr.po | 1667 +-
po/uk.gmo | Bin 606219 -> 606923
bytes
po/uk.po | 1698 +-
po/wa.po |13391 +++++++------
po/zh_CN.gmo | Bin 214138 -> 214138
bytes
po/zh_CN.po | 1671 +-
po/zh_TW.gmo | Bin 418861 -> 418725
bytes
po/zh_TW.po | 1686 +-
src/Buffer.cpp | 28 +-
src/BufferParams.cpp | 7 +-
src/Counters.cpp | 22 +-
src/Counters.h | 6 +-
src/CutAndPaste.cpp | 3 +-
src/HunspellChecker.cpp | 4 +-
src/LaTeXFeatures.cpp | 5 +-
src/LaTeXFeatures.h | 3 +-
src/Paragraph.cpp | 6 +-
src/TexRow.cpp | 5 +-
src/Text.cpp | 1 +
src/TextMetrics.cpp | 2 +-
src/frontends/Painter.h | 11 +-
src/frontends/qt4/CategorizedCombo.cpp | 1 -
src/frontends/qt4/CustomizedWidgets.cpp | 29 +-
src/frontends/qt4/CustomizedWidgets.h | 1 -
src/frontends/qt4/GuiApplication.cpp | 25 +-
src/frontends/qt4/GuiCitation.cpp | 46 +-
src/frontends/qt4/GuiClipboard.cpp | 34 +-
src/frontends/qt4/GuiClipboard.h | 9 +-
src/frontends/qt4/GuiCommandBuffer.cpp | 18 +-
src/frontends/qt4/GuiDelimiter.cpp | 14 +-
src/frontends/qt4/GuiDocument.cpp | 20 +-
src/frontends/qt4/GuiImage.cpp | 3 +-
src/frontends/qt4/GuiPainter.cpp | 47 +-
src/frontends/qt4/GuiPainter.h | 21 +-
src/frontends/qt4/GuiRef.cpp | 8 +-
src/frontends/qt4/GuiToc.cpp | 10 +-
src/frontends/qt4/GuiView.cpp | 5 +-
src/frontends/qt4/GuiWorkArea.cpp | 2 +-
src/frontends/qt4/LaTeXHighlighter.cpp | 21 +-
src/frontends/qt4/Makefile.am | 2 +-
src/frontends/qt4/TocWidget.cpp | 8 +
src/frontends/qt4/ui/ErrorListUi.ui | 2 +-
src/frontends/qt4/ui/LaTeXUi.ui | 19 +-
src/graphics/GraphicsLoader.cpp | 4 -
src/insets/InsetBox.cpp | 2 +-
src/insets/InsetBranch.cpp | 38 +-
src/insets/InsetBranch.h | 2 +-
src/insets/InsetLayout.cpp | 5 +-
src/insets/InsetRef.cpp | 2 +-
src/insets/InsetSeparator.cpp | 2 +-
src/insets/InsetSeparator.h | 16 +
src/insets/InsetTabular.cpp | 9 +-
src/insets/InsetVSpace.cpp | 8 +-
src/mathed/InsetMathBig.cpp | 90 +-
src/mathed/InsetMathDelim.cpp | 13 +-
src/mathed/InsetMathFont.cpp | 12 +-
src/mathed/InsetMathHull.cpp | 6 +-
src/mathed/InsetMathSize.cpp | 3 +-
src/mathed/MathExtern.cpp | 10 +-
src/mathed/MathMacro.cpp | 2 +-
src/mathed/MathStream.cpp | 22 +
src/mathed/MathStream.h | 3 +
src/output_xhtml.cpp | 14 +-
status.22x | 66 -
269 files changed, 91751 insertions(+), 87187 deletions(-)
diff --cc configure.ac
index 3c9bf4d,5878300..9c67d8f
--- a/configure.ac
+++ b/configure.ac
@@@ -1,7 -1,8 +1,8 @@@
dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(LyX,2.2.1dev,[[email protected]],[lyx])
+AC_INIT(LyX,2.2.2dev,[[email protected]],[lyx])
AC_PRESERVE_HELP_ORDER
+
# Use ISO format only. The frontend needs to parse this
AC_SUBST(LYX_DATE, ["2016-05-23"])
AC_PREREQ(2.60)
diff --cc status.22x
index 0760d12,4859299..1d74cf8
--- a/status.22x
+++ b/status.22x
@@@ -15,34 -15,48 +15,15 @@@ What's ne
* DOCUMENT INPUT/OUTPUT
* TEX2LYX IMPROVEMENTS
--
* USER INTERFACE
* DOCUMENTATION AND LOCALIZATION
-- Updated German and Interlingua user interface localization.
-
-- Increase the maximum value for the number of last open files that LyX can
- remember (bug 9924).
-
-- Change mouse cursor to indicate row/column selection in tabulars.
-
-- Make inset-select-all select all cells only in tables.
-
-- Automatically show the review toolbar if the document has tracked changes
- (bug 8738), and related UI imrovements.
-
-- Implement "Dissolve Inset" and "Show Label" context menu items for
- arguments (bug 10150).
-
-- Restore selected reference when using "Go to label" and "Go back" in the
- cross-reference dialog.
-
-
* BUILD/INSTALLATION
@@@ -53,65 -67,135 +34,22 @@@
* DOCUMENT INPUT/OUTPUT
* LYX2LYX
-- Fix paragraph argument conversion for \labelwidthstring etc (bug 10243).
-
-
-
* USER INTERFACE
- - Do not omit the first space of the selection when copying (bug 9995).
-
- - Display the correct column alignment and a better column spacing in AMS
- environments (bugs 1861, 9908).
-
- - Disable properly toggling math diplay in places where it is not
- possible (bug 10033).
-
- - Fix horizontal scrolling feature when inside a collapsable inset
- with several paragraphs.
-
- - Fix selection of large formula with the mouse when horizontal
- scrolling kicks in (but 10094).
-
- - Fix display of collapsable insets when the same document is shown in
- two views with different width (bug 9756).
-
- - fix display glitches when editing changes the dimension of insets
- (bug 6691).
-
- - Raise GuiView on buffer switch to bring it topmost in multi-window mode.
-
- - Fix cursor position after Redo of a document settings change (bug
- 10097).
-
- - Disable Edit > Dissolve Inset in tabulars (bug 9954).
-
- - Shortcut preferences: ask the user for removing bindings when using the
- "restore" button (#9174).
-
- - Shortcut preferences: fix the already-bound-key detection logic.
-
- - Shortcut preferences: don't forget to trigger the search when it is
- initialized with the previous value.
-
- - Remove extra spacing around button insets (bug 10149).
-
- - Fix drawing of buttons by enforcing equal left/right spacing (bug 10147).
-- CharStyles now prohibit layout changes by default (bug 10237).
-
-- Fix display of labels in right-to-left languages (bug 10169).
-
-- When a counter is stepped, reset recursively all subcounters (bug #10063).
-
-- Fix on screen narrow box when using \width as box width unit (bug 10048).
-
-- Raise GuiView on buffer switch to bring it topmost in multi-window mode.
-
-- Fix smal typo in Reference dialog (bug 10194).
-
-- Fix default location for RPM based hunspell dictionary search (bug 10071
and 10192).
-
-- Fix double input of tabulations with Qt5 < Qt5.5 (bug 9218).
-
-- Do not omit the first space of the selection when copying (bug 9995).
-
-- Do not allow non-default layouts to be pasted into table cells that are not
fixed
- width (bug 8782).
-
-- Display the correct column alignment and a better column spacing in AMS
- environments (bugs 1861, 9908).
-
-- Disable properly toggling math diplay in places where it is not
- possible (bug 10033).
-
-- Fix horizontal scrolling feature when inside a collapsable inset
- with several paragraphs.
-
-- Fix selection of large formula with the mouse when horizontal
- scrolling kicks in (but 10094).
-
-- Fix bug where cursor can't be put at the end of a line before an
- inset (bug 10180).
-
-- Fix display of collapsable insets when the same document is shown in
- two views with different width (bug 9756).
-
-- fix display glitches when editing changes the dimension of insets
- (bug 6691).
-
-- Raise GuiView on buffer switch to bring it topmost in multi-window mode.
-
-- Fix cursor position after Redo of a document settings change (bug
- 10097).
-
-- Handle undo after deleting end of paragraph in change tracking mode
- (bug 10253).
-
-- Disable Edit > Dissolve Inset in tabulars (bug 9954).
-
-- Shortcut preferences: ask the user for removing bindings when using the
- "restore" button (#9174).
-
-- Shortcut preferences: fix the already-bound-key detection logic.
-
-- Shortcut preferences: don't forget to trigger the search when it is
- initialized with the previous value.
-
-- Remove extra spacing around button insets (bug 10149).
-
-- Fix drawing of buttons by enforcing equal left/right spacing (bug 10147).
-
-- Fix problem with drawing of lists after pasting normal text (bug 8735).
-
-- Accessibility of the document class selector from keyboard (bug 10035).
-
* INTERNALS
--
* DOCUMENTATION AND LOCALIZATION
-- Move documentation change logs to lib/doc (they are not distributed).
-
-
* LYXHTML
-- Output width of table columns (bug 8168).
-
-- Fix output of math sizes (bug 10129).
-
-- Fix output of vertical space in the middle of a paragraph (bug 8154).
-
-- Fix output of ABOVE and CENTERED label types (bug 8843).
-
-- Output correct entities for named delimiters (bug 8280).
-
-- Added class attribute for mathbb to allow customization (part of bug
- 8521).
-
-- Use 'text-align: center;' with displayed equations (bug 8654).
-
-
* TEX2LYX
@@@ -121,7 -205,16 +59,3 @@@
* BUILD/INSTALLATION
--
- - Fix monolithic builds with autotools on Mac OS X.
-
- - Avoid 'ar' warning with recent binutils versions.
-- Due to bug fixes, it is no longer discouraged to build against Qt 5.4.
-
-- Building against Qt < 4.7 no longer fails.
-
-- Fix monolithic builds with autotools on Mac OS X.
-
-- Avoid 'ar' warning with recent binutils versions.
-
-- LyX compiled with Microsoft Visual Studio 2015 runs now on Windows Vista
(bug 10186)
-
-- Add some missing oxygen and IPA icons to the distribution.
-
