[LyX/master] Add new placeholder $${python} to configure
commit 109ea2be4a21ca93d22ab25703b3352a50fbbe3b
Author: José Matos
Date: Tue Jan 4 00:21:34 2022 +
Add new placeholder $${python} to configure
This ensures that we use a consistent Python interpreter in LyX.
$${python} is replaced by the Python version found.
Users can apply this in preferences and use the same version defined by
LyX.
---
lib/configure.py | 96
lib/scripts/include_bib.py |2 +-
src/Converter.cpp | 13 +++---
src/Mover.cpp |1 +
src/graphics/PreviewLoader.cpp |5 +-
src/support/ForkedCalls.cpp| 11 +---
src/support/Systemcall.cpp |2 +-
src/support/filetools.cpp |2 +-
8 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 7d9b61c..17ef38f 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -653,7 +653,7 @@ def checkLatex(dtl_tools):
if dtl_tools:
# Windows only: DraftDVI
addToRC(r'''\converter latex dvi2 "%s"
"latex,hyperref-driver=dvips"
-\converter dvi2 dvi"python -tt $$s/scripts/clean_dvi.py $$i $$o"
""''' % LATEX)
+\converter dvi2 dvi"$${python} $$s/scripts/clean_dvi.py $$i $$o"
""''' % LATEX)
else:
addToRC(r'\converter latex dvi"%s"
"latex,hyperref-driver=dvips"' % LATEX)
# no latex
@@ -943,7 +943,7 @@ def checkConverterEntries():
checkProg('an HTML -> LaTeX converter', ['html2latex $$i', 'gnuhtml2latex',
'htmltolatex -input $$i -output $$o', 'htmltolatex.jar -input $$i
-output $$o'],
rc_entry = [ r'\converter html latex "%%" ""',
- r'\converter html latex "python -tt
$$s/scripts/html2latexwrapper.py %% $$i $$o" ""',
+ r'\converter html latex "$${python}
$$s/scripts/html2latexwrapper.py %% $$i $$o" ""',
r'\converter html latex "%%" ""',
r'\converter html latex "%%" ""', '' ])
#
@@ -964,8 +964,8 @@ def checkConverterEntries():
['elyxer.py --html --nofooter --unicode --directory $$r $$i $$o',
'elyxer --html --nofooter --unicode --directory $$r $$i $$o'],
rc_entry = [ r'\converter lyx word "%%" ""' ])
if elyxer.find('elyxer') >= 0:
- addToRC(r'''\copierhtml "python -tt $$s/scripts/ext_copy.py -e
html,png,jpg,jpeg,css $$i $$o"''')
- addToRC(r'''\copierwordhtml "python -tt
$$s/scripts/ext_copy.py -e html,png,jpg,jpeg,css $$i $$o"''')
+ addToRC(r'''\copierhtml "$${python} $$s/scripts/ext_copy.py -e
html,png,jpg,jpeg,css $$i $$o"''')
+ addToRC(r'''\copierwordhtml "$${python}
$$s/scripts/ext_copy.py -e html,png,jpg,jpeg,css $$i $$o"''')
else:
# search for HTML converters other than eLyXer
# On SuSE the scripts have a .sh suffix, and on debian they are in
/usr/share/tex4ht/
@@ -974,17 +974,17 @@ def checkConverterEntries():
'latex2html -no_subdir -split 0 -show_section_numbers $$i', 'hevea
-s $$i'],
rc_entry = [ r'\converter latex html "%%" "needaux"' ])
if htmlconv.find('htlatex') >= 0 or htmlconv == 'latex2html':
-addToRC(r'''\copierhtml "python -tt $$s/scripts/ext_copy.py
-e html,png,css $$i $$o"''')
+addToRC(r'''\copierhtml "$${python} $$s/scripts/ext_copy.py
-e html,png,css $$i $$o"''')
else:
-addToRC(r'''\copierhtml "python -tt $$s/scripts/ext_copy.py
$$i $$o"''')
+addToRC(r'''\copierhtml "$${python} $$s/scripts/ext_copy.py
$$i $$o"''')
path, htmlconv = checkProg('a LaTeX -> HTML (MS Word) converter',
["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'",
"htlatex.sh $$i 'html,word' 'symbol/!' '-cvalidate'",
"/usr/share/tex4ht/htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"],
rc_entry = [ r'\converter latex wordhtml "%%" "needaux"' ])
if htmlconv.find('htlatex') >= 0:
-addToRC(r'''\copierwordhtml "python -tt
$$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
+addToRC(r'''\copierwordhtml "$${python}
$$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
else:
-addToRC(r'''\copierwordhtml "python -tt
$$s/scripts/ext_copy.py $$i $$o"''')
+addToRC(r'''\copierwordhtml "$${python}
$$s/scripts/ext_copy.py $$i $$o"''')
# Check if LyXBlogger is installed
@@ -1015,9 +1015,9 @@ def checkConverterEntries():
xpath = 'none'
global java
if xsltproc != '':
-addToRC(r'\converter docbook5 epub "python $$s/scripts/docbook2epub.py
none none \"' + xsltproc + r'\" ' + xpath + ' $$i $$r $$o" ""')
+addToRC(r'\converter docbook5 epub "$${python}
$$s/scripts/docbook2epub.py
[LyX/master] Change LFUN arg from "zoom" to "zoomlevel"
commit 13a7269b9dc9b00f2edf65de38483b99d8fb1dfe
Author: Scott Kostyshak
Date: Mon Jan 3 15:53:56 2022 -0500
Change LFUN arg from "zoom" to "zoomlevel"
This change is just to be more specific, to help when grepping and
reading.
The idea is from Daniel
(https://www.lyx.org/trac/ticket/12420?replyto=11#comment:11).
Amends cc787967 (and thus 49a17aaa).
---
lib/ui/stdcontext.inc|2 +-
src/frontends/qt/GuiView.cpp |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 5051c44..ed9a9da 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -729,7 +729,7 @@ Menuset
Menu "context-statusbar"
ZoomOptions
Separator
- Item "Show Zoom Level|Z" "ui-toggle zoom"
+ Item "Show Zoom Level|Z" "ui-toggle zoomlevel"
Item "Show Zoom Slider|S" "ui-toggle zoomslider"
End
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 1680ce6..6cd97f5 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -2374,7 +2374,7 @@ bool GuiView::getStatus(FuncRequest const & cmd,
FuncStatus & flag)
break;
case LFUN_UI_TOGGLE:
- if (cmd.argument() == "zoom") {
+ if (cmd.argument() == "zoomlevel") {
flag.setOnOff(zoom_value_ ? zoom_value_->isVisible() :
false);
} else if (cmd.argument() == "zoomslider") {
flag.setOnOff(zoom_slider_ ? zoom_slider_->isVisible()
: false);
@@ -4884,7 +4884,7 @@ bool GuiView::lfunUiToggle(string const & ui_component)
statusBar()->setVisible(!statusBar()->isVisible());
} else if (ui_component == "menubar") {
menuBar()->setVisible(!menuBar()->isVisible());
- } else if (ui_component == "zoom") {
+ } else if (ui_component == "zoomlevel") {
zoom_value_->setVisible(!zoom_value_->isVisible());
} else if (ui_component == "zoomslider") {
zoom_slider_->setVisible(!zoom_slider_->isVisible());
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
r41280 - www-user/trunk/farm/cookbook/LyX
Author: sanda Date: Mon Jan 3 20:44:50 2022 New Revision: 41280 URL: http://www.lyx.org/trac/changeset/41280 Log: * repology deprecated debian testing Modified: www-user/trunk/farm/cookbook/LyX/oswatersched_LyX.php Modified: www-user/trunk/farm/cookbook/LyX/oswatersched_LyX.php == --- www-user/trunk/farm/cookbook/LyX/oswatersched_LyX.php Sun Jul 11 03:57:38 2021(r41279) +++ www-user/trunk/farm/cookbook/LyX/oswatersched_LyX.php Mon Jan 3 20:44:50 2022(r41280) @@ -6,7 +6,7 @@ Debian: -https://repology.org/badge/version-only-for-repo/debian_testing/lyx.svg; alt="Debian Stable package"> +https://repology.org/badge/version-only-for-repo/debian_unstable/lyx.svg; alt="Debian Stable package"> Arch: https://repology.org/badge/version-only-for-repo/arch/lyx.svg; alt="Arch package"> Fedora: -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Make layout2layout compatible with Python 2 and 3
commit 940d3ceeb9e6d8ce216afedf18c898ec075cc27d
Author: José Matos
Date: Mon Jan 3 19:59:42 2022 +
Make layout2layout compatible with Python 2 and 3
---
lib/scripts/layout2layout.py | 14 +++---
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index 7e40bfb..88ada12 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -256,7 +256,7 @@ currentFormat = 95
# New textclass tag BibInToc
# Incremented to format 77, 6 August 2019 by spitz
-# New textclass tag PageSize (= default page size)
+# New textclass tag PageSize (= default page size)
# and textclass option PageSize (= list of available page sizes)
# Incremented to format 78, 6 August 2019 by spitz
@@ -354,7 +354,7 @@ def error(message):
def trim_bom(line):
" Remove byte order mark."
-if line[0:3] == "\357\273\277":
+if line[0:3] == b"\357\273\277":
return line[3:]
else:
return line
@@ -444,8 +444,8 @@ def convert(lines, end_format):
# for categories
re_Declaration = re.compile(b'^#\\s*\\Declare\\w+Class.*$')
re_ExtractCategory =
re.compile(b'^(#\\s*\\Declare\\w+Class(?:\\[[^]]*?\\])?){([^(]+?)\\s+\\(([^)]+?)\\)\\s*}\\s*$')
-ConvDict = {"article": "Articles", "book" : "Books", "letter" : "Letters",
"report": "Reports",
-"presentation" : "Presentations", "curriculum vitae" :
"Curricula Vitae", "handout" : "Handouts"}
+ConvDict = {b"article": b"Articles", b"book": b"Books", b"letter":
b"Letters", b"report": b"Reports",
+b"presentation": b"Presentations", b"curriculum vitae":
b"Curricula Vitae", b"handout": b"Handouts"}
# Arguments
re_OptArgs = re.compile(b'^(\\s*)OptionalArgs(\\s+)(\\d+)\\D*$',
re.IGNORECASE)
re_ReqArgs = re.compile(b'^(\\s*)RequiredArgs(\\s+)(\\d+)\\D*$',
re.IGNORECASE)
@@ -615,7 +615,7 @@ def convert(lines, end_format):
continue
col = match.group(2)
if col == "collapsable":
-lines[i] = match.group(1) + "collapsible"
+lines[i] = match.group(1) + b"collapsible"
i += 1
continue
@@ -833,7 +833,7 @@ def convert(lines, end_format):
# Insert the required number of arguments at the end of the style
definition
match = re_End.match(lines[i])
if match:
-newarg = ['']
+newarg = [b'']
# First the optionals (this is the required order pre 2.1)
if opts > 0:
if opts == 1:
@@ -1283,7 +1283,7 @@ def convert(lines, end_format):
if latextype == b"item_environment" and label.lower() ==
b"counter_enumi":
lines[labeltype_line] =
re_LabelType.sub(b'\\1\\2\\3Enumerate', lines[labeltype_line])
# Don't add the LabelCounter line later
-counter = ""
+counter = b""
# Replace
#
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remove temporary code comment.
commit 11d42ac3dff569f4e1a6bb606dcb99d0ba7adc7b
Author: Stephan Witt
Date: Mon Jan 3 10:44:02 2022 +0100
Remove temporary code comment.
---
src/frontends/qt/GuiView.cpp |1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 791a2c2..1680ce6 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -1634,7 +1634,6 @@ bool GuiView::event(QEvent * e)
QPinchGesture::ChangeFlags changeFlags =
pinch->changeFlags();
if (changeFlags & QPinchGesture::ScaleFactorChanged) {
qreal factor =
lyxrc.currentZoom*pinch->scaleFactor();
- //factor = ceil(factor/20)*20;
zoomValueChanged(factor);
}
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
