[LyX/master] Win installer: respect also 64bit MiKTeX

commit 9f9450cacdbbfa06f6234d733d01b7e563858b88 Author: Uwe Stöhr Date: Sun Mar 11 02:59:08 2018 +0100 Win installer: respect also 64bit MiKTeX --- .../Win32/packaging/installer/ChangeLog.txt|2 +- .../Win32/packaging/installer/include/LaTeX.nsh| 35

[LyX/master] add support for the PT fonts

commit d3c51876a902e5d41f79a559ffb2516674e55c1a Author: Uwe Stöhr Date: Sat Mar 10 19:59:48 2018 +0100 add support for the PT fonts - fileformat change - I also started https://wiki.lyx.org/LyX/NewInLyX24 for new features --- development/FORMAT

[LyX/master] Update tex2lyx tests.

commit b8adb0f933942c9d73a528d864369169c637d328 Author: Juergen Spitzmueller Date: Sat Mar 10 16:15:29 2018 +0100 Update tex2lyx tests. --- src/tex2lyx/test/CJK.lyx.lyx | 24 +++- src/tex2lyx/test/CJKutf8.lyx.lyx |2 +-

[LyX/master] tex2lyx/TODO: update

commit ad5dbbfd65dd39045a1adea8668b2bd10dab7c27 Author: Juergen Spitzmueller Date: Sat Mar 10 15:48:49 2018 +0100 tex2lyx/TODO: update --- src/tex2lyx/TODO.txt |8 +++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/tex2lyx/TODO.txt

[LyX/master] tex2lyx: add support for lstinputlisting

commit d325f79f5c782edcfa32e87579fb102763d8d29b Author: Juergen Spitzmueller Date: Sat Mar 10 15:40:51 2018 +0100 tex2lyx: add support for lstinputlisting --- src/tex2lyx/text.cpp | 18 -- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git

[LyX/master] tex2lyx: get rid of another large if-else if chain.

commit 11e4a24e6edbd1f69b60a194b31ac2d7c4dd5034 Author: Juergen Spitzmueller Date: Sat Mar 10 15:00:30 2018 +0100 tex2lyx: get rid of another large if-else if chain. --- src/tex2lyx/Preamble.cpp | 153 ++--- 1 files changed, 102

[LyX/2.3.2-staging] Amend 15fd17d83fb2

commit 91ce18388ef3d60573cc6fc155ae5904d0981759 Author: Juergen Spitzmueller Date: Sat Mar 10 14:22:51 2018 +0100 Amend 15fd17d83fb2 (cherry picked from commit b2ccdae22864ba72675b43d070022ae8fea18238) --- src/tex2lyx/Preamble.cpp |2 +- 1 files changed, 1

[LyX/master] Amend 15fd17d83fb2

commit b2ccdae22864ba72675b43d070022ae8fea18238 Author: Juergen Spitzmueller Date: Sat Mar 10 14:22:51 2018 +0100 Amend 15fd17d83fb2 --- src/tex2lyx/Preamble.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/tex2lyx/Preamble.cpp

[LyX/2.3.2-staging] tex2lyx: support for \includeonly

commit 0f33720d29e330cb5180cdf45e01ba822e89a994 Author: Juergen Spitzmueller Date: Fri Mar 9 17:27:55 2018 +0100 tex2lyx: support for \includeonly (cherry picked from commit 15fd17d83fb2b98d1ff226a79353e42f6e0247d4) --- src/tex2lyx/Preamble.cpp | 38

[LyX/2.3.1-staging] Reset buffer language only if we have something to reset.

commit 73c41a3c418fcd7002ba47f96953f3e9b44f3ed3 Author: Juergen Spitzmueller Date: Fri Mar 9 12:15:19 2018 +0100 Reset buffer language only if we have something to reset. Fixes: #11063 (cherry picked from commit 599b1222f7da0222cd1802af69abefb81145f566) ---

[LyX/2.2.x] syntax.default: add missing *

commit cd6a31c0d48b49efb623a39fca8c04ba70c1cc82 Author: Juergen Spitzmueller Date: Fri Mar 9 14:47:04 2018 +0100 syntax.default: add missing * Fixes: #10501 (cherry picked from commit 23766fdd592b95ecfc33cb66e08976654de33182) --- lib/syntax.default |2 +-

[LyX/2.3.1-staging] syntax.default: add missing *

commit ebae08616b17f4e384dcd9cf8ab98afe2a3773f1 Author: Juergen Spitzmueller Date: Fri Mar 9 14:47:04 2018 +0100 syntax.default: add missing * Fixes: #10501 (cherry picked from commit 23766fdd592b95ecfc33cb66e08976654de33182) --- lib/syntax.default |2 +-

[LyX/2.3.1-staging] tex2lyx: handle whitespace in table column declaration.

commit 20a63d2b5523d692bbf9fa17171465be8ede7cd6 Author: Juergen Spitzmueller Date: Fri Mar 9 14:18:03 2018 +0100 tex2lyx: handle whitespace in table column declaration. Fixes: #10804 (cherry picked from commit 247e1a223d917f81b5a2cc5ef3621c3e7fa9de92) ---

[LyX/2.3.2-staging] tex2lyx: chapterbib support

commit 42dd5f5cfadb65f20280a3ad04ffc72a05780b4a Author: Juergen Spitzmueller Date: Fri Mar 9 13:30:52 2018 +0100 tex2lyx: chapterbib support (cherry picked from commit af6933c06f603beca3d8684f56217243cbff1f94) --- src/tex2lyx/Preamble.cpp |3 +++