[LyX/master] Add remark about edit menu to release notes.

2019-05-28 Thread Richard Kimberly Heck
commit 762fc05dd95ee50c4bbabcb8dbdbf0acfe5a21f8
Author: Richard Kimberly Heck 
Date:   Tue May 28 16:47:11 2019 -0400

Add remark about edit menu to release notes.
---
 lib/RELEASE-NOTES |9 -
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES
index b3da89d..cf31d6b 100644
--- a/lib/RELEASE-NOTES
+++ b/lib/RELEASE-NOTES
@@ -5,7 +5,14 @@
 
 * It is now possible to cancel background export processes. A menu entry
   to do so will appear on the Document menu when such a process is underway.
-  The LFUN for this is export-cancel.
+  The LFUN for this is export-cancel. One can also click on the 'spinner'
+  to cancel export.
+
+* The items on the Edit menu have been reordered, and many of the shortcuts
+  have been changed so that they are more intuitive in the case of often
+  used items. We understand that this may frustrate some users and apologize,
+  while noting that menu shortcuts can always be customized by copying the
+  stdmenus.inc file to the user directory and editing it.
 
 
 !!Documents compilation process and images conversion


[LyX/master] Re-order and re-shortcut the edit menu.

2019-05-28 Thread Richard Kimberly Heck
commit 29d80772fc832a914c73b4de3010b7f4c108a5e3
Author: Richard Kimberly Heck 
Date:   Mon May 27 23:51:31 2019 -0400

Re-order and re-shortcut the edit menu.
---
 lib/ui/stdmenus.inc |   22 +++---
 1 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc
index 8d89737..dc12a7c 100644
--- a/lib/ui/stdmenus.inc
+++ b/lib/ui/stdmenus.inc
@@ -336,21 +336,21 @@ Menuset
 #
 
Menu "view"
-   Item "Open All Insets|O" "inset-forall * inset-toggle open"
-   Item "Close All Insets|C" "inset-forall * inset-toggle close"
-   Separator
-   Item "Unfold Math Macro|n" "math-macro-unfold"
-   Item "Fold Math Macro|d" "math-macro-fold"
-   Separator
-   Item "Outline Pane|u" "dialog-toggle toc"
+   Item "Outline Pane|O" "dialog-toggle toc"
Item "Code Preview Pane|P" "dialog-toggle view-source"
Item "Messages Pane|g" "dialog-toggle progress"
-   Submenu "Toolbars|b" "toolbars"
+   Submenu "Toolbars|T" "toolbars"
Separator
-   Item "Split View Into Left and Right Half|i" "view-split 
horizontal"
-   Item "Split View Into Upper and Lower Half|e" "view-split 
vertical"
+   OptItem "Unfold Math Macro|n" "math-macro-unfold"
+   OptItem "Fold Math Macro|d" "math-macro-fold"
+   Separator
+   Item "Split View Into Left and Right Half|L" "view-split 
horizontal"
+   Item "Split View Into Upper and Lower Half|U" "view-split 
vertical"
OptItem "Close Current View|w" "tab-group-close"
-   Item "Fullscreen|l" "ui-toggle fullscreen"
+   Item "Fullscreen|F" "ui-toggle fullscreen"
+   Separator
+   Item "Open All Insets|I" "inset-forall * inset-toggle open"
+   Item "Close All Insets|C" "inset-forall * inset-toggle close"
Separator
Documents
End


[LyX/master] Attempt to fix #11457

2019-05-28 Thread José Matos
commit 8dd31803b16d1fb6b30772955188c3595437f64a
Author: José Matos 
Date:   Tue May 28 16:22:32 2019 +0100

Attempt to fix #11457

In python 3 the colors need to be strings and not bytes:

This was the equivalent of

>> print("%s" % b"1")
"b'1'"

since the colors were bytes the call to dvipng was something like

dvipng -Ttight -depth -height -D 115 -fg "b'rgb 0.937255 0.941176 
0.945098'" -bg "b'rgb 0.137255 0.149020 0.160784'"  "lyxpreviewxBJEqm.dvi"

Note the "b'rgb after both -fg and -bg that wrecked havoc and thus dvipng 
failed. That was the difference between python2 and python3 calls.
---
 lib/scripts/lyxpreview2bitmap.py |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py
index e4bf131..ecefdaf 100755
--- a/lib/scripts/lyxpreview2bitmap.py
+++ b/lib/scripts/lyxpreview2bitmap.py
@@ -373,6 +373,7 @@ def main(argv):
 dir, latex_file = os.path.split(input_path)
 
 # Echo the settings
+progress("Running Python %s" % str(sys.version_info[:3]))
 progress("Starting %s..." % script_name)
 progress("Output format: %s" % output_format)
 progress("Foreground color: %s" % fg_color)
@@ -394,6 +395,11 @@ def main(argv):
 fg_color_dvipng = make_texcolor(fg_color, False)
 bg_color_dvipng = make_texcolor(bg_color, False)
 
+# For python > 2 convert bytes to string
+if not PY2:
+fg_color_dvipng = fg_color_dvipng.decode('ascii')
+bg_color_dvipng = bg_color_dvipng.decode('ascii')
+
 # External programs used by the script.
 latex = find_exe_or_terminate(latex or latex_commands)
 bibtex = find_exe(bibtex or bibtex_commands)