[LyX/2.2.x] Added missing oxygen icons to distribution

commit 35a78ae0e94bb7a6bfa5a8c539d4ff6850854f00 Author: Kornel Benko Date: Sat Jul 9 13:34:49 2016 +0200 Added missing oxygen icons to distribution Like in master at 60a1827b659219a93bd1fe5dfe0490ab71d72b0e --- lib/Makefile.am | 95 +++

[LyX/2.2.x] Added missing ipa icons to distribution

commit 53425c7e99d1018b153a88fd36146b53c72f4f2a Author: Kornel Benko Date: Sat Jul 9 13:25:33 2016 +0200 Added missing ipa icons to distribution Like in master at 43d284e15ad6193da2508a57b5260cb85ff4cdb9 --- lib/Makefile.am | 29 + 1 files changed, 29

[LyX/master] Correct format

commit fe06ef0e27badc6d6360ab55fb1af0df7f66be76 Author: Juergen Spitzmueller Date: Sat Jul 9 13:57:49 2016 +0200 Correct format --- lib/configure.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/configure.py b/lib/configure.py index 6f13356..a8515f3 100644 -

[LyX/2.2.x] Document 35a78ae0e9 and 53425c7e99

commit 87bc92cfe175c51ac7a55aac59bd313b3f373a6b Author: Juergen Spitzmueller Date: Sat Jul 9 15:13:46 2016 +0200 Document 35a78ae0e9 and 53425c7e99 --- status.22x |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/status.22x b/status.22x index dfe9d9d..1c25a8b 100644

[LyX/master] Fix for recent luatex versions.

commit 97b9e81ceef7aaedcdbe012fba5f4972727d29ea Author: Juergen Spitzmueller Date: Sat Jul 9 16:45:27 2016 +0200 Fix for recent luatex versions. --- src/LaTeXFeatures.cpp | 12 +++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXF

[LyX/master] Write magic paragraph label to main paragraph tag.

commit db954caf8b19879b9ae82f290fb429063ae2e37f Author: Richard Heck Date: Fri Jul 8 16:38:37 2016 -0400 Write magic paragraph label to main paragraph tag. --- src/output_xhtml.cpp | 15 ++- src/output_xhtml.h | 10 ++ 2 files changed, 8 insertions(+), 17 deletion

[LyX/master] Rename some variables and routines.

commit b3ab0190c1d8baa1f9c77bd8fb0fb0d5001cfe13 Author: Richard Heck Date: Sat Jul 9 23:53:18 2016 -0400 Rename some variables and routines. --- src/Paragraph.cpp|4 ++-- src/insets/InsetText.cpp |8 src/output_xhtml.cpp | 20 ++-- src/output_

[LyX/master] Update XHTML debugging code a bit.

commit 2b87026bf96cac255e69fef35f7cf0dc2c02f68b Author: Richard Heck Date: Sat Jul 9 14:28:27 2016 -0400 Update XHTML debugging code a bit. --- src/output_xhtml.cpp | 20 +--- src/output_xhtml.h |4 +--- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git

[LyX/master] Fix problem with branch handling. The problem was that we were not dealing properly with the paragraph separator tag.

commit 31e25c8ec695f864bec3679c3e11495e3011a0e2 Author: Richard Heck Date: Sat Jul 9 23:12:32 2016 -0400 Fix problem with branch handling. The problem was that we were not dealing properly with the paragraph separator tag. We really need to use that tag as a kind of general mar

[LyX/master] Only trim right end of lines in header. This allows us to preserve whitespace in local layout.

commit a11e07a62fb78cae8d33d132550454a5db96e26e Author: Richard Heck Date: Fri Jun 24 14:57:28 2016 -0400 Only trim right end of lines in header. This allows us to preserve whitespace in local layout. --- lib/lyx2lyx/LyX.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) d

[LyX/master] Fix thinko in Buffer::preview. It is possible for this routine to be called when we do not have a cloned Buffer, namely, if we do not have EXPORT_in_THREAD defined.

commit d8aab4af9e6e72c835f78ba54a46687b870c25fa Author: Richard Heck Date: Sun Jul 10 01:12:42 2016 -0400 Fix thinko in Buffer::preview. It is possible for this routine to be called when we do not have a cloned Buffer, namely, if we do not have EXPORT_in_THREAD defined. --- src/Buf

[LyX/2.2.x] Fix thinko in Buffer::preview. It is possible for this routine to be called when we do not have a cloned Buffer, namely, if we do not have EXPORT_in_THREAD defined.

commit b02a93d7e809775b58f21e9b56d19f858e6fd3ba Author: Richard Heck Date: Sun Jul 10 01:12:42 2016 -0400 Fix thinko in Buffer::preview. It is possible for this routine to be called when we do not have a cloned Buffer, namely, if we do not have EXPORT_in_THREAD defined. (ch

Re: [LyX/master] Fix thinko in Buffer::preview. It is possible for this routine to be called when we do not have a cloned Buffer, namely, if we do not have EXPORT_in_THREAD defined.

On Sun, Jul 10, 2016 at 07:16:13AM +0200, Richard Heck wrote: > commit d8aab4af9e6e72c835f78ba54a46687b870c25fa > Author: Richard Heck > Date: Sun Jul 10 01:12:42 2016 -0400 > > Fix thinko in Buffer::preview. It is possible for this routine to > be called when we do not have a cloned Bu

[LyX/master] Delete obsolete comment: We no longer support Qt < 4.4.

commit 74809e53a7b849df42f29adc7cfc6478232bf3f0 Author: Richard Heck Date: Sun Jul 10 01:43:56 2016 -0400 Delete obsolete comment: We no longer support Qt < 4.4. --- src/frontends/qt4/GuiView.cpp |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt4/Gui

[LyX/master] Simplify logic a bit. (This was meant to be part of a previous commit.)

commit 2104d41f71ff39f5c3f9f5a485707633b1bfb25b Author: Richard Heck Date: Sun Jul 10 01:43:19 2016 -0400 Simplify logic a bit. (This was meant to be part of a previous commit.) --- src/Buffer.cpp | 11 +-- 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Bu

[LyX/2.2.x] Simplify logic a bit. (This was meant to be part of a previous commit.)

commit 103bf05099652510ea0eaa5e45256acd32cba476 Author: Richard Heck Date: Sun Jul 10 01:43:19 2016 -0400 Simplify logic a bit. (This was meant to be part of a previous commit.) (cherry picked from commit 2104d41f71ff39f5c3f9f5a485707633b1bfb25b) --- src/Buffer.cpp | 11