[LyX/master] another typo
commit 6031666b01c5af77c5c43576292ed1df8a6c827c Author: Pavel Sanda Date: Sun Jul 31 00:26:04 2022 +0200 another typo --- src/LyXAction.cpp |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 5c62864..992b47a 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -4095,8 +4095,8 @@ void LyXAction::init() menubar: Toggle visibility of the menubar.\n scrollbar : Toggle visibility of the scrollbar.\n frame : Toggle visibility of the frames around editing window.\n - zoomslider : Toggle visibility of the zoom slider in tabbar.\n - zoomlevel : Toggle visibility of the zoom level display in tabbar.\n + zoomslider : Toggle visibility of the zoom slider in statusbar.\n + zoomlevel : Toggle visibility of the zoom level display in statusbar.\n fullscreen : Toggle fullscreen mode. This also covers calling the previous functions. However #LFUN_TOOLBAR_TOGGLE for the custom tweaks of the toolbars should be used. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Various python fixes suggested by pyupgrade.
commit d79637a88e368d8e67e4b38ddcf25a4b7f40176e
Author: Pavel Sanda
Date: Sun Jul 31 00:36:51 2022 +0200
Various python fixes suggested by pyupgrade.
Patch from Jose.
https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg217770.html
---
lib/lyx2lyx/lyx2lyx_tools.py |2 +-
lib/lyx2lyx/lyx_0_12.py |2 +-
lib/lyx2lyx/lyx_1_2.py | 10 +-
lib/lyx2lyx/lyx_1_3.py |2 +-
lib/lyx2lyx/lyx_1_4.py | 40
lib/lyx2lyx/lyx_1_5.py | 24
lib/lyx2lyx/lyx_1_6.py | 12 ++--
lib/lyx2lyx/lyx_2_0.py | 20 ++--
lib/lyx2lyx/lyx_2_1.py |4 ++--
lib/lyx2lyx/lyx_2_2.py | 10 +-
lib/lyx2lyx/lyx_2_3.py | 10 +-
lib/lyx2lyx/lyx_2_4.py | 14 +++---
lib/lyx2lyx/parser_tools.py | 14 +++---
13 files changed, 82 insertions(+), 82 deletions(-)
diff --git a/lib/lyx2lyx/lyx2lyx_tools.py b/lib/lyx2lyx/lyx2lyx_tools.py
index 9c4fe0b..871087c 100644
--- a/lib/lyx2lyx/lyx2lyx_tools.py
+++ b/lib/lyx2lyx/lyx2lyx_tools.py
@@ -145,7 +145,7 @@ def insert_to_preamble(document, text, index = 0):
# A dictionary of Unicode->LICR mappings for use in a Unicode string's
translate() method
# Created from the reversed list to keep the first of alternative definitions.
-licr_table = dict((ord(ch), cmd) for cmd, ch in unicode_reps[::-1])
+licr_table = {ord(ch): cmd for cmd, ch in unicode_reps[::-1]}
def put_cmd_in_ert(cmd, is_open=False, as_paragraph=False):
"""
diff --git a/lib/lyx2lyx/lyx_0_12.py b/lib/lyx2lyx/lyx_0_12.py
index b742dd5..db3d882 100644
--- a/lib/lyx2lyx/lyx_0_12.py
+++ b/lib/lyx2lyx/lyx_0_12.py
@@ -112,7 +112,7 @@ def update_inset_label(document):
i = find_token(lines, '\\begin_inset Label', i)
if i == -1:
return
-lines[i] = '\\begin_inset LatexCommand \label{' + lines[i][19:] + '}'
+lines[i] = '\\begin_inset LatexCommand \\label{' + lines[i][19:] + '}'
i = i + 1
diff --git a/lib/lyx2lyx/lyx_1_2.py b/lib/lyx2lyx/lyx_1_2.py
index b697a91..ae082a7 100644
--- a/lib/lyx2lyx/lyx_1_2.py
+++ b/lib/lyx2lyx/lyx_1_2.py
@@ -69,7 +69,7 @@ def find_beginning_of_inset(lines, i):
def find_end_of_inset(lines, i):
-" Finds the matching \end_inset"
+r" Finds the matching \end_inset"
return find_end_of(lines, i, "\\begin_inset", "\\end_inset")
@@ -143,7 +143,7 @@ def get_width(mo):
def remove_oldfloat(document):
-" Change \begin_float .. \end_float into \begin_inset Float .. \end_inset"
+r" Change \begin_float .. \end_float into \begin_inset Float .. \end_inset"
lines = document.body
i = 0
while True:
@@ -250,7 +250,7 @@ def remove_pextra(document):
if flag:
flag = 0
if hfill:
-start = ["","\hfill",""]+start
+start = ["",r"\hfill",""]+start
else:
start = ['\\layout %s' % document.default_layout,''] + start
@@ -324,7 +324,7 @@ def remove_oldert(document):
new = []
new2 = []
if check_token(lines[i], "\\layout LaTeX"):
-new = ['\layout %s' % document.default_layout, "", ""]
+new = [r'\layout %s' % document.default_layout, "", ""]
k = i+1
while True:
@@ -808,7 +808,7 @@ def change_infoinset(document):
note_lines = [txt]+note_lines
for line in note_lines:
-new = new + ['\layout %s' % document.default_layout, ""]
+new = new + [r'\layout %s' % document.default_layout, ""]
tmp = line.split('\\')
new = new + [tmp[0]]
for x in tmp[1:]:
diff --git a/lib/lyx2lyx/lyx_1_3.py b/lib/lyx2lyx/lyx_1_3.py
index 35f04db..a62b7b9 100644
--- a/lib/lyx2lyx/lyx_1_3.py
+++ b/lib/lyx2lyx/lyx_1_3.py
@@ -27,7 +27,7 @@ from parser_tools import find_token, find_end_of, get_value,\
# Private helper functions
def find_end_of_inset(lines, i):
-"Finds the matching \end_inset"
+r"Finds the matching \end_inset"
return find_end_of(lines, i, "\\begin_inset", "\\end_inset")
diff --git a/lib/lyx2lyx/lyx_1_4.py b/lib/lyx2lyx/lyx_1_4.py
index 9c7c7a5..19518ab 100644
--- a/lib/lyx2lyx/lyx_1_4.py
+++ b/lib/lyx2lyx/lyx_1_4.py
@@ -81,7 +81,7 @@ def get_next_paragraph(lines, i, format):
def find_end_of_inset(lines, i):
-"Finds the matching \end_inset"
+r"Finds the matching \end_inset"
return find_end_of(lines, i, "\\begin_inset", "\\end_inset")
def del_token(lines, token, start, end):
@@ -103,7 +103,7 @@ def del_token(lines, token, start, end):
def remove_color_default(document):
-" Remove \color default"
+r" Remove \color default"
i = 0
while True:
i = find_token(document.body, "\\color default", i)
@@ -114,12 +114,12 @@ def remove_color_default(document):
[LyX/master] Enhanced build script to use c++17 with EnableCXXMode for Qt6
commit e873ac3c909535fee90be6e31a255b7468fa5aa7
Author: Stephan Witt
Date: Sat Jul 30 15:04:37 2022 +0200
Enhanced build script to use c++17 with EnableCXXMode for Qt6
---
development/LyX-Mac-binary-release.sh |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/development/LyX-Mac-binary-release.sh
b/development/LyX-Mac-binary-release.sh
index cc7320d..8bad69d 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -285,7 +285,6 @@ while [ $# -gt 0 ]; do
shift
;;
--enable-cxx11|--enable-cxx-mode=*)
- LyXConfigureOptions="${LyXConfigureOptions} ${1}"
EnableCXXMode="${1}"
shift
;;
@@ -423,11 +422,13 @@ case "${EnableCXXMode}" in
export CC=cc
export CXX="c++ -stdlib=libc++"
export CXXFLAGS=-std=c++11
+ LyXConfigureOptions="${LyXConfigureOptions} --enable-cxx-mode=11"
;;
--enable-cxx-mode=17)
export CC=cc
export CXX="c++ -stdlib=libc++"
export CXXFLAGS=-std=c++17
+ LyXConfigureOptions="${LyXConfigureOptions} ${EnableCXXMode}"
;;
esac
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Doxy for zoom args in ui-toggle lfun.
commit 130282a418f932bc679a85a50098fcd62c9184e8 Author: Pavel Sanda Date: Sun Jul 31 00:23:09 2022 +0200 Doxy for zoom args in ui-toggle lfun. --- src/LyXAction.cpp |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 559d950..b14a0c0 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -4095,6 +4095,8 @@ void LyXAction::init() menubar: Toggle visibility of the menubar.\n scrollbar : Toggle visibility of the scrollbar.\n frame : Toggle visibility of the frames around editing window.\n + zoomslider : Toggle visibility of the zoom slider in tabbar.\n + zoomlevel : Toggle visibility of the zoom level display in tabbar.\n fullscreen : Toggle fullscreen mode. This also covers calling the previous functions. However #LFUN_TOOLBAR_TOGGLE for the custom tweaks of the toolbars should be used. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] whitespace
commit 00bba01de96a9009ba466756b2e29809df26c1bf Author: Pavel Sanda Date: Sun Jul 31 00:24:33 2022 +0200 whitespace --- src/LyXAction.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index b14a0c0..5c62864 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -4096,7 +4096,7 @@ void LyXAction::init() scrollbar : Toggle visibility of the scrollbar.\n frame : Toggle visibility of the frames around editing window.\n zoomslider : Toggle visibility of the zoom slider in tabbar.\n - zoomlevel : Toggle visibility of the zoom level display in tabbar.\n + zoomlevel : Toggle visibility of the zoom level display in tabbar.\n fullscreen : Toggle fullscreen mode. This also covers calling the previous functions. However #LFUN_TOOLBAR_TOGGLE for the custom tweaks of the toolbars should be used. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
