[LyX/2.2.x] Strike out (in the output) deleted display math with track-changes

commit 8a1f936ff190964649643872f0c45da10ce3105f Author: Enrico Forestieri Date: Sat Nov 5 21:31:09 2016 +0100 Strike out (in the output) deleted display math with track-changes Showing deleted display math by enabling "Show Changes in Output" was only possible with dvi (through

[LyX/2.2.x] doc files: backport recent changes in master

commit 319117855589c506728b2069cbc2ac562487052a Author: Uwe Stöhr Date: Sat Nov 5 19:20:51 2016 +0100 doc files: backport recent changes in master --- lib/doc/fr/Tutorial.lyx| 15 --- lib/doc/ja/EmbeddedObjects.lyx |4 2 files changed, 4 insertions(+), 15 del

[LyX/master] Japanese EmbeddedObjects.lyx: re-add export format

commit 96518792533849cb412cf55582f92c43695627b0 Author: Uwe Stöhr Date: Sat Nov 5 19:19:19 2016 +0100 Japanese EmbeddedObjects.lyx: re-add export format - I don't know if it is a bug that LyX automatically deletes the output format if it cannot find --- lib/doc/ja/EmbeddedObjects

[LyX/master] French Tutorial.lyx remove info accidentally introduced in recent commits

commit 02a1c06f321960ebd317f85dad11d12b3a5460c4 Author: Uwe Stöhr Date: Sat Nov 5 19:13:32 2016 +0100 French Tutorial.lyx remove info accidentally introduced in recent commits --- lib/doc/fr/Tutorial.lyx | 15 --- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git

[LyX/master] Japanese EmbeddedObjects.lyx: re-add code

commit f5fd6998473b690ea19ba138f5b8212bb5c91a2e Author: Uwe Stöhr Date: Sat Nov 5 19:12:40 2016 +0100 Japanese EmbeddedObjects.lyx: re-add code please use 2.2.x as working branch for all doc files unless you describe new features in master! --- lib/doc/ja/EmbeddedObjects.lyx |

[LyX/master] doc files port recent changes

commit 108d6763cf4298dde41a29556d351342910e0caf Author: Uwe Stöhr Date: Sat Nov 5 19:03:56 2016 +0100 doc files port recent changes --- lib/doc/Changelog-UserGuide-LyX_22x.txt |9 +++- lib/doc/EmbeddedObjects.lyx |2 +- lib/doc/Math.lyx|2 +-

[LyX/2.2.x] Changelog-UserGuide-LyX_22x.txt: a correction

commit 2a9bcb007731118fe86d51e9361d6786543d5556 Author: Uwe Stöhr Date: Sat Nov 5 19:03:14 2016 +0100 Changelog-UserGuide-LyX_22x.txt: a correction --- lib/doc/Changelog-UserGuide-LyX_22x.txt |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/doc/Changelog-UserG

[LyX/2.2.x] UserGuide.lyx: describe a feature

commit 547fec979c272722b66462d6c46713b5614f7018 Author: Uwe Stöhr Date: Sat Nov 5 19:01:08 2016 +0100 UserGuide.lyx: describe a feature fixes bug #3880 --- lib/doc/Changelog-UserGuide-LyX_22x.txt | 10 +++--- lib/doc/UserGuide.lyx |5 + lib/doc/de/U

[LyX/master] Don't parse multicolumn if the grid does not support it

commit 1c84d0ca821f847eb34a848dc7150007f2c8c46b Author: Guillaume Munch Date: Thu Nov 3 23:23:11 2016 +0100 Don't parse multicolumn if the grid does not support it Fixes #10466 and visual/compilation bugs with InsetMathSplit, InsetMathDiagram, InsetMathHull, InsetMathSubstack

[LyX/2.2.x] UserGuide.lyx: accept changes

commit 6e0b27bc20bfa1554ce8985cb6be422e7a24b41a Author: Uwe Stöhr Date: Sat Nov 5 18:42:14 2016 +0100 UserGuide.lyx: accept changes - update link to a Wiki page --- lib/doc/EmbeddedObjects.lyx|2 +- lib/doc/Math.lyx |2 +- lib/doc/UserGuide.lyx |

[LyX/master] Re-Fix #8471

commit e7654d9aa213a90fe957876b22f3a21d0a6cabab Author: Juergen Spitzmueller Date: Sat Nov 5 13:10:51 2016 +0100 Re-Fix #8471 The bug has partly been re-introduced with fb9a866a6 --- src/insets/InsetArgument.cpp | 10 ++ 1 files changed, 6 insertions(+), 4 deletions(-)

[LyX/master] Avoid dataloss with \multicolumn

commit 34ae9dc7f28d33120c27abd2bbbd341dd6044ce0 Author: Enrico Forestieri Date: Sat Nov 5 10:15:37 2016 +0100 Avoid dataloss with \multicolumn When \multicolumn{ncol}{align}{content} is parsed and the ncol parameter is not a numeric value, this parameter is swallowed and re

[LyX/2.2.x] de.po

commit c70f8e1281d0529e313d93db651a1c06d9989167 Author: Juergen Spitzmueller Date: Sat Nov 5 08:02:25 2016 +0100 de.po --- po/de.gmo | Bin 496998 -> 496995 bytes po/de.po | 215 +++-- 2 files changed, 109 insertions(+), 106 deleti