[LyX/master] Win installer: 2 bugfixes

commit eb9a118553a24cde919f84876f21342bb174d6a1 Author: Uwe Stöhr Date: Tue May 31 01:25:07 2016 +0200 Win installer: 2 bugfixes diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index

[LyX/2.2.x] Win installer: fix mistake introduced with last commit

commit 1921baf88ca3b1a4981452f307fc5c71957707d1 Author: Uwe Stöhr Date: Tue May 31 01:24:47 2016 +0200 Win installer: fix mistake introduced with last commit diff --git a/development/Win32/packaging/installer/settings.nsh

[LyX/2.2.x] Win installer: 2 bugfixes

commit 52548a44369e80b9d1411d07fbf795007f78c703 Author: Uwe Stöhr Date: Tue May 31 01:22:12 2016 +0200 Win installer: 2 bugfixes diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt index

[LyX/2.1.x] Win installer: prepare for 2.1.5 and bugfixes

commit dd2aef2c333f4b4c43f779489ffd8bf55a484192 Author: Uwe Stöhr Date: Tue May 31 01:20:09 2016 +0200 Win installer: prepare for 2.1.5 and bugfixes diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt

[LyX/master] ShortcutPrefs: clean-up

commit b53d07897b3e8f1e89e8d12005508b23921042b8 Author: Guillaume Munch Date: Sun May 29 20:58:33 2016 +0100 ShortcutPrefs: clean-up diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index 98dbd8c..91f8720 100644 ---

[LyX/master] Show names of debug modes in the debug panel

commit 2b6d0ae3deae80558a73346d60739fa408cbe2c3 Author: Guillaume Munch Date: Sun May 29 23:33:12 2016 +0100 Show names of debug modes in the debug panel Sometimes it's hard to know which is which from a translation of the description alone. diff --git

[LyX/master] TocWidget: fix part of #9825

commit 78a5c877812a522534a79ab81eb37fe9df9bf5e5 Author: Guillaume Munch Date: Mon May 30 22:11:27 2016 +0100 TocWidget: fix part of #9825 diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index ff929c0..e98786b 100644 ---

[LyX/master] GuiDelimiter: Synchronise the vertical scrollbars

commit ef8b8ebcfd611b295c164f41450f74e0c0855ccc Author: Guillaume Munch Date: Tue May 10 18:34:39 2016 +0100 GuiDelimiter: Synchronise the vertical scrollbars diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp index 1f96788..72e2296 100644

[LyX/master] GuiDelimiters: display at least (and at most?) 4 columns

commit 6aceb3558aa40e9af6731010b90f8ae0f9d9c6cf Author: Guillaume Munch Date: Tue May 10 18:47:27 2016 +0100 GuiDelimiters: display at least (and at most?) 4 columns diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp index 72e2296..94154f5

[LyX/master] TocModel: clean-up

commit 6a662cbb2717f8c11e4b5e77e7d6a6320a0fce85 Author: Guillaume Munch Date: Mon May 30 22:11:00 2016 +0100 TocModel: clean-up diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp index 6bfcdcb..c1c74d5 100644 --- a/src/frontends/qt4/GuiView.cpp +++

[LyX/master] TocWidget: fix an erroneous collapse and optimise updates based on profiling

commit 1cc14a31ca8320d881b674f93c34a09cf1666cca Author: Guillaume Munch Date: Mon May 30 21:42:08 2016 +0100 TocWidget: fix an erroneous collapse and optimise updates based on profiling TocModels::reset() in GuiView::structureChanged() collapses the TocWidget, and

[LyX/master] ShortcutPrefs: hide empty lfuns for which there is already a binding

commit 8aaa79cfb64ad9eab8ba45dfcc21f07679404517 Author: Guillaume Munch Date: Tue Feb 23 22:02:02 2016 + ShortcutPrefs: hide empty lfuns for which there is already a binding diff --git a/src/frontends/qt4/GuiPrefs.cpp b/src/frontends/qt4/GuiPrefs.cpp index

[LyX/master] UserGuide.lyx: update 2 images

commit b4ab19421691dca51c528fc75924ce7120053c46 Author: Uwe Stöhr Date: Mon May 30 23:20:49 2016 +0200 UserGuide.lyx: update 2 images diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx index a42c6aa..05d534b 100644 ---

