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

2017-10-22 Thread Juergen Spitzmueller
commit 70b0df85c80120e0a0eeaa9e3fec721d91d53849 Author: Juergen Spitzmueller Date: Sun Oct 22 19:08:10 2017 +0200 Do not add deleted text to inset button label. Fixes: #10775 --- src/insets/InsetCollapsible.cpp |2 ++ 1 files changed, 2 insertions(+), 0

[LyX/master] Fix issue with change-tracked deleted display math

2017-10-22 Thread Enrico Forestieri
commit 7f23ca912c5e92bf30bdc05b6d801082f6643e8e Author: Enrico Forestieri Date: Sun Oct 22 13:12:33 2017 +0200 Fix issue with change-tracked deleted display math - If a display math not starting a new paragraph is deleted, the current \lyxdeleted macro (if

[LyX/master] Additional.lyx: port today's changes

2017-10-22 Thread Uwe Stöhr
commit 032932cbee2f89f198dd1ce623188786f287e183 Author: Uwe Stöhr Date: Mon Oct 23 00:04:28 2017 +0200 Additional.lyx: port today's changes lib/doc/Additional.lyx| 2339 ++--- lib/doc/de/Additional.lyx | 23 +-

[LyX/master] Account for shadowed system macros

2017-10-22 Thread Enrico Forestieri
commit d58d3f677442fc8b2ee2454a1da8f5eedd8b95ac Author: Enrico Forestieri Date: Sun Oct 22 23:09:37 2017 +0200 Account for shadowed system macros Part of #10694. --- src/Cursor.cpp |7 --- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git

[LyX/2.3.x] Additional.lyx: accept and distribute changes

2017-10-22 Thread Uwe Stöhr
commit 080c068e971a7a194e5a6db6b8a6bdb717fbcbae Author: Uwe Stöhr Date: Mon Oct 23 00:02:04 2017 +0200 Additional.lyx: accept and distribute changes - almost all changes were already distributed - fix some cross-reference issues lib/doc/Additional.lyx|

[LyX/2.3.x] Fix math mode for InsetMathMacro on output

2017-10-22 Thread Guillaume MM
commit 25678dae120fd968eb2a21ff5e81324bcd5dc083 Author: Guillaume MM Date: Sun Oct 8 23:21:10 2017 +0200 Fix math mode for InsetMathMacro on output After 6642152e, user macros were no longer wrapped in \ensuremath. In 2.2 and before, InsetMathMacro behaved as

[LyX/master] Fix math mode for InsetMathMacro on output

2017-10-22 Thread Guillaume MM
commit 6503073070c9d4f35961df68ebfc7cfaa2c39ab3 Author: Guillaume MM Date: Sun Oct 8 23:21:10 2017 +0200 Fix math mode for InsetMathMacro on output After 6642152e, user macros were no longer wrapped in \ensuremath. In 2.2 and before, InsetMathMacro behaved as

[LyX/2.3.x] Account for shadowed system macros

2017-10-22 Thread Enrico Forestieri
commit 8f7b40955cc34e31a2932906d334499ef1af3665 Author: Enrico Forestieri Date: Sun Oct 22 23:09:37 2017 +0200 Account for shadowed system macros Part of #10694. (cherry picked from commit d58d3f677442fc8b2ee2454a1da8f5eedd8b95ac) --- src/Cursor.cpp |