[LyX/2.2.x] Make math options loading automatic, see ticket 10661

[Richard Heck]

commit 95d6cfe3643ddabf55ccf7c90ef95bdc53b11b0b
Author: jpc 
Date:   Mon Oct 23 09:18:56 2017 +0200

Make math options loading automatic, see ticket 10661

(cherry picked from commit 95f60915a73219e1fcf549b292b17f5307f94078)

 lib/doc/Additional.lyx |   12 ++--
 lib/doc/Customization.lyx  |   18 +-
 lib/doc/Development.lyx|   12 ++--
 lib/doc/DummyDocument1.lyx |   10 +-
 lib/doc/DummyDocument2.lyx |   10 +-
 lib/doc/Formula-numbering.lyx  |   12 ++--
 lib/doc/Intro.lyx  |   12 ++--
 lib/doc/LFUNs.lyx  |   12 ++--
 lib/doc/LaTeXConfig.lyx|   20 ++--
 lib/doc/Math.lyx   |6 +++---
 lib/doc/MergedManuals.lyx  |   10 +-
 lib/doc/Shortcuts.lyx  |   12 ++--
 lib/doc/Tutorial.lyx   |   16 
 lib/doc/ar/Shortcuts.lyx   |   12 ++--
 lib/doc/ar/Tutorial.lyx|   16 
 lib/doc/attic/DocStyle.lyx |   18 +-
 lib/doc/attic/aastex6_sample.lyx   |   16 
 lib/doc/attic/eu_Additional.lyx|   12 ++--
 lib/doc/attic/eu_Customization.lyx |   16 
 lib/doc/attic/eu_UserGuide.lyx |   12 ++--
 lib/doc/attic/id_UserGuide.lyx |   10 +-
 lib/doc/attic/it_Customization.lyx |   18 +-
 lib/doc/attic/it_UserGuide.lyx |   10 +-
 lib/doc/attic/pl_Additional.lyx|   12 ++--
 lib/doc/attic/sk_UserGuide.lyx |   12 ++--
 lib/doc/ca/Intro.lyx   |   12 ++--
 lib/doc/cs/Tutorial.lyx|   16 
 lib/doc/da/Intro.lyx   |   12 ++--
 lib/doc/de/Additional.lyx  |   10 +-
 lib/doc/de/DummyDocument1.lyx  |   10 +-
 lib/doc/de/DummyDocument2.lyx  |   10 +-
 lib/doc/de/Formelnummerierung.lyx  |   12 ++--
 lib/doc/de/Intro.lyx   |   12 ++--
 lib/doc/de/Math.lyx|6 +++---
 lib/doc/de/Shortcuts.lyx   |   12 ++--
 lib/doc/de/Tutorial.lyx|   12 ++--
 lib/doc/el/Intro.lyx   |   12 ++--
 lib/doc/es/Additional.lyx  |   12 ++--
 lib/doc/es/Customization.lyx   |   18 +-
 lib/doc/es/DocumentoPostizo1.lyx   |   10 +-
 lib/doc/es/DocumentoPostizo2.lyx   |   10 +-
 lib/doc/es/Formula-numbering.lyx   |   12 ++--
 lib/doc/es/Intro.lyx   |   12 ++--
 lib/doc/es/Math.lyx|6 +++---
 lib/doc/es/Shortcuts.lyx   |   12 ++--
 lib/doc/es/Tutorial.lyx|   16 
 lib/doc/eu/Intro.lyx   |   12 ++--
 lib/doc/eu/Tutorial.lyx|   16 
 lib/doc/fr/Additional.lyx  |   12 ++--
 lib/doc/fr/Customization.lyx   |   16 
 lib/doc/fr/DocumentBidon1.lyx  |   10 +-
 lib/doc/fr/DocumentBidon2.lyx  |   10 +-
 lib/doc/fr/Formula-numbering.lyx   |   12 ++--
 lib/doc/fr/Intro.lyx   |   12 ++--
 lib/doc/fr/Math.lyx|6 +++---
 lib/doc/fr/Shortcuts.lyx   |   12 ++--
 lib/doc/fr/Tutorial.lyx|   16 
 lib/doc/gl/Intro.lyx   |   16 
 lib/doc/gl/Tutorial.lyx|   16 
 lib/doc/he/Intro.lyx   |   12 ++--
 lib/doc/he/Tutorial.lyx|   16 
 lib/doc/hu/Intro.lyx   |   12 ++--
 lib/doc/hu/Tutorial.lyx|   16 
 lib/doc/id/Intro.lyx   |   12 ++--
 lib/doc/id/Shortcuts.lyx   |   12 ++--
 lib/doc/id/Tutorial.lyx   

[LyX/2.2.x] Status for last two commits.

[Richard Heck]

commit c6a16909e0d9d1eda9d2196d1e97d6d7bcd5a877
Author: Richard Heck 
Date:   Mon Oct 23 16:36:34 2017 -0400

Status for last two commits.
---
 status.22x |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/status.22x b/status.22x
index 8128fb8..46e9027 100644
--- a/status.22x
+++ b/status.22x
@@ -136,6 +136,11 @@ What's new
 
 * DOCUMENTATION AND LOCALIZATION
 
+- Fix loading of math packages in many manuals (bug 10661).
+
+- Add note that the fixltx2e package (and so module) is obsolete as of
+  TeXLive 2015 (bug 9361).
+
 - Updated French user interface localization.
 
 * LYXHTML

[LyX/2.2.x] Add obsolescence warning in fixltx2e description (ticket 9361)

[Richard Heck]

commit c28a604f3d736ab12bfd5e251774e213861c69e4
Author: jpc 
Date:   Mon Oct 23 09:51:08 2017 +0200

Add obsolescence warning in fixltx2e description (ticket 9361)