[LyX/2.2.x] UserGuide.lyx: update 2 images

commit cbd103e159bb39c3d5293a687661eb09686b6064 Author: Uwe Stöhr Date: Mon May 30 23:19:24 2016 +0200 UserGuide.lyx: update 2 images diff --git a/lib/doc/es/EmbeddedObjects.lyx b/lib/doc/es/EmbeddedObjects.lyx index a42c6aa..05d534b 100644 ---

[LyX/2.2.x] status.22x: undocument a bugfix

commit 4dd30bca570853983061253f2201391409de492b Author: Georg Baum Date: Mon May 30 21:34:33 2016 +0200 status.22x: undocument a bugfix This reverts c5e63f73b, since the fix is already in 2.2.0. diff --git a/status.22x b/status.22x index 05e71e5..c1ed4b4 100644 ---

[LyX/master] Only add inset postion to cache in paintInset

commit 77ef48d093d08ef3491e4f00a994f9709b41ccf2 Author: Jean-Marc Lasgouttes Date: Mon Feb 29 14:34:55 2016 +0100 Only add inset postion to cache in paintInset It was also added in paintText and paintOnlyInsets. diff --git a/src/RowPainter.cpp

[LyX/master] Update PAINTING_ANALYSIS and add a new task

commit 095c390fe2d7c983ccb0228d73c09b8da58bc206 Author: Jean-Marc Lasgouttes Date: Wed May 11 14:16:08 2016 +0200 Update PAINTING_ANALYSIS and add a new task diff --git a/development/PAINTING_ANALYSIS b/development/PAINTING_ANALYSIS index acb033d..78719f5 100644 ---

[LyX/master] Set vertical margins in redoParagraph, not setRowHeight

commit 656b7f5ab7de9d96a0ec3379dc47fd138b1caa4f Author: Jean-Marc Lasgouttes Date: Fri Apr 8 16:34:46 2016 +0200 Set vertical margins in redoParagraph, not setRowHeight It is actually easier to set the 20 pixels margin in redoParagraph, since it is not

[LyX/master] Update PAINTING_ANALYSIS

commit 78eaf8333bacec8d735eae06c0745163d06a5122 Author: Jean-Marc Lasgouttes Date: Sat Mar 5 00:09:34 2016 +0100 Update PAINTING_ANALYSIS Some things were wrong, and some new ideas are added (some are done in this branch already). diff --git

[LyX/master] Update PAINTING_ANALYSIS

commit 47c0b3cc052ece15dea5289b683bc57bb9cfc01a Author: Jean-Marc Lasgouttes Date: Mon May 30 14:54:20 2016 +0200 Update PAINTING_ANALYSIS Remove all the tasks that have been performed. diff --git a/development/PAINTING_ANALYSIS b/development/PAINTING_ANALYSIS

[LyX/master] Split TextMetrics::setRowHeight in three parts

commit 03117182154941a7d6fe73c3f86fc52553fafecd Author: Jean-Marc Lasgouttes Date: Fri May 20 17:14:54 2016 +0200 Split TextMetrics::setRowHeight in three parts The new functions parBottomSpaging and parTopSapcing return below/above each paragraph.

[LyX/master] Do not use the return value of Painter::text for logos

commit 51b1cfab721ea6d7c9f43853de987ad6f0157ea8 Author: Jean-Marc Lasgouttes Date: Sat Mar 19 17:26:25 2016 +0100 Do not use the return value of Painter::text for logos This will allow to get rid of this return value (and avoid computing it). diff --git

[LyX/master] Simplify redoParagraph by merging duplicate code

