[LyX/master] Update tex2lyx tests
commit c18f02967d7a0a806fbddaa4758b7e11fcd7b903 Author: Scott Kostyshak Date: Wed May 15 00:27:27 2024 -0400 Update tex2lyx tests Needed after the file format change. --- src/tex2lyx/test/CJK.lyx.lyx| 4 ++-- src/tex2lyx/test/CJKutf8.lyx.lyx| 4 ++-- src/tex2lyx/test/DummyDocument.lyx.lyx | 4 ++-- src/tex2lyx/test/Dummy~Document.lyx.lyx | 4 ++-- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx | 4 ++-- src/tex2lyx/test/algo2e.lyx.lyx | 4 ++-- src/tex2lyx/test/beamer.lyx.lyx | 4 ++-- src/tex2lyx/test/box-color-size-space-align.lyx.lyx | 4 ++-- src/tex2lyx/test/listpreamble.lyx.lyx | 4 ++-- src/tex2lyx/test/tabular-x-test.lyx.lyx | 4 ++-- src/tex2lyx/test/test-insets-basic.lyx.lyx | 4 ++-- src/tex2lyx/test/test-insets.lyx.lyx| 4 ++-- src/tex2lyx/test/test-memoir.lyx.lyx| 4 ++-- src/tex2lyx/test/test-minted.lyx.lyx| 4 ++-- src/tex2lyx/test/test-modules.lyx.lyx | 4 ++-- src/tex2lyx/test/test-refstyle-theorems.lyx.lyx | 4 ++-- src/tex2lyx/test/test-scr.lyx.lyx | 4 ++-- src/tex2lyx/test/test-structure.lyx.lyx | 4 ++-- src/tex2lyx/test/test.lyx.lyx | 4 ++-- src/tex2lyx/test/verbatim.lyx.lyx | 4 ++-- 20 files changed, 40 insertions(+), 40 deletions(-) diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index e021644c96..9e4058385c 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx index ae9e67bd71..8ab27f47d6 100644 --- a/src/tex2lyx/test/CJKutf8.lyx.lyx +++ b/src/tex2lyx/test/CJKutf8.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx index 6b6ac9a34c..78b56e8c7f 100644 --- a/src/tex2lyx/test/DummyDocument.lyx.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx index 0ead176ae1..30636f3a8c 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 8221db0d1e..ac6a7a4810 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index 70a0e9bc2f..e76fdd2436 100644 --- a/src/tex2lyx/test/algo2e.lyx.lyx +++ b/src/tex2lyx/test/algo2e.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx index eb134decbf..19fa25c92d 100644 --- a/src/tex2lyx/test/beamer.lyx.lyx +++ b/src/tex2lyx/test/beamer.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index 0713067800..bfcc01ac89 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx b/src/tex2lyx/test/listpreamble.lyx.lyx index b4730be63a..0843c3b53c 100644 --- a/src/tex2lyx/test/listpreamble.lyx.lyx +++ b/src/tex2lyx/test/listpreamble.lyx.lyx @@ -1,5 +1,5 @@ -#LyX file created by tex2lyx 2.4 -\lyxformat 620 +#LyX file created by tex2lyx 2.5 +\lyxformat 621 \begin_document
[LyX/master] CMake: adapt to new location of Lexer
commit 23c45f76adf66082851632a28f9c259e0f43a212
Author: Scott Kostyshak
Date: Sun Apr 28 09:13:55 2024 -0400
CMake: adapt to new location of Lexer
Lexer is now in support/. See 2660df9b.
---
src/tests/CMakeLists.txt | 2 +-
src/tex2lyx/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 0fe014f9c2..bde03f1b0d 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -6,7 +6,7 @@
set(check_layout_SOURCES)
foreach(_f insets/InsetLayout.cpp CiteEnginesList.cpp Color.cpp Counters.cpp
Floating.cpp
- FloatList.cpp FontInfo.cpp Layout.cpp LayoutFile.cpp Lexer.cpp
+ FloatList.cpp FontInfo.cpp Layout.cpp LayoutFile.cpp support/Lexer.cpp
ModuleList.cpp Spacing.cpp TextClass.cpp tests/check_layout.cpp
tests/boost.cpp tests/dummy_functions.cpp)
list(APPEND check_layout_SOURCES "${TOP_SRC_DIR}/src/${_f}")
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 79768138d4..9bf42ee0f6 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -13,7 +13,7 @@ set(LINKED_headers)
foreach(_src graphics/GraphicsParams insets/ExternalTemplate
insets/ExternalTransforms insets/InsetLayout Author CiteEnginesList
Color Counters
Encoding FloatList Floating FontInfo LaTeXPackages Layout
- LayoutFile LayoutModuleList Lexer ModuleList TextClass
+ LayoutFile LayoutModuleList support/Lexer ModuleList TextClass
Spacing version)
list(APPEND LINKED_sources ${TOP_SRC_DIR}/src/${_src}.cpp)
list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit dd4c67bfdc1a61dbd7cc958a00843e258d620df7
Author: Scott Kostyshak
Date: Sat Apr 20 14:22:07 2024 -0400
Whitespace
---
development/cmake/Install.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 76b53d8ff5..a901942b4a 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -137,7 +137,7 @@ lyx_install("data" ${TOP_SRC_DIR}/libscripts
*.R .
lyx_install("data" ${TOP_SRC_DIR}/libscripts saxon*.*
.)
lyx_install("data" ${TOP_SRC_DIR}/libdocbook *
. epub3 xhtml5 xhtml lib common)
lyx_install("data" ${TOP_SRC_DIR}/libxtemplates *.xtemplate
.)
-lyx_install("data" ${TOP_SRC_DIR}/lib tabletemplates *.lyx
.)
+lyx_install("data" ${TOP_SRC_DIR}/libtabletemplates *.lyx
.)
lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync *
.)
lyx_install("font" ${TOP_SRC_DIR}/lib/fonts .*
.)
lyx_install("tex" ${TOP_SRC_DIR}/lib/tex.*
.)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX features/biginset] Restore origin tag
commit 8a0daee999f8a8cc24bad01222506e4a2daaac6f
Author: Scott Kostyshak
Date: Tue Mar 5 11:34:59 2024 -0500
Restore origin tag
---
.../Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
b/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
index 8480811464..88e1c55aeb 100644
---
a/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
+++
b/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
@@ -3,7 +3,7 @@
\begin_document
\begin_header
\save_transient_properties true
-\origin unavailable
+\origin /systemlyxdir/examples/Articles/
\textclass aastex63
\begin_preamble
\newcommand{\myemail}{skywal...@galaxy.far.far.away}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Restore origin tag
commit 8a0daee999f8a8cc24bad01222506e4a2daaac6f
Author: Scott Kostyshak
Date: Tue Mar 5 11:34:59 2024 -0500
Restore origin tag
---
.../Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
b/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
index 8480811464..88e1c55aeb 100644
---
a/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
+++
b/lib/examples/Articles/American_Astronomical_Society_%28AASTeX_v._6.3.1%29.lyx
@@ -3,7 +3,7 @@
\begin_document
\begin_header
\save_transient_properties true
-\origin unavailable
+\origin /systemlyxdir/examples/Articles/
\textclass aastex63
\begin_preamble
\newcommand{\myemail}{skywal...@galaxy.far.far.away}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert a utf8x test failing on TL23
commit 0c0f4c6b56eed9b77a0fba2dbef6c70aefcc94a5 Author: Scott Kostyshak Date: Mon Feb 26 11:12:20 2024 -0500 ctests: invert a utf8x test failing on TL23 It seems that utf8x is not supported, or needed, on updated TL. From David Carlisle: utf8x by default does nothing now, but as a compromise compatibility for some specific existing documents if you explicitly load ucs then it and utf8x work as before, but that over writes all of latex's default unicode handling and things will go wrong. There really isn't much that can be said other than don't load the package. The alternative would be to make ucs do nothing as well, but that would stop some documents working that currently work. --- development/autotests/invertedTests | 4 1 file changed, 4 insertions(+) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 5506b648df..c88e67cda5 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -315,6 +315,10 @@ export/examples/(|es/)Curricula_Vitae/Europe_CV_(pdf.*|dvi|lyx22|lyx23) # Armenian currently only works with XeTeX and LuaTeX and system fonts export/examples/Language_Support/Writing_Armenian_(dvi|dvi3_texF|pdf|pdf2|pdf3|pdf5_texF) +# utf8x is not really supported (or needed) anymore: +# https://github.com/latex3/hyperref/issues/248#issuecomment-1961868947 +export/export/latex/unicodesymbols/008-greek-and-coptic_utf8x_pdf2 + # Sublabel: externalissues -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX master] ctests: categorize #12708 test file as resolved
The branch, master, has been updated.
- Log -
commit 7e0d41ce51ff15365d1de62dcfa97ef8966edf4c
Author: Scott Kostyshak
Date: Tue Feb 20 10:56:04 2024 -0500
ctests: categorize #12708 test file as resolved
From Jürgen:
the bug was fixed in the recent refstyle release:
https://ctan.org/ctan-ann/id/mailman.6197.1706904970.3764.ctan-...@ctan.org
diff --git a/autotests/export/latex/lyxbugs/12708-refstyle-amsmath.lyx
b/autotests/export/latex/lyxbugs-resolved/12708-refstyle-amsmath.lyx
similarity index 100%
rename from autotests/export/latex/lyxbugs/12708-refstyle-amsmath.lyx
rename to autotests/export/latex/lyxbugs-resolved/12708-refstyle-amsmath.lyx
---
Summary of changes:
.../export/latex/{lyxbugs => lyxbugs-resolved}/12708-refstyle-amsmath.lyx | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename autotests/export/latex/{lyxbugs =>
lyxbugs-resolved}/12708-refstyle-amsmath.lyx (100%)
hooks/post-receive
--
The LyX Source Repository
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend previous commit
commit 65f3677145da324735093f0ef4254647874c5c0a Author: Scott Kostyshak Date: Fri Jan 26 10:34:06 2024 -0500 Amend previous commit Set the default document output format to PDF (pdflatex), because the test file fails to export with LuaTeX (in both 2.3.x and master). This commit amends 6094a56b. --- .../lyxbugs-resolved/13036-lyx2lyx-preamble.lyx|2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx b/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx index 4039414..0ebf550 100644 --- a/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx +++ b/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx @@ -28,7 +28,7 @@ \use_microtype false \use_dash_ligatures true \graphics default -\default_output_format default +\default_output_format pdf2 \output_sync 0 \bibtex_command default \index_command default -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Add export test for #13036
commit 6094a56b1dff5e1bc56efcc23cd3131a8a1c73db
Author: Scott Kostyshak
Date: Fri Jan 26 10:18:05 2024 -0500
Add export test for #13036
---
.../lyxbugs-resolved/13036-lyx2lyx-preamble.lyx| 89
1 files changed, 89 insertions(+), 0 deletions(-)
diff --git a/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx
b/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx
new file mode 100644
index 000..4039414
--- /dev/null
+++ b/autotests/export/latex/lyxbugs-resolved/13036-lyx2lyx-preamble.lyx
@@ -0,0 +1,89 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\begin_preamble
+\usepackage{lineno}
+\linenumbers
+\end_preamble
+\use_default_options true
+\maintain_unincluded_children false
+\language ngerman
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Stichwortverzeichnis
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style danish
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+.
+\end_layout
+
+\end_body
+\end_document
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Add export test for #13022
commit f11a529698dc2f0d89649b49003e2822d1210dcd
Author: Scott Kostyshak
Date: Fri Jan 26 10:13:27 2024 -0500
Add export test for #13022
---
.../13022-unicode-PassThruChars.lyx| 119
1 files changed, 119 insertions(+), 0 deletions(-)
diff --git
a/autotests/export/latex/lyxbugs-resolved/13022-unicode-PassThruChars.lyx
b/autotests/export/latex/lyxbugs-resolved/13022-unicode-PassThruChars.lyx
new file mode 100644
index 000..80f4fd7
--- /dev/null
+++ b/autotests/export/latex/lyxbugs-resolved/13022-unicode-PassThruChars.lyx
@@ -0,0 +1,119 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children false
+\begin_local_layout
+Format 66
+InsetLayout ERT
+ PassThru False
+ PassThruChars "$\ε{}"
+End
+\end_local_layout
+\language english
+\language_package default
+\inputencoding utf8
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "default"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 1
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_bookmarks true
+\pdf_bookmarksnumbered false
+\pdf_bookmarksopen false
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle true
+\papersize default
+\use_geometry true
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Section
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+texorpdfstring{$
+\backslash
+varepsilon$}{ε}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\end_body
+\end_document
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: move fixed bug test to regression tests
commit a7f331d9e49fcf3f20e9441f4ac04e0b93f6e67a
Author: Scott Kostyshak
Date: Fri Jan 12 13:03:52 2024 -0500
ctests: move fixed bug test to regression tests
The export has been fixed as of 37dce940.
---
.../latex/lyxbugs-resolved/13022-unicode-ERT.lyx | 112
.../export/latex/lyxbugs/13022-unicode-ERT.lyx | 112
2 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/autotests/export/latex/lyxbugs-resolved/13022-unicode-ERT.lyx
b/autotests/export/latex/lyxbugs-resolved/13022-unicode-ERT.lyx
new file mode 100644
index 000..53dce3e
--- /dev/null
+++ b/autotests/export/latex/lyxbugs-resolved/13022-unicode-ERT.lyx
@@ -0,0 +1,112 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding utf8
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "default"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format pdf2
+\output_sync 1
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_bookmarks true
+\pdf_bookmarksnumbered false
+\pdf_bookmarksopen false
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle true
+\papersize default
+\use_geometry true
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Section
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+texorpdfstring{$
+\backslash
+varepsilon$}{ε}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/latex/lyxbugs/13022-unicode-ERT.lyx
b/autotests/export/latex/lyxbugs/13022-unicode-ERT.lyx
deleted file mode 100644
index 53dce3e..000
--- a/autotests/export/latex/lyxbugs/13022-unicode-ERT.lyx
+++ /dev/null
@@ -1,112 +0,0 @@
-#LyX 2.3 created this file. For more info see http://www.lyx.org/
-\lyxformat 544
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin unavailable
-\textclass article
-\use_default_options true
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding utf8
-\fontencoding global
-\font_roman "default" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
-\font_math "auto" "default"
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\use_microtype false
-\use_dash_ligatures true
-\graphics default
-\default_output_format pdf2
-\output_sync 1
-\bibtex_command default
-\index_command default
-\paperfontsize default
-\spacing single
-\use_hyperref true
-\pdf_bookmarks true
-\pdf_bookmarksnumbered false
-\pdf_bookmarksopen false
-\pdf_bookmarksopenlevel 1
-\pdf_breaklinks false
-\pdf_pdfborder false
-\pdf_colorlinks false
-\pdf_backref false
-\pdf_pdfusetitle true
-\papersize default
-\use_geometry true
-\use_package amsmath 1
-\use_package amssymb 1
-\use_package cancel 1
-\use_package esint 1
-\use_package mathdots 1
-\use_package mathtools 1
-\use_package mhchem 1
-\use_package stackrel 1
-\use_package stmaryrd 1
-\use_package undertilde 1
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 1
-\use_minted 0
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\
[LyX/master] Add an export test for #13022
commit f59c088b5c4dc9af802137877fcfc7dc38a1dc5b
Author: Scott Kostyshak
Date: Sat Dec 30 10:50:53 2023 -0500
Add an export test for #13022
Original file provided by Jéssica Milaré, and simplified to this
simple example by Udi.
---
.../export/latex/lyxbugs/13022-unicode-ERT.lyx | 112
1 files changed, 112 insertions(+), 0 deletions(-)
diff --git a/autotests/export/latex/lyxbugs/13022-unicode-ERT.lyx
b/autotests/export/latex/lyxbugs/13022-unicode-ERT.lyx
new file mode 100644
index 000..53dce3e
--- /dev/null
+++ b/autotests/export/latex/lyxbugs/13022-unicode-ERT.lyx
@@ -0,0 +1,112 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding utf8
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "default"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format pdf2
+\output_sync 1
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_bookmarks true
+\pdf_bookmarksnumbered false
+\pdf_bookmarksopen false
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks false
+\pdf_backref false
+\pdf_pdfusetitle true
+\papersize default
+\use_geometry true
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Section
+\begin_inset ERT
+status open
+
+\begin_layout Plain Layout
+
+
+\backslash
+texorpdfstring{$
+\backslash
+varepsilon$}{ε}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\end_body
+\end_document
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: add regression test for #13019
commit 294a18b6437ee3a333cc629da85cacfaf0674015
Author: Scott Kostyshak
Date: Fri Dec 29 16:59:30 2023 -0500
ctests: add regression test for #13019
File was posted by Udi.
---
.../lyxbugs-resolved/13019-math-normalcolor.lyx| 101
1 files changed, 101 insertions(+), 0 deletions(-)
diff --git a/autotests/export/latex/lyxbugs-resolved/13019-math-normalcolor.lyx
b/autotests/export/latex/lyxbugs-resolved/13019-math-normalcolor.lyx
new file mode 100644
index 000..f29fe60
--- /dev/null
+++ b/autotests/export/latex/lyxbugs-resolved/13019-math-normalcolor.lyx
@@ -0,0 +1,101 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 620
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language american
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_formatted_ref 0
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008080
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content true
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Formula
+\[
+{\color{gray}\underset{1}{\underbrace{{\normalcolor
\sin^{2}\alpha+\cos^{2}\alpha
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ja docs: restore \font_typewriter to IPAGothic
commit fcb3e0cea04735004c5f28029147cd23a2fcdfda Author: Scott Kostyshak Date: Mon Dec 25 12:20:33 2023 -0500 ja docs: restore \font_typewriter to IPAGothic This fixes, for example, the following ctests: export/doc/ja/Customization_pdf4_systemF export/doc/ja/Customization_pdf5_systemF Consistent with ffe5d61b. --- lib/doc/ja/Additional.lyx|2 +- lib/doc/ja/Customization.lyx |2 +- lib/doc/ja/Math.lyx |2 +- lib/doc/ja/UserGuide.lyx |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index d9d403f..48f7fae 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -125,7 +125,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 4341ff1..629857c 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -91,7 +91,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx index d4bfdee..d8f2f09 100644 --- a/lib/doc/ja/Math.lyx +++ b/lib/doc/ja/Math.lyx @@ -188,7 +188,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index abf9366..9b79a3e 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -100,7 +100,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ja docs: restore \origin
commit 2aee182d9db219642662cc74682886d784b4399c Author: Scott Kostyshak Date: Mon Dec 25 12:09:31 2023 -0500 ja docs: restore \origin Amends afcd501f. --- lib/doc/ja/Additional.lyx|2 +- lib/doc/ja/Customization.lyx |2 +- lib/doc/ja/Math.lyx |2 +- lib/doc/ja/Tutorial.lyx |2 +- lib/doc/ja/UserGuide.lyx |2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 30440a0..d9d403f 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties false -\origin unavailable +\origin /systemlyxdir/doc/ja/ \textclass scrbook \begin_preamble % DO NOT ALTER THIS PREAMBLE!!! diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index e9d05a7..4341ff1 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties false -\origin unavailable +\origin /systemlyxdir/doc/ja/ \textclass scrbook \begin_preamble % DO NOT ALTER THIS PREAMBLE!!! diff --git a/lib/doc/ja/Math.lyx b/lib/doc/ja/Math.lyx index a1ad775..d4bfdee 100644 --- a/lib/doc/ja/Math.lyx +++ b/lib/doc/ja/Math.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties false -\origin unavailable +\origin /systemlyxdir/doc/ja/ \textclass scrartcl \begin_preamble % DO NOT ALTER THIS PREAMBLE!!! diff --git a/lib/doc/ja/Tutorial.lyx b/lib/doc/ja/Tutorial.lyx index 6ea946d..295975a 100644 --- a/lib/doc/ja/Tutorial.lyx +++ b/lib/doc/ja/Tutorial.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties false -\origin unavailable +\origin /systemlyxdir/doc/ja/ \textclass bxjsbook \use_default_options true \begin_modules diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 5c91dc8..abf9366 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties false -\origin unavailable +\origin /systemlyxdir/doc/ja/ \textclass scrbook \begin_preamble % DO NOT ALTER THIS PREAMBLE!!! -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Python fixes for export to LyX Archive
commit 9143878e5dd8dc1039f0f6a0b8ec9123be5585b6
Author: Scott Kostyshak
Date: Wed Dec 6 14:11:41 2023 -0500
Python fixes for export to LyX Archive
Patch by Kees and José Matos.
For discussion, please see this [1] ML thread. José additionally
notes [2] the following:
I took the change and I changed some minor annoyances:
* test comparison with None;
* fixed a region where the indentation was different from all the
others (2 spaces instead of 4);
* replaced xrange with range.
[1]
https://www.mail-archive.com/search?l=mid=007b01da285a%241b8e28c0%2452aa7a40%24%40gmail.com
[2]
https://www.mail-archive.com/search?l=mid=0cd9fe5fd161c0ad8950258867255a3bfae8dbc1.camel%40gmail.com
---
lib/scripts/lyxpak.py | 36 ++--
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index affef65..6cdea5c 100755
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
@@ -233,7 +233,7 @@ def find_lyx2lyx(progloc, path):
if "PATHEXT" in os.environ:
extlist = extlist + os.environ["PATHEXT"].split(os.pathsep)
lyx_exe, full_path = find_exe(["lyxc", "lyx"], extlist, path)
-if lyx_exe == None:
+if lyx_exe is None:
error('Cannot find the LyX executable in the path.')
try:
cmd_stdout = subprocess.check_output([lyx_exe, '-version'],
stderr=subprocess.STDOUT)
@@ -265,9 +265,9 @@ def main(args):
ourprog = args[0]
try:
- (options, argv) = getopt(args[1:], "htzl:o:")
+(options, argv) = getopt(args[1:], "htzl:o:")
except:
- error(usage(ourprog))
+error(usage(ourprog))
# we expect the filename to be left
if len(argv) != 1:
@@ -278,19 +278,19 @@ def main(args):
lyx2lyx = None
for (opt, param) in options:
- if opt == "-h":
-print(usage(ourprog))
-sys.exit(0)
- elif opt == "-t":
-makezip = False
- elif opt == "-z":
-makezip = True
- elif opt == "-l":
-lyx2lyx = param
- elif opt == "-o":
-outdir = param
-if not os.path.isdir(unicode(outdir, 'utf-8')):
- error('Error: "%s" is not a directory.' % outdir)
+if opt == "-h":
+print(usage(ourprog))
+sys.exit(0)
+elif opt == "-t":
+makezip = False
+elif opt == "-z":
+makezip = True
+elif opt == "-l":
+lyx2lyx = param
+elif opt == "-o":
+outdir = param
+if not os.path.isdir(unicode(outdir, 'utf-8')):
+error('Error: "%s" is not a directory.' % outdir)
lyxfile = argv[0]
if not running_on_windows:
@@ -320,7 +320,7 @@ def main(args):
path = os.environ["PATH"].split(os.pathsep)
-if lyx2lyx == None:
+if lyx2lyx is None:
lyx2lyx = find_lyx2lyx(ourprog, path)
# Initialize the list with the specified LyX file and recursively
@@ -390,7 +390,7 @@ if __name__ == "__main__":
argc = c_int(0)
argv_unicode = CommandLineToArgvW(GetCommandLineW(), byref(argc))
# unicode_argv[0] is the Python interpreter, so skip that.
-argv = [argv_unicode[i].encode('utf-8') for i in xrange(1, argc.value)]
+argv = [argv_unicode[i].encode('utf-8') for i in range(1, argc.value)]
# Also skip option arguments to the Python interpreter.
while len(argv) > 0:
if not argv[0].startswith("-"):
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix pt_BR.po escapes
commit ea37ee23d3e8ad6614d21ffc417bef63f656aabf
Author: Scott Kostyshak
Date: Tue Dec 5 11:24:00 2023 -0500
Fix pt_BR.po escapes
We need to use two backslashes for "\\arabic".
This fixes instances of the following warning:
warning: internationalized messages should not contain the '\a'
escape sequence
Amends a82ea09a.
---
po/pt_BR.po | 34 +-
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 1e534bf..44feff9 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -12080,7 +12080,7 @@ msgstr "Definição \\arabic{theorem}"
#: lib/layouts/elsart.layout:463 lib/layouts/theorems-counters-bytype.inc:26
msgid "Conjecture \\arabic{theorem}"
-msgstr "Conjetura \arabic{theorem}"
+msgstr "Conjetura \\arabic{theorem}"
#: lib/layouts/elsart.layout:475 lib/layouts/theorems-counters-bytype.inc:39
msgid "Example \\arabic{theorem}"
@@ -15830,7 +15830,7 @@ msgstr "Seção ##"
#: lib/layouts/numreport.inc:46
msgid "footnote \\arabic{footnote}"
-msgstr "nota de rodapé \arabic{footnote}"
+msgstr "nota de rodapé \\arabic{footnote}"
#: lib/layouts/numrevtex.inc:9
msgid "\\Roman{section}."
@@ -16794,7 +16794,7 @@ msgstr "\\thesection.\\arabic{equation}"
#: lib/layouts/scrbook.layout:33
msgid "equation \\thechapter.\\arabic{equation}"
-msgstr "equação \\thechapter.\arabic{equation}"
+msgstr "equação \\thechapter.\\arabic{equation}"
#: lib/layouts/scrclass.inc:49
msgid "\\alph{enumii})"
@@ -17531,7 +17531,7 @@ msgstr "Equação ##"
#: lib/layouts/stdcounters.inc:91 lib/layouts/stdcounters.inc:96
msgid "Footnote \\arabic{footnote}"
-msgstr "Nota de rodapé \arabic{footnote}"
+msgstr "Nota de rodapé \\arabic{footnote}"
#: lib/layouts/stdcounters.inc:97
msgid "\\fnsymbol{thanks}"
@@ -18538,7 +18538,7 @@ msgstr "Caso (Nível 1)"
#: lib/layouts/theorems-case.inc:13
msgid "Case \\arabic{casei}"
-msgstr "Caso \arabic{casei}"
+msgstr "Caso \\arabic{casei}"
#: lib/layouts/theorems-case.inc:14
msgid "Case \\arabic{casei}."
@@ -18566,7 +18566,7 @@ msgstr "Caso \\alph{caseiii}."
#: lib/layouts/theorems-case.inc:26
msgid "Case \\alph{caseiii}"
-msgstr "Caso \alph{caseiii}"
+msgstr "Caso \\alph{caseiii}"
#: lib/layouts/theorems-case.inc:29
msgid "Case (Level 4)"
@@ -18574,7 +18574,7 @@ msgstr "Caso (Nível 4)"
#: lib/layouts/theorems-case.inc:31
msgid "Case \\arabic{caseiv}"
-msgstr "Caso \arabic{caseiv}"
+msgstr "Caso \\arabic{caseiv}"
#: lib/layouts/theorems-case.inc:32
msgid "Case \\arabic{caseiv}."
@@ -18615,43 +18615,43 @@ msgstr ""
#: lib/layouts/theorems-counters-bytype.inc:30
msgid "Fact \\arabic{theorem}"
-msgstr "Fato \arabic{theorem}"
+msgstr "Fato \\arabic{theorem}"
#: lib/layouts/theorems-counters-bytype.inc:48
msgid "Exercise \\arabic{theorem}"
-msgstr "Exercício \arabic{theorem}"
+msgstr "Exercício \\arabic{theorem}"
#: lib/layouts/theorems-counters-bytype.inc:53
msgid "Solution \\arabic{theorem}"
-msgstr "Solução \arabic{theorem}"
+msgstr "Solução \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:16
msgid "Axiom \\arabic{theorem}"
-msgstr "Axioma \arabic{theorem}"
+msgstr "Axioma \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:20
msgid "Condition \\arabic{theorem}"
-msgstr "Condição \arabic{theorem}"
+msgstr "Condição \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:28
msgid "Notation \\arabic{theorem}"
-msgstr "Notação \arabic{theorem}"
+msgstr "Notação \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:32
msgid "Summary \\arabic{theorem}"
-msgstr "Resumo \arabic{theorem}"
+msgstr "Resumo \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:36
msgid "Conclusion \\arabic{theorem}"
-msgstr "Afirmação \arabic{theorem}"
+msgstr "Afirmação \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:40
msgid "Assumption \\arabic{theorem}"
-msgstr "Suposição \arabic{theorem}"
+msgstr "Suposição \\arabic{theorem}"
#: lib/layouts/theorems-counters-extended-bytype.inc:44
msgid "Question \\arabic{theorem}"
-msgstr "Pergunta \arabic{theorem}"
+msgstr "Pergunta \\arabic{theorem}"
#: lib/layouts/theorems-named.module:3
msgid "Standard Theorems (Nameable)"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert an export fixed in acmart
commit 606e9443fad3a775e9cf7d075fec91e31b659c4d Author: Scott Kostyshak Date: Tue Oct 17 22:16:11 2023 -0400 ctests: uninvert an export fixed in acmart Fixed after a tlmgr update with acmart version 1.92. See here for info: https://github.com/borisveytsman/acmart/issues/505 --- development/autotests/invertedTests |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index ff7a77b..5506b64 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -315,10 +315,6 @@ export/examples/(|es/)Curricula_Vitae/Europe_CV_(pdf.*|dvi|lyx22|lyx23) # Armenian currently only works with XeTeX and LuaTeX and system fonts export/examples/Language_Support/Writing_Armenian_(dvi|dvi3_texF|pdf|pdf2|pdf3|pdf5_texF) -# ! Package hyperxmp Error: hyperref must be loaded before hyperxmp. -# https://github.com/borisveytsman/acmart/issues/505 -export/templates/Articles/Association_for_Computing_Machinery_%28ACM%29_pdf2 - # Sublabel: externalissues -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert DocBook test due to recent fix
commit e97ebe93d3bd0a61dcc97ce60ca304930f6b90ad Author: Scott Kostyshak Date: Tue Oct 10 10:35:53 2023 -0400 ctests: uninvert DocBook test due to recent fix --- development/autotests/invertedTests |2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 8bcf370..ff7a77b 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -516,8 +516,6 @@ export/export/latex/lyxbugs-resolved/cprotect/7779-float-in-par-env_docbook5 # See also ML discussion: # https://www.mail-archive.com/search?l=mid=20211102011304.dmrcr7gjpxxwpd4o%40poole export/examples/(|ja/)Modules/LilyPond_Book_docbook5 -# Undiagnosed -export/doc/es/Intro_docbook5 Sublabel: docbook poster # Posters cannot be properly exported, the LyX documents are too far from -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: in InsetInfo, ensure that no db:date is inserted within a db:date.
commit 43921861b9b14c2b4f5b2cef8e482a43776fc982
Author: Thibaut Cuvelier
Date: Sun Oct 8 21:06:46 2023 +0200
DocBook: in InsetInfo, ensure that no db:date is inserted within a db:date.
---
autotests/export/docbook/insetinfo.lyx | 11 +++
autotests/export/docbook/insetinfo.xml |3 +++
src/Paragraph.cpp | 11 ++-
src/insets/InsetInfo.cpp | 27 +++
4 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/autotests/export/docbook/insetinfo.lyx
b/autotests/export/docbook/insetinfo.lyx
index 1ae6c30..a1b04a5 100644
--- a/autotests/export/docbook/insetinfo.lyx
+++ b/autotests/export/docbook/insetinfo.lyx
@@ -91,6 +91,17 @@ Test:
InsetInfo
\end_layout
+\begin_layout Date
+
+\lang japanese-cjk
+\begin_inset Info
+type "moddate"
+arg "long"
+\end_inset
+
+
+\end_layout
+
\begin_layout Standard
\lang spanish
diff --git a/autotests/export/docbook/insetinfo.xml
b/autotests/export/docbook/insetinfo.xml
index 48ba1d8..dd0dd66 100644
--- a/autotests/export/docbook/insetinfo.xml
+++ b/autotests/export/docbook/insetinfo.xml
@@ -2,6 +2,9 @@
http://docbook.org/ns/docbook;
xmlns:xlink="http://www.w3.org/1999/xlink;
xmlns:m="http://www.w3.org/1998/Math/MathML;
xmlns:xi="http://www.w3.org/2001/XInclude; version="5.2">
+
Test: InsetInfo
+2023-10-08
+
Véase la User's
Guide o Additional
Features para más detalles.
\ No newline at end of file
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 333aeb8..5ac03fa 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3635,11 +3635,11 @@ std::tuple,
vector> computeDocBookFontSwit
std::tuple, std::vector,
std::vector>
Paragraph::simpleDocBookOnePar(Buffer const & buf,
- OutputParams const &
runparams,
- Font const & outerfont,
- pos_type initial,
- bool is_last_par,
- bool ignore_fonts) const
+ OutputParams const & runparams,
+ Font const & outerfont,
+ pos_type initial,
+ bool is_last_par,
+ bool ignore_fonts) const
{
// Return values: segregation of the content of this paragraph.
std::vector prependedParagraphs; // Anything that must be
output before the main tag of this paragraph.
@@ -3669,6 +3669,7 @@ std::tuple,
std::vector, std::vector");
xs << qstring_to_ucs4(parseDate(buffer(),
params_).toString(Qt::ISODate));
- xml::closeTag(xs, "date", "inline");
+ if (!isWithinDate)
+ xml::closeTag(xs, "date", "inline");
break;
}
@@ -1752,9 +1763,17 @@ void InsetInfo::docbook(XMLStream & xs, OutputParams
const & rp) const
}
// DocBook has no specific element for time, so use a date.
- xml::openTag(xs, "date", "(role=\"" + role + "\"", "inline");
+ // See the discussion above (DATE_INFO, MODDATE_INFO, and
FIXDATE_INFO) for a discussion about the choices that
+ // have been made.
+ const bool isWithinDate =
buffer().getParFromID(rp.lastid).top().paragraph().layout().docbooktag() ==
"date";
+
+ if (!isWithinDate)
+ xml::openTag(xs, "date", "role=\"" + role + "\"",
"inline");
+ else
+ xs << XMLStream::ESCAPE_NONE <<
from_ascii(std::string("");
xs << qstring_to_ucs4(parseTime(buffer(),
params_).toString(Qt::ISODate));
- xml::closeTag(xs, "date", "inline");
+ if (!isWithinDate)
+ xml::closeTag(xs, "date", "inline");
break;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: fix a crash in docbookSimpleAllParagraphs.
commit d8a0f1aadda25e11e5a330e8c7cdd0d413ff55b4
Author: Thibaut Cuvelier
Date: Sun Oct 8 21:11:17 2023 +0200
DocBook: fix a crash in docbookSimpleAllParagraphs.
When having the code preview pane open with
examples/Language_Support/Mixing_Japanese_with_other_Languages_(with_CJKutf8),
clicking at random on paragraphs sometimes yielded a crash: *par when par is
the end of the iterator. LyX could output the whole document as DocBook without
this patch and still generates the same output with it (i.e. no text is
missing).
---
src/output_docbook.cpp |5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index 19f6de4..983d4e7 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -1127,8 +1127,9 @@ void docbookSimpleAllParagraphs(
// Then, the content. It starts where the ends.
auto par = paragraphs.iterator_at(info.epit);
- auto end = paragraphs.iterator_at(epit);
- while (par != end) {
+ auto par_epit = paragraphs.iterator_at(epit);
+ auto par_end = paragraphs.end();
+ while (par != par_epit && par != par_end) {
if (!hasOnlyNotes(*par))
par = makeAny(text, buf, xs, runparams, par);
else
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix three sign-compare compiler warning
commit 1273f25c76f313b4b4d89402b6c1cbc9b1644509
Author: Scott Kostyshak
Date: Tue Oct 10 10:07:23 2023 -0400
Fix three sign-compare compiler warning
Fixes three similar warnings. One of them is the following:
src/insets/InsetInfo.cpp:1583:20: error: comparison of integers of
different signs: 'int' and 'std::basic_string::size_type' (aka
'unsigned long') [-Werror,-Wsign-compare]
for (int i = 0; i < sequence.length(); ++i) {
~ ^ ~
---
src/insets/InsetInfo.cpp |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 4b92774..1cb6853 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -1580,7 +1580,7 @@ void xhtmlShortcutInfo(XMLStream & xs, const
InsetInfoParams & params) {
odocstringstream ods;
string const lcode = params.lang->code();
docstring trans;
- for (int i = 0; i < sequence.length(); ++i) {
+ for (size_t i = 0; i < sequence.length(); ++i) {
char_type const c = sequence[i];
const auto keyMapping = keyToString.find(c);
if (keyMapping != keyToString.end()) {
@@ -1675,7 +1675,7 @@ void docbookMenuInfo(XMLStream & xs, Buffer const &
buffer, const InsetInfoParam
xml::openTag(xs, "menuchoice", attr, "inline"); // More of an inline
tag in this case, as there is no db:shortcut to
// accompany the succession of menus.
- for (int i = 0; i < names.size(); ++i) {
+ for (size_t i = 0; i < names.size(); ++i) {
docstring const & name = names[i];
std::string tag;
@@ -1746,7 +1746,7 @@ void xhtmlMenuInfo(XMLStream & xs, Buffer const & buffer,
const InsetInfoParams
// Use bdo instead of span to specify the text direction (dir is only
allowed globally or on bdo).
xml::openTag(xs, "bdo", attr, "inline");
- for (int i = 0; i < names.size(); ++i) {
+ for (size_t i = 0; i < names.size(); ++i) {
docstring const & name = names[i];
//FIXME: add proper underlines here. This
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: add support for InsetInfo.
commit 0c2f3dedd6590d56d771d5d56dce2935a82e9289
Author: Thibaut Cuvelier
Date: Sun Oct 8 01:20:14 2023 +0200
DocBook: add support for InsetInfo.
A similar patch would be required for LyXHTML, but it will come later. The
main impact is that some text isn't output in XHTML (like DocBook before this
patch).
The code isn't as clean as it could be. I avoided touching anything not
related to DocBook, as the release of 2.4 is nearing, while leaving comments
for parts to improve for the next release cycle. Given that the code compiles,
there are no risks for TeX or XHTML outputs; for DocBook, less content is
skipped, which is a net improvement for users.
---
autotests/export/docbook/insetinfo.lyx | 121 +++
autotests/export/docbook/insetinfo.xml |7 +
src/insets/InsetInfo.cpp | 545
src/insets/InsetInfo.h |2 +
4 files changed, 675 insertions(+), 0 deletions(-)
diff --git a/autotests/export/docbook/insetinfo.lyx
b/autotests/export/docbook/insetinfo.lyx
new file mode 100644
index 000..1ae6c30
--- /dev/null
+++ b/autotests/export/docbook/insetinfo.lyx
@@ -0,0 +1,121 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 620
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language american
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_formatted_ref 0
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content true
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Title
+Test:
+ InsetInfo
+\end_layout
+
+\begin_layout Standard
+
+\lang spanish
+Véase la
+\emph on
+
+\begin_inset Info
+type "l7n"
+arg "User's Guide|U"
+\end_inset
+
+
+\emph default
+ o
+\emph on
+
+\begin_inset Info
+type "l7n"
+arg "Additional Features|F"
+\end_inset
+
+
+\emph default
+ para más detalles.
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/docbook/insetinfo.xml
b/autotests/export/docbook/insetinfo.xml
new file mode 100644
index 000..48ba1d8
--- /dev/null
+++ b/autotests/export/docbook/insetinfo.xml
@@ -0,0 +1,7 @@
+
+
+http://docbook.org/ns/docbook;
xmlns:xlink="http://www.w3.org/1999/xlink;
xmlns:m="http://www.w3.org/1998/Math/MathML;
xmlns:xi="http://www.w3.org/2001/XInclude; version="5.2">
+Test: InsetInfo
+Véase la User's
Guide o Additional
Features para más detalles.
+
\ No newline at end of file
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 06851bb..1f50dfe 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -31,6 +31,7 @@
#include "LyXRC.h"
#include "LyXVC.h"
#include "Lexer.h"
+#include "output_docbook.h"
#include "Paragraph.h"
#include "ParIterator.h"
#include "ParagraphParameters.h"
@@ -54,6 +55,7 @@
#include "support/Translator.h"
#include
+#include
#include
#include
@@ -297,6 +299,7 @@ vector>
InsetInfoParams::getArguments(Buffer const * buf,
case FIXDATE_INFO:
case DATE_INFO:
case MODDATE_INFO: {
+ // TODO: away from a release, use parseDate instead.
string const dt = split(name, '@');
QDate date;
if (itype == "moddate")
@@ -327,6 +330,7 @@ vector>
InsetInfoParams::getArguments(Buffer const * buf,
case FIXTIME_INFO:
case
[LyX/master] DocBook: fix closing formatting after deleted text.
commit 78b157b61eefc36c1c837a724f0cb067fe40f172
Author: Thibaut Cuvelier
Date: Sun Oct 8 01:39:45 2023 +0200
DocBook: fix closing formatting after deleted text.
Previously, when closing font tags, only the previous character's font was
used. However, if that character is deleted, it had no change of having the
right font tags opened/closed. Hence, look further to compare the font of the
current character to output with the font of the previously output character.
---
autotests/export/docbook/tracking_formatting.lyx | 111 ++
autotests/export/docbook/tracking_formatting.xml |7 ++
src/Paragraph.cpp| 10 ++-
3 files changed, 126 insertions(+), 2 deletions(-)
diff --git a/autotests/export/docbook/tracking_formatting.lyx
b/autotests/export/docbook/tracking_formatting.lyx
new file mode 100644
index 000..44802ff
--- /dev/null
+++ b/autotests/export/docbook/tracking_formatting.lyx
@@ -0,0 +1,111 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 620
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language american
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_formatted_ref 0
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes true
+\output_changes false
+\change_bars false
+\postpone_fragile_content true
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\author 1075283030 "Thibaut"
+\end_header
+
+\begin_body
+
+\begin_layout Title
+Test:
+ deleted text just after the end of formatted text
+\end_layout
+
+\begin_layout Standard
+
+\lang spanish
+incluye el archivo
+\family typewriter
+config.log
+\change_deleted 1075283030 1696721001
+
+\family default
+,
+
+\change_unchanged
+ y menciona el compilador que usas.
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/docbook/tracking_formatting.xml
b/autotests/export/docbook/tracking_formatting.xml
new file mode 100644
index 000..fb245c1
--- /dev/null
+++ b/autotests/export/docbook/tracking_formatting.xml
@@ -0,0 +1,7 @@
+
+
+http://docbook.org/ns/docbook;
xmlns:xlink="http://www.w3.org/1999/xlink;
xmlns:m="http://www.w3.org/1998/Math/MathML;
xmlns:xi="http://www.w3.org/2001/XInclude; version="5.2">
+Test: deleted text just after the end of formatted text
+incluye el archivo config.log y menciona el compilador que
usas.
+
\ No newline at end of file
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 3718bd4..333aeb8 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3721,10 +3721,16 @@ std::tuple,
std::vector, std::vector 0) {
+ while (last_output_char > 0 &&
isDeleted(last_output_char))
+ --last_output_char;
+ }
FontInfo const font_old = (i == 0 ?
(style.labeltype == LABEL_MANUAL ?
style.labelfont : style.font) :
- getFont(buf.masterBuffer()->params(), i - 1,
outerfont).fontInfo());
+ getFont(buf.masterBuffer()->params(),
last_output_char, outerfont).fontInfo());
Font const font = getFont(buf.masterBuffer()->params(), i,
outerfont);
tie(tagsToOpen, tagsToClose) = computeDocBookFontSwitch(
font_old, font,
buf.masterBuffer()->params().fonts_default_family, fs);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
[LyX/master] DocBook: fix formatting of TODOs.
commit b9fc4bae44ca8f41b636101909ef0596bf2d4def
Author: Thibaut Cuvelier
Date: Sun Oct 8 01:38:27 2023 +0200
DocBook: fix formatting of TODOs.
The lines were very long; this commit truncates them to 120 characters.
---
src/output_docbook.cpp |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/output_docbook.cpp b/src/output_docbook.cpp
index c80a7cd..19f6de4 100644
--- a/src/output_docbook.cpp
+++ b/src/output_docbook.cpp
@@ -1300,7 +1300,8 @@ void docbookParagraphs(Text const ,
}
// Close all sections before the bibliography.
- // TODO: Only close all when the bibliography is at the end of
the document? Or force to output the bibliography at the end of the document?
Or don't care (as allowed by DocBook)?
+ // TODO: Only close all when the bibliography is at the end of
the document? Or force to output the bibliography
+ // at the end of the document? Or don't care (as allowed by
DocBook)?
if (!par->insetList().empty()) {
Inset const *firstInset = par->getInset(0);
if (firstInset && (firstInset->lyxCode() ==
BIBITEM_CODE || firstInset->lyxCode() == BIBTEX_CODE)) {
@@ -1326,7 +1327,8 @@ void docbookParagraphs(Text const ,
// Generate the tag if a section was just opened.
// Some sections may require abstracts (mostly parts, in books:
DocBookForceAbstractTag will not be NONE),
// others can still have an abstract (it must be detected so
that it can be output at the right place).
- // TODO: docbookforceabstracttag is a bit contrived here, but
it does the job. Having another field just for this would be cleaner, but
that's just for and , so it's probably not worth the effort.
+ // TODO: docbookforceabstracttag is a bit contrived here, but
it does the job. Having another field just for
+ // this would be cleaner, but that's just for and
, so it's probably not worth the effort.
if (isLayoutSectioning(style)) {
// This abstract may be found between the next
paragraph and the next title.
pit_type cpit =
std::distance(text.paragraphs().begin(), par);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] XHTML: implement InsetInfo.
commit 531a37baee776e4a984820809d5ef4bcbe6f5047
Author: Thibaut Cuvelier
Date: Sun Oct 8 22:09:59 2023 +0200
XHTML: implement InsetInfo.
---
src/insets/InsetInfo.cpp | 342 --
src/insets/InsetInfo.h |2 +
2 files changed, 330 insertions(+), 14 deletions(-)
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index b08eb7b..4b92774 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -1295,48 +1295,54 @@ namespace {
// TODO: away from a release, use these functions in InsetInfo::build and
InsetInfoParams::getArguments.
-QDate parseDate(Buffer const & buffer, const InsetInfoParams & params) {
+std::pair parseDate(Buffer const & buffer, const
InsetInfoParams & params) {
std::string date_format = params.name;
std::string const date_specifier = (params.type ==
InsetInfoParams::FIXDATE_INFO
&& contains(params.name, '@'))
? split(params.name, date_format,
'@') : string();
+ QDate date;
if (params.type == InsetInfoParams::MODDATE_INFO)
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
- return
QDateTime::fromSecsSinceEpoch(buffer.fileName().lastModified()).date();
+ date =
QDateTime::fromSecsSinceEpoch(buffer.fileName().lastModified()).date();
#else
- return
QDateTime::fromTime_t(buffer.fileName().lastModified()).date();
+ date =
QDateTime::fromTime_t(buffer.fileName().lastModified()).date();
#endif
else if (params.type == InsetInfoParams::FIXDATE_INFO &&
!date_specifier.empty()) {
QDate date = QDate::fromString(toqstr(date_specifier),
Qt::ISODate);
- return (date.isValid()) ? date : QDate::currentDate();
+ date = (date.isValid()) ? date : QDate::currentDate();
} else {
if (params.type != InsetInfoParams::DATE_INFO && params.type !=
InsetInfoParams::FIXDATE_INFO)
lyxerr << "Unexpected InsetInfoParams::info_type in
parseDate: " << params.type;
- return QDate::currentDate();
+ date = QDate::currentDate();
}
+
+ return {date, date_format};
}
-QTime parseTime(Buffer const & buffer, const InsetInfoParams & params) {
+std::pair parseTime(Buffer const & buffer, const
InsetInfoParams & params) {
std::string time_format = params.name;
std::string const date_specifier = (params.type ==
InsetInfoParams::FIXTIME_INFO
&& contains(params.name, '@'))
? split(params.name, time_format,
'@') : string();
+ QTime time;
if (params.type == InsetInfoParams::MODTIME_INFO)
#if (QT_VERSION >= QT_VERSION_CHECK(5, 8, 0))
- return
QDateTime::fromSecsSinceEpoch(buffer.fileName().lastModified()).time();
+ time =
QDateTime::fromSecsSinceEpoch(buffer.fileName().lastModified()).time();
#else
- return
QDateTime::fromTime_t(buffer.fileName().lastModified()).time();
+ time =
QDateTime::fromTime_t(buffer.fileName().lastModified()).time();
#endif
else if (params.type == InsetInfoParams::FIXTIME_INFO &&
!date_specifier.empty()) {
- QTime time = QTime::fromString(toqstr(date_specifier),
Qt::ISODate);
- return (time.isValid()) ? time : QTime::currentTime();
+ time = QTime::fromString(toqstr(date_specifier), Qt::ISODate);
+ time = (time.isValid()) ? time : QTime::currentTime();
} else {
if (params.type != InsetInfoParams::TIME_INFO && params.type !=
InsetInfoParams::FIXTIME_INFO)
lyxerr << "Unexpected InsetInfoParams::info_type in
parseTime: " << params.type;
- return QTime::currentTime();
+ time = QTime::currentTime();
}
+
+ return {time, time_format};
}
docstring getBufferInfo(Buffer const & buffer, const InsetInfoParams & params)
{
@@ -1444,7 +1450,7 @@ void docbookShortcutInfo(XMLStream & xs, const
InsetInfoParams & params) {
std::string attr;
if (params.type == InsetInfoParams::SHORTCUTS_INFO)
- attr = R"(role="shorcuts")";
+ attr = R"(role="shortcuts")";
else if (params.type == InsetInfoParams::SHORTCUT_INFO)
attr = R"(role="shortcut")";
else {
@@ -1519,6 +1525,78 @@ void docbookShortcutInfo(XMLStream & xs, const
InsetInfoParams & params) {
xml::closeTag(xs, "shortcut", "inline");
}
+void xhtmlShortcutInfo(XMLStream & xs, const InsetInfoParams & params) {
+ std::string attr;
+ if (params.type == InsetInfoParams::SHORTCUTS_INFO)
+ attr = R"(class="shortcuts")";
+ else if (params.type == InsetInfoParams::SHORTCUT_INFO)
+ attr = R"(class="shortcut")";
+
[LyX/master] ctests: add test cases for DocBook
commit 1e63aebc3e71d29723ad0e73c2a3175d4648f013
Author: Scott Kostyshak
Date: Sat Oct 7 14:57:30 2023 -0400
ctests: add test cases for DocBook
Patch from Thibaut Cuvelier.
---
autotests/export/docbook/stray_emph.lyx | 148 +++
autotests/export/docbook/stray_emph.xml |9 ++
2 files changed, 157 insertions(+), 0 deletions(-)
diff --git a/autotests/export/docbook/stray_emph.lyx
b/autotests/export/docbook/stray_emph.lyx
new file mode 100644
index 000..4abbc0c
--- /dev/null
+++ b/autotests/export/docbook/stray_emph.lyx
@@ -0,0 +1,148 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 619
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\begin_preamble
+% DO NOT ALTER THIS PREAMBLE!!!
+%
+%This preamble is designed to ensure that the document prints
+% out as advertised. If you mess with this preamble,
+% parts of the document may not print out as expected. If you
+% have problems LaTeXing this file, please contact
+% the documentation team
+% email: lyx-d...@lists.lyx.org
+
+% the pages of the TOC is numbered roman
+% and a pdf-bookmark for the TOC is added
+\pagenumbering{roman}
+\let\myTOC\tableofcontents
+\renewcommand\tableofcontents{%
+ \pdfbookmark[1]{\contentsname}{}
+ \myTOC
+ \cleardoublepage
+ \pagenumbering{arabic} }
+\end_preamble
+\use_default_options false
+\maintain_unincluded_children no
+\language catalan
+\language_package default
+\inputencoding utf8
+\fontencoding auto
+\font_roman "palatino" "default"
+\font_sans "helvet" "default"
+\font_typewriter "courier" "default"
+\font_math "auto" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures false
+\graphics default
+\default_output_format pdf2
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize 12
+\spacing single
+\use_hyperref true
+\pdf_title "Introducció al LyX"
+\pdf_author "LyX Team, translation: Joan Montané, Daniel Fernández"
+\pdf_subject "LyX-documentation Introducció"
+\pdf_keywords "LyX, Documentation"
+\pdf_bookmarks true
+\pdf_bookmarksnumbered true
+\pdf_bookmarksopen true
+\pdf_bookmarksopenlevel 2
+\pdf_breaklinks false
+\pdf_pdfborder false
+\pdf_colorlinks true
+\pdf_backref false
+\pdf_pdfusetitle false
+\pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue,
filecolor=blue, pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ,
plainpages=false"
+\papersize a4
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 0
+\use_formatted_ref 0
+\use_minted 0
+\use_lineno 0
+\index Índex
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 2
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style french
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Title
+Introducció al \SpecialChar LyX
+
+\end_layout
+
+\begin_layout Standard
+El LaTeX és un sistemaf
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+la bibliografia.
+
+\emph on
+
+\end_layout
+
+\end_inset
+
+.
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/docbook/stray_emph.xml
b/autotests/export/docbook/stray_emph.xml
new file mode 100644
index 000..8a76bee
--- /dev/null
+++ b/autotests/export/docbook/stray_emph.xml
@@ -0,0 +1,9 @@
+
+
+http://docbook.org/ns/docbook;
xmlns:xlink="http://www.w3.org/1999/xlink;
xmlns:m="http://www.w3.org/1998/Math/MathML;
xmlns:xi="http://www.w3.org/2001/XInclude; version="5.2">
+Introducció al LyX
+El LaTeX és un sistemaf
+la bibliografia.
+.
+
\ No newline at end of file
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert couple of suspended tests
commit bb55c3429ff194a24836a50a5c94ea7978bc4605 Author: Scott Kostyshak Date: Sat Sep 30 20:43:10 2023 -0400 ctests: uninvert couple of suspended tests Due to recent changes, 'xcolor' is now loaded in the corresponding document export, which somehow fixes the compilation error that was occurring. --- development/autotests/invertedTests |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 25f3643..8bcf370 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -55,7 +55,6 @@ export/export/lyx2lyx/lyx_2_3_test_lyx(16|20|21|22) export/export/lyx2lyx/lyx_2_3_test2_lyx(16|20) # nonstandard tests failing for unknown reason: -export/templates/Obsolete/ACM_SIGGGRAPH.*_pdf5_(texF|systemF) export/templates/Articles/R_Journal_(dvi3|pdf[45])_systemF #export/templates/Articles/Kluwer_.*_systemF -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 087f6bce
commit a6882a1db0152af270bcba08215424793946d99a
Author: Scott Kostyshak
Date: Sat Sep 30 20:21:22 2023 -0400
Amend 087f6bce
Explanation from Udi:
There is a missing validation for the requirement of xcolor in
InsetBox::validate, the case we use Boxed with non-default color.
Patch from Udi.
---
src/insets/InsetBox.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index 36507cf..81506be 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -810,7 +810,7 @@ void InsetBox::validate(LaTeXFeatures & features) const
break;
case Boxed:
features.require("calc");
- if (getFrameColor() != "black" || getBackgroundColor() !=
"white")
+ if (getFrameColor() != "default" || getBackgroundColor() !=
"white")
features.require("xcolor");
break;
case ovalbox:
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 04bfbc0f
commit 10403b7959b5d8c4c931943708eb8832418612f8 Author: Scott Kostyshak Date: Sat Sep 30 20:20:03 2023 -0400 Amend 04bfbc0f Patch from Udi. --- src/Encoding.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/Encoding.cpp b/src/Encoding.cpp index dc84192..dab24b7 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -204,7 +204,7 @@ bool Encoding::encodable(char_type c) const return true; // platex does not load inputenc: force conversion of supported characters if (package_ == Encoding::japanese - && ((0xb7 <= c && c <= 0x058f) // Latin-1 Supplement ... Armenian + && ((0xb7 <= c && c <= 0x05ff) // Latin-1 Supplement ... Hebrew || (0x1d00 <= c && c <= 0x218f) // Phonetic Extensions ... Number Forms || (0x2193 <= c && c <= 0x2aff) // Arrows ... Supplemental Mathematical Operators || (0xfb00 <= c && c <= 0xfb4f) // Alphabetic Presentation Forms -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Merge branch 'fix-spanish-quoting'
commit 46a62573c363165f738e8ad83e827e83ec8b7720 Merge: 7aa00f0 d937afb Author: Scott Kostyshak Date: Fri Sep 29 10:31:19 2023 -0400 Merge branch 'fix-spanish-quoting' This branch reverts a document-specific fix and introduces a more general fix. The following tests still all pass: ctest -R "es/Letter" lib/languages |2 ++ .../es/Letters/Letter_%28Standard_Class%29.lyx |2 +- 2 files changed, 3 insertions(+), 1 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix babel quoting for Spanish
commit d937afba8aaf846deaa0ef3bb67b9622359bfe18
Author: Scott Kostyshak
Date: Fri Sep 29 10:25:46 2023 -0400
Fix babel quoting for Spanish
The problem, described by Udi, was the following:
See section 1.10 of babel's manual, on page 12 under
"TROUBLESHOOTING". There cannot be
a closing curly brace after a shorthand, and in babel-spanish
">" is a shorthand.
Thanks to Udi and Jürgen for the patch.
This is a more general fix than the (now reverted) fix at fa67f709.
For ML discussion, see here:
https://www.mail-archive.com/search?l=mid=rwwvyyvwmx5wwvwhqdaioil32hblkzi7ghokzgekksrf66ww3f%40u6nj3guoayay
---
lib/languages |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/languages b/lib/languages
index 3157077..a027a43 100644
--- a/lib/languages
+++ b/lib/languages
@@ -1438,6 +1438,7 @@ Language spanish
LangCode es_ES
PostBabelPreamble
\addto\shorthandsspanish{\spanishdeactivate{~<>}}
+ \deactivatequoting
EndPostBabelPreamble
End
@@ -1454,6 +1455,7 @@ Language spanish-mexico
LangCode es_MX
PostBabelPreamble
\addto\shorthandsspanish{\spanishdeactivate{~<>.}}
+ \deactivatequoting
EndPostBabelPreamble
End
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Revert "Fix compilation of es/Letter standard class"
commit cc66c755938a19e124e4352f3623639de2497e1a
Author: Scott Kostyshak
Date: Fri Sep 29 10:23:26 2023 -0400
Revert "Fix compilation of es/Letter standard class"
This fix hardcoded a language package and was specific to this
document.
The next commit will introduce a better fix, thanks to Udi and
Jürgen.
This reverts commit fa67f70992da5f7c6cb0958d557993d6c0750534.
---
.../es/Letters/Letter_%28Standard_Class%29.lyx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
b/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
index 2af7c2d..24767f8 100644
--- a/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
+++ b/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
@@ -8,7 +8,7 @@
\use_default_options false
\maintain_unincluded_children no
\language spanish
-\language_package \usepackage[spanish,es-noquoting]{babel}
+\language_package default
\inputencoding utf8
\fontencoding auto
\font_roman "default" "default"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctest: invert es/Intro_docbook5
commit bf241165dd9b30b26e45b5fcbab0e2bd0d143b4c Author: Scott Kostyshak Date: Wed Sep 27 13:42:40 2023 -0400 ctest: invert es/Intro_docbook5 This fails after recent changes to the document. --- development/autotests/invertedTests |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index b8a2d45..25f3643 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -517,6 +517,8 @@ export/export/latex/lyxbugs-resolved/cprotect/7779-float-in-par-env_docbook5 # See also ML discussion: # https://www.mail-archive.com/search?l=mid=20211102011304.dmrcr7gjpxxwpd4o%40poole export/examples/(|ja/)Modules/LilyPond_Book_docbook5 +# Undiagnosed +export/doc/es/Intro_docbook5 Sublabel: docbook poster # Posters cannot be properly exported, the LyX documents are too far from -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: fix case with emphasis at end of footnote
commit ff9dfa96f26b8544d1264d6eaac390b3f5891bde
Author: Scott Kostyshak
Date: Mon Sep 25 10:41:21 2023 -0400
DocBook: fix case with emphasis at end of footnote
For ML discussion, see here:
https://www.mail-archive.com/search?l=mid=CAK0LPyiusCMu-X7KpgO0d1-rh4e3%3DRwR5ooXE_fdb7UVuB0VUA%40mail.gmail.com
Patch from Thibaut Cuvelier.
---
src/Paragraph.cpp | 24 +++-
src/xml.cpp | 10 ++
src/xml.h | 13 +
3 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index a9b186b..3718bd4 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3673,6 +3673,7 @@ std::tuple,
std::vector, std::vectorstartDivision(false);
std::vector delayedChars; // When a font tag ends with a space,
output it after the closing font tag.
// This requires to store delayed characters at some point.
@@ -3696,8 +3697,8 @@ std::tuple,
std::vector, std::vectorlyxCode() == NEWLINE_CODE) {
if (!ignore_fonts_i)
xs->closeFontTags();
@@ -3705,11 +3706,14 @@ std::tuple,
std::vector, std::vectorendDivision();
+
// Create a new XMLStream for the new paragraph,
completely independent of the previous one. This implies
// that the string stream must be reset.
os.str(from_ascii(""));
delete xs;
xs = new XMLStream(os);
+ xs->startDivision(false);
// Restore the fonts for the new paragraph, so that the
right tags are opened for the new entry.
if (!ignore_fonts_i) {
@@ -3744,11 +3748,12 @@ std::tuple,
std::vector, std::vector::const_iterator sen =
tagsToOpen.end();
for (; sit != sen; ++sit)
*xs << *sit;
-
- tagsToClose.clear();
- tagsToOpen.clear();
}
+ // The font tags are no longer useful; free their memory right
now.
+ tagsToClose.clear();
+ tagsToOpen.clear();
+
// Finally, write the next character or inset.
if (Inset const * inset = getInset(i)) {
bool inset_is_argument_elsewhere =
getInset(i)->asInsetArgument() &&
@@ -3781,12 +3786,21 @@ std::tuple,
std::vector, std::vectorcloseFontTags();
+ // Close the potentially remaining tags, like pending font tags.
+ // There is no need to check for ignore_fonts, as these tags won't be
+ // inserted in the stack in the first place if ignore_fonts is false.
+ xs->endDivision();
+
// Deal with the delayed characters *after* closing font tags.
if (!delayedChars.empty()) {
for (const docstring : delayedChars)
diff --git a/src/xml.cpp b/src/xml.cpp
index 53ccb8a..5b81024 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -287,6 +287,16 @@ XMLStream ::operator<<(docstring const )
}
+XMLStream ::operator<<(xml::NullTag const &)
+{
+ is_last_tag_cr_ = false;
+ clearTagDeque();
+ // Don't output anything to os_, by definition of a NullTag (as opposed
to text output).
+ escape_ = ESCAPE_ALL;
+ return *this;
+}
+
+
XMLStream ::operator<<(const char *s)
{
is_last_tag_cr_ = false;
diff --git a/src/xml.h b/src/xml.h
index 03710c1..346e42d 100644
--- a/src/xml.h
+++ b/src/xml.h
@@ -31,6 +31,7 @@ namespace xml {
struct StartTag;
struct EndTag;
struct CompTag;
+struct NullTag;
struct ParTag;
struct FontTag;
struct CR;
@@ -67,6 +68,8 @@ public:
///
XMLStream & operator<<(char);
///
+ XMLStream & operator<<(xml::NullTag const &);
+ ///
XMLStream & operator<<(xml::StartTag const &);
///
XMLStream & operator<<(xml::EndTag const &);
@@ -274,6 +277,16 @@ struct ParTag : public StartTag
};
+/// A special tag that doesn't produce any XML output, but makes the XMLStream
behave as it it output some text.
+struct NullTag : public StartTag
+{
+ ///
+ NullTag(): StartTag("NULLTAG", from_utf8(""), true) {}
+ ///
+ ~NullTag() override = default;
+};
+
+
///
enum FontTypes {
// ranges
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: update inverted list after DocBook fix
commit beec7b669f5b93deee44e528bad21b61c29e2bd7 Author: Scott Kostyshak Date: Mon Sep 25 10:58:50 2023 -0400 ctests: update inverted list after DocBook fix Thanks to the fix at ff9dfa96, we can uninvert a test. Also invert a couple of other tests and organize into the correct location. --- development/autotests/invertedTests |5 + 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 8805bd9..b8a2d45 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -428,7 +428,7 @@ export/export/docbook/Hollywood_docbook5 # - Lettre, formatting in elements DocBook does not allow to be formatted (like email). export/templates/Letters/French_Letter_%28lettre%29_docbook5 # - Letter, elements at the end of the document that should be in . -export/templates/Letters/Letter_%28Standard_Class%29_docbook5 +export/templates(|/es|/ca)/Letters/Letter_%28Standard_Class%29_docbook5 # - G-Brief: too far from the other classes, not implemented. export/templates/Letters/G-Brief_%28V._2%29_docbook5 export/templates/Obsolete/G-Brief_%28V._1,_Obsolete%29/.*_docbook5 @@ -517,9 +517,6 @@ export/export/latex/lyxbugs-resolved/cprotect/7779-float-in-par-env_docbook5 # See also ML discussion: # https://www.mail-archive.com/search?l=mid=20211102011304.dmrcr7gjpxxwpd4o%40poole export/examples/(|ja/)Modules/LilyPond_Book_docbook5 -# - Undiagnosed issues. -export/doc/ca/Intro_docbook5 -export/templates/ca/Letters/Letter_%28Standard_Class%29_docbook5 Sublabel: docbook poster # Posters cannot be properly exported, the LyX documents are too far from -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix compilation of es/Letter standard class
commit fa67f70992da5f7c6cb0958d557993d6c0750534
Author: Scott Kostyshak
Date: Sat Sep 23 20:35:36 2023 -0400
Fix compilation of es/Letter standard class
The problem, described by Udi, was the following:
See section 1.10 of babel's manual, on page 12 under
"TROUBLESHOOTING". There cannot be
a closing curly brace after a shorthand, and in babel-spanish ">" is a
shorthand.
Patch from Dan.
For more discussion, see the following ML thread:
https://www.mail-archive.com/search?l=mid=rwwvyyvwmx5wwvwhqdaioil32hblkzi7ghokzgekksrf66ww3f%40u6nj3guoayay
---
.../es/Letters/Letter_%28Standard_Class%29.lyx |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
b/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
index 24767f8..2af7c2d 100644
--- a/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
+++ b/lib/templates/es/Letters/Letter_%28Standard_Class%29.lyx
@@ -8,7 +8,7 @@
\use_default_options false
\maintain_unincluded_children no
\language spanish
-\language_package default
+\language_package \usepackage[spanish,es-noquoting]{babel}
\inputencoding utf8
\fontencoding auto
\font_roman "default" "default"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert another ca docbook test
commit c6317b123ed5d29a87c157eebb094854a349a1f8 Author: Scott Kostyshak Date: Sat Sep 23 12:43:31 2023 -0400 ctests: invert another ca docbook test Perhaps similar to eb920502. --- development/autotests/invertedTests |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index ba71fb9..8805bd9 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -517,8 +517,9 @@ export/export/latex/lyxbugs-resolved/cprotect/7779-float-in-par-env_docbook5 # See also ML discussion: # https://www.mail-archive.com/search?l=mid=20211102011304.dmrcr7gjpxxwpd4o%40poole export/examples/(|ja/)Modules/LilyPond_Book_docbook5 -# - Undiagnosed issue. +# - Undiagnosed issues. export/doc/ca/Intro_docbook5 +export/templates/ca/Letters/Letter_%28Standard_Class%29_docbook5 Sublabel: docbook poster # Posters cannot be properly exported, the LyX documents are too far from -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert test due to acmart issue
commit 91d5a262cb853c4becc5528e6589fc05bd4c60cf Author: Scott Kostyshak Date: Mon Sep 18 16:25:29 2023 -0400 ctests: invert test due to acmart issue The upstream bug report is here: https://github.com/borisveytsman/acmart/issues/505 --- development/autotests/invertedTests |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index cff37e0..ba71fb9 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -316,6 +316,10 @@ export/examples/(|es/)Curricula_Vitae/Europe_CV_(pdf.*|dvi|lyx22|lyx23) # Armenian currently only works with XeTeX and LuaTeX and system fonts export/examples/Language_Support/Writing_Armenian_(dvi|dvi3_texF|pdf|pdf2|pdf3|pdf5_texF) +# ! Package hyperxmp Error: hyperref must be loaded before hyperxmp. +# https://github.com/borisveytsman/acmart/issues/505 +export/templates/Articles/Association_for_Computing_Machinery_%28ACM%29_pdf2 + # Sublabel: externalissues -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert ca/Intro_docbook5
commit eb920502db33cadadf093a2543e08fea5a7cf591 Author: Scott Kostyshak Date: Wed Sep 13 20:33:41 2023 -0400 ctests: invert ca/Intro_docbook5 The document was recently added and the underlying DocBook issue has not been diagnosed yet. --- development/autotests/invertedTests |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index c1011e8..cff37e0 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -513,6 +513,8 @@ export/export/latex/lyxbugs-resolved/cprotect/7779-float-in-par-env_docbook5 # See also ML discussion: # https://www.mail-archive.com/search?l=mid=20211102011304.dmrcr7gjpxxwpd4o%40poole export/examples/(|ja/)Modules/LilyPond_Book_docbook5 +# - Undiagnosed issue. +export/doc/ca/Intro_docbook5 Sublabel: docbook poster # Posters cannot be properly exported, the LyX documents are too far from -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix lyx2lyx issue reported on ML
commit 77fc67d3f01576070bb51cedc4d578c0457f5bce Author: Scott Kostyshak Date: Wed Sep 6 13:05:07 2023 -0400 Fix lyx2lyx issue reported on ML The issue was reported on lyx-users by Chris Menzel [1]. Patch is from José Matos [2]. [1] https://www.mail-archive.com/search?l=mid=BD744D7E-54B4-4E95-A4E3-6B28F4987DE1%40gmail.com [2] https://www.mail-archive.com/search?l=mid=c2ac54c2322d24051f171558ad8487ea4f7078ed.camel%40gmail.com --- lib/lyx2lyx/parser_tools.py |3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/lyx2lyx/parser_tools.py b/lib/lyx2lyx/parser_tools.py index cc22236..96abb1c 100644 --- a/lib/lyx2lyx/parser_tools.py +++ b/lib/lyx2lyx/parser_tools.py @@ -689,7 +689,8 @@ def count_pars_in_inset(lines, i): pars = 0 for j in range(ins[1], ins[2]): m = re.match(r'\\begin_layout (.*)', lines[j]) - if m and get_containing_inset(lines, j)[1] == ins[1]: + found_inset = get_containing_inset(lines, j) + if m and found_inset and found_inset[1] == ins[1]: pars += 1 return pars -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] cat.py: fix Python deprecation warning
commit dee5eec15f6e9c36e7fe858c0bb9d44da051418f Author: Scott Kostyshak Date: Thu Mar 19 18:22:16 2020 -0400 cat.py: fix Python deprecation warning This commit fixes the following warning: DeprecationWarning: 'U' mode is deprecated Removing 'U' has no effect with Python 3 [1]: There is an additional mode character permitted, 'U', which no longer has any effect, and is considered deprecated. It previously enabled universal newlines in text mode, which became the default behaviour in Python 3.0. [1] https://docs.python.org/3/library/functions.html?highlight=open#open (cherry picked from commit 9715d3504c6a74f9a498e2d9232956255110225d) --- development/cmake/po/cat.py | 14 +++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/development/cmake/po/cat.py b/development/cmake/po/cat.py index 7a1ee26..fd676cc 100644 --- a/development/cmake/po/cat.py +++ b/development/cmake/po/cat.py @@ -29,9 +29,17 @@ if outfile: out = open(outfile, "wb") for f in args: - # accept both windows and unix line endings, since it can happen that we - # are on unix, but the file has been written on windows or vice versa. - fil = open(f, "rU") + if sys.version_info[0] < 3: + # accept both windows and unix line endings, since it can + # happen that we are on unix, but the file has been written on + # windows or vice versa. + mode = "rU" + else: + # The default behavior of Python 3 is to enable universal + # newlines in text mode. Adding "U" gives a deprecation + # warning. + mode = "r" + fil = open(f, mode) for l in fil: # this does always write unix line endings since the file has # been opened in binary mode. This is needed since both gettext -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] endl needs ostream header here.
commit 6b4c7c5e9107716353f8c3315fe93abfc0a27c1a Author: Pavel Sanda Date: Tue Jan 14 21:59:05 2020 +0100 endl needs ostream header here. (cherry picked from commit 8c4d6bbba68d0913ae4a7ec3beefea0e9ff4d8ea) --- src/boost.cpp |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/boost.cpp b/src/boost.cpp index ce1fb27..646d4e4 100644 --- a/src/boost.cpp +++ b/src/boost.cpp @@ -18,6 +18,7 @@ #include #include +#include using namespace std; using lyx::lyxerr; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Python fixes from José Matos
commit 677dc3b7a6792b3a07c2f7f33ed06aa173d55308
Author: Scott Kostyshak
Date: Sat Aug 19 21:32:41 2023 -0400
Python fixes from José Matos
See here:
https://www.mail-archive.com/search?l=mid=a7960223ee91696e916b281d1d9fc55df10a9480.camel%40gmail.com
Description from José pasted below:
Functions `length_in_bp` and `revert_flex_inset` have an error in a
(almost) never used path. The reason why this was never triggered is
because this is part of the code where we try all the best efforts
to recover from an ill-formed LyX file.
The problem is that the functions call the `document` variable to
issue an warning if the file does not follow the usual structure.
The simple fix is to add that variable (as the first for the
functions) and to add them at all the places where the functions are
called.
For reference this code was introduced by Georg (Baum) more than 8
years ago and it was never reported. So the issue is not urgent in
any meaningful way. :-)
In `lyx2lyx/lyx_2_0.py`, in the function `revert_nameref`, there is
a call to the document variable. The same as all the above.
In `lyx2lyx/lyx_2_4.py`, in the `class fontmapping`. Similar to the
above but now for error.
---
lib/lyx2lyx/lyx_1_2.py |4 ++--
lib/lyx2lyx/lyx_2_0.py |4 ++--
lib/lyx2lyx/lyx_2_3.py |2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/lyx2lyx/lyx_1_2.py b/lib/lyx2lyx/lyx_1_2.py
index ae082a7..e091b3b 100644
--- a/lib/lyx2lyx/lyx_1_2.py
+++ b/lib/lyx2lyx/lyx_1_2.py
@@ -745,8 +745,8 @@ def update_longtables(document):
for j in range(rows):
i = find_token(body, ' end:
-document.warning("Can't find end of inset at line " + str(nb))
+document.warning("Can't find end of inset at line " + str(ne))
ns += 1
continue
if document.body[ne + 1] == "":
diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py
index 69b2aba..5e330ed 100644
--- a/lib/lyx2lyx/lyx_2_3.py
+++ b/lib/lyx2lyx/lyx_2_3.py
@@ -1427,7 +1427,7 @@ def revert_multibib(document):
}
if multibib not in units.keys():
-document.warning("Unknown multibib value `%s'!" % nultibib)
+document.warning("Unknown multibib value `%s'!" % multibib)
return
unit = units[multibib]
btunit = False
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] supported-languages.lyx: update format
commit 946b7500900fea077922b9391c035226dad6d455 Author: Scott Kostyshak Date: Fri Aug 18 11:22:07 2023 -0400 supported-languages.lyx: update format .../export/latex/languages/supported-languages.lyx | 750 +++- 1 files changed, 412 insertions(+), 338 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] supported-languages: update info on font subs
commit ccd88246a94e66552882bfe6fc5e047f2501f89f
Author: Scott Kostyshak
Date: Fri Aug 18 11:24:34 2023 -0400
supported-languages: update info on font subs
Consistent with 008e1cc9.
---
.../export/latex/languages/supported-languages.lyx |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/autotests/export/latex/languages/supported-languages.lyx
b/autotests/export/latex/languages/supported-languages.lyx
index b099da2..0130643 100644
--- a/autotests/export/latex/languages/supported-languages.lyx
+++ b/autotests/export/latex/languages/supported-languages.lyx
@@ -6006,13 +6006,14 @@ usepackage{fonts-tlwg}}
\end_layout
\begin_layout Standard
-or set up the font substitutes with the
+or set up the font substitutes with
+\backslash
+DeclareFontFamilySubstitution (if you have a LaTeX kernel older than February
2020,
+ you can use the now-deprecated
\emph on
substitutefont
\emph default
-package
-\emph on
-.
+package).
\end_layout
\end_deeper
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix font substitutions of Thai documents
commit 008e1cc963b5ca54f1e71fa501ecb4b2306349ff
Author: Scott Kostyshak
Date: Thu Aug 17 22:02:09 2023 -0400
Fix font substitutions of Thai documents
The substitutefont package is obsoleted now on TL because the
required functionality is in the kernel. See here:
https://ctan.org/pkg/substitutefont
---
lib/languages | 20
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/lib/languages b/lib/languages
index 3101ee3..760a1ff 100644
--- a/lib/languages
+++ b/lib/languages
@@ -1522,11 +1522,23 @@ Language thai
\DeclareRobustCommand{\copyright}{%
\ifmmode{\nfss@text{\textcopyright}}\else\textcopyright\fi}
\DeclareTextSymbol{\textcopyright}{LTH}{8}
+ %
% set up Thai fonts as substitue for the default families
- \usepackage{substitutefont}
- \substitutefont{LTH}{\rmdefault}{norasi}
- \substitutefont{LTH}{\sfdefault}{garuda}
- \substitutefont{LTH}{\ttdefault}{ttypist}
+ % The 'substitutefont' package is obsolete now, since commands
+ % from the LaTeX kernel can be used instead. See here:
+ % https://ctan.org/pkg/substitutefont
+ % https://www.latex-project.org/news/latex2e-news/ltnews31.pdf
+ \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion}
+ \IfFormatAtLeastTF{2020/02/01}{%
+ \DeclareFontFamilySubstitution{LTH}{\rmdefault}{norasi}
+ \DeclareFontFamilySubstitution{LTH}{\sfdefault}{garuda}
+ \DeclareFontFamilySubstitution{LTH}{\ttdefault}{ttypist}
+ }{%
+ \usepackage{substitutefont}
+ \substitutefont{LTH}{\rmdefault}{norasi}
+ \substitutefont{LTH}{\sfdefault}{garuda}
+ \substitutefont{LTH}{\ttdefault}{ttypist}
+ }
EndPostBabelPreamble
End
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Fix a comparison of arrays to compare *contents*
commit 79507c98af1758f4edb5e3bf6f760fce003816b1
Author: Scott Kostyshak
Date: Thu Dec 31 13:15:14 2020 -0500
Fix a comparison of arrays to compare *contents*
The previous code was mistakenly comparing addresses of the arrays.
This issue was caught by a warning when compiling with Clang in
C++20 mode, since comparing array addresses in this way is
deprecated.
This commit should prevent some unnecessary dispatches of
LFUN_SCREEN_FONT_UPDATE.
(cherry picked from commit eaebe404ae6c8305161bd5f41496f36cf6a2ab78)
---
src/LyXRC.cpp |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 0753534..96a1c09 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -3074,7 +3074,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC
const & lyxrc_new)
|| lyxrc_orig.roman_font_foundry != lyxrc_new.roman_font_foundry
|| lyxrc_orig.sans_font_foundry != lyxrc_new.sans_font_foundry
|| lyxrc_orig.use_scalable_fonts != lyxrc_new.use_scalable_fonts
- || lyxrc_orig.font_sizes != lyxrc_new.font_sizes
+ || !std::equal(std::begin(lyxrc_orig.font_sizes),
std::end(lyxrc_orig.font_sizes),
+ std::begin(lyxrc_new.font_sizes))
|| lyxrc_orig.typewriter_font_foundry !=
lyxrc_new.typewriter_font_foundry
|| lyxrc_orig.defaultZoom != lyxrc_new.defaultZoom) {
dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Keep cursor position when splitting
commit a2310d04f47ba6aadea0e43ffc1e8a8579110022 Author: Daniel Ramoeller Date: Mon Mar 6 21:44:59 2023 +0100 Keep cursor position when splitting Fix for #12689 --- src/frontends/qt/GuiView.cpp |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp index 844ef90..c02c479 100644 --- a/src/frontends/qt/GuiView.cpp +++ b/src/frontends/qt/GuiView.cpp @@ -4880,6 +4880,8 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) ? Qt::Vertical : Qt::Horizontal); TabWorkArea * twa = addTabWorkArea(); GuiWorkArea * wa = twa->addWorkArea(*doc_buffer, *this); + DocIterator cur = bv->cursor(); + wa->bufferView().moveToPosition(cur.pit(), cur.pos(), 0, 0); setCurrentWorkArea(wa); break; } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Comments
commit cc951cd4111a3a82d34235cc7efbcd87b226d215 Author: Scott Kostyshak Date: Thu Aug 10 06:17:29 2023 -0400 Comments --- src/frontends/qt/GuiView.cpp |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp index c02c479..764921c 100644 --- a/src/frontends/qt/GuiView.cpp +++ b/src/frontends/qt/GuiView.cpp @@ -4880,8 +4880,13 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr) ? Qt::Vertical : Qt::Horizontal); TabWorkArea * twa = addTabWorkArea(); GuiWorkArea * wa = twa->addWorkArea(*doc_buffer, *this); + + // set cursor to same position as current view. + // TODO: would be good to *scroll* to same position also + // so that the display is the same (#12689) DocIterator cur = bv->cursor(); wa->bufferView().moveToPosition(cur.pit(), cur.pos(), 0, 0); + setCurrentWorkArea(wa); break; } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update tex2lyx tests after format change to 618
commit 224f21c8562ba1f3dab8cd2f2f72cc7d5b0f24d6 Author: Scott Kostyshak Date: Sun Aug 6 15:06:15 2023 -0400 Update tex2lyx tests after format change to 618 Amends 9e8901f9. --- src/tex2lyx/test/CJK.lyx.lyx |2 +- src/tex2lyx/test/CJKutf8.lyx.lyx |2 +- src/tex2lyx/test/DummyDocument.lyx.lyx |2 +- src/tex2lyx/test/Dummy~Document.lyx.lyx|2 +- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +- src/tex2lyx/test/algo2e.lyx.lyx|2 +- src/tex2lyx/test/beamer.lyx.lyx|2 +- .../test/box-color-size-space-align.lyx.lyx|2 +- src/tex2lyx/test/listpreamble.lyx.lyx |2 +- src/tex2lyx/test/tabular-x-test.lyx.lyx|2 +- src/tex2lyx/test/test-insets-basic.lyx.lyx |2 +- src/tex2lyx/test/test-insets.lyx.lyx |2 +- src/tex2lyx/test/test-memoir.lyx.lyx |2 +- src/tex2lyx/test/test-minted.lyx.lyx |2 +- src/tex2lyx/test/test-modules.lyx.lyx |2 +- src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|2 +- src/tex2lyx/test/test-scr.lyx.lyx |2 +- src/tex2lyx/test/test-structure.lyx.lyx|2 +- src/tex2lyx/test/test.lyx.lyx |2 +- src/tex2lyx/test/verbatim.lyx.lyx |2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 95dcfae..26787e2 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx index 6db7fab..0430b74 100644 --- a/src/tex2lyx/test/CJKutf8.lyx.lyx +++ b/src/tex2lyx/test/CJKutf8.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx index 77defb5..eba602a 100644 --- a/src/tex2lyx/test/DummyDocument.lyx.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx index bbaa513..1ef361c 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 471fc52..7f61c1c 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index 9748d9c..8b3dd17 100644 --- a/src/tex2lyx/test/algo2e.lyx.lyx +++ b/src/tex2lyx/test/algo2e.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx index cdd6aa1..b603a1a 100644 --- a/src/tex2lyx/test/beamer.lyx.lyx +++ b/src/tex2lyx/test/beamer.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index 8fdde19..03be597 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx b/src/tex2lyx/test/listpreamble.lyx.lyx index cf8a361..88ebbae 100644 --- a/src/tex2lyx/test/listpreamble.lyx.lyx +++ b/src/tex2lyx/test/listpreamble.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/tabular-x-test.lyx.lyx b/src/tex2lyx/test/tabular-x-test.lyx.lyx index db81aab..69dc6e1 100644 --- a/src/tex2lyx/test/tabular-x-test.lyx.lyx +++ b/src/tex2lyx/test/tabular-x-test.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 617 +\lyxformat 618 \begin_document
[LyX/master] missing-symbols-hebrew-kbd
commit 582a437d1472c30c837128562c8ba20f87d3c819 Author: Udi Fogiel Date: Tue Aug 1 04:16:17 2023 +0300 missing-symbols-hebrew-kbd --- lib/kbd/hebrew.kmap |6 +- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/kbd/hebrew.kmap b/lib/kbd/hebrew.kmap index 9056650..e7e4cb5 100644 --- a/lib/kbd/hebrew.kmap +++ b/lib/kbd/hebrew.kmap @@ -97,4 +97,8 @@ \kmap < > \kmap > < - +# Add missing symbols: +\kmap D ־ # Shift+Gimel = Maqqaf +\kmap F ֿ # Shift+Kaf = Rafe +\kmap K ׳ # Shift+Lamed = Geresh +\kmap L ״ # Shift+Kaf Sofit = Gershayim -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Layout typo
commit e8b01f3d8364abb08b8d4677d773e5f703179572
Author: Scott Kostyshak
Date: Mon Jul 31 18:37:10 2023 -0400
Layout typo
Amends e932dc45.
---
lib/layouts/theorems-case.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/layouts/theorems-case.inc b/lib/layouts/theorems-case.inc
index 692653b..3cf64e4 100644
--- a/lib/layouts/theorems-case.inc
+++ b/lib/layouts/theorems-case.inc
@@ -28,7 +28,7 @@ End
Counter caseiv
GuiName "Case (Level 4)"
Within caseiii
-PrettyForamt "Case \arabic{caseiv}"
+PrettyFormat "Case \arabic{caseiv}"
LabelString "Case \arabic{caseiv}."
End
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit e9fb0df5eaaf0603ccb8b2519941e1f08b3fd72e
Author: Scott Kostyshak
Date: Mon Jul 31 18:41:11 2023 -0400
Whitespace
Use tab for consistency.
---
lib/layouts/theorems-case.inc | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/layouts/theorems-case.inc b/lib/layouts/theorems-case.inc
index 3cf64e4..ac60130 100644
--- a/lib/layouts/theorems-case.inc
+++ b/lib/layouts/theorems-case.inc
@@ -15,21 +15,21 @@ Counter casei
End
Counter caseii
GuiName "Case (Level 2)"
-Within casei
-LabelString "Case \roman{caseii}."
-PrettyFormat "Case \roman{caseii}"
+ Within casei
+ LabelString "Case \roman{caseii}."
+ PrettyFormat "Case \roman{caseii}"
End
Counter caseiii
GuiName "Case (Level 3)"
-Within caseii
-LabelString "Case \alph{caseiii}."
-PrettyFormat "Case \alph{caseiii}"
+ Within caseii
+ LabelString "Case \alph{caseiii}."
+ PrettyFormat "Case \alph{caseiii}"
End
Counter caseiv
GuiName "Case (Level 4)"
-Within caseiii
-PrettyFormat "Case \arabic{caseiv}"
-LabelString "Case \arabic{caseiv}."
+ Within caseiii
+ PrettyFormat "Case \arabic{caseiv}"
+ LabelString "Case \arabic{caseiv}."
End
Style Case
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] FORMAT: more details on 616
commit 573b4be7bc4dac611e97a84235a76415672f21d7 Author: Scott Kostyshak Date: Thu Jul 20 10:11:53 2023 -0400 FORMAT: more details on 616 --- development/FORMAT |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index b60e294..2b0d293 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -18,6 +18,8 @@ changes happened in particular if possible. A good example would be 2023-06-11 Enrico Forestieri * Format incremented to 616: Do not output LaTeX for a macro if the LaTeX part is empty + - This allows the user to define the LyX display for LaTeX commands + that are already defined (e.g., in user preamble or a package). 2023-04-02 Jürgen Spitzmüller * Format incremented to 615: Unifiy spelling of "acknowledgment" styles -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix cursor font after collapsing inset (#12830)
commit c4cdff5de22c683df4423dbc0950191294381cd1
Author: Scott Kostyshak
Date: Thu Jul 6 08:40:12 2023 -0400
Fix cursor font after collapsing inset (#12830)
If the cursor is in an inset, and it is closed (e.g., with ctrl + i,
or inset-toggle), the cursor is moved outside of the inset, so the
font must be reset.
---
src/insets/InsetCollapsible.cpp |5 -
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/insets/InsetCollapsible.cpp b/src/insets/InsetCollapsible.cpp
index e029671..56d8ce8 100644
--- a/src/insets/InsetCollapsible.cpp
+++ b/src/insets/InsetCollapsible.cpp
@@ -717,8 +717,11 @@ void InsetCollapsible::setStatus(Cursor & cur,
CollapseStatus status)
{
status_ = status;
setButtonLabel();
- if (status_ == Collapsed)
+ if (status_ == Collapsed) {
cur.leaveInset(*this);
+ // if cursor was inside the inset, it was now moved outside
(#12830)
+ cur.setCurrentFont();
+ }
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Style and whitespace
commit 551ede855ab5c60246cd318346465530a5733782
Author: Scott Kostyshak
Date: Thu Jun 29 05:31:41 2023 -0400
Style and whitespace
---
src/insets/InsetListings.cpp | 10 +-
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index f2b26f0..fa38340 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -405,14 +405,14 @@ void InsetListings::latex(otexstream & os, OutputParams
const & runparams) const
os << code << breakln << "\\end{lstlisting}\n";
}
- if (encoding_switched){
+ if (encoding_switched) {
// Switch back
switchEncoding(os.os(), buffer().params(),
runparams, *save_enc, true, true);
-if (!isInline)
-// Go out of vertical mode. Otherwise \egroup
-// causes a paragraph break (#12821)
-os << "\\leavevmode";
+ if (!isInline)
+ // Go out of vertical mode. Otherwise \egroup
+ // causes a paragraph break (#12821)
+ os << "\\leavevmode";
os << "\\egroup" << breakln;
runparams.encoding = save_enc;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update tex2lyx tests
commit f208f180223aa0418cdb7c86619cdf9fa8255962 Author: Scott Kostyshak Date: Wed Jun 21 14:38:23 2023 -0400 Update tex2lyx tests Update the test files after the last format change (c3f98d1f). --- src/tex2lyx/test/CJK.lyx.lyx |2 +- src/tex2lyx/test/CJKutf8.lyx.lyx |2 +- src/tex2lyx/test/DummyDocument.lyx.lyx |2 +- src/tex2lyx/test/Dummy~Document.lyx.lyx|2 +- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +- src/tex2lyx/test/algo2e.lyx.lyx|2 +- src/tex2lyx/test/beamer.lyx.lyx|2 +- .../test/box-color-size-space-align.lyx.lyx|2 +- src/tex2lyx/test/listpreamble.lyx.lyx |2 +- src/tex2lyx/test/tabular-x-test.lyx.lyx|2 +- src/tex2lyx/test/test-insets-basic.lyx.lyx |2 +- src/tex2lyx/test/test-insets.lyx.lyx |2 +- src/tex2lyx/test/test-memoir.lyx.lyx |2 +- src/tex2lyx/test/test-minted.lyx.lyx |2 +- src/tex2lyx/test/test-modules.lyx.lyx |2 +- src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|2 +- src/tex2lyx/test/test-scr.lyx.lyx |2 +- src/tex2lyx/test/test-structure.lyx.lyx|2 +- src/tex2lyx/test/test.lyx.lyx |2 +- src/tex2lyx/test/verbatim.lyx.lyx |2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 884553b..12fc913 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx index eac7f50..0e0155d 100644 --- a/src/tex2lyx/test/CJKutf8.lyx.lyx +++ b/src/tex2lyx/test/CJKutf8.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx index 12be303..c335ab5 100644 --- a/src/tex2lyx/test/DummyDocument.lyx.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx index 3ad3bfd..9110eb4 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 47ba3a9..65a7384 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index c1fb6f2..abd1e0d 100644 --- a/src/tex2lyx/test/algo2e.lyx.lyx +++ b/src/tex2lyx/test/algo2e.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx index b3fafa0..312e500 100644 --- a/src/tex2lyx/test/beamer.lyx.lyx +++ b/src/tex2lyx/test/beamer.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index 9e0d06e..b51e65e 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx b/src/tex2lyx/test/listpreamble.lyx.lyx index c36e285..e3c62fb 100644 --- a/src/tex2lyx/test/listpreamble.lyx.lyx +++ b/src/tex2lyx/test/listpreamble.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat 616 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/tabular-x-test.lyx.lyx b/src/tex2lyx/test/tabular-x-test.lyx.lyx index d592af3..e8c6795 100644 --- a/src/tex2lyx/test/tabular-x-test.lyx.lyx +++ b/src/tex2lyx/test/tabular-x-test.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 615 +\lyxformat
[LyX/master] Add "override" to fix warning
commit f14384ff91d49255543ac458767e94a59bae6c43 Author: Scott Kostyshak Date: Mon Jun 19 14:46:05 2023 -0400 Add "override" to fix warning Otherwise we get the following warning: src/frontends/qt/InsertTableWidget.h:44:7: error: 'hideEvent' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override] void hideEvent(QHideEvent * event); ^ Amends ca5a75b2. --- src/frontends/qt/InsertTableWidget.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt/InsertTableWidget.h b/src/frontends/qt/InsertTableWidget.h index 4917392..e5d7648 100644 --- a/src/frontends/qt/InsertTableWidget.h +++ b/src/frontends/qt/InsertTableWidget.h @@ -41,7 +41,7 @@ protected Q_SLOTS: void mouseReleaseEvent(QMouseEvent *) override; void mousePressEvent(QMouseEvent *) override; void paintEvent(QPaintEvent *) override; - void hideEvent(QHideEvent * event); + void hideEvent(QHideEvent * event) override; private: //! update the geometry -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remove the mathed "BUGS" file (#3493)
commit eac460e4381b7ccf657f4a56755812cd42b4e821 Author: Scott Kostyshak Date: Thu Jun 15 05:11:32 2023 -0400 Remove the mathed "BUGS" file (#3493) Jürgen cleaned up the previous contents of this "BUGS" file. What was left (before the rm in this commit) had been written in 2001 at 2dd1a460, and it is not clear if it is still relevant. --- src/mathed/BUGS | 15 --- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/src/mathed/BUGS b/src/mathed/BUGS deleted file mode 100644 index 7e444e2..000 --- a/src/mathed/BUGS +++ /dev/null @@ -1,15 +0,0 @@ -Álvaro Tejero Cantero - - Flattening macros. Sometimes it's annoying the fact that once you have - written a macro, you can't touch at it's "constant parts". I call flattening - to the process of substituting all macros with LaTeX code. - - Task: designing a macro substitution system that reads from a file - (possibly the same file as the document's) the macros and parses the document - doing the appropriate replacements - - This is very useful, because sometimes you have a big expression in a macro - and you want to change an index only. What do you do then?. You retype - everything (perhaps several times in the document) or you create extremely - generic and parametrizable macros that aren't very fast to fill in the - majority of cases. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix margins and spacing of InsetParamsUI
commit c13c95997402ae9c82ba3e5a13aac8006ff13476
Author: Daniel Ramoeller
Date: Thu Jun 15 07:18:31 2023 +0200
Fix margins and spacing of InsetParamsUI
Fix for bug #12244.
---
src/frontends/qt/InsetParamsDialog.cpp |4 ++
src/frontends/qt/ui/InsetParamsUi.ui | 73 +++
2 files changed, 39 insertions(+), 38 deletions(-)
diff --git a/src/frontends/qt/InsetParamsDialog.cpp
b/src/frontends/qt/InsetParamsDialog.cpp
index d2c0cae..67cbfdd 100644
--- a/src/frontends/qt/InsetParamsDialog.cpp
+++ b/src/frontends/qt/InsetParamsDialog.cpp
@@ -80,6 +80,8 @@ InsetParamsDialog::InsetParamsDialog(GuiView & lv,
InsetParamsWidget * widget)
widget->dialogTitle()), d(new Private)
{
setupUi(this);
+ // Remove margins since the widget is embedded in dialog which provides
them
+ widget->layout()->setContentsMargins(0, 0, 0, 0);
setInsetParamsWidget(widget);
immediateApplyCB->setChecked(false);
synchronizedCB->setChecked(true);
@@ -87,6 +89,8 @@ InsetParamsDialog::InsetParamsDialog(GuiView & lv,
InsetParamsWidget * widget)
setFocusProxy(widget);
newPB = buttonBox->addButton(qt_("Ne Inset"),
QDialogButtonBox::ActionRole);
+ // fix height to minimum
+ setFixedHeight(sizeHint().height());
}
InsetParamsDialog::~InsetParamsDialog()
diff --git a/src/frontends/qt/ui/InsetParamsUi.ui
b/src/frontends/qt/ui/InsetParamsUi.ui
index af6312f..c7e6ee1 100644
--- a/src/frontends/qt/ui/InsetParamsUi.ui
+++ b/src/frontends/qt/ui/InsetParamsUi.ui
@@ -7,7 +7,7 @@
0
0
484
-108
+104
@@ -17,31 +17,41 @@
Inset Parameter Configuration
-
+
+12
+
+
- 0
+ 1
-
-
-
- Qt::Horizontal
+
+
+
+
QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset
-
-
- 31
- 31
-
-
-
+
-
+
+
+
+Qt::Horizontal
+
+
+
+ 0
+ 0
+
+
+
+
+
Update dialog when moving context
@@ -66,31 +76,18 @@
-
-
-
- 6
-
-
- 0
-
-
- 0
-
-
- 0
+
+
+
+ Qt::Vertical
-
- 0
+
+
+ 20
+ 10
+
-
-
-
-
QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset
-
-
-
-
+
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix for HiDPI logo in About
commit 7371a99256825b144ee1960e5ca5016700d39a56
Author: Daniel Ramoeller
Date: Sat Mar 11 17:58:35 2023 +0100
Fix for HiDPI logo in About
Fix for #12322.
---
src/frontends/qt/GuiAbout.cpp | 12 +++-
src/frontends/qt/ui/AboutUi.ui | 19 +--
2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/frontends/qt/GuiAbout.cpp b/src/frontends/qt/GuiAbout.cpp
index 539739b..325801c 100644
--- a/src/frontends/qt/GuiAbout.cpp
+++ b/src/frontends/qt/GuiAbout.cpp
@@ -340,12 +340,14 @@ GuiAbout::GuiAbout(GuiView & lv)
d->ui.copyrightTB->append(disclaimer());
d->ui.versionLA->setText(version());
- QPixmap icon = getPixmap("images/", "lyx", "svg,png");
int const iconsize = d->ui.versionLA->height() * 1.5;
- d->ui.iconLA->setPixmap(icon.scaled(iconsize, iconsize,
- Qt::IgnoreAspectRatio,
- Qt::SmoothTransformation));
- d->ui.iconLA->setFixedWidth(iconsize);
+ QString path = "images/";
+ QString name = "lyx";
+ QString ext = "svg";
+ FileName fname = imageLibFileSearch(path, name, ext,
theGuiApp()->imageSearchMode());
+ QString fpath = toqstr(fname.absFileName());
+ d->ui.iconSW->load(fpath);
+ d->ui.iconSW->setFixedSize(iconsize, iconsize);
d->ui.dirLibraryLA->setText(dirLibrary());
d->ui.dirLibraryLA->adjustSize();
d->ui.dirUserLA->setText(dirUser());
diff --git a/src/frontends/qt/ui/AboutUi.ui b/src/frontends/qt/ui/AboutUi.ui
index bce7593..bd44510 100644
--- a/src/frontends/qt/ui/AboutUi.ui
+++ b/src/frontends/qt/ui/AboutUi.ui
@@ -33,22 +33,13 @@
QLayout::SetFixedSize
-
-
-
- 0
- 0
-
-
+
80
80
-
-LyX Icon
-
@@ -398,6 +389,14 @@
+
+
+ QSvgWidget
+ QWidget
+ QSvgWidget.h
+ 1
+
+
qt_i18n.h
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit 67ff56c63af67b5897c18f22aeb206d8387b086a
Author: Scott Kostyshak
Date: Tue Jun 13 04:32:34 2023 -0400
Whitespace
---
src/insets/InsetHyperlink.cpp |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/insets/InsetHyperlink.cpp b/src/insets/InsetHyperlink.cpp
index a0c504c..dcdcbbb 100644
--- a/src/insets/InsetHyperlink.cpp
+++ b/src/insets/InsetHyperlink.cpp
@@ -94,9 +94,9 @@ void InsetHyperlink::doDispatch(Cursor & cur, FuncRequest &
cmd)
{
// Ctrl + click: open hyperlink
if (cmd.action() == LFUN_MOUSE_RELEASE && cmd.modifier() ==
ControlModifier) {
- lyx::dispatch(FuncRequest(LFUN_INSET_EDIT));
- return;
- }
+ lyx::dispatch(FuncRequest(LFUN_INSET_EDIT));
+ return;
+ }
switch (cmd.action()) {
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remove ellipsis from "End Edit Externally..."
commit d957afdb64325d1ae4cbbee4a6d9b5055dae3b8f Author: Daniel Ramoeller Date: Wed May 17 20:26:32 2023 +0200 Remove ellipsis from "End Edit Externally..." Fix for bug #12780 --- lib/ui/stdcontext.inc |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 0b0d32f..b594814 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -371,7 +371,7 @@ Menuset spellingsuggestions Separator OptItem "Edit Externally..." "inset-edit" - OptItem "End Editing Externally..." "inset-end-edit" + OptItem "End Editing Externally" "inset-end-edit" Separator Item "Cut" "cut" Item "Copy" "copy" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Simplify Quotation/Quote style
commit 5556cb3d3f8d39fdb5811a8002ad3c706c3edc7c Author: Daniel Ramoeller Date: Sun Apr 16 09:47:35 2023 +0200 Simplify Quotation/Quote style Fix for bug #12745 --- lib/layouts/stdlayouts.inc | 37 +++-- 1 files changed, 11 insertions(+), 26 deletions(-) diff --git a/lib/layouts/stdlayouts.inc b/lib/layouts/stdlayouts.inc index 96fca4a..c1aded1 100644 --- a/lib/layouts/stdlayouts.inc +++ b/lib/layouts/stdlayouts.inc @@ -9,31 +9,6 @@ Format 99 -Style Quotation - Category MainText - MarginStatic - LatexType Environment - LatexName quotation - NextNoIndent 1 - ToggleIndent Always - LeftMarginMMM - RightMargin MMM - ParIndent MM - ParSkip 0 - ItemSep 0 - TopSep0.5 - BottomSep 0.5 - ParSep0 - Align Block - AlignPossible Block, Left, Right, Center - HTMLTag blockquote - HTMLItem div - DocBookWrapperTag blockquote - DocBookWrapperMergeWithPrevioustrue - DocBookTagpara -End - - Style Quote Category MainText MarginStatic @@ -48,7 +23,6 @@ Style Quote BottomSep 0.5 Align Block AlignPossible Block, Left, Right, Center - LabelType No_Label HTMLTag blockquote HTMLItem div DocBookWrapperTag blockquote @@ -57,6 +31,17 @@ Style Quote End +Style Quotation + CopyStyle Quote + LatexName quotation + ToggleIndent Always + ParIndent MM + ParSkip 0 + ItemSep 0 + ParSep0 +End + + Style Verse # LaTeX type is first dynamic because of LaTeX implementation. # In LyX this does not make sense. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix compiler warning about unused string consts
commit 1dc55bd88b9671ade0b3ad84fcbd992db1c66ca3 Author: Scott Kostyshak Date: Wed Apr 26 14:03:57 2023 -0400 Fix compiler warning about unused string consts These trigger a warning with Clang: src/Session.cpp:34:14: error: unused variable 'sec_session' [-Werror,-Wunused-const-variable] string const sec_session = "[session info]"; ^ src/Session.cpp:35:14: error: unused variable 'sec_toolbars' [-Werror,-Wunused-const-variable] string const sec_toolbars = "[toolbars]"; ^ --- src/Session.cpp |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Session.cpp b/src/Session.cpp index d79a5a0..9ec18f1 100644 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -31,11 +31,12 @@ string const sec_lastfiles = "[recent files]"; string const sec_lastfilepos = "[cursor positions]"; string const sec_lastopened = "[last opened files]"; string const sec_bookmarks = "[bookmarks]"; -string const sec_session = "[session info]"; -string const sec_toolbars = "[toolbars]"; string const sec_lastcommands = "[last commands]"; string const sec_authfiles = "[auth files]"; string const sec_shellescape = "[shell escape files]"; +// currently unused: +//string const sec_session = "[session info]"; +//string const sec_toolbars = "[toolbars]"; } // namespace -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: move #12734 testfile thanks to fix
commit 8490b3e73b751b6f3c2107383f5627a681c2d853
Author: Scott Kostyshak
Date: Sat Apr 15 07:43:33 2023 -0400
ctests: move #12734 testfile thanks to fix
Categorize a 'lyxbugs' testfile as fixed thanks to a15bc829.
---
.../latex/lyxbugs-resolved/12734-unicode-math.lyx | 102
.../export/latex/lyxbugs/12734-unicode-math.lyx| 102
development/autotests/invertedTests|3 -
3 files changed, 102 insertions(+), 105 deletions(-)
diff --git a/autotests/export/latex/lyxbugs-resolved/12734-unicode-math.lyx
b/autotests/export/latex/lyxbugs-resolved/12734-unicode-math.lyx
new file mode 100644
index 000..c063d37
--- /dev/null
+++ b/autotests/export/latex/lyxbugs-resolved/12734-unicode-math.lyx
@@ -0,0 +1,102 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 615
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language english
+\language_package default
+\inputencoding auto-legacy
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "default"
+\font_default_family default
+\use_non_tex_fonts true
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype true
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Formula
+\[
+\overrightarrow{\mathscr{P}}
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/autotests/export/latex/lyxbugs/12734-unicode-math.lyx
b/autotests/export/latex/lyxbugs/12734-unicode-math.lyx
deleted file mode 100644
index c063d37..000
--- a/autotests/export/latex/lyxbugs/12734-unicode-math.lyx
+++ /dev/null
@@ -1,102 +0,0 @@
-#LyX 2.4 created this file. For more info see https://www.lyx.org/
-\lyxformat 615
-\begin_document
-\begin_header
-\save_transient_properties true
-\origin unavailable
-\textclass article
-\use_default_options true
-\maintain_unincluded_children no
-\language english
-\language_package default
-\inputencoding auto-legacy
-\fontencoding auto
-\font_roman "default" "default"
-\font_sans "default" "default"
-\font_typewriter "default" "default"
-\font_math "auto" "default"
-\font_default_family default
-\use_non_tex_fonts true
-\font_sc false
-\font_roman_osf false
-\font_sans_osf false
-\font_typewriter_osf false
-\font_sf_scale 100 100
-\font_tt_scale 100 100
-\use_microtype true
-\use_dash_ligatures true
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command default
-\index_command default
-\float_placement class
-\float_alignment class
-\paperfontsize default
-\spacing single
-\use_hyperref false
-\papersize default
-\use_geometry false
-\use_package amsmath 1
-\use_package amssymb 1
-\use_package cancel 1
-\use_package esint 0
-\use_package mathdots 1
-\use_package mathtools 1
-\use_package mhchem 1
-\use_package stackrel 1
-\use_package stmaryrd 1
-\use_package undertilde 1
-\cite_engine basic
-\cite_engine_type default
-\biblio_style plain
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\justification true
-\use_refstyle 1
-\use_minted 0
-\use_lineno 0
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation indent
-\paragraph_indentation default
-\is_mat
[LyX/master] ctests: test file for #12734
commit a5ebeb3b466fd5aa9cb07942bf5296481515a427
Author: Scott Kostyshak
Date: Tue Apr 11 23:44:49 2023 -0400
ctests: test file for #12734
---
.../export/latex/lyxbugs/12734-unicode-math.lyx| 102
development/autotests/invertedTests|3 +
2 files changed, 105 insertions(+), 0 deletions(-)
diff --git a/autotests/export/latex/lyxbugs/12734-unicode-math.lyx
b/autotests/export/latex/lyxbugs/12734-unicode-math.lyx
new file mode 100644
index 000..c063d37
--- /dev/null
+++ b/autotests/export/latex/lyxbugs/12734-unicode-math.lyx
@@ -0,0 +1,102 @@
+#LyX 2.4 created this file. For more info see https://www.lyx.org/
+\lyxformat 615
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\maintain_unincluded_children no
+\language english
+\language_package default
+\inputencoding auto-legacy
+\fontencoding auto
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "auto" "default"
+\font_default_family default
+\use_non_tex_fonts true
+\font_sc false
+\font_roman_osf false
+\font_sans_osf false
+\font_typewriter_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype true
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
+\float_placement class
+\float_alignment class
+\paperfontsize default
+\spacing single
+\use_hyperref false
+\papersize default
+\use_geometry false
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\use_lineno 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tablestyle default
+\tracking_changes false
+\output_changes false
+\change_bars false
+\postpone_fragile_content false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\docbook_table_output 0
+\docbook_mathml_prefix 1
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Formula
+\[
+\overrightarrow{\mathscr{P}}
+\]
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index c1011e8..23d7f03 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -88,6 +88,9 @@ export/export/latex/languages/nested-inputenc_auto-legacy_pdf2
# - This test is usually inverted, but it works with the DocBook backend.
!export/export/latex/lyxbugs/3059-language-in-tables_docbook5
!export/export/latex/lyxbugs/12708-refstyle-amsmath_docbook5
+# - The issue is only with XeTeX
+!export/export/latex/lyxbugs/12734-unicode-math_(docbook5|dvi|pdf[235]).*
+!export/export/latex/lyxbugs/12734-unicode-math_pdf
#
Sublabel: lyxbugs
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: add a test file for #12708
commit 3a9bd795369bfaf7170ca57f43d1b43667c00575
Author: Scott Kostyshak
Date: Tue Apr 11 22:52:40 2023 -0400
ctests: add a test file for #12708
The file is taken from #12727 which is a duplicate.
---
.../latex/lyxbugs/12708-refstyle-amsmath.lyx | 123
development/autotests/invertedTests|1 +
2 files changed, 124 insertions(+), 0 deletions(-)
diff --git a/autotests/export/latex/lyxbugs/12708-refstyle-amsmath.lyx
b/autotests/export/latex/lyxbugs/12708-refstyle-amsmath.lyx
new file mode 100644
index 000..d105038
--- /dev/null
+++ b/autotests/export/latex/lyxbugs/12708-refstyle-amsmath.lyx
@@ -0,0 +1,123 @@
+#LyX 2.3 created this file. For more info see http://www.lyx.org/
+\lyxformat 544
+\begin_document
+\begin_header
+\save_transient_properties true
+\origin unavailable
+\textclass article
+\use_default_options true
+\begin_modules
+theorems-ams
+\end_modules
+\maintain_unincluded_children false
+\language english
+\language_package default
+\inputencoding auto
+\fontencoding global
+\font_roman "default" "default"
+\font_sans "default" "default"
+\font_typewriter "default" "default"
+\font_math "libertine-ntxm" "auto"
+\font_default_family default
+\use_non_tex_fonts false
+\font_sc false
+\font_osf false
+\font_sf_scale 100 100
+\font_tt_scale 100 100
+\use_microtype false
+\use_dash_ligatures true
+\graphics default
+\default_output_format default
+\output_sync 1
+\bibtex_command default
+\index_command default
+\paperfontsize default
+\spacing single
+\use_hyperref true
+\pdf_bookmarks true
+\pdf_bookmarksnumbered false
+\pdf_bookmarksopen false
+\pdf_bookmarksopenlevel 1
+\pdf_breaklinks true
+\pdf_pdfborder true
+\pdf_colorlinks true
+\pdf_backref false
+\pdf_pdfusetitle true
+\pdf_quoted_options "allcolors=blue"
+\papersize default
+\use_geometry true
+\use_package amsmath 1
+\use_package amssymb 1
+\use_package cancel 1
+\use_package esint 1
+\use_package mathdots 1
+\use_package mathtools 1
+\use_package mhchem 1
+\use_package stackrel 1
+\use_package stmaryrd 1
+\use_package undertilde 1
+\cite_engine basic
+\cite_engine_type default
+\biblio_style plain
+\use_bibtopic false
+\use_indices false
+\paperorientation portrait
+\suppress_date false
+\justification true
+\use_refstyle 1
+\use_minted 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
+\leftmargin 1.5in
+\topmargin 1in
+\rightmargin 1.5in
+\bottommargin 1in
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation indent
+\paragraph_indentation default
+\is_math_indent 0
+\math_numbering_side default
+\quotes_style english
+\dynamic_quotes 0
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Formula
+\begin{align}
+x & =2\label{eq:x}\\
+y & =3\label{eq:y}
+\end{align}
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset CommandInset ref
+LatexCommand formatted
+reference "eq:x"
+plural "false"
+caps "false"
+noprefix "false"
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index 908d8bb..c1011e8 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -87,6 +87,7 @@ export/export/latex/languages/nested-inputenc_auto-legacy_pdf2
# - This test is usually inverted, but it works with the DocBook backend.
!export/export/latex/lyxbugs/3059-language-in-tables_docbook5
+!export/export/latex/lyxbugs/12708-refstyle-amsmath_docbook5
#
Sublabel: lyxbugs
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 1dc66608
commit 7368e5be2be2c24f5cb363443d86c72973bd2719
Author: Scott Kostyshak
Date: Mon Apr 10 13:10:11 2023 -0400
Amend 1dc66608
Declare override, otherwise we get the following warning:
src/insets/InsetListings.h:42:7: error: 'isEnvironment' overrides a member
function but is not marked 'override' [-Werror,-Winconsistent-missing-override]
bool isEnvironment() const { return !params().isInline(); }
^
src/insets/Inset.h:606:15: note: overridden virtual function is here
virtual bool isEnvironment() const { return getLayout().latextype()
== InsetLaTeXType::ENVIRONMENT; }
^
1 error generated.
---
src/insets/InsetListings.h |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/insets/InsetListings.h b/src/insets/InsetListings.h
index 080b7b7..d75f968 100644
--- a/src/insets/InsetListings.h
+++ b/src/insets/InsetListings.h
@@ -39,7 +39,7 @@ public:
///
static std::string params2string(InsetListingsParams const &);
///
- bool isEnvironment() const { return !params().isInline(); }
+ bool isEnvironment() const override { return !params().isInline(); }
private:
///
bool isLabeled() const override { return true; }
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend d0a83d33
commit e3288b4b4a3649c030fa679c5edbdda9a08b8e98
Author: Scott Kostyshak
Date: Mon Apr 10 13:03:19 2023 -0400
Amend d0a83d33
---
lib/layouts/heb-article.layout |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/layouts/heb-article.layout b/lib/layouts/heb-article.layout
index 5281c26..1fbe690 100644
--- a/lib/layouts/heb-article.layout
+++ b/lib/layouts/heb-article.layout
@@ -98,7 +98,7 @@ End
Style Remarks
CopyStyle Theorem
LatexName remark
- LabelString "הערות \thetheorem."
+ LabelString "Remarks \thetheorem."
Preamble
\newtheorem{remark}[theorem]{הערה}
EndPreamble
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert tests thanks to microtype update
commit 21d9bcb5619ff2f23c1089caf5ddfd0eaaaf869f Author: Scott Kostyshak Date: Tue Apr 4 23:37:55 2023 -0400 ctests: uninvert tests thanks to microtype update microtype version 3.1 somehow fixed an issue that was affecting these exports and the exports now succeed. For more information, see here: https://github.com/schlcht/microtype/issues/21#issuecomment-1496803268 --- development/autotests/invertedTests |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 09caddd..908d8bb 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -309,10 +309,6 @@ export/templates/Obsolete/.*American_Geophysical_Union.*_(lyx22|lyx23|pdf|dvi).* export/templates/Obsolete/.*American_Geophysical_Union.*_(lyx22|lyx23|pdf|dvi).* -# Fails starting with microtype version v3.0e -# https://github.com/schlcht/microtype/issues/21 -export/templates/Articles/Hebrew_Article_.*(dvi|pdf|pdf2|pdf3) - # https://github.com/gsilano/EuropeCV/pull/33 export/examples/(|es/)Curricula_Vitae/Europe_CV_(pdf.*|dvi|lyx22|lyx23) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix a comment
commit f521c05ae64a9b612474cdf06b54948ab69801ea Author: Scott Kostyshak Date: Tue Apr 4 15:28:01 2023 -0400 Fix a comment --- development/autotests/unreliableTests |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests index 7ec7258..a48d714 100644 --- a/development/autotests/unreliableTests +++ b/development/autotests/unreliableTests @@ -155,7 +155,7 @@ export/examples/ar/Presentations/Beamer_.*_systemF export/.*/he/.*(dvi3|pdf5)_systemF export/export/latex/languages/supported-languages_(dvi3|pdf5)_systemF -Fails with TL19 but solved in TL20 +# Fails with TL19 but solved in TL20 # Babel with non-TeX fonts fails for some supported languages # Lithuanian: L7x font encoding also set with LuaTeX and non-TeX fonts -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: do not mark Hebrew + Lua as unreliable
commit 5d853e55addedb756c5e6889c7cc942d7460cc4f Author: Scott Kostyshak Date: Tue Apr 4 15:28:45 2023 -0400 ctests: do not mark Hebrew + Lua as unreliable The referenced terminal message no longer appears. The upstream polyglossia issue has been fixed: https://github.com/reutenauer/polyglossia/issues/337 --- development/autotests/unreliableTests |4 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/development/autotests/unreliableTests b/development/autotests/unreliableTests index a48d714..34394da 100644 --- a/development/autotests/unreliableTests +++ b/development/autotests/unreliableTests @@ -151,10 +151,6 @@ export/.*/fa/Welcome_(dvi3|pdf5)_systemF # Beamer fails also with XeTeX export/examples/ar/Presentations/Beamer_.*_systemF -# terminal message: "Language hebrew not found in language.dat.lua" -export/.*/he/.*(dvi3|pdf5)_systemF -export/export/latex/languages/supported-languages_(dvi3|pdf5)_systemF - # Fails with TL19 but solved in TL20 # Babel with non-TeX fonts fails for some supported languages -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ja docs: restore \font_typewriter to IPAGothic
commit ffe5d61bb256745b81fb2b8a065def64034f5776 Author: Scott Kostyshak Date: Mon Feb 27 20:44:57 2023 -0500 ja docs: restore \font_typewriter to IPAGothic It had been (accidentally, I think) set to default at 723d3703. See 6656dd22 for why we set to IPAGothic. --- lib/doc/ja/Additional.lyx|2 +- lib/doc/ja/Customization.lyx |2 +- lib/doc/ja/LaTeXConfig.lyx |2 +- lib/doc/ja/UserGuide.lyx |2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index a98d53b..51957cb 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -105,7 +105,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index 331b2da..6bc715a 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -91,7 +91,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx index c104a26..98ff29e 100644 --- a/lib/doc/ja/LaTeXConfig.lyx +++ b/lib/doc/ja/LaTeXConfig.lyx @@ -13,7 +13,7 @@ \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index b15427f..99076b8 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -100,7 +100,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix equation numbers after row operation (#12665)
commit 83af3dfd2969e6dbe2b515aabfe5cf71c64cf6a8 Author: Scott Kostyshak Date: Wed Feb 22 11:12:56 2023 -0500 Fix equation numbers after row operation (#12665) After removing/adding rows, the corresponding equation numbers in the LyX display were not updated (although if you clicked outside the math inset they were). Now they are updated immediately after the operation. --- src/mathed/InsetMathGrid.cpp |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp index 0061bdd..65cd662 100644 --- a/src/mathed/InsetMathGrid.cpp +++ b/src/mathed/InsetMathGrid.cpp @@ -1550,6 +1550,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd) cur.undispatched(); break; } + cur.forceBufferUpdate(); // perhaps this should be FINISHED_BACKWARD -- just for clarity? //lyxerr << "returning FINISHED_LEFT" << endl; break; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] French docs: remove unicode thin spaces
commit 07a7e847d6d4af4b19d4daa5066b192cac2bc07f Author: Scott Kostyshak Date: Sat Feb 18 16:40:50 2023 -0500 French docs: remove unicode thin spaces Consistent with 9b20b33a and cb732ef5. --- lib/doc/fr/Customization.lyx |2 +- lib/doc/fr/UserGuide.lyx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 5e7587a..c2f78d4 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -327,7 +327,7 @@ Avertissement: \series default dans le document, - on utilise « graphique » en tant que raccourci de « objet graphique »: + on utilise «graphique» en tant que raccourci de «objet graphique»: graphique, diagramme, image, diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 8be88c7..8742d95 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -498,7 +498,7 @@ Avertissement: \series default dans le document, - on utilise « graphique » en tant que raccourci de « objet graphique »: + on utilise «graphique» en tant que raccourci de «objet graphique»: graphique, diagramme, image, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] fr EmbeddedObjects: fix comp with LuaTeX + babel
commit 9b20b33a3e54ee2c418a25fb7b78359c1da43b40 Author: Scott Kostyshak Date: Sat Feb 18 16:18:53 2023 -0500 fr EmbeddedObjects: fix comp with LuaTeX + babel This commit removes unicode thin space characters (unicode 2009). LuaTeX with polyglossia (the default) was compiling before, but this fixes LuaTeX with babel. XeTeX compilation (with both polyglossia and babel) still yields missing glyphs. Consistent with cb732ef5. --- lib/doc/fr/EmbeddedObjects.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index 1595539..304987f 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -491,7 +491,7 @@ Avertissement: \series default dans le document, - on utilise « graphique » en tant que raccourci de « objet graphique »: + on utilise «graphique» en tant que raccourci de «objet graphique»: graphique, diagramme, image, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert lyx2lyx tests expected to fail
commit caa7e6f6c8e4b09884e642a8ef5ae009b93b7976 Author: Scott Kostyshak Date: Fri Feb 17 10:17:51 2023 -0500 ctests: invert lyx2lyx tests expected to fail These tests are expected to fail, but are not really because of a bug. For more info see the comment in this commit. --- development/autotests/invertedTests | 25 + 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index e6e336e..09caddd 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -527,3 +527,28 @@ Sublabel: docbook beamer !export/templates/Presentations/Slides_docbook5 export/(examples|templates)/(ar|de|es|fr|ja|ru)/Presentations/.*_docbook5 export/(examples|templates)/Presentations/.*_docbook5 + +# == +Sublabel: expected +# These exports are expected to fail but don't necessarily indicate a bug. +# == + +# These fail because of the following warning: +# +# lyx2lyx warning: Can't find bibfiles for bibtex inset at line ! +# +# From Jürgen (https://www.mail-archive.com/search?l=mid=f6dad5b0596f33e6931ffa4ea4ca49390b5c1bf8.camel%40lyx.org): +# The bibtex inset in these files does not contain any bib file, so the +# warning is appropriate. I would not want to ditch the warning, as it +# makes sense to warn in this case. +# +# On the other hand I can see why it makes sense to include an empty +# inset to a template file. +# +# So this is probably a case where adjustment to please the tests would +# be over-optimization. +# +# Alternative to inverting them would be to just always ignore this warning in +# the ctests, but I think it might be useful in other cases. +# +export/templates/ja/(Articles|Books|Reports)/.*_lyx(16|20|21|22) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix \origin of newly added ja books and reports
commit 0784e080626f256156592885afa969a381059bdb Author: Scott Kostyshak Date: Thu Feb 16 12:07:51 2023 -0500 Fix \origin of newly added ja books and reports --- .../Japanese_Book_%28JS_Bundle_for_LuaTeX%29.lyx |2 +- ...panese_Book_%28Standard_Class_for_LuaTeX%29.lyx |2 +- ...ard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx |2 +- .../Japanese_Report_%28JS_Bundle_for_LuaTeX%29.lyx |2 +- ...nese_Report_%28Standard_Class_for_LuaTeX%29.lyx |2 +- ...ard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx |2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/templates/ja/Books/Japanese_Book_%28JS_Bundle_for_LuaTeX%29.lyx b/lib/templates/ja/Books/Japanese_Book_%28JS_Bundle_for_LuaTeX%29.lyx index b7c603c..c2a9ac0 100644 --- a/lib/templates/ja/Books/Japanese_Book_%28JS_Bundle_for_LuaTeX%29.lyx +++ b/lib/templates/ja/Books/Japanese_Book_%28JS_Bundle_for_LuaTeX%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Books/ \textclass ltjsreport \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%29.lyx b/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%29.lyx index d313b24..49e4d4b 100644 --- a/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%29.lyx +++ b/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Books/ \textclass ltjbook \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx b/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx index c2f4420..e2716d5 100644 --- a/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx +++ b/lib/templates/ja/Books/Japanese_Book_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Books/ \textclass ltjtbook \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Reports/Japanese_Report_%28JS_Bundle_for_LuaTeX%29.lyx b/lib/templates/ja/Reports/Japanese_Report_%28JS_Bundle_for_LuaTeX%29.lyx index 07cc10c..a75210d 100644 --- a/lib/templates/ja/Reports/Japanese_Report_%28JS_Bundle_for_LuaTeX%29.lyx +++ b/lib/templates/ja/Reports/Japanese_Report_%28JS_Bundle_for_LuaTeX%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Reports/ \textclass ltjsreport \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%29.lyx b/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%29.lyx index d26b748..339d7c0 100644 --- a/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%29.lyx +++ b/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Reports/ \textclass ltjreport \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx b/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx index 8200be1..6354f27 100644 --- a/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx +++ b/lib/templates/ja/Reports/Japanese_Report_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Reports/ \textclass ltjtreport \use_default_options true \maintain_unincluded_children no -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix \origin of newly added files
commit 8bf93b35a1b576a96ae0904cefcd86970f1a3b3a Author: Scott Kostyshak Date: Thu Feb 16 12:05:07 2023 -0500 Fix \origin of newly added files --- ...Japanese_Article_%28JS_Bundle_for_LuaTeX%29.lyx |2 +- ...ese_Article_%28Standard_Class_for_LuaTeX%29.lyx |2 +- ...ard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/templates/ja/Articles/Japanese_Article_%28JS_Bundle_for_LuaTeX%29.lyx b/lib/templates/ja/Articles/Japanese_Article_%28JS_Bundle_for_LuaTeX%29.lyx index b2be12b..4ca0c75 100644 --- a/lib/templates/ja/Articles/Japanese_Article_%28JS_Bundle_for_LuaTeX%29.lyx +++ b/lib/templates/ja/Articles/Japanese_Article_%28JS_Bundle_for_LuaTeX%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Articles/ \textclass ltjsarticle \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%29.lyx b/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%29.lyx index c5b54f3..06e228b 100644 --- a/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%29.lyx +++ b/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Articles/ \textclass ltjarticle \use_default_options true \maintain_unincluded_children no diff --git a/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx b/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx index 3a34336..ac7fab6 100644 --- a/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx +++ b/lib/templates/ja/Articles/Japanese_Article_%28Standard_Class_for_LuaTeX%2C_vertical_Writing%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/templates/ja/Articles/ \textclass ltjtarticle \use_default_options true \maintain_unincluded_children no -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Add layout format number of newly added file
commit 8887c4eddabd853c3f4502459f41aeea1a2185d9 Author: Scott Kostyshak Date: Thu Feb 16 12:00:21 2023 -0500 Add layout format number of newly added file Update it to 99. --- lib/layouts/japanese-vertical.inc |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/layouts/japanese-vertical.inc b/lib/layouts/japanese-vertical.inc index ffb2875..61eb858 100644 --- a/lib/layouts/japanese-vertical.inc +++ b/lib/layouts/japanese-vertical.inc @@ -6,6 +6,7 @@ # - tbook # - treport +Format 99 InsetLayout Flex:Rensuji LyxType custom LatexType Command @@ -18,6 +19,7 @@ InsetLayout Flex:Rensuji MenuString "Alignment" Tooltip "Insert 'c' for centering, 'r' for flushright and 'l' for flushleft" EndArgument + ResetsFont true End InsetLayout Flex:Rensuji* -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: invert unsupported exports of Armenia file
commit c0bca65635f170d330b0f27dccea13c4894d79e0 Author: Scott Kostyshak Date: Sat Feb 11 14:57:21 2023 -0500 ctests: invert unsupported exports of Armenia file This new example file is only expected to work with XeTeX and LuaTeX with system fonts. --- development/autotests/invertedTests |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 8a29b8e..e6e336e 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -316,6 +316,10 @@ export/templates/Articles/Hebrew_Article_.*(dvi|pdf|pdf2|pdf3) # https://github.com/gsilano/EuropeCV/pull/33 export/examples/(|es/)Curricula_Vitae/Europe_CV_(pdf.*|dvi|lyx22|lyx23) +# Armenian currently only works with XeTeX and LuaTeX and system fonts +export/examples/Language_Support/Writing_Armenian_(dvi|dvi3_texF|pdf|pdf2|pdf3|pdf5_texF) + + # Sublabel: externalissues # Export fails due to non-LaTeX external tool, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: adapt inverted & ignored to renamings
commit e54dedb49f4f027bf718d309a5a62b1c0a23012e Author: Scott Kostyshak Date: Sat Feb 11 14:44:47 2023 -0500 ctests: adapt inverted & ignored to renamings --- development/autotests/ignoredTests |7 --- development/autotests/invertedTests |2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests index f7b97d0..ff1c39e 100644 --- a/development/autotests/ignoredTests +++ b/development/autotests/ignoredTests @@ -127,11 +127,12 @@ export/export/latex/languages/ja[-_].*_(pdf2|texF) # For a discussion of alternatives for Japanese with LaTeX , see also # https://tex.stackexchange.com/questions/320021/xelatex-using-japanese-ldf-for-babel-causes-invalid-characters-errors # +export/examples/Language_Support/Mixing_Japanese_with_other_Languages_%28with_platex%29_pdf2 # Exceptions: # The "!" means: "Protect these tests from being matched by future patterns in this file". # Export by plain- and pdflatex engines works with language "japanese-cjk", e.g. -!export/examples/ja/Multilingual_Typesetting_with_CJK_(dvi|pdf[23]?) -!export/examples/ja/Multilingual_Typesetting_with_CJK_.*systemF +!export/examples/Language_Support/Mixing_Japanese_with_other_Languages_.*(dvi|pdf[23]?) +export/examples/Language_Support/Mixing_Japanese_with_other_Languages_.*systemF # the rest: export/.*/ja/.*_(pdf2|texF) @@ -151,7 +152,7 @@ export/export/latex/CJK/zh_CN-toc.*_dvi3_systemF # CJK fails (sometimes) with Xe/LuaTeX and 8-bit fonts: # -export/examples/ja/Multilingual_Typesetting_.*CJK.(dvi3|pdf5)_texF +export/examples/Language_Support/Mixing_Japanese_with_other_Languages_.*(dvi3|pdf5)_texF export/.*/(ko|zh_CN)/.*(dvi3|pdf[45])_texF export/export/latex/CJK/zh_CN-toc_*.(dvi3|pdf[45])_texF export/export/latex/CJK/en-de-el-ru-ko_utf8_.*_texF diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 8699504..8a29b8e 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -475,7 +475,7 @@ export/examples/Modules/Variable-width_Minipages_docbook5 # - Listing in LyX-Code, i.e. double . export/examples/es/Modules/Linguistics_docbook5 # - Inlines in inlines ( within ), double sidebar. -export/examples/ko/cjk-ko-doc_docbook5 +export/examples/ko/Language_Support/Writing_Korean_with_CJK-ko_docbook5 # - Metadata in abstract paragraph. export/templates/Articles/Springers_Global_Journal_Template_%28V._3%29_docbook5 # - Sweave impossible to implement. Broken references (no .bib file, still referenced in the text). -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests inverted: adapt to recent renaming
commit c0c5d0bc8042e2dee818f2bbd464e1b385e430a7 Author: Scott Kostyshak Date: Sat Feb 11 12:13:44 2023 -0500 ctests inverted: adapt to recent renaming --- development/autotests/invertedTests |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index eac3719..8699504 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -462,7 +462,7 @@ export/examples(|/es)/Curricula_Vitae/Modern_CV_docbook5 # - Chess: multicol not supported. export/examples/Modules/Chessboard_docbook5 # - Empty figure and table (just a caption, while DocBook requires some content). -export/examples/Localization_Test_docbook5 +export/examples/Language_Support/Localization_Test_%28for_Developers%29_docbook5 # - Inline equation in formatting. export/examples(|/ru)/Modules/Fancy_Colored_Boxes_docbook5 # - Waiting for a new version of DocBook to be tagged on https://github.com/docbook/docbook (anything over 5.2b10a3). -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix a layout error in newly added file
commit bb9ef421fdd178e06055fb6fbdad907ab10c49a7 Author: Scott Kostyshak Date: Wed Feb 8 13:11:34 2023 -0500 Fix a layout error in newly added file Fix the following terminal output: TextClass.cpp (850): Unable to remove counter: chapter --- lib/layouts/jlreq-article.layout |1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/lib/layouts/jlreq-article.layout b/lib/layouts/jlreq-article.layout index 6282bb4..9b3a899 100644 --- a/lib/layouts/jlreq-article.layout +++ b/lib/layouts/jlreq-article.layout @@ -18,5 +18,4 @@ Input article.layout Input jlreq-common.inc NoStyle Chapter -NoCounter chapter NoStyle Chapter* -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remove executable flag on some image files
commit 1ac7dfc17448b733d075d8e651c6f580dd8d61f2 Author: Scott Kostyshak Date: Wed Feb 8 11:59:40 2023 -0500 Remove executable flag on some image files --- lib/images/classic/toolbar-toggle_review.png | Bin 413 -> 413 bytes lib/images/oxygen/iconsize.png | Bin 191 -> 191 bytes lib/images/oxygen/toolbar-toggle_review.svgz | Bin 6149 -> 6149 bytes 3 files changed, 0 insertions(+), 0 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix layout font settings of newly added file
commit ba264ec485170b49d766732189bf602f8f672aea
Author: Scott Kostyshak
Date: Wed Feb 8 11:46:42 2023 -0500
Fix layout font settings of newly added file
Change "TextFont" to "Font". This fixes the following terminal
errors when opening the file:
LyX: Unknown InsetLayout tag [around line 247 of file
[layouts/jlreq-common.inc] current token: 'TextFont' context: '']
LyX: Unknown InsetLayout tag [around line 247 of file
[layouts/jlreq-common.inc] current token: 'Family' context: '']
LyX: Unknown InsetLayout tag [around line 248 of file
[layouts/jlreq-common.inc] current token: 'Typewriter' context: '']
LyX: Unknown InsetLayout tag [around line 249 of file
[layouts/jlreq-common.inc] current token: 'EndFont' context: '']
---
lib/layouts/jlreq-common.inc |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/layouts/jlreq-common.inc b/lib/layouts/jlreq-common.inc
index df4c8fc..55fd144 100644
--- a/lib/layouts/jlreq-common.inc
+++ b/lib/layouts/jlreq-common.inc
@@ -244,7 +244,7 @@ InsetLayout Flex:Warichu*
PassThru1
MultiPar1
ParbreakIgnored 1
- TextFont
+ Font
Family Typewriter
EndFont
HTMLLabel \arabic{footnote}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix a \origin of newly added file
commit afbf9dc6f7c260a25487583329aa9a55c55348d6 Author: Scott Kostyshak Date: Wed Feb 8 11:28:18 2023 -0500 Fix a \origin of newly added file --- .../Japanese_Article_%28JLReq_Class%29.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx b/lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx index 0ce8185..0e6c8e9 100644 --- a/lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx +++ b/lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx @@ -3,7 +3,7 @@ \begin_document \begin_header \save_transient_properties true -\origin unavailable +\origin /systemlyxdir/examples/ja/Articles/ \textclass jlreq-article \options tate, b5paper, sidenote_length=30mm \use_default_options true -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remove executable flag on newly added files
commit 2d6341cdb48eb1de01b1c1caf5c655203d1efd75 Author: Scott Kostyshak Date: Wed Feb 8 11:22:54 2023 -0500 Remove executable flag on newly added files --- 0 files changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx b/lib/examples/ja/Articles/Japanese_Article_%28JLReq_Class%29.lyx old mode 100755 new mode 100644 diff --git a/lib/layouts/jlreq-common.inc b/lib/layouts/jlreq-common.inc old mode 100755 new mode 100644 -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert JSS exports
commit 4b8b5bc252303022d1bd55acae9d185ea514f96c
Author: Scott Kostyshak
Date: Mon Jan 30 20:59:08 2023 -0500
ctests: uninvert JSS exports
The Journal of Statistical Software exports now succeed. An update
must have fixed the core issue.
---
development/autotests/invertedTests | 11 ---
1 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/development/autotests/invertedTests
b/development/autotests/invertedTests
index 0aad5eb..eac3719 100644
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -287,17 +287,6 @@
export/export/latex/languages/uk-babel-date-missing-chars-with-ascii_pdf5_texF
# \RequirePackage[2020-02-02]{latexrelease}
export/templates/Articles/Journal_of_the_Acoustical_Society_of_America_%28JASA%29.*(dvi|pdf|lyx22|lyx23).*
-# The new jss.cls (version 3.1) seems to not work with an updated TL20 (for
-# either the template they provide or our LyX template).
-# I expect this to be fixed with an update of the .cls or TL update.
-# On an updated TL20, I (Scott) currently get the following error:
-#
-# ! Undefined control sequence.
-# \hyper@linkurl ...tionraw >>}\relax \Hy@colorlink
-# \@urlcolor
#1\Hy@xspace@en...
-#
-export/templates/Articles/Journal_of_Statistical_Software_%28JSS%29_version_2_(lyx22|lyx23|pdf2)
-
# These fail on updated TL 2020 after an update to "babel-greek" because of
# missing symbols. I (Scott) checked the output of an older TL system and
# indeed the output looks good (no missing symbols). This issue was reported
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix more ja documents for LuaTeX/XeTeX + systemF
commit 795d5c408d9aebd424543aee4189171a486e975c Author: Scott Kostyshak Date: Mon Jan 30 12:53:25 2023 -0500 Fix more ja documents for LuaTeX/XeTeX + systemF I used the following command inside the ja directories, and confirmed the diff manually: git ls-files -z | xargs -0 sed -i -e 's/\\font_typewriter "default" "default"/\\font_typewriter "default" "IPAGothic"/' These changes are consistent with 6656dd22. --- development/autotests/invertedTests|4 ++-- lib/doc/ja/Additional.lyx |2 +- lib/doc/ja/DummyDocument1.lyx |2 +- lib/doc/ja/DummyDocument2.lyx |2 +- lib/doc/ja/Formula-numbering.lyx |2 +- lib/doc/ja/LaTeXConfig.lyx |2 +- lib/doc/ja/Math.lyx|2 +- lib/doc/ja/MergedManuals.lyx |2 +- lib/doc/ja/Shortcuts.lyx |2 +- lib/doc/ja/UserGuide.lyx |2 +- .../ja/Graphics_and_Insets/Feynman_Diagrams.lyx|2 +- lib/examples/ja/Graphics_and_Insets/XY-Pic.lyx |2 +- lib/examples/ja/Modules/Braille.lyx|2 +- lib/examples/ja/Modules/LilyPond_Book.lyx |2 +- lib/examples/ja/Modules/Multilingual_Captions.lyx |2 +- lib/examples/ja/Modules/Rnw_%28knitr%29.lyx|2 +- lib/examples/ja/Modules/Sweave.lyx |2 +- lib/examples/ja/Presentations/Beamer.lyx |2 +- lib/examples/ja/Welcome.lyx|2 +- lib/templates/ja/Presentations/Beamer.lyx |2 +- 20 files changed, 21 insertions(+), 21 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 31d591d..0aad5eb 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -65,12 +65,12 @@ export/export/latex/unicodesymbols/031-thai_th_(euc-|gbk|jis|utf8-cjk).* # Package clashes when Japanese documents are compiled with non-TeX fonts, # -export/doc/ja/(Additional|LaTeXConfig|Math|UserGuide).*_systemF +export/doc/ja/(Additional|Math|UserGuide).*_systemF export/doc/ja/(Formula-numbering|EmbeddedObjects)_pdf4_systemF # Test for command \pdfsave fails: # ! Package xypdf Error: pdfTeX version 1.40.0 or higher is needed for the xypdf -export/examples/ja/Graphics_and_Insets/XY-Pic.*_systemF +export/examples/ja/Graphics_and_Insets/XY-Pic.*_pdf5_systemF # Does this still fail in TL19? What is the error? export/.*/fa/Welcome_(dvi3|pdf5)_systemF diff --git a/lib/doc/ja/Additional.lyx b/lib/doc/ja/Additional.lyx index 17312cb..6ee6015 100644 --- a/lib/doc/ja/Additional.lyx +++ b/lib/doc/ja/Additional.lyx @@ -105,7 +105,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/DummyDocument1.lyx b/lib/doc/ja/DummyDocument1.lyx index da2d7ab..b5573ef 100644 --- a/lib/doc/ja/DummyDocument1.lyx +++ b/lib/doc/ja/DummyDocument1.lyx @@ -19,7 +19,7 @@ \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/DummyDocument2.lyx b/lib/doc/ja/DummyDocument2.lyx index 52cc03a..cbb3ee1 100644 --- a/lib/doc/ja/DummyDocument2.lyx +++ b/lib/doc/ja/DummyDocument2.lyx @@ -19,7 +19,7 @@ \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/Formula-numbering.lyx b/lib/doc/ja/Formula-numbering.lyx index dcaaec5..1be34d4 100644 --- a/lib/doc/ja/Formula-numbering.lyx +++ b/lib/doc/ja/Formula-numbering.lyx @@ -54,7 +54,7 @@ \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/LaTeXConfig.lyx b/lib/doc/ja/LaTeXConfig.lyx index 38f0260..91b2bbb 100644 --- a/lib/doc/ja/
[LyX/master] Fix Embedded Objects comp with LuaTeX (systemF)
commit 479825fe097014ac92c2584adde4cae52aee7153
Author: Scott Kostyshak
Date: Mon Jan 30 12:22:25 2023 -0500
Fix Embedded Objects comp with LuaTeX (systemF)
Thanks to Jürgen.
---
lib/doc/ja/EmbeddedObjects.lyx |2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx
index 2962e99..c6ecca7 100644
--- a/lib/doc/ja/EmbeddedObjects.lyx
+++ b/lib/doc/ja/EmbeddedObjects.lyx
@@ -9,8 +9,10 @@
%% Added by the translator
% Correction for PDF bookmarks
%\usepackage[dvipdfm,bookmarks=true,bookmarksnumbered=true,bookmarkstype=toc]{hyperref}
+\ifpdftex
\ifnum 42146=\euc"A4A2 \AtBeginDvi{\special{pdf:tounicode EUC-UCS2}}\else
\AtBeginDvi{\special{pdf:tounicode 90ms-RKSJ-UCS2}}\fi
+\fi
% that links to image floats jumps
% to the beginning of the float and
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert ja XeLaTeX exports that work now
commit 4e9f66041133f96ee8cc68532ab4dfa5263f4a60 Author: Scott Kostyshak Date: Mon Jan 30 11:54:36 2023 -0500 ctests: uninvert ja XeLaTeX exports that work now These exports now work thanks to the font fix at 6656dd22. --- development/autotests/invertedTests |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 1fa9941..31d591d 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -66,7 +66,7 @@ export/export/latex/unicodesymbols/031-thai_th_(euc-|gbk|jis|utf8-cjk).* # Package clashes when Japanese documents are compiled with non-TeX fonts, # export/doc/ja/(Additional|LaTeXConfig|Math|UserGuide).*_systemF -export/doc/ja/(Formula-numbering|Customization|EmbeddedObjects|Intro)_pdf4_systemF +export/doc/ja/(Formula-numbering|EmbeddedObjects)_pdf4_systemF # Test for command \pdfsave fails: # ! Package xypdf Error: pdfTeX version 1.40.0 or higher is needed for the xypdf -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Set typewriter fonts for ja docs
commit 6656dd2275302080204deae0e4e24d27edf6d4d7 Author: Scott Kostyshak Date: Sun Jan 29 23:22:51 2023 -0500 Set typewriter fonts for ja docs This fixes compilation with system fonts and LuaTeX for the Intro and Customization manuals, although Embedded Objects still has an error due to some preamble code. Thanks to Jürgen. --- lib/doc/ja/Customization.lyx |2 +- lib/doc/ja/EmbeddedObjects.lyx |2 +- lib/doc/ja/Intro.lyx |2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/doc/ja/Customization.lyx b/lib/doc/ja/Customization.lyx index dac9c23..65cf085 100644 --- a/lib/doc/ja/Customization.lyx +++ b/lib/doc/ja/Customization.lyx @@ -91,7 +91,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 39683dd..2962e99 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -185,7 +185,7 @@ ruby \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false diff --git a/lib/doc/ja/Intro.lyx b/lib/doc/ja/Intro.lyx index 7ec4dd8..dea42db 100644 --- a/lib/doc/ja/Intro.lyx +++ b/lib/doc/ja/Intro.lyx @@ -66,7 +66,7 @@ End \fontencoding auto \font_roman "lmodern" "IPAexMincho" \font_sans "default" "IPAexGothic" -\font_typewriter "default" "default" +\font_typewriter "default" "IPAGothic" \font_math "auto" "auto" \font_default_family default \use_non_tex_fonts false -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: comment out the new XHTML validate tests
commit 168af93020f7f1ab65ecb1dfdf706be0bf10f2aa
Author: Scott Kostyshak
Date: Thu Jan 26 21:40:23 2023 -0500
ctests: comment out the new XHTML validate tests
These new checks found issues that are difficult to fix.
---
development/autotests/export.cmake |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/development/autotests/export.cmake
b/development/autotests/export.cmake
index 85195c6..fb85a9d 100755
--- a/development/autotests/export.cmake
+++ b/development/autotests/export.cmake
@@ -342,7 +342,7 @@ else()
if (format MATCHES "docbook5")
check_docbook_jing(${result_file_name})
else()
-check_xhtml_validate(${result_file_name})
+#check_xhtml_validate(${result_file_name})
endif()
endif()
if (XMLLINT_EXECUTABLE)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix -Winconsistent-missing-override
commit 2ccaefa8a121e8ae921420cef1c886a57271fb67 Author: Scott Kostyshak Date: Wed Jan 25 10:56:40 2023 -0500 Fix -Winconsistent-missing-override Fix the following warning: src/frontends/qt/GuiDocument.h:377:7: error: 'eventFilter' overrides a member function but is not marked 'override' [-Werror,-Winconsistent-missing-override] bool eventFilter(QObject * sender, QEvent * event); ^ /usr/include/x86_64-linux-gnu/qt5/QtCore/qobject.h:139:18: note: overridden virtual function is here virtual bool eventFilter(QObject *watched, QEvent *event); ^ Amends 62413580dee8a4ff325da8d28419b60a95cadd71. --- src/frontends/qt/GuiDocument.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt/GuiDocument.h b/src/frontends/qt/GuiDocument.h index a5dfdfc..248e584 100644 --- a/src/frontends/qt/GuiDocument.h +++ b/src/frontends/qt/GuiDocument.h @@ -374,7 +374,7 @@ Q_SIGNALS: void changed(); protected: - bool eventFilter(QObject * sender, QEvent * event); + bool eventFilter(QObject * sender, QEvent * event) override; private: void closeEvent(QCloseEvent *) override; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] updatelayouts.py: skip .txt files
commit 95dd4f6bf63da04a28165fa901ef6c4016e2c898
Author: Scott Kostyshak
Date: Sat Jan 7 09:43:47 2023 -0500
updatelayouts.py: skip .txt files
---
development/tools/updatelayouts.py |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/development/tools/updatelayouts.py
b/development/tools/updatelayouts.py
index ad02f8a..81bf4d6 100755
--- a/development/tools/updatelayouts.py
+++ b/development/tools/updatelayouts.py
@@ -29,7 +29,8 @@ def main(argv):
os.chdir(directory)
for i in os.listdir("."):
(base, ext) = os.path.splitext(i)
-if ext == ".old":
+# Skip files like lib/layouts/TODO.txt
+if ext in [ ".old", ".txt" ]:
continue
args = ["layout2layout", i + ".old", i]
shutil.copy(args[2], args[1])
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: uninvert a lyx2lyx test thanks to fix
commit ec02df2bb9a4812ceab5cf6e2e9fe409f02ec0cd Author: Scott Kostyshak Date: Fri Jan 6 13:51:34 2023 -0500 ctests: uninvert a lyx2lyx test thanks to fix Thanks to the fix at d89a4848, the roundtrip now converges. This reverts commit 83c72a3eceb1ce98242a848579952b7526739d15. --- development/autotests/invertedTests | 16 1 files changed, 0 insertions(+), 16 deletions(-) diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests index 0fc1eeb..1fa9941 100644 --- a/development/autotests/invertedTests +++ b/development/autotests/invertedTests @@ -148,22 +148,6 @@ export/examples/ko/Welcome_lyx2[23] # https://www.mail-archive.com/search?l=mid=20200915233446.atwbyulny5gsbtyi%40tallinn export/examples/ru/Presentations/Beamer_lyx(16|20) -# The following is the diff that prevents convergence: -# -# \begin_inset Newpage cleardoublepage -# \end_inset -# -# -# \end_layout -# -# \begin_layout Standard -# -# If convert_bibtex_clearpage(document) in lyx_2_0.py is commented out, then -# the test passes. -# Since this is an old export (and additionally the issue is an old export routine) -# it is not critical. -export/examples/Books/KOMA-Script_Book_lyx16 - # == Sublabel: ert -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Typo in a comment
commit bee08b19ee2bdd8089cbd45ab2035bde7c9c6903 Author: Scott Kostyshak Date: Thu Jan 5 23:33:16 2023 -0500 Typo in a comment --- src/support/os.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/support/os.h b/src/support/os.h index a96791d..7e6bdbd 100644 --- a/src/support/os.h +++ b/src/support/os.h @@ -62,7 +62,7 @@ int timeout_ms(); /// @param reset True if the python path should be recomputed std::string const python(bool reset = false); -/// Check for availbility of the python interpreter +/// Check for availability of the python interpreter bool hasPython(); /// -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