(cherry picked from commit d57935b33bc813ffd8e3b49c53676d66d7ee0c4a)
---
 lib/layouts/fixltx2e.module |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
index f11189a..b67ede8 100644
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@@ -5,6 +5,8 @@
 #If you use this module your typeset document may look different
 #when you process it with future LaTeX versions, because fixltx2e may provide
 #more bugfixes in future versions.
+#Note that the recent LaTeX kernel (2015/01/01) includes fixltx2e,
+#so the fixltx2e module becomes obsolete as of TeXLive 2015.
 #DescriptionEnd
 
 # Author : Georg Baum 

[LyX/2.3.x] Fix bug #10556.

[Richard Heck]

commit 6247de26293d72fb14c5d4a21bb358d673934aeb
Author: Richard Heck 
Date:   Mon Oct 16 20:57:04 2017 -0400

Fix bug #10556.

Update CSS for Standard layout in Memoir.

(cherry picked from commit e05c91083fa69a2912328bb382c928d18f0f6e1a)
---
 lib/layouts/memoir.layout |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index e198cbb..63bca26 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -39,6 +39,12 @@ Style Standard
Align Block
AlignPossible Block, Left, Right, Center
LabelType No_Label
+   HTMLStyle
+   div.standard {
+   margin-bottom: 2ex;
+   text-align: left;
+   }
+   EndHTMLStyle
 End
 
 

[LyX/2.2.x] More accurate description of fixltx2e state.

[Richard Heck]

commit 9b3b20a0ace6f53f2b0a5e2b7672be1a59dbf118
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 13:49:03 2017 +0200

More accurate description of fixltx2e state.

(cherry picked from commit bd14639d1ce7be9de94f427152cbd7d8e06269a7)
---
 lib/layouts/fixltx2e.module |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
index b67ede8..b8f2ee8 100644
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@@ -1,12 +1,11 @@
 #\DeclareLyXModule{Fix LaTeX}
 #DescriptionBegin
 #Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX.
-#Those fixes are not part of the LaTeX kernel because of backward 
compatibility.
+#Those fixes were not part of older LaTeX kernels because of backward 
compatibility.
 #If you use this module your typeset document may look different
-#when you process it with future LaTeX versions, because fixltx2e may provide
-#more bugfixes in future versions.
-#Note that the recent LaTeX kernel (2015/01/01) includes fixltx2e,
-#so the fixltx2e module becomes obsolete as of TeXLive 2015.
+#with different LaTeX versions, depending on the respective version of 
fixltx2e.
+#NOTE: recent LaTeX kernels (as of 2015/01/01) include the functionality of
+#fixltx2e, so the fixltx2e module becomes obsolete with newer LaTeX 
distributions.
 #DescriptionEnd
 
 # Author : Georg Baum 

r41088 - in www-user/trunk/misc/archaeology: . old_mirror/LGT-1.3

[sanda]

Author: sanda
Date: Tue Oct 24 00:32:14 2017
New Revision: 41088
URL: http://www.lyx.org/trac/changeset/41088

Log:
archeo: add lyx 1.3 graphical tour

Added:
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/01.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/01_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/02.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/02_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/03.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/03_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/04.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/04_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/05.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/05_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/06.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/06_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/07.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/07_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/08.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/08_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/09.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/09_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/10.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/100.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/101.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/101_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/102.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/102_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/103.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/103_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/104.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/104_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/105.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/105_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/10_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/11.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/11_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/12.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/12_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/13.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/13_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/15-1.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/15-1_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/15-2.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/15-2_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/16.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/16_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/17.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/17_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/18.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/18_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/19.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/19_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/20.png   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/20_sm.png   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/LGT-1.3/21.png   (contents, props 
changed)
   

r41089 - www-user/trunk/misc/archaeology

[sanda]

Author: sanda
Date: Tue Oct 24 00:33:24 2017
New Revision: 41089
URL: http://www.lyx.org/trac/changeset/41089

Log:
archeo: frontend fix

Modified:
   www-user/trunk/misc/archaeology/lyx-time.html

Modified: www-user/trunk/misc/archaeology/lyx-time.html
==
--- www-user/trunk/misc/archaeology/lyx-time.html   Tue Oct 24 00:32:14 
2017(r41088)
+++ www-user/trunk/misc/archaeology/lyx-time.html   Tue Oct 24 00:33:24 
2017(r41089)
@@ -637,11 +637,11 @@
 File format:
 222
 xforms:
-0.89, 1.0 
+0.89, 1.0
+qt:
+2.-3.
 Graphical tour
 
-qt:
-2.-3.
 
 1.3.7 Screenshot:
 

r41087 - in www-user/trunk/misc/archaeology: . old_mirror old_mirror/lgt-1.0

[sanda]

Author: sanda
Date: Mon Oct 23 23:46:39 2017
New Revision: 41087
URL: http://www.lyx.org/trac/changeset/41087

Log:
Archeology: add lyx 1.0.0 graphical tour