commit 17516267769abde8c02ae44bd838e3fce373d9a4 Author: Jean-Marc Lasgouttes Date: Sat Mar 5 23:11:45 2016 +0100 Simplify redoParagraph by merging duplicate code Let breakRow return a boolean indicating whether an additional row is required (after a

[LyX/master] Make the non-drawing cases faster in TextMetrics::drawParagraph

commit fc73ebc16c4f0aca76360415a94eca57f283e44e Author: Jean-Marc Lasgouttes Date: Mon Feb 29 16:07:35 2016 +0100 Make the non-drawing cases faster in TextMetrics::drawParagraph There are two main cases: * when drawing is disabled from the start, use a

[LyX/master] Do not require an extra pit parameter when a row is available

commit e39e4cf96b23997c065a890c015138eb93a1d4fd Author: Jean-Marc Lasgouttes Date: Wed May 18 09:39:47 2016 +0200 Do not require an extra pit parameter when a row is available Now that Row has a pit() member, it is possible to use it instead of passing an

[LyX/master] RowPainter const cleanup

commit 4c19c5149df496ea327582f0934506d7e3dc6ef9 Author: Jean-Marc Lasgouttes Date: Tue May 17 15:00:09 2016 +0200 RowPainter const cleanup Change the various paint* helpers to take a single row element as argument. Do not update x_ in the various

[LyX/master] Make the different Painter::text void methods

commit 333f6fcf07b35f240bcc1190dd21b0dc068a9129 Author: Jean-Marc Lasgouttes Date: Sat Mar 19 17:52:07 2016 +0100 Make the different Painter::text void methods The textwidth value that was returned is not used anymore. Now in some cases we can avoid to

[LyX/master] Rewrite setRowHeight using row information

commit ac759b4368e2a3477c8ef81ebf749a68280ef3d8 Author: Jean-Marc Lasgouttes Date: Sun Mar 6 16:22:53 2016 +0100 Rewrite setRowHeight using row information The initial values for maxasc and maxdes (renamed from maxdesc) is obtained as a maximum of max

[LyX/master] Move some horizontal scrolling code from TextMetrics to BufferView

commit 96fee0ed7acdd9d757d59b126f07631176e2d96f Author: Jean-Marc Lasgouttes Date: Mon Feb 29 16:05:06 2016 +0100 Move some horizontal scrolling code from TextMetrics to BufferView It is better to have all the code in the same place, and it will avoid code

[LyX/master] Cleanup Painter text() API

commit 598f7e4a45dc10232a42db34e5ca887615c5306f Author: Jean-Marc Lasgouttes Date: Sun Mar 20 20:02:05 2016 +0100 Cleanup Painter text() API * remove optional arguments to the helpers that use a FontInfo * add a textwidth argument to the text() methods that

[LyX/master] Cmake xhtml export tests: Missing script for commit 416242476289d423eb392345555f3dad941df544

commit 30ef73ab662a90c39f17cf0b08db9dc33ee2679a Author: Kornel Benko Date: Mon May 30 10:22:59 2016 +0200 Cmake xhtml export tests: Missing script for commit 416242476289d423eb39234f3dad941df544 diff --git a/development/autotests/examineXmllintOutput.pl

[LyX/master] Cmake xhtml export tests: Use command xmllint to test the export result

commit 416242476289d423eb39234f3dad941df544 Author: Kornel Benko Date: Mon May 30 09:50:22 2016 +0200 Cmake xhtml export tests: Use command xmllint to test the export result diff --git a/development/autotests/ExportTests.cmake b/development/autotests/ExportTests.cmake

[LyX/master] Dont use invalid tag '' in xhtml export

commit 161cf523631af91a0197aa3f2b321174d2ca6c4c Author: Kornel Benko Date: Mon May 30 09:48:06 2016 +0200 Dont use invalid tag '' in xhtml export diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout index 47e3dae..1055043 100644 --- a/lib/layouts/jss.layout +++

[LyX/master] Cmake tests: Allow test of LongestLabelWithUnderscore_xhtml

commit 6823115d17540968d96a0c10e6979264afe2abf1 Author: Kornel Benko Date: Mon May 30 09:46:01 2016 +0200 Cmake tests: Allow test of LongestLabelWithUnderscore_xhtml diff --git a/development/autotests/suspiciousTests b/development/autotests/suspiciousTests index

[LyX/master] Cmake: Allow test for X11 with QT5.6

commit 7a86fe3e0b70f944a2c99381ebf217609bf993e9 Author: Kornel Benko Date: Mon May 30 08:22:15 2016 +0200 Cmake: Allow test for X11 with QT5.6 Used for key-test tests. diff --git a/development/cmake/ConfigureChecks.cmake b/development/cmake/ConfigureChecks.cmake