Added:
   www-user/trunk/misc/archaeology/old_mirror/
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/01.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/01_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/02.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/02_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/03.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/03_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/04.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/04_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/05.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/05_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/06.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/06_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/07.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/07_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/08.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/08_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/09.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/09_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/10.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/10_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/11.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/11_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/12.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/12_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/13.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/13_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/14.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/14_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/15.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/15_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/16.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/16_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/17.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/17_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/18.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/18_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/19.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/19_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/20.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/20_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/21.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/21_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/22.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/22_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/23.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/23_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/24.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/24_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/25.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/25_sm.gif   (contents, 
props changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/26.gif   (contents, props 
changed)
   www-user/trunk/misc/archaeology/old_mirror/lgt-1.0/26_sm.gif   

[LyX/master] Turn 'Do not load' math option to 'Automatic' (ticket 10661)

[jpc]

commit 1720f54b414e48a9e4f00de8d9284fa1ee265760
Author: jpc 
Date:   Thu Oct 19 14:47:51 2017 +0200

 Turn 'Do not load' math option to 'Automatic' (ticket 10661)

 lib/doc/Additional.lyx |   12 ++--
 lib/doc/Customization.lyx  |   18 +-
 lib/doc/Development.lyx|   12 ++--
 lib/doc/DummyDocument1.lyx |   10 +-
 lib/doc/DummyDocument2.lyx |   10 +-
 lib/doc/Formula-numbering.lyx  |   12 ++--
 lib/doc/Intro.lyx  |   12 ++--
 lib/doc/LFUNs.lyx  |   12 ++--
 lib/doc/LaTeXConfig.lyx|   20 ++--
 lib/doc/Math.lyx   |8 
 lib/doc/MergedManuals.lyx  |   10 +-
 lib/doc/Shortcuts.lyx  |   12 ++--
 lib/doc/Tutorial.lyx   |   16 
 lib/doc/ar/Shortcuts.lyx   |   12 ++--
 lib/doc/ar/Tutorial.lyx|   16 
 lib/doc/attic/DocStyle.lyx |   18 +-
 lib/doc/attic/aastex6_sample.lyx   |   16 
 lib/doc/attic/eu_Additional.lyx|   12 ++--
 lib/doc/attic/eu_Customization.lyx |   16 
 lib/doc/attic/eu_UserGuide.lyx |   12 ++--
 lib/doc/attic/id_UserGuide.lyx |   10 +-
 lib/doc/attic/it_Customization.lyx |   18 +-
 lib/doc/attic/it_UserGuide.lyx |   10 +-
 lib/doc/attic/pl_Additional.lyx|   12 ++--
 lib/doc/attic/sk_UserGuide.lyx |   12 ++--
 lib/doc/ca/Intro.lyx   |   12 ++--
 lib/doc/cs/Tutorial.lyx|   16 
 lib/doc/da/Intro.lyx   |   12 ++--
 lib/doc/de/Additional.lyx  |   10 +-
 lib/doc/de/DummyDocument1.lyx  |   10 +-
 lib/doc/de/DummyDocument2.lyx  |   10 +-
 lib/doc/de/Formelnummerierung.lyx  |   12 ++--
 lib/doc/de/Intro.lyx   |   12 ++--
 lib/doc/de/Math.lyx|8 
 lib/doc/de/Shortcuts.lyx   |   12 ++--
 lib/doc/de/Tutorial.lyx|   12 ++--
 lib/doc/el/Intro.lyx   |   12 ++--
 lib/doc/es/Additional.lyx  |   12 ++--
 lib/doc/es/Customization.lyx   |   18 +-
 lib/doc/es/DocumentoPostizo1.lyx   |   10 +-
 lib/doc/es/DocumentoPostizo2.lyx   |   10 +-
 lib/doc/es/Formula-numbering.lyx   |   12 ++--
 lib/doc/es/Intro.lyx   |   12 ++--
 lib/doc/es/Math.lyx|8 
 lib/doc/es/Shortcuts.lyx   |   12 ++--
 lib/doc/es/Tutorial.lyx|   16 
 lib/doc/eu/Intro.lyx   |   12 ++--
 lib/doc/eu/Tutorial.lyx|   16 
 lib/doc/fr/Additional.lyx  |   12 ++--
 lib/doc/fr/Customization.lyx   |   16 
 lib/doc/fr/DocumentBidon1.lyx  |   10 +-
 lib/doc/fr/DocumentBidon2.lyx  |   10 +-
 lib/doc/fr/Formula-numbering.lyx   |   12 ++--
 lib/doc/fr/Intro.lyx   |   12 ++--
 lib/doc/fr/Math.lyx|8 
 lib/doc/fr/Shortcuts.lyx   |   12 ++--
 lib/doc/fr/Tutorial.lyx|   16 
 lib/doc/gl/Intro.lyx   |   16 
 lib/doc/gl/Tutorial.lyx|   16 
 lib/doc/he/Intro.lyx   |   12 ++--
 lib/doc/he/Tutorial.lyx|   16 
 lib/doc/hu/Intro.lyx   |   12 ++--
 lib/doc/hu/Tutorial.lyx|   16 
 lib/doc/id/Intro.lyx   |   12 ++--
 lib/doc/id/Shortcuts.lyx   |   12 ++--
 lib/doc/id/Tutorial.lyx|   16 
 

[LyX/2.3.x] Update sk.po

[Kornel Benko]

commit 979c96aa4f8d1e165bb3981ab19e43f6e933ba51
Author: Kornel Benko 
Date:   Mon Oct 23 14:55:51 2017 +0200

Update sk.po
---
 po/sk.gmo |  Bin 525847 -> 526102 bytes
 po/sk.po  |   13 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/po/sk.gmo b/po/sk.gmo
index 0c9eff8..692ec85 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 09a72d5..2327ec6 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-10-16 14:25+0200\n"
-"PO-Revision-Date: 2017-09-16 14:52+\n"
+"POT-Creation-Date: 2017-10-23 10:26+0200\n"
+"PO-Revision-Date: 2017-10-23 12:52+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -11436,19 +11436,22 @@ msgstr ""
 msgid "Fix LaTeX"
 msgstr "Upraviť LaTeX"
 
-#: lib/layouts/fixltx2e.module:9
+#: lib/layouts/fixltx2e.module:11
 msgid ""
 "Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX. "
 "Those fixes are not part of the LaTeX kernel because of backward "
 "compatibility. If you use this module your typeset document may look "
 "different when you process it with future LaTeX versions, because fixltx2e "
-"may provide more bugfixes in future versions."
+"may provide more bugfixes in future versions. Note that the recent LaTeX "
+"kernel (2015/01/01) includes fixltx2e, so the fixltx2e module becomes "
+"obsolete as of TeXLive 2015."
 msgstr ""
 "Nahrá LaTeX-ov balík fixltx2e ktorý obsahuje pár korektúr pre LaTeX. Tieto "
 "korektúry nie sú časťou LaTeX-ovho jadra kvôli spätnej kompatibilite. "
 "Použitím tohto modulu môžu vaše vytlačené dokumenty vyzerať ináč pri "
 "spracovaní s budúcimi verziami LaTeX-u, lebo fixltx2e vtedy môže poskytovať "
-"aj viac korektúr."
+"aj viac korektúr. Berte na vedomie že nedávne LaTeX jadrá (2015/01/01) "
+"obsahujú fixltx2e, čiže od TeXLive 2015 je modul fixltx2e obsoletný."
 
 #: lib/layouts/fixme.module:2
 msgid "FiXme"

[LyX/master] More accurate description of fixltx2e state.

[Juergen Spitzmueller]

commit bd14639d1ce7be9de94f427152cbd7d8e06269a7
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 13:49:03 2017 +0200

More accurate description of fixltx2e state.
---
 lib/layouts/fixltx2e.module |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
index 6e3f41c..99d5e21 100644
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@@ -1,12 +1,11 @@
 #\DeclareLyXModule{Fix LaTeX}
 #DescriptionBegin
 #Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX.
-#Those fixes are not part of the LaTeX kernel because of backward 
compatibility.
+#Those fixes were not part of older LaTeX kernels because of backward 
compatibility.
 #If you use this module your typeset document may look different
-#when you process it with future LaTeX versions, because fixltx2e may provide
-#more bugfixes in future versions.
-#Note that the recent LaTeX kernel (2015/01/01) includes fixltx2e,
-#so the fixltx2e module becomes obsolete as of TeXLive 2015.
+#with different LaTeX versions, depending on the respective version of 
fixltx2e.
+#NOTE: recent LaTeX kernels (as of 2015/01/01) include the functionality of
+#fixltx2e, so the fixltx2e module becomes obsolete with newer LaTeX 
distributions.
 #DescriptionEnd
 
 # Author : Georg Baum 

[LyX/2.3.x] More accurate description of fixltx2e state.

[Juergen Spitzmueller]

commit aa1698ede0cbc32a277140f7de0046e5574e82e7
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 13:49:03 2017 +0200

More accurate description of fixltx2e state.
---
 lib/layouts/fixltx2e.module |9 -
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
index 6e3f41c..99d5e21 100644
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@@ -1,12 +1,11 @@
 #\DeclareLyXModule{Fix LaTeX}
 #DescriptionBegin
 #Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX.
-#Those fixes are not part of the LaTeX kernel because of backward 
compatibility.
+#Those fixes were not part of older LaTeX kernels because of backward 
compatibility.
 #If you use this module your typeset document may look different
-#when you process it with future LaTeX versions, because fixltx2e may provide
-#more bugfixes in future versions.
-#Note that the recent LaTeX kernel (2015/01/01) includes fixltx2e,
-#so the fixltx2e module becomes obsolete as of TeXLive 2015.
+#with different LaTeX versions, depending on the respective version of 
fixltx2e.
+#NOTE: recent LaTeX kernels (as of 2015/01/01) include the functionality of
+#fixltx2e, so the fixltx2e module becomes obsolete with newer LaTeX 
distributions.
 #DescriptionEnd
 
 # Author : Georg Baum 

[LyX/master] de.po

[Juergen Spitzmueller]

commit 8be2c0ff042f9d30df76529fe6e2ed7a37d5d5c0
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 13:51:36 2017 +0200

de.po

 po/de.gmo |  Bin 540064 -> 540495 bytes
 po/de.po  |  651 +++--
 2 files changed, 328 insertions(+), 323 deletions(-)

[LyX/2.3.x] de.po

[Juergen Spitzmueller]

commit 57db5a0dbcf85c099afb3a9eeec91bf372ae37d6
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 13:53:51 2017 +0200

de.po
---
 po/de.gmo |  Bin 539575 -> 539815 bytes
 po/de.po  |  417 +++--
 2 files changed, 212 insertions(+), 205 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index c0a450e..8d4c23c 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 1565126..5f3e65b 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,10 +95,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.3\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-10-16 14:25+0200\n"
-"PO-Revision-Date: 2017-09-10 11:02+0100\n"
+"POT-Creation-Date: 2017-10-23 13:51+0200\n"
+"PO-Revision-Date: 2017-10-23 13:53+0100\n"
 "Last-Translator: Juergen Spitzmueller \n"
-"Language-Team: German \n"
+"Language-Team: German \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -141,7 +141,7 @@ msgstr "Versionshinweise"
 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66
 #: src/frontends/qt4/ui/TexinfoUi.ui:77 src/frontends/qt4/ui/ThesaurusUi.ui:138
 #: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/GuiParagraph.cpp:163
-#: src/frontends/qt4/GuiView.cpp:2836
+#: src/frontends/qt4/GuiView.cpp:2838
 msgid ""
 msgstr "ßen"
 
@@ -771,7 +771,7 @@ msgid "Remove the selected branch"
 msgstr "Den ausgewählten Zweig entfernen"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:136 src/frontends/qt4/ui/IndicesUi.ui:165
-#: src/Buffer.cpp:4572 src/Buffer.cpp:4585
+#: src/Buffer.cpp:4573 src/Buffer.cpp:4586
 msgid ""
 msgstr ""
 
@@ -805,17 +805,17 @@ msgstr "A hinzufügen"
 #: src/frontends/qt4/ui/DocumentUi.ui:84 src/frontends/qt4/ui/IndexUi.ui:78
 #: src/frontends/qt4/ui/ListingsUi.ui:559
 #: src/frontends/qt4/ui/PrintindexUi.ui:108 src/Buffer.cpp:1402
-#: src/Buffer.cpp:4546 src/Buffer.cpp:4610 src/LyXVC.cpp:114 src/LyXVC.cpp:304
+#: src/Buffer.cpp:4547 src/Buffer.cpp:4611 src/LyXVC.cpp:114 src/LyXVC.cpp:304
 #: src/buffer_funcs.cpp:78 src/frontends/qt4/GuiBranches.cpp:219
 #: src/frontends/qt4/GuiClipboard.cpp:247
 #: src/frontends/qt4/GuiDocument.cpp:2328 src/frontends/qt4/GuiParagraph.cpp:69
 #: src/frontends/qt4/GuiParagraph.cpp:161 src/frontends/qt4/GuiPrefs.cpp:3328
-#: src/frontends/qt4/GuiView.cpp:2450 src/frontends/qt4/GuiView.cpp:2598
-#: src/frontends/qt4/GuiView.cpp:2622 src/frontends/qt4/GuiView.cpp:2636
-#: src/frontends/qt4/GuiView.cpp:2737 src/frontends/qt4/GuiView.cpp:2781
-#: src/frontends/qt4/GuiView.cpp:3049 src/frontends/qt4/GuiView.cpp:3063
-#: src/frontends/qt4/GuiView.cpp:3165 src/frontends/qt4/GuiView.cpp:3193
-#: src/frontends/qt4/GuiView.cpp:3848 src/frontends/qt4/GuiView.cpp:3855
+#: src/frontends/qt4/GuiView.cpp:2452 src/frontends/qt4/GuiView.cpp:2600
+#: src/frontends/qt4/GuiView.cpp:2624 src/frontends/qt4/GuiView.cpp:2638
+#: src/frontends/qt4/GuiView.cpp:2739 src/frontends/qt4/GuiView.cpp:2783
+#: src/frontends/qt4/GuiView.cpp:3051 src/frontends/qt4/GuiView.cpp:3065
+#: src/frontends/qt4/GuiView.cpp:3167 src/frontends/qt4/GuiView.cpp:3195
+#: src/frontends/qt4/GuiView.cpp:3850 src/frontends/qt4/GuiView.cpp:3857
 #: src/insets/InsetBibtex.cpp:160
 msgid ""
 msgstr ""
@@ -4542,8 +4542,8 @@ msgstr "Menüs"
 msgid " last files:"
 msgstr " Anzahl letzter Dateien:"
 
-#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:3049
-#: src/frontends/qt4/GuiView.cpp:3063 src/frontends/qt4/GuiView.cpp:3165
+#: src/frontends/qt4/ui/PrefsUi.ui:70 src/frontends/qt4/GuiView.cpp:3051
+#: src/frontends/qt4/GuiView.cpp:3065 src/frontends/qt4/GuiView.cpp:3167
 msgid ""
 msgstr ""
 
@@ -5167,8 +5167,8 @@ msgstr ""
 #: src/frontends/qt4/ui/TabularUi.ui:1404
 #: src/frontends/qt4/ui/TabularUi.ui:1445
 #: src/frontends/qt4/ui/TabularUi.ui:1476
-#: src/frontends/qt4/ui/TabularUi.ui:1514 src/frontends/qt4/GuiToolbar.cpp:396
-#: src/frontends/qt4/GuiToolbar.cpp:405 src/insets/InsetBranch.cpp:79
+#: src/frontends/qt4/ui/TabularUi.ui:1514 src/frontends/qt4/GuiToolbar.cpp:395
+#: src/frontends/qt4/GuiToolbar.cpp:404 src/insets/InsetBranch.cpp:79
 #: src/insets/InsetBranch.cpp:82
 msgid "on"
 msgstr "an"
@@ -5523,8 +5523,8 @@ msgstr "Nur Vorspann"
 msgid "Body Only"
 msgstr "Nur Haupttext"
 
-#: src/frontends/qt4/ui/WorkAreaUi.ui:82 src/frontends/qt4/GuiView.cpp:3193
-#: src/frontends/qt4/GuiView.cpp:3848
+#: src/frontends/qt4/ui/WorkAreaUi.ui:82 src/frontends/qt4/GuiView.cpp:3195
+#: src/frontends/qt4/GuiView.cpp:3850
 msgid ""
 msgstr "Ne laden"
 
@@ -6914,8 +6914,8 @@ msgstr "Literaturverzeichnis"
 #: lib/layouts/kluwer.layout:347 lib/layouts/kluwer.layout:360
 #: lib/layouts/llncs.layout:285 lib/layouts/moderncv.layout:515
 #: lib/layouts/siamltex.layout:342 lib/layouts/stdstruct.inc:70
-#: lib/layouts/svcommon.inc:590 src/insets/InsetBibtex.cpp:911
-#: src/insets/InsetBibtex.cpp:964 

[LyX/master] Update sk.po

[Kornel Benko]

commit cab20e0594745e72d37e5492395e8d19a4bfd67d
Author: Kornel Benko 
Date:   Mon Oct 23 14:39:32 2017 +0200

Update sk.po
---
 po/sk.gmo |  Bin 526328 -> 526764 bytes
 po/sk.po  |   15 ---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/po/sk.gmo b/po/sk.gmo
index c77de09..f9b9a06 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index 8ccb7a0..239750e 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.4\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2017-10-13 11:34+0200\n"
-"PO-Revision-Date: 2017-10-13 14:49+\n"
+"POT-Creation-Date: 2017-10-23 10:30+0200\n"
+"PO-Revision-Date: 2017-10-23 12:37+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -11455,19 +11455,22 @@ msgstr ""
 msgid "Fix LaTeX"
 msgstr "Upraviť LaTeX"
 
-#: lib/layouts/fixltx2e.module:9
+#: lib/layouts/fixltx2e.module:11
 msgid ""
 "Loads the LaTeX package fixltx2e which contains some bug fixes for LaTeX. "
 "Those fixes are not part of the LaTeX kernel because of backward "
 "compatibility. If you use this module your typeset document may look "
 "different when you process it with future LaTeX versions, because fixltx2e "
-"may provide more bugfixes in future versions."
+"may provide more bugfixes in future versions. Note that the recent LaTeX "
+"kernel (2015/01/01) includes fixltx2e, so the fixltx2e module becomes "
+"obsolete as of TeXLive 2015."
 msgstr ""
 "Nahrá LaTeX-ov balík fixltx2e ktorý obsahuje pár korektúr pre LaTeX. Tieto "
 "korektúry nie sú časťou LaTeX-ovho jadra kvôli spätnej kompatibilite. "
 "Použitím tohto modulu môžu vaše vytlačené dokumenty vyzerať ináč pri "
 "spracovaní s budúcimi verziami LaTeX-u, lebo fixltx2e vtedy môže poskytovať "
-"aj viac korektúr."
+"aj viac korektúr. Berte na vedomie že nedávne LaTeX jadrá (2015/01/01) "
+"obsahujú fixltx2e, čiže od TeXLive 2015 je modul fixltx2e obsoletný."
 
 #: lib/layouts/fixme.module:2
 msgid "FiXme"
@@ -26171,12 +26174,10 @@ msgid "math macro new parameter"
 msgstr "mat. makro: nový parameter"
 
 #: src/Color.cpp:272
-#, fuzzy
 msgid "collapsible inset text"
 msgstr "zbaliteľná vložka: text"
 
 #: src/Color.cpp:273
-#, fuzzy
 msgid "collapsible inset frame"
 msgstr "zbaliteľná vložka: rám"
 

[LyX/master] Implement ParamInfo::HANDLING_LTRIM and use it to ltrim InsetBibitem output

[Juergen Spitzmueller]

commit 76f49fad78db5ed768db163feef4e3b3c062228f
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 08:20:58 2017 +0200

Implement ParamInfo::HANDLING_LTRIM and use it to ltrim InsetBibitem
output

See #9847.
---
 src/insets/InsetBibitem.cpp   |3 ++-
 src/insets/InsetCommandParams.cpp |   27 ---
 src/insets/InsetCommandParams.h   |7 ---
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index d5ebaf7..08e8c76 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -112,7 +112,8 @@ ParamInfo const & InsetBibitem::findInfo(string const & /* 
cmdName */)
param_info_.add("label", ParamInfo::LATEX_OPTIONAL,
ParamInfo::HANDLING_LATEXIFY);
param_info_.add("key", ParamInfo::LATEX_REQUIRED,
-   ParamInfo::HANDLING_ESCAPE);
+   
ParamInfo::ParamHandling(ParamInfo::HANDLING_ESCAPE
+| 
ParamInfo::HANDLING_LTRIM));
param_info_.add("literal", ParamInfo::LYX_INTERNAL);
}
return param_info_;
diff --git a/src/insets/InsetCommandParams.cpp 
b/src/insets/InsetCommandParams.cpp
index 9d34808..aa2458c 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -432,12 +432,21 @@ docstring InsetCommandParams::prepareCommand(OutputParams 
const & runparams,
 docstring const & command,
 ParamInfo::ParamHandling handling) 
const
 {
-   if (handling == ParamInfo::HANDLING_LATEXIFY)
+   docstring result;
+   bool ltrimmed = false;
+   // Trimming can be done on top of any of the other handlings
+   // We check this here since handling might be changed below.
+   if (handling & ParamInfo::HANDLING_LTRIM) {
+   // this is used if no other handling is done
+   result = command;
+   ltrimmed = true;
+   }
+   if (handling & ParamInfo::HANDLING_LATEXIFY)
if ((*this)["literal"] == "true")
handling = ParamInfo::HANDLING_NONE;
-   docstring result;
-   switch (handling) {
-   case ParamInfo::HANDLING_LATEXIFY: {
+
+   // LATEXIFY, ESCAPE and NONE are mutually exclusive
+   if (handling & ParamInfo::HANDLING_LATEXIFY) {
// First handle backslash
result = subst(command, from_ascii("\\"), 
from_ascii("\\textbackslash{}"));
// Then get LaTeX macros
@@ -476,17 +485,13 @@ docstring InsetCommandParams::prepareCommand(OutputParams 
const & runparams,
result.replace(pos, 1, 
backslash + chars_escape[k] + term);
}
}
-   break;
}
-   case ParamInfo::HANDLING_ESCAPE:
+   else if (handling & ParamInfo::HANDLING_ESCAPE)
result = escape(command);
-   break;
-   case ParamInfo::HANDLING_NONE:
+   else if (handling & ParamInfo::HANDLING_NONE)
result = command;
-   break;
-   } // switch
 
-   return result;
+   return ltrimmed ? ltrim(result) : result;
 }
 
 
diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index 121fdac..e823205 100644
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -42,9 +42,10 @@ public:
};
/// Special handling on output
enum ParamHandling {
-   HANDLING_NONE,/// no special handling
-   HANDLING_ESCAPE,  /// escape special characters
-   HANDLING_LATEXIFY /// transform special characters to LaTeX 
macros
+   HANDLING_NONE = 1,/// no special handling
+   HANDLING_ESCAPE = 2,  /// escape special characters
+   HANDLING_LATEXIFY = 4, /// transform special characters to 
LaTeX macros
+   HANDLING_LTRIM = 8 /// trim blanks on the left
};
///
class ParamData {

[LyX/2.3.x] Do not add deleted text to inset button label.

[Juergen Spitzmueller]

commit d088f7f03f10bf7a51c807e9b0a3172449c15a01
Author: Juergen Spitzmueller 
Date:   Sun Oct 22 19:08:10 2017 +0200

Do not add deleted text to inset button label.

Fixes: #10775
(cherry picked from commit 70b0df85c80120e0a0eeaa9e3fec721d91d53849)
---
 src/insets/InsetCollapsible.cpp |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index 11c9e2a..c429c51 100644
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -423,6 +423,8 @@ docstring const InsetCollapsible::getNewLabel(docstring 
const & l) const
pos_type i = 0;
pos_type j = 0;
for (; i < n && j < p_siz; ++j) {
+   if (paragraphs().begin()->isDeleted(j))
+   continue;
if (paragraphs().begin()->isInset(j)) {
if (!paragraphs().begin()->getInset(j)->isChar())
continue;

[LyX/2.3.x] Implement ParamInfo::HANDLING_LTRIM and use it to ltrim InsetBibitem output

[Juergen Spitzmueller]

commit a81a0c55349693df59be9239cae2fdfdf7a1
Author: Juergen Spitzmueller 
Date:   Mon Oct 23 08:20:58 2017 +0200

Implement ParamInfo::HANDLING_LTRIM and use it to ltrim InsetBibitem
output

See #9847.

(cherry picked from commit 76f49fad78db5ed768db163feef4e3b3c062228f)
---
 src/insets/InsetBibitem.cpp   |3 ++-
 src/insets/InsetCommandParams.cpp |   27 ---
 src/insets/InsetCommandParams.h   |7 ---
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/insets/InsetBibitem.cpp b/src/insets/InsetBibitem.cpp
index d5ebaf7..08e8c76 100644
--- a/src/insets/InsetBibitem.cpp
+++ b/src/insets/InsetBibitem.cpp
@@ -112,7 +112,8 @@ ParamInfo const & InsetBibitem::findInfo(string const & /* 
cmdName */)
param_info_.add("label", ParamInfo::LATEX_OPTIONAL,
ParamInfo::HANDLING_LATEXIFY);
param_info_.add("key", ParamInfo::LATEX_REQUIRED,
-   ParamInfo::HANDLING_ESCAPE);
+   
ParamInfo::ParamHandling(ParamInfo::HANDLING_ESCAPE
+| 
ParamInfo::HANDLING_LTRIM));
param_info_.add("literal", ParamInfo::LYX_INTERNAL);
}
return param_info_;
diff --git a/src/insets/InsetCommandParams.cpp 
b/src/insets/InsetCommandParams.cpp
index 9d34808..aa2458c 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -432,12 +432,21 @@ docstring InsetCommandParams::prepareCommand(OutputParams 
const & runparams,
 docstring const & command,
 ParamInfo::ParamHandling handling) 
const
 {
-   if (handling == ParamInfo::HANDLING_LATEXIFY)
+   docstring result;
+   bool ltrimmed = false;
+   // Trimming can be done on top of any of the other handlings
+   // We check this here since handling might be changed below.
+   if (handling & ParamInfo::HANDLING_LTRIM) {
+   // this is used if no other handling is done
+   result = command;
+   ltrimmed = true;
+   }
+   if (handling & ParamInfo::HANDLING_LATEXIFY)
if ((*this)["literal"] == "true")
handling = ParamInfo::HANDLING_NONE;
-   docstring result;
-   switch (handling) {
-   case ParamInfo::HANDLING_LATEXIFY: {
+
+   // LATEXIFY, ESCAPE and NONE are mutually exclusive
+   if (handling & ParamInfo::HANDLING_LATEXIFY) {
// First handle backslash
result = subst(command, from_ascii("\\"), 
from_ascii("\\textbackslash{}"));
// Then get LaTeX macros
@@ -476,17 +485,13 @@ docstring InsetCommandParams::prepareCommand(OutputParams 
const & runparams,
result.replace(pos, 1, 
backslash + chars_escape[k] + term);
}
}
-   break;
}
-   case ParamInfo::HANDLING_ESCAPE:
+   else if (handling & ParamInfo::HANDLING_ESCAPE)
result = escape(command);
-   break;
-   case ParamInfo::HANDLING_NONE:
+   else if (handling & ParamInfo::HANDLING_NONE)
result = command;
-   break;
-   } // switch
 
-   return result;
+   return ltrimmed ? ltrim(result) : result;
 }
 
 
diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index 121fdac..e823205 100644
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -42,9 +42,10 @@ public:
};
/// Special handling on output
enum ParamHandling {
-   HANDLING_NONE,/// no special handling
-   HANDLING_ESCAPE,  /// escape special characters
-   HANDLING_LATEXIFY /// transform special characters to LaTeX 
macros
+   HANDLING_NONE = 1,/// no special handling
+   HANDLING_ESCAPE = 2,  /// escape special characters
+   HANDLING_LATEXIFY = 4, /// transform special characters to 
LaTeX macros
+   HANDLING_LTRIM = 8 /// trim blanks on the left
};
///
class ParamData {

[LyX/2.3.x] Add obsolescence warning in fixltx2e description (ticket 9361)

[jpc]

commit d57935b33bc813ffd8e3b49c53676d66d7ee0c4a
Author: jpc 
Date:   Mon Oct 23 09:51:08 2017 +0200

   Add obsolescence warning in fixltx2e description (ticket 9361)
---
 lib/layouts/fixltx2e.module |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
index 3568789..6e3f41c 100644
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@@ -5,6 +5,8 @@
 #If you use this module your typeset document may look different
 #when you process it with future LaTeX versions, because fixltx2e may provide
 #more bugfixes in future versions.
+#Note that the recent LaTeX kernel (2015/01/01) includes fixltx2e,
+#so the fixltx2e module becomes obsolete as of TeXLive 2015.
 #DescriptionEnd
 
 # Author : Georg Baum 

[LyX/master] Add obsolescence warning in fixltx2e description (ticket 9361)

[jpc]

commit 448255a371fba3a7b27437ab2c97a45acd08283e
Author: jpc 
Date:   Mon Oct 23 09:51:08 2017 +0200

   Add obsolescence warning in fixltx2e description (ticket 9361)
---
 lib/layouts/fixltx2e.module |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/layouts/fixltx2e.module b/lib/layouts/fixltx2e.module
index 3568789..6e3f41c 100644
--- a/lib/layouts/fixltx2e.module
+++ b/lib/layouts/fixltx2e.module
@@ -5,6 +5,8 @@
 #If you use this module your typeset document may look different
 #when you process it with future LaTeX versions, because fixltx2e may provide
 #more bugfixes in future versions.
+#Note that the recent LaTeX kernel (2015/01/01) includes fixltx2e,
+#so the fixltx2e module becomes obsolete as of TeXLive 2015.
 #DescriptionEnd
 
 # Author : Georg Baum 

[LyX/2.3.x] Make math options loading automatic, see ticket 10661

[jpc]

commit 95f60915a73219e1fcf549b292b17f5307f94078
Author: jpc 
Date:   Mon Oct 23 09:18:56 2017 +0200

  Make math options loading automatic, see ticket 10661

 lib/doc/Additional.lyx |   12 ++--
 lib/doc/Customization.lyx  |   18 +-
 lib/doc/Development.lyx|   12 ++--
 lib/doc/DummyDocument1.lyx |   10 +-
 lib/doc/DummyDocument2.lyx |   10 +-
 lib/doc/Formula-numbering.lyx  |   12 ++--
 lib/doc/Intro.lyx  |   12 ++--
 lib/doc/LFUNs.lyx  |   12 ++--
 lib/doc/LaTeXConfig.lyx|   20 ++--
 lib/doc/Math.lyx   |6 +++---
 lib/doc/MergedManuals.lyx  |   10 +-
 lib/doc/Shortcuts.lyx  |   12 ++--
 lib/doc/Tutorial.lyx   |   16 
 lib/doc/ar/Shortcuts.lyx   |   12 ++--
 lib/doc/ar/Tutorial.lyx|   16 
 lib/doc/attic/DocStyle.lyx |   18 +-
 lib/doc/attic/aastex6_sample.lyx   |   16 
 lib/doc/attic/eu_Additional.lyx|   12 ++--
 lib/doc/attic/eu_Customization.lyx |   16 
 lib/doc/attic/eu_UserGuide.lyx |   12 ++--
 lib/doc/attic/id_UserGuide.lyx |   10 +-
 lib/doc/attic/it_Customization.lyx |   18 +-
 lib/doc/attic/it_UserGuide.lyx |   10 +-
 lib/doc/attic/pl_Additional.lyx|   12 ++--
 lib/doc/attic/sk_UserGuide.lyx |   12 ++--
 lib/doc/ca/Intro.lyx   |   12 ++--
 lib/doc/cs/Tutorial.lyx|   16 
 lib/doc/da/Intro.lyx   |   12 ++--
 lib/doc/de/Additional.lyx  |   10 +-
 lib/doc/de/DummyDocument1.lyx  |   10 +-
 lib/doc/de/DummyDocument2.lyx  |   10 +-
 lib/doc/de/Formelnummerierung.lyx  |   12 ++--
 lib/doc/de/Intro.lyx   |   12 ++--
 lib/doc/de/Math.lyx|6 +++---
 lib/doc/de/Shortcuts.lyx   |   12 ++--
 lib/doc/de/Tutorial.lyx|   12 ++--
 lib/doc/el/Intro.lyx   |   12 ++--
 lib/doc/es/Additional.lyx  |   12 ++--
 lib/doc/es/Customization.lyx   |   18 +-
 lib/doc/es/DocumentoPostizo1.lyx   |   10 +-
 lib/doc/es/DocumentoPostizo2.lyx   |   10 +-
 lib/doc/es/Formula-numbering.lyx   |   12 ++--
 lib/doc/es/Intro.lyx   |   12 ++--
 lib/doc/es/Math.lyx|6 +++---
 lib/doc/es/Shortcuts.lyx   |   12 ++--
 lib/doc/es/Tutorial.lyx|   16 
 lib/doc/eu/Intro.lyx   |   12 ++--
 lib/doc/eu/Tutorial.lyx|   16 
 lib/doc/fr/Additional.lyx  |   12 ++--
 lib/doc/fr/Customization.lyx   |   16 
 lib/doc/fr/DocumentBidon1.lyx  |   10 +-
 lib/doc/fr/DocumentBidon2.lyx  |   10 +-
 lib/doc/fr/Formula-numbering.lyx   |   12 ++--
 lib/doc/fr/Intro.lyx   |   12 ++--
 lib/doc/fr/Math.lyx|6 +++---
 lib/doc/fr/Shortcuts.lyx   |   12 ++--
 lib/doc/fr/Tutorial.lyx|   16 
 lib/doc/gl/Intro.lyx   |   16 
 lib/doc/gl/Tutorial.lyx|   16 
 lib/doc/he/Intro.lyx   |   12 ++--
 lib/doc/he/Tutorial.lyx|   16 
 lib/doc/hu/Intro.lyx   |   12 ++--
 lib/doc/hu/Tutorial.lyx|   16 
 lib/doc/id/Intro.lyx   |   12 ++--
 lib/doc/id/Shortcuts.lyx   |   12 ++--
 lib/doc/id/Tutorial.lyx|   16 
 lib/doc/it/Intro.lyx