[LyX/2.3.x] Amend 14b108fc222ef9e
commit 263e1045e26156cab577385fca29e10bc2e82f9e
Author: Juergen Spitzmueller
Date: Mon Dec 5 08:23:50 2022 +0100
Amend 14b108fc222ef9e
---
src/mathed/InsetMathMacro.cpp |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index d9a307f..65f677e 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -1081,8 +1081,10 @@ void InsetMathMacro::write(WriteStream & os) const
docstring name_recoded;
docstring uncodable;
for (char_type c : name_in) {
- if (!os.encoding())
- break;
+ if (!os.encoding()) {
+ name_recoded += c;
+ continue;
+ }
if (os.encoding()->encodable(c))
name_recoded += c;
else {
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 14b108fc222ef9e
commit c715db4ae852e84ebc5f80d20127d12c2ee867ce
Author: Juergen Spitzmueller
Date: Mon Dec 5 08:20:25 2022 +0100
Amend 14b108fc222ef9e
---
src/mathed/InsetMathMacro.cpp |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 70e67a6..6a23abf 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -1153,8 +1153,10 @@ void InsetMathMacro::write(TeXMathStream & os) const
docstring name_recoded;
docstring uncodable;
for (char_type c : name_in) {
- if (!os.encoding())
- break;
+ if (!os.encoding()) {
+ name_recoded += c;
+ continue;
+ }
if (os.encoding()->encodable(c) || os.output() ==
TeXMathStream::wsSearchAdv)
name_recoded += c;
else {
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] tex2lyx support for starred refs
commit dedcee9117547fc0fba1f3b159a239b3d2725143
Author: Juergen Spitzmueller
Date: Mon Dec 5 07:52:41 2022 +0100
tex2lyx support for starred refs
---
src/tex2lyx/TODO.txt |1 -
src/tex2lyx/text.cpp | 17 +++--
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 001d6cf..7efd943 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -34,7 +34,6 @@ Format LaTeX featureLyX feature
443unicode-math.sty InsetMath*
453automatic stmaryrd loading \use_package stmaryrd
457automatic stackrel loading \use_package stackrel
-612starred reference commands
General
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 2ee2ada..b4afeee 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -151,6 +151,9 @@ char const * const known_ref_commands[] = { "ref",
"pageref", "vref",
char const * const known_coded_ref_commands[] = { "ref", "pageref", "vref",
"vpageref", "formatted", "nameref", "eqref", 0 };
+char const * const known_starref_commands[] = { "ref", "pageref", "vref",
+ "vpageref", "nameref", "eqref", 0 };
+
char const * const known_refstyle_commands[] = { "algref", "chapref", "corref",
"eqref", "enuref", "figref", "fnref", "lemref", "parref", "partref",
"propref",
"secref", "subsecref", "tabref", "thmref", 0 };
@@ -4548,8 +4551,14 @@ void parse_text(Parser & p, ostream & os, unsigned
flags, bool outer,
// if refstyle is used, we must not convert \prettyref to a
// formatted reference, since that would result in a refstyle
command.
- if ((where = is_known(t.cs(), known_ref_commands)) &&
-(t.cs() != "prettyref" || !preamble.refstyle())) {
+ if ((where = is_known(t.cs(), known_ref_commands))
+&& (t.cs() != "prettyref" || !preamble.refstyle())
+&& (p.next_token().asInput() != "*" || is_known(t.cs(),
known_starref_commands))) {
+ bool starred = false;
+ if (p.next_token().asInput() == "*") {
+ starred = true;
+ p.get_token();
+ }
string const opt = p.getOpt();
if (opt.empty()) {
context.check_layout(os);
@@ -4561,6 +4570,10 @@ void parse_text(Parser & p, ostream & os, unsigned
flags, bool outer,
os << "plural \"false\"\n";
os << "caps \"false\"\n";
os << "noprefix \"false\"\n";
+ if (starred)
+ os << "nolink \"true\"\n";
+ else
+ os << "nolink \"false\"\n";
end_inset(os);
if (t.cs() == "vref" || t.cs() == "vpageref")
preamble.registerAutomaticallyLoadedPackage("varioref");
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] * pt_BR.po
commit f5ad8747818eb9da73dc23a8d54814f625784b1d Author: Pavel Sanda Date: Mon Dec 5 07:46:34 2022 +0100 * pt_BR.po --- po/pt_BR.po | 14 -- 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index 658d19c..e2d17f5 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -6,13 +6,13 @@ # Susana Barbosa , 2007, 2008. # susana barbosa , 2009. # Susana Barbosa , 2010, 2011. -# Georger Araujo 2015 - 2017 " +# Georger Araujo 2015 - 2022 " msgid "" msgstr "" "Project-Id-Version: pt_BR 2.3.7\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2022-12-04 19:23+0100\n" -"PO-Revision-Date: 2022-11-24 12:00-0300\n" +"PO-Revision-Date: 2022-12-04 21:47-0300\n" "Last-Translator: Georger Araujo \n" "Language-Team: Brazilian Portuguese \n" @@ -27638,7 +27638,7 @@ msgid "" "Show a small box around a Math Macro with the macro name when the cursor is " "inside." msgstr "" -"Mostrar uma pequena caixa ao redor de uma Macro Matemática com o nome da " +"Mostrar uma pequena caixa ao redor de uma Macro de Matemática com o nome da " "macro quando o cursor estiver em seu interior." #: src/LyXRC.cpp:3241 @@ -32667,7 +32667,7 @@ msgstr "No fim das contas, não foi necessário converter %1$s" #: src/insets/InsetGraphics.cpp:913 msgid "Uncodable characters in path" -msgstr "Caminho contém caracteres não-codificáveis" +msgstr "Caracteres não-codificáveis no caminho" #: src/insets/InsetGraphics.cpp:914 #, c-format @@ -33745,9 +33745,8 @@ msgid "Can't change number of columns in '%1$s'" msgstr "Não é possível alterar número de colunas em '%1$s'" #: src/mathed/InsetMathMacro.cpp:1116 -#, fuzzy msgid "Uncodable characters in math macro" -msgstr "Caminho contém caracteres não-codificáveis" +msgstr "Caracteres não-codificáveis na macro de matemática" #: src/mathed/InsetMathMacro.cpp:1117 #, c-format @@ -33756,6 +33755,9 @@ msgid "" "that is not encodable in the current encoding (%2$s).\n" "Please fix this macro." msgstr "" +"O nome de macro '%1$s' contém um caractere\n" +"que não é codificável na codificação atual (%2$s).\n" +"Por favor retifique essa macro." #: src/mathed/InsetMathMacro.cpp:1269 src/mathed/InsetMathMacro.cpp:1275 #, c-format -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Document new format
commit 1b8b4c0b506ca2e13429e3affd7afe87c597164d
Author: Juergen Spitzmueller
Date: Mon Dec 5 07:35:04 2022 +0100
Document new format
---
development/FORMAT |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index 5fcf13e..ba4ea20 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -7,6 +7,15 @@ changes happened in particular if possible. A good example
would be
---
+2022-12-04 Daniel Ramöller
+ * Format incremented to 612: Implement support for starred crossref
commands (with
+ hyperref) which suppress links:
+ - \begin_inset CommandInset ref
+ LatexCommand {ref,pageref,vref,vpageref,eqref,nameref}
+ [...]
+ nolink "true"
+=> \*{}
+
2022-11-27 Yuriy Skalko
* Format incremented to 611: Implement "semantic linefeeds" after
punctuation marks.
Dummy format change for now.
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update tex2lyx tests
commit e0e84eba01dad1db627d28b9d38c5378385fd2d3 Author: Richard Kimberly Heck Date: Mon Dec 5 01:09:05 2022 -0500 Update tex2lyx tests --- 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 c7d4d51..661dd30 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 611 +\lyxformat 612 \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 2e70c5e..a09ffde 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 611 +\lyxformat 612 \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 b6cace0..37322e8 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 611 +\lyxformat 612 \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 b083b4d..7386c08 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 611 +\lyxformat 612 \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 c0fe384..234b7f8 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 611 +\lyxformat 612 \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 2bc80bf..0edbb2f 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 611 +\lyxformat 612 \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 f561113..3a96a2f 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 611 +\lyxformat 612 \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 f45eaf4..bac468f 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 611 +\lyxformat 612 \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 a391016..678320a 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 611 +\lyxformat 612 \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 cf1b48b..542e131 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 611 +\lyxformat 612 \begin_document \begin_header \save_transient_properties true
[LyX/master] Missed this one: InsetLayout does not do HTMLClass (at least not yet).
commit 409d889822d411f7f7d8b88138d389284a5e7d14
Author: Richard Kimberly Heck
Date: Mon Dec 5 01:07:25 2022 -0500
Missed this one: InsetLayout does not do HTMLClass (at least not yet).
---
lib/layouts/logicalmkup.module |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index 1f70d6d..88ba523 100644
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -19,7 +19,7 @@ InsetLayout Flex:Noun
Requires noun
InToc true
HTMLTag span
- HTMLClass noun
+ HTMLAttr "class='noun'"
HTMLStyle
span.noun {
font-family: sans-serif;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Typo spotted by Pavel
commit 7a0c8f366d8e8ba1df534c3f5644d789a9c8a6e8
Author: Juergen Spitzmueller
Date: Mon Dec 5 06:47:52 2022 +0100
Typo spotted by Pavel
---
src/mathed/InsetMathMacro.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 543bd23..70e67a6 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -1186,7 +1186,7 @@ void InsetMathMacro::write(TeXMathStream & os) const
if (!uncodable.empty()) {
frontend::Alert::warning(
_("Uncodable characters in math macro"),
- support::bformat(_("The macro name '%1$s' contains a
character.\n"
+ support::bformat(_("The macro name '%1$s' contains a
character\n"
"that is not encodable in the
current encoding (%2$s).\n"
"Please fix this macro."), name_in,
uncodable));
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Release notes
commit 70deab72bcc6edadf3f17165f0144031aa97d3c9 Author: Richard Kimberly Heck Date: Sun Dec 4 18:39:39 2022 -0500 Release notes --- lib/RELEASE-NOTES |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 4d72f71..7a42650 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -44,6 +44,10 @@ * When using the document compare function, there is now an option to display the differences using a special "Document Compare" author. +* InsetRef now supports starred commands. The starred commands stop hyperref from + creating a link (and are only available when hyperref is used). There is a + checkbox "No Hyperlink" for this purpose. + !!Documents compilation process and images conversion * LyX now uses utf8 encoding per default for all languages. This does -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix bug #11410.
commit d4f2460ac4707aa4d9302c6257fc2511fa0dc54f
Author: Richard Kimberly Heck
Date: Sun Dec 4 18:33:58 2022 -0500
Fix bug #11410.
Main part of patch from Daniel, adapted by me.
I also added the lyx2lyx code.
---
lib/lyx2lyx/lyx_2_4.py| 81 -
lib/ui/stdcontext.inc |1 +
src/frontends/qt/GuiRef.cpp |9
src/frontends/qt/ui/RefUi.ui |7 +++
src/insets/InsetCommandParams.cpp |4 +-
src/insets/InsetCommandParams.h |2 +-
src/insets/InsetRef.cpp | 26 +++-
src/tex2lyx/TODO.txt |2 +-
src/version.h |4 +-
9 files changed, 127 insertions(+), 9 deletions(-)
diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py
index 5c0507a..e10475b 100644
--- a/lib/lyx2lyx/lyx_2_4.py
+++ b/lib/lyx2lyx/lyx_2_4.py
@@ -4550,6 +4550,81 @@ def revert_index_macros(document):
document.body[pl:pl+1] = document.body[pl:pl] + sortkey +
put_cmd_in_ert("@")
+def revert_starred_refs(document):
+i = find_token(document.header, "\\use_hyperref true", 0)
+use_hyperref = (i != -1)
+i = 0
+in_inset = False
+cmd = ref = ""
+plural = caps = noprefix = nolink = False
+nolinkline = -1
+while True:
+if not in_inset:
+i = find_token(document.body, "\\begin_inset CommandInset ref", i)
+if i == -1:
+break
+start = i
+end = find_end_of_inset(document.body, i)
+if end == -1:
+document.warning("Malformed LyX document: Can't find end of
inset at line %d" % i)
+i += 1
+continue
+# If we are not using hyperref, then we just need to delete the
line
+if not use_hyperref:
+i = find_token(document.body, "nolink", i, e)
+if i == -1:
+continue
+del document.body[i]
+i = e - 1
+continue
+# If we are using hyperref, then we'll need to do more.
+in_inset = True
+i += 1
+continue
+# so we are in an InsetRef
+if i == end:
+in_inset = False
+# If nolink is False, just remove that line
+if nolink == False or cmd == "formatted":
+# document.warning("Skipping " + cmd + " " + ref)
+if nolinkline != -1:
+del document.body[nolinkline]
+continue
+# We need to construct a new command and put it in ERT
+newcmd = "\\" + cmd + "*{" + ref + "}"
+# document.warning(newcmd)
+newlines = put_cmd_in_ert(newcmd)
+document.body[start:end+1] = newlines
+i += len(newlines) - (end - start) + 1
+# reset variables
+cmd = ref = ""
+plural = caps = noprefix = nolink = False
+nolinkline = -1
+continue
+l = document.body[i]
+if l.startswith("LatexCommand"):
+cmd = l[13:]
+elif l.startswith("reference"):
+ref = l[11:-1]
+elif l.startswith("caps"):
+tmp = l[6:-1]
+caps = (tmp == "true")
+elif l.startswith("plural"):
+tmp = l[8:-1]
+plural = (tmp == "true")
+elif l.startswith("noprefix"):
+tmp = l[10:-1]
+noprefix = (tmp == "true")
+elif l.startswith("nolink"):
+tmp = l[8:-1]
+nolink = (tmp == "true")
+nolinkline = i
+i += 1
+
+
+
+
+
##
# Conversion hub
#
@@ -4622,10 +4697,12 @@ convert = [
[608, []],
[609, []],
[610, []],
- [611, []]
+ [611, []],
+ [612, []]
]
-revert = [[610, []],
+revert = [[611, [revert_starred_refs]],
+ [610, []],
[609, [revert_index_macros]],
[608, [revert_document_metadata]],
[607, [revert_docbook_mathml_prefix]],
diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index 210e555..0b0d32f 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
@@ -124,6 +124,7 @@ Menuset
OptItem "Plural|a" "inset-modify ref toggle-plural"
OptItem "Capitalize|C" "inset-modify ref toggle-caps"
OptItem "No Prefix" "inset-modify ref toggle-noprefix"
+ OptItem "No Hyperlink" "inset-modify ref toggle-nolink"
Separator
Item "Settings...|S" "inset-settings"
End
diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index eff0917..d5a551e 100644
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -22,6 +22,7 @@
#include "Cursor.h"
#include "FancyLineEdit.h"
#include "FuncRequest.h"
+#inclu
[LyX/master] InsetLayout does not understand HTMLClass
commit 053e858e2c3f9ff02bfc4e99666a936b6fa3c047
Author: Richard Kimberly Heck
Date: Sun Dec 4 16:39:44 2022 -0500
InsetLayout does not understand HTMLClass
---
lib/layouts/aastex.layout|2 +-
lib/layouts/aguplus.inc |2 +-
lib/layouts/apa.layout |2 +-
lib/layouts/apax.inc |2 +-
lib/layouts/bicaption.module |2 +-
lib/layouts/scrclass.inc |4 ++--
lib/layouts/stdinsets.inc|8
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index af33b05..58b8b14 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -619,7 +619,7 @@ InsetLayout Caption:FigCaption
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-figcaption"
+ HTMLAttr "class='float-caption float-caption-figcaption'"
End
diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index ce90f53..7453b2a 100644
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -222,7 +222,7 @@ InsetLayout Caption:Table
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-table"
+ HTMLAttr "class='float-caption float-caption-table'"
End
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 409f160..57af913 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -300,7 +300,7 @@ InsetLayout Caption:Centered
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-centered"
+ HTMLAttr "class='float-caption float-caption-centered'"
End
diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index abdb629..9a51d37 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -399,7 +399,7 @@ InsetLayout Caption:Centered
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-centered"
+ HTMLAttr "class='float-caption float-caption-centered'"
End
diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index cbe2a8b..d3b258a 100644
--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@@ -62,5 +62,5 @@ InsetLayout Caption:Bicaption
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-bicaption"
+ HTMLAttr "class='float-caption float-caption-bicaption'"
End
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 0538909..b1c1c9f 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -335,7 +335,7 @@ InsetLayout Caption:Above
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-above"
+ HTMLAttr "class='float-caption float-caption-above'"
End
@@ -360,7 +360,7 @@ InsetLayout Caption:Below
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-below"
+ HTMLAttr "class='float-caption float-caption-below'"
End
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 364afe6..cac502d 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -666,7 +666,7 @@ InsetLayout Info:menu
Font
Family sans
EndFont
- HTMLClass "info menu'"
+ HTMLAttr "class='info menu'"
HTMLStyle
span.menu { font-family: sans-serif; }
EndHTMLStyle
@@ -685,7 +685,7 @@ InsetLayout Info:shortcut
Font
Family sans
EndFont
- HTMLCLass "info shortcut"
+ HTMLAttr "class='info shortcut'"
HTMLStyle
span.shortcut { font-family: sans-serif; }
EndHTMLStyle
@@ -706,7 +706,7 @@ InsetLayout Info:shortcuts
Font
Family sans
EndFont
- HTMLClass "info shortcut"
+ HTMLAttr "class='info shortcut'"
HTMLStyle
span.shortcuts { font-family: sans-serif; }
EndHTMLStyle
@@ -737,7 +737,7 @@ InsetLayout Caption:Standard
margin: 1ex;
}
EndHTMLStyle
- HTMLClass "float-caption float-caption-standard"
+ HTMLAttr "class='float-caption float-caption-standard'"
End
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
Re: [LyX/master] Introduce HTMLClass tag, to make it easier to give these.
Le 04/12/2022 à 18:41, Richard Kimberly Heck a écrit : commit 69a6c41b9417c0f069f4eeae2b0f2e932ee39be4 Author: Richard Kimberly Heck Date: Sun Dec 4 13:27:19 2022 -0500 Introduce HTMLClass tag, to make it easier to give these. Hi Riki, Now I see lapinot: src/lyx ../master/lib/doc/LFUNs.lyx Warning: Ignoring XDG_SESSION_TYPE=wayland on Gnome. Use QT_QPA_PLATFORM=wayland to run on Wayland anyway. LyX: Unknown InsetLayout tag [around line 668 of file [layouts/stdinsets.inc] current token: 'HTMLClass' context: ''] LyX: Unknown InsetLayout tag [around line 687 of file [layouts/stdinsets.inc] current token: 'HTMLCLass' context: ''] LyX: Unknown InsetLayout tag [around line 708 of file [layouts/stdinsets.inc] current token: 'HTMLClass' context: ''] LyX: Unknown InsetLayout tag [around line 739 of file [layouts/stdinsets.inc] current token: 'HTMLClass' context: ''] Indeed, it doe snot seem that InsetLayouts understand HTMLClass... JMarc -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update release notes
commit ea26cb222019b58119f13523df4834cb42ed9e40 Author: Richard Kimberly Heck Date: Sun Dec 4 15:22:54 2022 -0500 Update release notes --- lib/RELEASE-NOTES |5 + 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index f91b3d6..4d72f71 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -60,6 +60,11 @@ * Documents that use TeX fonts can only be compiled with XeTeX if the input encoding is set to "utf8-plain" or "ascii". +* With LyXHTML output, there are now different CSS classees generated for + different depths: enumi, enumii, enumiii, and enumiv, and similarly for + itemize: lyxitemi, etc. There is also a new HTMLClass tag, which makes it + easier to provide specific classes for paragraphs. + * DocBook support has been revamped and now targets DocBook 5 (i.e. only XML, SGML is gone). Some supporting files for the previous implementation have been removed: all examples (lib/examples), -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fixup 71623b88: change semantics of "delete" LFUNs again
commit ff1ddf6251766ac11422079bc16fd3a7254b5fe0 Author: Jean-Marc Lasgouttes Date: Mon Feb 21 14:00:14 2022 +0100 Fixup 71623b88: change semantics of "delete" LFUNs again Instead of specifying "force" to disable the deletion protection mechanism, invert the default so that "confirm" is needed to activate it. The idea is to keep the lfun reasonable for scripting and add a special argument for interactive use. Document in release notes. Update LFUN.lyx documentation Update bind files. Add conversion step to prefs2prefs_lfun.py. lib/RELEASE-NOTES| 10 + lib/bind/cua.bind|4 +- lib/bind/emacs.bind |8 +- lib/bind/mac.bind| 10 +- lib/bind/site.bind |4 +- lib/bind/sk/menus.bind |2 +- lib/bind/xemacs.bind | 10 +- lib/doc/LFUNs.lyx| 1346 +- lib/scripts/prefs2prefs_lfuns.py | 24 +- src/LyXAction.cpp| 18 +- src/Text3.cpp|8 +- src/mathed/InsetMathNest.cpp |8 +- 12 files changed, 540 insertions(+), 912 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix CSS
commit 3800036b2a376c3ce808386eda0568f2f627d2d1
Author: Richard Kimberly Heck
Date: Sun Dec 4 14:46:30 2022 -0500
Fix CSS
---
lib/layouts/apa.layout |8
lib/layouts/apax.inc|8
lib/layouts/beamer.layout |8
lib/layouts/egs.layout |8
lib/layouts/powerdot.layout |8
lib/layouts/stdlists.inc|8
6 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 38216e8..409f160 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -460,10 +460,10 @@ Style Enumerate
DocBookItemTaglistitem
DocBookItemInnerTag para
HTMLStyle
- ol.lyxenumi { list-style-type: decimal; }
- ol.lyxenumii { list-style-type: lower-latin; }
- ol.lyxenumiii { list-style-type: lower-roman; }
- ol.lyxenumiv { list-style-type: upper-latin; }
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-roman; }
+ ol.enumiv { list-style-type: upper-latin; }
EndHTMLStyle
End
diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index 65f1179..abdb629 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -560,10 +560,10 @@ Style Enumerate
DocBookItemTaglistitem
DocBookItemInnerTag para
HTMLStyle
- ol.lyxenumi { list-style-type: decimal; }
- ol.lyxenumii { list-style-type: lower-latin; }
- ol.lyxenumiii { list-style-type: lower-roman; }
- ol.lyxenumiv { list-style-type: upper-latin; }
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-roman; }
+ ol.enumiv { list-style-type: upper-latin; }
EndHTMLStyle
End
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 00579c9..4a644f9 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -184,10 +184,10 @@ Style Enumerate
DocBookItemTaglistitem
DocBookItemInnerTag para
HTMLStyle
- ol.lyxenumi { list-style-type: decimal; }
- ol.lyxenumii { list-style-type: lower-latin; }
- ol.lyxenumiii { list-style-type: lower-roman; }
- ol.lyxenumiv { list-style-type: upper-latin; }
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-roman; }
+ ol.enumiv { list-style-type: upper-latin; }
EndHTMLStyle
End
diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout
index 954a859..6d1d1a1 100644
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@@ -198,10 +198,10 @@ Style Enumerate
DocBookItemTaglistitem
DocBookItemInnerTag para
HTMLStyle
- ol.lyxenumi { list-style-type: decimal; }
- ol.lyxenumii { list-style-type: lower-latin; }
- ol.lyxenumiii { list-style-type: lower-roman; }
- ol.lyxenumiv { list-style-type: upper-latin; }
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-roman; }
+ ol.enumiv { list-style-type: upper-latin; }
EndHTMLStyle
End
diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout
index f2bcf68..714bffb 100644
--- a/lib/layouts/powerdot.layout
+++ b/lib/layouts/powerdot.layout
@@ -375,10 +375,10 @@ Style Enumerate
DocBookItemTaglistitem
DocBookItemInnerTag para
HTMLStyle
- ol.lyxenumi { list-style-type: decimal; }
- ol.lyxenumii { list-style-type: lower-latin; }
- ol.lyxenumiii { list-style-type: lower-roman; }
- ol.lyxenumiv { list-style-type: upper-latin; }
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-roman; }
+ ol.enumiv { list-style-type: upper-latin; }
EndHTMLStyle
End
diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc
index 1e83198..abe5dbe 100644
--- a/lib/layouts/stdlists.inc
+++ b/lib/layouts/stdlists.inc
@@ -89,10 +89,10 @@ Style Enumerate
DocBookItemTaglistitem
DocBookItemInnerTag para
HTMLStyle
- ol.lyxenumi { list-style-type: decimal; }
- ol.lyxenumii { list-style-type: lower-latin; }
- ol.lyxenumiii { list-style-type: lower-roman; }
- ol.lyxenumiv { list-style-type: upper-latin; }
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-
[LyX/master] Fix CSS output for lists.
commit 7b5a5e524b71d6445810b5127073e8064b9d92c6
Author: Richard Kimberly Heck
Date: Sun Dec 4 14:55:59 2022 -0500
Fix CSS output for lists.
Somehow that got committed before it was done. I guess I'm out of
practice...
---
src/output_xhtml.cpp |8 +---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index c812966..4418f28 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -417,9 +417,9 @@ ParagraphList::const_iterator makeEnvironment(Buffer const
& buf,
// be done at all in HTML.)
// Code adapated from Buffer::Impl::setLabel
+ bool const isenum = bstyle.labeltype == LABEL_ENUMERATE;
docstring enumcounter = bstyle.counter.empty() ?
- (bstyle.labeltype == LABEL_ENUMERATE ?
- from_ascii("lyxenum") :
from_ascii("lyxitem") ) :
+ ( isenum ? from_ascii("enum") :
from_ascii("lyxitem") ) :
bstyle.counter;
switch (par->itemdepth) {
case 2:
@@ -438,7 +438,9 @@ ParagraphList::const_iterator makeEnvironment(Buffer const
& buf,
// not a valid enumdepth...
break;
}
- openParTag(xs, bstyle, to_utf8(enumcounter),
pbegin->magicLabel());
+ openParTag(xs, bstyle,
+ string( isenum ? "lyxenum" : "lyxitem" ) + "
"
+ + to_utf8(enumcounter),
pbegin->magicLabel());
}
else
openParTag(xs, bstyle, pbegin->magicLabel());
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Customization update for HTMLClass
commit 23a997bbf68229fc893d5e30bebaf275721a2034 Author: Richard Kimberly Heck Date: Sun Dec 4 14:33:47 2022 -0500 Customization update for HTMLClass --- lib/doc/Customization.lyx | 98 + 1 files changed, 98 insertions(+), 0 deletions(-) diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx index 443187a..0bbce33 100644 --- a/lib/doc/Customization.lyx +++ b/lib/doc/Customization.lyx @@ -28836,6 +28836,100 @@ HTMLStyle \end_inset for that purpose. +\change_inserted -584632292 1670182206 + +\end_layout + +\begin_layout Description + +\change_inserted -584632292 1670182369 +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted -584632292 167018 +HTMLClass +\end_layout + +\end_inset + + [ +\begin_inset Flex Code +status collapsed + +\begin_layout Plain Layout + +\change_inserted -584632292 1670182217 +string +\end_layout + +\end_inset + +] The CSS class to use for this paragraph. + Note that, + if the paragarph is of enumerate or itemize type, + then the default will be +\begin_inset Quotes eld +\end_inset + +lyxenum +\begin_inset Quotes erd +\end_inset + + or +\begin_inset Quotes eld +\end_inset + +lyxitem +\begin_inset Quotes erd +\end_inset + +, + plus +\begin_inset Quotes eld +\end_inset + +i +\begin_inset Quotes erd +\end_inset + +, + +\begin_inset Quotes eld +\end_inset + +ii +\begin_inset Quotes erd +\end_inset + +, + +\begin_inset Quotes eld +\end_inset + +iii +\begin_inset Quotes erd +\end_inset + +, + or +\begin_inset Quotes eld +\end_inset + +iv +\begin_inset Quotes erd +\end_inset + +, + depending upon the depth. + That can be over-ridden here. + However, + the suffix will not be added in that case. + I.e., + the CSS class will always be exactly what it is declared to be here. +\change_unchanged + \end_layout \begin_layout Description @@ -28912,6 +29006,8 @@ status collapsed \change_inserted -584632292 1670132221 HTMLInToc +\change_unchanged + \end_layout \end_inset @@ -28926,6 +29022,8 @@ status open 0, \emph on 1 +\change_unchanged + \end_layout \end_inset -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Add i, ii, iii, iv suffixes to CSS class as well in the case of itemizations
commit 5ac560cfa1096c94cf989cc541fb5ac122999e05
Author: Richard Kimberly Heck
Date: Sun Dec 4 14:34:29 2022 -0500
Add i, ii, iii, iv suffixes to CSS class as well in the case of itemizations
---
src/Layout.cpp |6 +++---
src/output_xhtml.cpp | 15 +--
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/Layout.cpp b/src/Layout.cpp
index 7578d15..88d5539 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -1825,9 +1825,9 @@ string const & Layout::htmlattr() const
string const & Layout::htmlclass() const
{
- // If it's an enumeration, then we recalculate the class each time
through
- // unless it has been given explicitly. So we do nothing here.
- if (htmlclass_.empty() && labeltype != LABEL_ENUMERATE)
+ // If it's an enumeration or itemize list, then we recalculate the
class each
+ // time through (unless it has been given explicitly). So we do nothing
here.
+ if (htmlclass_.empty() && labeltype != LABEL_ENUMERATE && labeltype !=
LABEL_ITEMIZE)
htmlclass_ = defaultCSSClass();
return htmlclass_;
}
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 0c4bdb9..c812966 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -408,16 +408,19 @@ ParagraphList::const_iterator makeEnvironment(Buffer
const & buf,
depth_type const origdepth = pbegin->params().depth();
// open tag for this environment
- if (bstyle.labeltype == LABEL_ENUMERATE && bstyle.htmlclass().empty()) {
+ if ((bstyle.labeltype == LABEL_ENUMERATE || bstyle.labeltype ==
LABEL_ITEMIZE)
+ && bstyle.htmlclass().empty()) {
// In this case, we have to calculate the CSS class ourselves,
each time
// through
- // FIXME We assume in these cases that the standard enumeration
counter
- // is being used. (We also do not deal with 'resume' counters,
though I'm
- // not sure that can be done at all.)
+ // FIXME We assume in these cases that the standard counters
are being used.
+ // (We also do not deal with 'resume' counters, though I'm not
sure that can
+ // be done at all in HTML.)
- // Code borrowed from Buffer::Impl::setLabel
+ // Code adapated from Buffer::Impl::setLabel
docstring enumcounter = bstyle.counter.empty() ?
- from_ascii("enum") : bstyle.counter;
+ (bstyle.labeltype == LABEL_ENUMERATE ?
+ from_ascii("lyxenum") :
from_ascii("lyxitem") ) :
+ bstyle.counter;
switch (par->itemdepth) {
case 2:
enumcounter += 'i';
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Add CSS for enumerations to other classes
commit 59acab7eeae8948f4b02289df04b27aa5948dcf9
Author: Richard Kimberly Heck
Date: Sun Dec 4 14:33:29 2022 -0500
Add CSS for enumerations to other classes
---
lib/layouts/apa.layout |6 ++
lib/layouts/apax.inc |6 ++
lib/layouts/beamer.layout |6 ++
lib/layouts/egs.layout |6 ++
lib/layouts/ijmpc.layout |4
lib/layouts/ijmpd.layout |4
lib/layouts/linguistics.module |2 ++
lib/layouts/powerdot.layout|6 ++
lib/layouts/stdlists.inc |8
lib/layouts/theorems-case.inc |1 +
10 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index fb15f29..38216e8 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -459,6 +459,12 @@ Style Enumerate
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ ol.lyxenumi { list-style-type: decimal; }
+ ol.lyxenumii { list-style-type: lower-latin; }
+ ol.lyxenumiii { list-style-type: lower-roman; }
+ ol.lyxenumiv { list-style-type: upper-latin; }
+ EndHTMLStyle
End
diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index e693303..65f1179 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -559,6 +559,12 @@ Style Enumerate
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ ol.lyxenumi { list-style-type: decimal; }
+ ol.lyxenumii { list-style-type: lower-latin; }
+ ol.lyxenumiii { list-style-type: lower-roman; }
+ ol.lyxenumiv { list-style-type: upper-latin; }
+ EndHTMLStyle
End
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index ca31c3e..00579c9 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -183,6 +183,12 @@ Style Enumerate
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ ol.lyxenumi { list-style-type: decimal; }
+ ol.lyxenumii { list-style-type: lower-latin; }
+ ol.lyxenumiii { list-style-type: lower-roman; }
+ ol.lyxenumiv { list-style-type: upper-latin; }
+ EndHTMLStyle
End
Style Description
diff --git a/lib/layouts/egs.layout b/lib/layouts/egs.layout
index c2ca95e..954a859 100644
--- a/lib/layouts/egs.layout
+++ b/lib/layouts/egs.layout
@@ -197,6 +197,12 @@ Style Enumerate
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ ol.lyxenumi { list-style-type: decimal; }
+ ol.lyxenumii { list-style-type: lower-latin; }
+ ol.lyxenumiii { list-style-type: lower-roman; }
+ ol.lyxenumiv { list-style-type: upper-latin; }
+ EndHTMLStyle
End
diff --git a/lib/layouts/ijmpc.layout b/lib/layouts/ijmpc.layout
index ea60d59..7b2ebd3 100644
--- a/lib/layouts/ijmpc.layout
+++ b/lib/layouts/ijmpc.layout
@@ -387,6 +387,7 @@ Style RomanList
AlignPossibleBlock, Left
LabelTypeEnumerate
LabelCounter "enum"
+ HTMLClass LyXRomanList
HTMLTag ol
HTMLItem li
HTMLLabelNONE
@@ -394,6 +395,9 @@ Style RomanList
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ol.LyXRomanList { list-style-type: lower-roman; }
+ EndHTMLStyle
End
Style Proof
diff --git a/lib/layouts/ijmpd.layout b/lib/layouts/ijmpd.layout
index 25b6542..435f635 100644
--- a/lib/layouts/ijmpd.layout
+++ b/lib/layouts/ijmpd.layout
@@ -393,6 +393,7 @@ Style RomanList
AlignPossibleBlock, Left
LabelTypeEnumerate
LabelCounter "enum"
+ HTMLClass LyXRomanList
HTMLTag ol
HTMLItem li
HTMLLabelNONE
@@ -400,6 +401,9 @@ Style RomanList
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ol.LyXRomanList { list-style-type: lower-roman; }
+ EndHTMLStyle
End
Style Proof
diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module
index 1869c7b..c9478b5 100644
--- a/lib/layouts/linguistics.module
+++ b/lib/layouts/linguistics.module
@@ -115,6 +115,7 @@ Style Numbered_Examples_(consecutive)
DocBookWrapperAttrrole='consecutive'
DocBookWrapperMergeWithPrevious true
DocBookTagpara
+ HTMLClass NumberedExample
End
@@ -131,6 +132,7 @@ Style Subexample
Tooltip "Add subexamples options here"
PassThru 1
EndArgument
+ HTMLClass SubExample
End
diff --git a/lib/layouts/powerdot.layout b/lib/layouts/powerdot.layout
index d1bf9c6..f2bcf68 100644
--- a/lib/layouts/powerd
[LyX/master] Introduce HTMLClass tag, to make it easier to give these.
commit 69a6c41b9417c0f069f4eeae2b0f2e932ee39be4
Author: Richard Kimberly Heck
Date: Sun Dec 4 13:27:19 2022 -0500
Introduce HTMLClass tag, to make it easier to give these.
---
lib/layouts/aastex.layout |2 +-
lib/layouts/aguplus.inc|2 +-
lib/layouts/apa.layout |2 +-
lib/layouts/apax.inc |2 +-
lib/layouts/bicaption.module |2 +-
lib/layouts/logicalmkup.module |2 +-
lib/layouts/scrclass.inc |4 ++--
lib/layouts/stdinsets.inc |8
lib/layouts/stdlists.inc |1 -
lib/layouts/stdlyxlist.inc |2 +-
lib/scripts/layout2layout.py |7 +--
src/Layout.cpp | 35 +++
src/Layout.h | 14 +++---
src/TextClass.cpp |2 +-
src/insets/InsetIndex.cpp |2 +-
src/output_xhtml.cpp |8
16 files changed, 66 insertions(+), 29 deletions(-)
diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout
index 52933dc..6551e2f 100644
--- a/lib/layouts/aastex.layout
+++ b/lib/layouts/aastex.layout
@@ -619,7 +619,7 @@ InsetLayout Caption:FigCaption
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-figcaption'"
+ HTMLClass "float-caption float-caption-figcaption"
End
diff --git a/lib/layouts/aguplus.inc b/lib/layouts/aguplus.inc
index 1d7ceb5..f21aa55 100644
--- a/lib/layouts/aguplus.inc
+++ b/lib/layouts/aguplus.inc
@@ -222,7 +222,7 @@ InsetLayout Caption:Table
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-table'"
+ HTMLClass "float-caption float-caption-table"
End
diff --git a/lib/layouts/apa.layout b/lib/layouts/apa.layout
index 5ddd1f8..bed15f6 100644
--- a/lib/layouts/apa.layout
+++ b/lib/layouts/apa.layout
@@ -300,7 +300,7 @@ InsetLayout Caption:Centered
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-centered'"
+ HTMLClass "float-caption float-caption-centered"
End
diff --git a/lib/layouts/apax.inc b/lib/layouts/apax.inc
index 8981e36..321dd08 100644
--- a/lib/layouts/apax.inc
+++ b/lib/layouts/apax.inc
@@ -399,7 +399,7 @@ InsetLayout Caption:Centered
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-centered'"
+ HTMLClass "float-caption float-caption-centered"
End
diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index 12c4f25..fc2c105 100644
--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@@ -62,5 +62,5 @@ InsetLayout Caption:Bicaption
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-bicaption'"
+ HTMLClass "float-caption float-caption-bicaption"
End
diff --git a/lib/layouts/logicalmkup.module b/lib/layouts/logicalmkup.module
index 78d1009..7c56aed 100644
--- a/lib/layouts/logicalmkup.module
+++ b/lib/layouts/logicalmkup.module
@@ -19,7 +19,7 @@ InsetLayout Flex:Noun
Requires noun
InToc true
HTMLTag span
- HTMLAttr class='noun'
+ HTMLClass noun
HTMLStyle
span.noun {
font-family: sans-serif;
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index c437c0e..5127ab5 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -335,7 +335,7 @@ InsetLayout Caption:Above
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-above'"
+ HTMLClass "float-caption float-caption-above"
End
@@ -360,7 +360,7 @@ InsetLayout Caption:Below
margin: 1ex;
}
EndHTMLStyle
- HTMLAttr "class='float-caption float-caption-below'"
+ HTMLClass "float-caption float-caption-below"
End
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index b102ceb..57f05af 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -666,7 +666,7 @@ InsetLayout Info:menu
Font
Family sans
EndFont
- HTMLAttr "class='info menu'"
+ HTMLClass "info menu'"
HTMLStyle
span.menu { font-family: sans-serif; }
EndHTMLStyle
@@ -685,7 +685,7 @@ InsetLayout Info:shortcut
Font
Family sans
EndFont
- HTMLAttr "class='info shortcut'"
+ HTMLCLass "info shortcut"
HTMLStyle
span.shortcut { font-family: sans-serif; }
EndHTMLStyle
@@ -706,7 +706,7 @@ InsetLayout Info:shortcuts
Font
Family
[LyX/master] Update layout format
commit c72cef7e8ab8c6b48cba043a3619d6d5e5cf8114 Author: Richard Kimberly Heck Date: Sun Dec 4 13:36:16 2022 -0500 Update layout format lib/citeengines/basic.citeengine |2 +- lib/citeengines/biblatex-natbib.citeengine |2 +- lib/citeengines/biblatex.citeengine|2 +- lib/citeengines/jurabib.citeengine |2 +- lib/citeengines/natbib.citeengine |2 +- lib/layouts/AEA.layout |2 +- lib/layouts/IEEEtran-CompSoc.layout|2 +- lib/layouts/IEEEtran-TransMag.layout |2 +- lib/layouts/IEEEtran.layout|2 +- lib/layouts/InStar.module |2 +- lib/layouts/RJournal.layout|2 +- lib/layouts/a0poster.layout|2 +- lib/layouts/aa.layout |2 +- lib/layouts/aapaper.inc|2 +- lib/layouts/aapaper.layout |2 +- lib/layouts/aastex.layout |2 +- lib/layouts/aastex6.layout |2 +- lib/layouts/aastex62.layout|2 +- lib/layouts/achemso.layout |2 +- lib/layouts/acm-sigs-alt.layout|2 +- lib/layouts/acm-sigs.inc |2 +- lib/layouts/acm-sigs.layout|2 +- lib/layouts/acmart.layout |2 +- lib/layouts/acmsiggraph-0-92.layout|2 +- lib/layouts/acmsiggraph.layout |2 +- lib/layouts/agums.layout |2 +- lib/layouts/aguplus.inc|2 +- lib/layouts/agutex.layout |2 +- lib/layouts/algorithm2e.module |2 +- lib/layouts/amsart.layout |2 +- lib/layouts/amsbook.layout |2 +- lib/layouts/amsdefs.inc|2 +- lib/layouts/apa.layout |2 +- lib/layouts/apa6.layout|2 +- lib/layouts/apa7.layout|2 +- lib/layouts/apax.inc |2 +- lib/layouts/arab-article.layout|2 +- lib/layouts/article-beamer.layout |2 +- lib/layouts/article.layout |2 +- lib/layouts/beamer.layout |2 +- lib/layouts/beamerposter.layout|2 +- lib/layouts/bicaption.module |2 +- lib/layouts/book.layout|2 +- lib/layouts/braille.module |2 +- lib/layouts/broadway.layout|2 +- lib/layouts/bxjsarticle.layout |2 +- lib/layouts/bxjsbook.layout|2 +- lib/layouts/bxjsreport.layout |2 +- lib/layouts/bxjsslide.layout |2 +- lib/layouts/chess.layout |2 +- lib/layouts/chessboard.module |2 +- lib/layouts/cl2emult.layout|2 +- lib/layouts/copernicus.layout |2 +- lib/layouts/ctex-article.layout|2 +- lib/layouts/ctex-book.layout |2 +- lib/layouts/ctex-report.layout |2 +- lib/layouts/customHeadersFooters.module|2 +- lib/layouts/db_stdcharstyles.inc |2 +- lib/layouts/db_stdclass.inc|2 +- lib/layouts/db_stdstarsections.inc |2 +- lib/layouts/db_stdstruct.inc |2 +- lib/layouts/db_stdtitle.inc|2 +- lib/layouts/dinbrief.layout|2 +- lib/layouts/docbook-book.layout|2 +- lib/layouts/docbook-chapter.layout |2 +- lib/layouts/docbook-section.layout |2 +- lib/layouts/docbook.layout |2 +- lib/layouts/doublecol-new.layout |2 +- lib/layouts/dtk.layout |2 +- lib/layouts/ectaart.layout |2 +- lib/layouts/egs.layout |2 +- lib/layouts/elsart.layout |2 +- lib/layouts/elsarticle.layout |2 +- lib/layouts/endnotes.module|2 +- lib/layouts/enotez.module |2 +- lib/layouts/entcs.layout |2 +- lib/layouts/enumitem.module|2 +- lib/layouts/eqs-within-sections.module |2 +- lib/layouts/europa
r41288 - www-user/trunk/farm/cookbook/LyX
Author: sanda Date: Sun Dec 4 18:39:14 2022 New Revision: 41288 URL: http://www.lyx.org/trac/changeset/41288 Log: www: one more string in 2.3.7 translations Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc == --- www-user/trunk/farm/cookbook/LyX/i18n.inc Sat Dec 3 12:12:54 2022 (r41287) +++ www-user/trunk/farm/cookbook/LyX/i18n.inc Sun Dec 4 18:39:14 2022 (r41288) @@ -7,88 +7,88 @@ // The data itself $podata = array ( array ( 'langcode' => 'ar', "date" => "2019-04-11", -"msg_tr" => 6044, "msg_fu" => 120, "msg_nt" => 1132, +"msg_tr" => 6044, "msg_fu" => 121, "msg_nt" => 1133, "translator" => "Hatim Alahmadi", "email" => "Dr ! Hatim () hotmail ! com"), array ( 'langcode' => 'bg', "date" => "2019-04-23", -"msg_tr" => 5554, "msg_fu" => 1003, "msg_nt" => 739, +"msg_tr" => 5554, "msg_fu" => 1004, "msg_nt" => 740, "translator" => "V. Jeliazkov", "email" => "vveesskkoo () gmail ! com"), array ( 'langcode' => 'ca', "date" => "2008-07-28", "msg_tr" => 2773, "msg_fu" => 2536, "msg_nt" => 1914, "translator" => "joan", "email" => "joan () montane ! cat"), array ( 'langcode' => 'cs', "date" => "2022-11-15", -"msg_tr" => 7296, "msg_fu" => 0, "msg_nt" => 0, +"msg_tr" => 7298, "msg_fu" => 0, "msg_nt" => 0, "translator" => "Pavel Sanda", "email" => "sanda () lyx ! org"), array ( 'langcode' => 'da', "date" => "2011-04-20", "msg_tr" => 3486, "msg_fu" => 2264, "msg_nt" => 1473, "translator" => "Jesper Stemann Andersen", "email" => "jesper () sait ! dk"), -array ( 'langcode' => 'de', "date" => "2022-11-24", -"msg_tr" => 7296, "msg_fu" => 0, "msg_nt" => 0, +array ( 'langcode' => 'de', "date" => "2022-12-04", +"msg_tr" => 7298, "msg_fu" => 0, "msg_nt" => 0, "translator" => "Jürgen Spitzmüller", "email" => "spitz () lyx ! org"), array ( 'langcode' => 'el', "date" => "2018-02-19", -"msg_tr" => 4299, "msg_fu" => 172, "msg_nt" => 2825, +"msg_tr" => 4299, "msg_fu" => 173, "msg_nt" => 2826, "translator" => "Οδυσσέας Δαγκλής", "email" => "o2d () freemail ! gr"), array ( 'langcode' => 'es', "date" => "2017-11-27", -"msg_tr" => 6797, "msg_fu" => 256, "msg_nt" => 243, +"msg_tr" => 6797, "msg_fu" => 257, "msg_nt" => 244, "translator" => "Ignacio García", "email" => "ignacio ! gmorales () gmail ! com"), array ( 'langcode' => 'eu', "date" => "2018-02-17", -"msg_tr" => 7166, "msg_fu" => 87, "msg_nt" => 43, +"msg_tr" => 7166, "msg_fu" => 88, "msg_nt" => 44, "translator" => "Inaki Larranaga Murgoitio", "email" => "dooteo () zundan ! com"), array ( 'langcode' => 'fi', "date" => "2017-11-14", -"msg_tr" => 5286, "msg_fu" => 734, "msg_nt" => 1276, +"msg_tr" => 5286, "msg_fu" => 735, "msg_nt" => 1277, "translator" => "Jari-Matti Mäkelä", "email" => "jmjm () iki ! fi"), array ( 'langcode' => 'fr', "date" => "2022-11-26", -"msg_tr" => 7296, "msg_fu" => 0, "msg_nt" => 0, +"msg_tr" => 7296, "msg_fu" => 1, "msg_nt" => 1, "translator" => "Jean-Pierre Chrétien", "email" => "jeanpierre ! chretien () free ! fr"), array ( 'langcode' => 'gl', "date" => "2007-07-11", "msg_tr" => 2885, "msg_fu" => 2765, "msg_nt" => 1573, "translator" => "Ramon Flores", "email" => "inactive () inactive"), array ( 'langcode' => 'he', "date" => "2019-10-29", -"msg_tr" => 3838, "msg_fu" => 1739, "msg_nt" => 1719, +"msg_tr" => 3838, "msg_fu" => 1740, "msg_nt" => 1720, "translator" => "Guy Rutenberg", "email" => "guyrutenberg () gmail ! com"), array ( 'langcode' => 'hu', "date" => "2018-11-20", -"msg_tr" => 5404, "msg_fu" => 1075, "msg_nt" => 817, +"msg_tr" => 5404, "msg_fu" => 1076, "msg_nt" => 818, "translator" => "Szőke Sándor", "email" => "mail () szokesandor ! hu"), array ( 'langcode' => 'ia', "date" => "2020-03-14", -"msg_tr" => 7264, "msg_fu" => 24, "msg_nt" => 8, +"msg_tr" => 7264, "msg_fu" => 25, "msg_nt" => 9, "translator" => "Giovanni Sora", "email" => "g ! sora () tiscali ! it"), array ( 'langcode' => 'id', "date" => "2014-03-28", -"msg_tr" => 5177, "msg_fu" => 1301, "msg_nt" => 818, +"msg_tr" => 5177, "msg_fu" => 1302, "msg_nt" => 819, "translator" => "Waluyo Adi Siswanto", "email" => "was ! uthm () gmail ! com"), array ( 'langcode' => 'it', "date" => "2022-11-26", -"msg_tr" => 7296, "msg_fu" => 0, "msg_nt" => 0, +"msg_tr" => 7296, "msg_fu" => 1, "msg_nt" => 1, "translator" => "Enrico Forestieri", "email" => "forenr () lyx ! org"), array ( 'langcode' => 'ja', "date" => "2017-08-23", -"msg_tr" => 7113, "msg_fu" => 127, "msg_nt" => 56, +"msg_tr" => 7113, "msg_fu" => 128, "msg_nt" => 57, "translator" => "Koji Yokota", "email" => "yokota6 () gmail ! com"), array ( 'langcode' => 'ko', "date" => "2007-05-15", "msg_tr" => 1764, "msg_fu" => 1300, "msg_nt" => 4159, "translator" => "cghan", "email" => "cghan () pusan ! ac ! kr"), array ( 'langcode' => 'nb', "date" => "2016-04-07", -"msg_tr" => 6475, "msg_fu" => 509, "msg_nt" => 312, +"msg_tr" => 6475, "msg_fu" => 510, "msg_nt" =>
[LyX/master] Add support for libstdc++ assertions in autoconf builds
commit e658113ea671024610a434b645d156f83c397493 Author: Jean-Marc Lasgouttes Date: Sun Dec 4 19:22:38 2022 +0100 Add support for libstdc++ assertions in autoconf builds This is less powerful than stdlib-debug, but at least it does not change the ABI. This avoids crashes with Qt6 in particular. The new defaults are: - stdlib-assertions is enabled by default in development builds; - stdlib-debug has to be enabled explicitely. Fixes bug #12215. --- INSTALL | 22 ++ config/lyxinclude.m4 | 26 -- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/INSTALL b/INSTALL index 330e7e1..8f2836c 100644 --- a/INSTALL +++ b/INSTALL @@ -109,12 +109,13 @@ flags: release prerelease development profiling gprof optimization-O2 -O2 -O -O2 -O2 assertions X X -stdlib-debug X +stdlib-assertionsX +stdlib-debug warnings X X debugX X X X maintainer-mode X -The defaults are as follows in terms of version number +The defaults are as follows in terms of version number: release: stable release (2.x.y) prerelease: version number contains `alpha', `beta', `rc' or `pre'. development: version number contains `dev'. @@ -228,12 +229,17 @@ values): code which checks that some variables have sane values. Opposite is --disable-assertions. - o --enable-stdlib-debug adds some debug code in the standard -library; this slows down the code, but has been helpful in the -past to find bugs. Note that this is in general incompatible with -the system hunspell library (as of version 1.5). You may have to use ---disable-stdlib-debug when linking development versions against -your system's hunspell library. + o --enable-stdlib-assertions adds some bound checking code in the +libstdc++ standard library; this slows down the code, but has been +helpful in the past to find bugs. This has no effect when using +llvm's libc++ library. + + o --enable-stdlib-debug encompasses stdlib-assertions and adds +additional checks in libstdc++. Note that this changes the ABI and +is in general incompatible with the system hunspell library (as of +version 1.5). You may have to use --disable-stdlib-debug when +linking development versions against your system's hunspell +library. This has no effect when using llvm's libc++ library. diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index f7489eb..90113fd 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -310,9 +310,14 @@ AC_ARG_ENABLE(debug, ) AC_ARG_ENABLE(stdlib-debug, - AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in the standard library]),, - [AS_CASE([$build_type], [dev*], [enable_stdlib_debug=yes], - [enable_stdlib_debug=no])] + AS_HELP_STRING([--enable-stdlib-debug],[enable debug mode in libstdc++]),, + [enable_stdlib_debug=no] +) + +AC_ARG_ENABLE(stdlib-assertions, + AS_HELP_STRING([--enable-stdlib-assertions],[enable assertions in libstdc++]),, + [AS_CASE([$build_type], [dev*], [enable_stdlib_assertions=yes], + [enable_stdlib_assertions=no])] ) ### set up optimization @@ -357,6 +362,10 @@ if test x$GXX = xyes; then CXX_VERSION="($clang_version)" fi + case $gxx_version in + 2.*|3.*|4.@<:@0-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);; + esac + AM_CXXFLAGS="$lyx_optim $AM_CXXFLAGS" if test x$enable_debug = xyes ; then AM_CXXFLAGS="-g $AM_CXXFLAGS" @@ -381,9 +390,6 @@ if test x$GXX = xyes; then [AM_CXXFLAGS="$AM_CXXFLAGS -Wno-deprecated-copy"], [], [-Werror]) AC_LANG_POP(C++) fi - case $gxx_version in - 2.*|3.*|4.@<:@0-8@:>@*) AC_MSG_ERROR([gcc >= 4.9 is required]);; - esac if test x$enable_stdlib_debug = xyes ; then dnl FIXME: for clang/libc++, one should define _LIBCPP_DEBUG2=0 dnl See http://clang-developers.42468.n3.nabble.com/libc-debug-mode-td3336742.html @@ -396,6 +402,14 @@ if test x$GXX = xyes; then enable_stdlib_debug=no fi fi + if test x$enable_stdlib_assertions = xyes ; then +if test x$lyx_cv_lib_stdcxx = xyes ; then +lyx_flags="$lyx_flags stdlib-assertions" + AC_DEFINE(_GLIBCXX_ASSERTIONS, 1, [libstdc++ assertions mode]) +else + enable_stdlib_assertions=no +fi + fi fi # Some additional flags may be needed -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Remerge strings for a new string.
commit 53235a21e0154fec9c2b9c21fbc3fa9c1c400030 Author: Pavel Sanda Date: Sun Dec 4 19:26:21 2022 +0100 Remerge strings for a new string. (Better untranslated string than a crash). po/ar.po| 25 +- po/bg.po| 26 +- po/el.po| 25 +- po/en.po| 24 +- po/es.po| 25 +- po/eu.po| 25 +- po/fi.po| 25 +- po/fr.po| 25 +- po/he.po| 25 +- po/hu.po| 25 +- po/ia.po| 25 +- po/id.po| 25 +- po/it.po| 1272 +-- po/ja.po| 25 +- po/nb.po| 25 +- po/nl.po| 29 +- po/nn.po| 25 +- po/pl.po| 25 +- po/pt_BR.po | 25 +- po/pt_PT.po | 25 +- po/ru.po| 25 +- po/sk.po| 25 +- po/sv.po| 25 +- po/tr.po| 25 +- po/uk.po| 96 +++--- po/zh_CN.po | 25 +- po/zh_TW.po | 25 +- 27 files changed, 1227 insertions(+), 770 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] * cs.po
commit 96785ec51214d2df6b8cc091220036117b929d37 Author: Pavel Sanda Date: Sun Dec 4 19:23:26 2022 +0100 * cs.po --- po/cs.po | 27 +-- 1 files changed, 21 insertions(+), 6 deletions(-) diff --git a/po/cs.po b/po/cs.po index 756e1c7..db12057 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Lyx 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2022-11-23 21:01+0100\n" +"POT-Creation-Date: 2022-12-04 19:12+0100\n" "PO-Revision-Date: 2022-11-15 01:09-0800\n" "Last-Translator: Pavel Sanda \n" "Language-Team: Czech \n" @@ -25771,8 +25771,8 @@ msgstr "Třída dokumentu není dostupná" #: src/insets/InsetCommandParams.cpp:503 src/insets/InsetCommandParams.cpp:511 #: src/insets/InsetGraphics.cpp:894 src/insets/InsetGraphics.cpp:902 #: src/insets/InsetListings.cpp:260 src/insets/InsetListings.cpp:268 -#: src/insets/InsetListings.cpp:291 src/mathed/MathExtern.cpp:1440 -#: src/mathed/MathExtern.cpp:1518 +#: src/insets/InsetListings.cpp:291 src/mathed/InsetMathMacro.cpp:1091 +#: src/mathed/MathExtern.cpp:1440 src/mathed/MathExtern.cpp:1518 msgid "LyX Warning: " msgstr "Výstraha LyX-u: " @@ -25780,8 +25780,8 @@ msgstr "Výstraha LyX-u: " #: src/Paragraph.cpp:2767 src/insets/InsetCommandParams.cpp:504 #: src/insets/InsetCommandParams.cpp:512 src/insets/InsetGraphics.cpp:895 #: src/insets/InsetGraphics.cpp:903 src/insets/InsetListings.cpp:261 -#: src/insets/InsetListings.cpp:269 src/mathed/MathExtern.cpp:1441 -#: src/mathed/MathExtern.cpp:1519 +#: src/insets/InsetListings.cpp:269 src/mathed/InsetMathMacro.cpp:1092 +#: src/mathed/MathExtern.cpp:1441 src/mathed/MathExtern.cpp:1519 msgid "uncodable character" msgstr "nekódovatelný znak" @@ -33538,7 +33538,22 @@ msgstr "Nelze změnit počet řádků v '%1$s'" msgid "Can't change number of columns in '%1$s'" msgstr "Nelze změnit počet sloupců v '%1$s'" -#: src/mathed/InsetMathMacro.cpp:1224 src/mathed/InsetMathMacro.cpp:1230 +#: src/mathed/InsetMathMacro.cpp:1116 +msgid "Uncodable characters in math macro" +msgstr "Nekódovatelné znaky v matematickém makru" + +#: src/mathed/InsetMathMacro.cpp:1117 +#, c-format +msgid "" +"The macro name '%1$s' contains a character\n" +"that is not encodable in the current encoding (%2$s).\n" +"Please fix this macro." +msgstr "" +"Jméno makra '%1$s' obsahuje znak,\n" +"který není reprezentovatelný v současném kódování (%2$s).\n" +"Opravte prosím makro." + +#: src/mathed/InsetMathMacro.cpp:1269 src/mathed/InsetMathMacro.cpp:1275 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Fix de.po
commit 5883886ba11b5333cf802398608e07bb7fc6f9c2 Author: Pavel Sanda Date: Sun Dec 4 19:25:47 2022 +0100 Fix de.po --- po/de.po |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/po/de.po b/po/de.po index 4cd8279..5794d82 100644 --- a/po/de.po +++ b/po/de.po @@ -33977,7 +33977,7 @@ msgstr "Unkodierbare Zeichen in Mathe-Makro" #: src/mathed/InsetMathMacro.cpp:1117 #, c-format msgid "" -"The macro name '%1$s' contains a character.\n" +"The macro name '%1$s' contains a character\n" "that is not encodable in the current encoding (%2$s).\n" "Please fix this macro." msgstr "" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Typo in new string.
commit ef1a2838ce5f7359e9e68c5f28a87c3f8e58b918
Author: Pavel Sanda
Date: Sun Dec 4 19:19:18 2022 +0100
Typo in new string.
---
src/mathed/InsetMathMacro.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 5bed4a0..d9a307f 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -1114,7 +1114,7 @@ void InsetMathMacro::write(WriteStream & os) const
if (!uncodable.empty()) {
frontend::Alert::warning(
_("Uncodable characters in math macro"),
- support::bformat(_("The macro name '%1$s' contains a
character.\n"
+ support::bformat(_("The macro name '%1$s' contains a
character\n"
"that is not encodable in the
current encoding (%2$s).\n"
"Please fix this macro."), name_in,
uncodable));
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] de.po
commit 0b002b5428184908b270197899da64b9a5366d4c Author: Juergen Spitzmueller Date: Sun Dec 4 18:57:45 2022 +0100 de.po --- po/de.gmo | Bin 550079 -> 550436 bytes po/de.po | 29 ++--- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/po/de.gmo b/po/de.gmo index d7b37d7..f15f68e 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 0588916..4cd8279 100644 --- a/po/de.po +++ b/po/de.po @@ -94,8 +94,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2022-11-23 21:33+0100\n" -"PO-Revision-Date: 2022-11-24 07:11+0100\n" +"POT-Creation-Date: 2022-12-04 18:53+0100\n" +"PO-Revision-Date: 2022-12-04 18:57+0100\n" "Last-Translator: Jürgen Spitzmüller \n" "Language-Team: Deutsch \n" "Language: de\n" @@ -26025,8 +26025,8 @@ msgstr "Die Dokumentklasse ist nicht verfügbar" #: src/insets/InsetCommandParams.cpp:503 src/insets/InsetCommandParams.cpp:511 #: src/insets/InsetGraphics.cpp:894 src/insets/InsetGraphics.cpp:902 #: src/insets/InsetListings.cpp:260 src/insets/InsetListings.cpp:268 -#: src/insets/InsetListings.cpp:291 src/mathed/MathExtern.cpp:1440 -#: src/mathed/MathExtern.cpp:1518 +#: src/insets/InsetListings.cpp:291 src/mathed/InsetMathMacro.cpp:1091 +#: src/mathed/MathExtern.cpp:1440 src/mathed/MathExtern.cpp:1518 msgid "LyX Warning: " msgstr "LyX-Warnung: " @@ -26034,8 +26034,8 @@ msgstr "LyX-Warnung: " #: src/Paragraph.cpp:2767 src/insets/InsetCommandParams.cpp:504 #: src/insets/InsetCommandParams.cpp:512 src/insets/InsetGraphics.cpp:895 #: src/insets/InsetGraphics.cpp:903 src/insets/InsetListings.cpp:261 -#: src/insets/InsetListings.cpp:269 src/mathed/MathExtern.cpp:1441 -#: src/mathed/MathExtern.cpp:1519 +#: src/insets/InsetListings.cpp:269 src/mathed/InsetMathMacro.cpp:1092 +#: src/mathed/MathExtern.cpp:1441 src/mathed/MathExtern.cpp:1519 msgid "uncodable character" msgstr "unkodierbares Zeichen" @@ -33970,7 +33970,22 @@ msgstr "Die Anzahl der Zeilen in '%1$s' kann nicht geändert werden." msgid "Can't change number of columns in '%1$s'" msgstr "Die Anzahl der Spalten in '%1$s' kann nicht geändert werden." -#: src/mathed/InsetMathMacro.cpp:1224 src/mathed/InsetMathMacro.cpp:1230 +#: src/mathed/InsetMathMacro.cpp:1116 +msgid "Uncodable characters in math macro" +msgstr "Unkodierbare Zeichen in Mathe-Makro" + +#: src/mathed/InsetMathMacro.cpp:1117 +#, c-format +msgid "" +"The macro name '%1$s' contains a character.\n" +"that is not encodable in the current encoding (%2$s).\n" +"Please fix this macro." +msgstr "" +"Der Makronamen '%1$s' enthält Zeichen, die nicht\n" +"in der aktuellen Kodierung kodierbar sind (%2$s).\n" +"Bitte korrigieren Sie das Makro." + +#: src/mathed/InsetMathMacro.cpp:1269 src/mathed/InsetMathMacro.cpp:1275 #, c-format msgid "Macro: %1$s" msgstr "Makro: %1$s" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Check encodability of math user macro names (#11855)
commit 8900b5a3aa00393c6fcc6429c16ef6e59e3d1617
Author: Juergen Spitzmueller
Date: Fri Dec 2 11:23:32 2022 +0100
Check encodability of math user macro names (#11855)
(cherry picked from commit 14b108fc222ef9e7891d90ce364ceb227f8182dc)
---
src/mathed/InsetMathMacro.cpp | 51 ++--
status.23x|2 +
2 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/src/mathed/InsetMathMacro.cpp b/src/mathed/InsetMathMacro.cpp
index 1a5e220..5bed4a0 100644
--- a/src/mathed/InsetMathMacro.cpp
+++ b/src/mathed/InsetMathMacro.cpp
@@ -26,6 +26,7 @@
#include "BufferView.h"
#include "CoordCache.h"
#include "Cursor.h"
+#include "Encoding.h"
#include "FuncStatus.h"
#include "FuncRequest.h"
#include "LaTeXFeatures.h"
@@ -33,6 +34,7 @@
#include "LyXRC.h"
#include "MetricsInfo.h"
+#include "frontends/alert.h"
#include "frontends/Painter.h"
#include "support/debug.h"
@@ -1074,10 +1076,53 @@ void InsetMathMacro::write(WriteStream & os) const
mode_type mode = currentMode();
MathEnsurer ensurer(os, mode == MATH_MODE, true, mode == TEXT_MODE);
+ // Check if the macro name is encodable. Otherwise we might crash
(#11855).
+ docstring const name_in = name();
+ docstring name_recoded;
+ docstring uncodable;
+ for (char_type c : name_in) {
+ if (!os.encoding())
+ break;
+ if (os.encoding()->encodable(c))
+ name_recoded += c;
+ else {
+ switch (os.output()) {
+ case WriteStream::wsDryrun: {
+ os << "<" << _("LyX Warning: ")
+ << _("uncodable character") << " '";
+ os << docstring(1, c);
+ os << "'>";
+ break;
+ }
+ case WriteStream::wsPreview: {
+ // indicate the encoding error by a boxed '?'
+ os << "{\\fboxsep=1pt\\fbox{?}}";
+ LYXERR0("Uncodable character" << " '"
+ << docstring(1, c)
+ << "'");
+ break;
+ }
+ case WriteStream::wsDefault:
+ default:
+ // record for error message
+ uncodable += c;
+ break;
+ }
+ }
+ }
+
+ if (!uncodable.empty()) {
+ frontend::Alert::warning(
+ _("Uncodable characters in math macro"),
+ support::bformat(_("The macro name '%1$s' contains a
character.\n"
+ "that is not encodable in the
current encoding (%2$s).\n"
+ "Please fix this macro."), name_in,
uncodable));
+ }
+
// non-normal mode
if (d->displayMode_ != DISPLAY_NORMAL) {
- os << "\\" << name();
- if (name().size() != 1 || isAlphaASCII(name()[0]))
+ os << "\\" << name_recoded;
+ if (name_recoded.size() != 1 || isAlphaASCII(name_recoded[0]))
os.pendingSpace(true);
return;
}
@@ -1090,7 +1135,7 @@ void InsetMathMacro::write(WriteStream & os) const
if (os.fragile())
os << "\\protect";
- os << "\\" << name();
+ os << "\\" << name_recoded;
bool first = true;
// Optional arguments:
diff --git a/status.23x b/status.23x
index 076bb4e..2b96fd2 100644
--- a/status.23x
+++ b/status.23x
@@ -83,6 +83,8 @@ What's new
- Fix validating a macro definitions (bug 12524).
+- Fix crashing due to uncodable character in math macro name (bug 11855).
+
* USER INTERFACE
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Use ranges
commit dfa87371f707614915c9d60df020a58ca2eb4e1a Author: Richard Kimberly Heck Date: Sun Dec 4 12:06:48 2022 -0500 Use ranges --- src/Paragraph.cpp | 14 -- 1 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 453b1e1..6b156b9 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -4009,16 +4009,10 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf, // FIXME XHTML // Other such tags? What about the other text ranges? - vector::const_iterator cit = tagsToClose.begin(); - vector::const_iterator cen = tagsToClose.end(); - for (; cit != cen; ++cit) - xs << *cit; - - vector::const_iterator sit = tagsToOpen.begin(); - vector::const_iterator sen = tagsToOpen.end(); - for (; sit != sen; ++sit) - xs << *sit; - + for (auto const & t : tagsToClose) + xs << t; + for (auto const & t : tagsToOpen) + xs << t; tagsToClose.clear(); tagsToOpen.clear(); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix bug #11769
commit 6f4f7442ef3d5ec254e3af33ca6f1461a287200e
Author: Richard Kimberly Heck
Date: Sun Dec 4 12:51:47 2022 -0500
Fix bug #11769
---
lib/layouts/stdlists.inc |6 ++
src/Layout.cpp |4 +++-
src/output_xhtml.cpp | 46 +++---
3 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/lib/layouts/stdlists.inc b/lib/layouts/stdlists.inc
index 45ec559..1a50878 100644
--- a/lib/layouts/stdlists.inc
+++ b/lib/layouts/stdlists.inc
@@ -88,6 +88,12 @@ Style Enumerate
DocBookTagorderedlist
DocBookItemTaglistitem
DocBookItemInnerTag para
+ HTMLStyle
+ ol.enumi { list-style-type: decimal; }
+ ol.enumii { list-style-type: lower-latin; }
+ ol.enumiii { list-style-type: lower-roman; }
+ ol.enumiv { list-style-type: upper-latin; }
+ EndHTMLStyle
End
Style Description
diff --git a/src/Layout.cpp b/src/Layout.cpp
index b94696f..f782c12 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -1809,7 +1809,9 @@ string const & Layout::htmltag() const
string const & Layout::htmlattr() const
{
- if (htmlattr_.empty())
+ // If it's an enumeration, then we recalculate the class each time
through
+ // unless it has been given explicitly
+ if (htmlattr_.empty() && labeltype != LABEL_ENUMERATE)
htmlattr_ = "class=\"" + defaultCSSClass() + "\"";
return htmlattr_;
}
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 47c4145..3fb292e 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -19,6 +19,7 @@
#include "Counters.h"
#include "Font.h"
#include "Layout.h"
+#include "LayoutEnums.h"
#include "Paragraph.h"
#include "ParagraphList.h"
#include "ParagraphParameters.h"
@@ -156,7 +157,7 @@ namespace {
// convenience functions
inline void openParTag(XMLStream & xs, Layout const & lay,
- const std::string & parlabel)
+ std::string const & parlabel)
{
string attrs = lay.htmlattr();
if (!parlabel.empty())
@@ -166,8 +167,17 @@ inline void openParTag(XMLStream & xs, Layout const & lay,
void openParTag(XMLStream & xs, Layout const & lay,
+std::string const & cssclass,
+std::string const & parlabel) {
+string attrs = "class='" + cssclass + "'";
+if (!parlabel.empty())
+attrs += " id='" + parlabel + "'";
+xs << xml::ParTag(lay.htmltag(), attrs);
+}
+
+void openParTag(XMLStream & xs, Layout const & lay,
ParagraphParameters const & params,
-const std::string & parlabel)
+std::string const & parlabel)
{
// FIXME Are there other things we should handle here?
string const align = alignmentToCSS(params.align());
@@ -398,7 +408,37 @@ ParagraphList::const_iterator makeEnvironment(Buffer const
& buf,
depth_type const origdepth = pbegin->params().depth();
// open tag for this environment
- openParTag(xs, bstyle, pbegin->magicLabel());
+ if (bstyle.labeltype == LABEL_ENUMERATE && bstyle.htmlattr().empty()) {
+ // In this case, we have to calculate the CSS class ourselves,
each time
+ // through
+ // FIXME We assume in these cases that the standard enumeration
counter
+ // is being used. (We also do not deal with 'resume' counters,
though I'm
+ // not sure that can be done at all.)
+
+ // Code borrowed from Buffer::Impl::setLabel
+ docstring enumcounter = bstyle.counter.empty() ?
+ from_ascii("enum") : bstyle.counter;
+ switch (par->itemdepth) {
+ case 2:
+ enumcounter += 'i';
+ // fall through
+ case 1:
+ enumcounter += 'i';
+ // fall through
+ case 0:
+ enumcounter += 'i';
+ break;
+ case 3:
+ enumcounter += "iv";
+ break;
+ default:
+ // not a valid enumdepth...
+ break;
+ }
+ openParTag(xs, bstyle, to_utf8(enumcounter),
pbegin->magicLabel());
+ }
+ else
+ openParTag(xs, bstyle, pbegin->magicLabel());
xs << xml::CR();
// we will on occasion need to remember a layout from before.
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Do not output label tags if there is no label
commit b37ac5807f388a690436e4af809acf6506905eb5
Author: Richard Kimberly Heck
Date: Sun Dec 4 12:01:42 2022 -0500
Do not output label tags if there is no label
---
src/output_xhtml.cpp | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 9924be1..47c4145 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -466,10 +466,13 @@ ParagraphList::const_iterator makeEnvironment(Buffer
const & buf,
xs << xml::CR();
}
else {
- openLabelTag(xs, style);
- xs <<
par->params().labelString();
- closeLabelTag(xs,
style);
- xs << xml::CR();
+ docstring const & ls =
par->params().labelString();
+ if (!ls.empty()) {
+
openLabelTag(xs, style);
+ xs << ls;
+
closeLabelTag(xs, style);
+ xs << xml::CR();
+ }
}
}
} // end label output
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Whitespace
commit b9c52f20c7e714e1594134cd859638b59e476e6a Author: Richard Kimberly Heck Date: Sun Dec 4 11:59:21 2022 -0500 Whitespace --- src/output_xhtml.cpp |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp index f1bcfb8..9924be1 100644 --- a/src/output_xhtml.cpp +++ b/src/output_xhtml.cpp @@ -417,7 +417,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf, if (!style.counter.empty() && (par == pbegin || !isNormalEnv(style)) && cnts.hasCounter(cntr) - ) + ) cnts.step(cntr, OutputUpdate); ParagraphList::const_iterator send; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fixup refs sorting
commit 3ec87be05088d035bbe289dc12b55fb8a96b7282
Author: Juergen Spitzmueller
Date: Sun Dec 4 16:21:14 2022 +0100
Fixup refs sorting
This has been broken at df59649a18f
---
src/frontends/qt/GuiRef.cpp | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index 0e76f03..eff0917 100644
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -435,7 +435,7 @@ void GuiRef::redoRefs()
QString const oldSelection(referenceED->text());
QStringList refsNames;
- QStringList refsAsStrings;
+ QMap refsAsStrings;
QStringList refsCategories;
vector>::const_iterator iter;
bool noprefix = false;
@@ -444,7 +444,7 @@ void GuiRef::redoRefs()
QString const lab = toqstr((*iter).first);
refsNames.append(lab);
// the label as gui string
- refsAsStrings.append(toqstr((*iter).second));
+ refsAsStrings.insert(lab, toqstr((*iter).second));
if (groupCB->isChecked()) {
if (lab.contains(":")) {
QString const pref = lab.split(':')[0];
@@ -487,7 +487,8 @@ void GuiRef::redoRefs()
&& (!ref.mid(1).contains(":") ||
ref.left(1).contains(":" {
QTreeWidgetItem * child =
new
QTreeWidgetItem(item);
- child->setText(0,
refsAsStrings.at(j));
+ QString const val =
refsAsStrings.value(ref, ref);
+ child->setText(0, val);
child->setData(0, Qt::UserRole,
ref);
item->addChild(child);
}
@@ -500,7 +501,8 @@ void GuiRef::redoRefs()
for (int i = 0; i < refsNames.size(); ++i) {
QTreeWidgetItem * item = new QTreeWidgetItem(refsTW);
QString const & ref = refsNames.at(i);
- item->setText(0, refsAsStrings.at(i));
+ QString const val = refsAsStrings.value(ref, ref);
+ item->setText(0, val);
item->setData(0, Qt::UserRole, ref);
refsItems.append(item);
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fixup refs grouping
commit abd69b06f4715b570ccc84390a0adf332cc92c4f
Author: Juergen Spitzmueller
Date: Sun Dec 4 15:32:47 2022 +0100
Fixup refs grouping
This has been broken at df59649a18f
---
src/frontends/qt/GuiRef.cpp |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index ad4d710..0e76f03 100644
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -487,8 +487,8 @@ void GuiRef::redoRefs()
&& (!ref.mid(1).contains(":") ||
ref.left(1).contains(":" {
QTreeWidgetItem * child =
new
QTreeWidgetItem(item);
- item->setText(0,
refsAsStrings.at(j));
- item->setData(0, Qt::UserRole,
ref);
+ child->setText(0,
refsAsStrings.at(j));
+ child->setData(0, Qt::UserRole,
ref);
item->addChild(child);
}
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Properly reset on ESC key on LayoutBox/CategorizedCombo
commit 7bdf372ecc3129eeb6299ae13331a354467a7000
Author: Daniel Ramoeller
Date: Sun Feb 27 20:33:48 2022 +0100
Properly reset on ESC key on LayoutBox/CategorizedCombo
Fix for bug #12497.
---
src/frontends/qt/CategorizedCombo.cpp |2 ++
src/frontends/qt/CategorizedCombo.h |2 ++
src/frontends/qt/LayoutBox.cpp|2 ++
src/frontends/qt/LayoutBox.h |1 +
4 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/src/frontends/qt/CategorizedCombo.cpp
b/src/frontends/qt/CategorizedCombo.cpp
index 1548ecf..c4005ac 100644
--- a/src/frontends/qt/CategorizedCombo.cpp
+++ b/src/frontends/qt/CategorizedCombo.cpp
@@ -370,6 +370,7 @@ void CategorizedCombo::Private::countCategories()
void CategorizedCombo::showPopup()
{
+ lastCurrentIndex_ = currentIndex();
bool enabled = view()->updatesEnabled();
view()->setUpdatesEnabled(false);
@@ -400,6 +401,7 @@ bool CategorizedCombo::eventFilter(QObject * o, QEvent * e)
case Qt::Key_Escape:
if (!modified && !d->filter_.isEmpty()) {
d->resetFilter();
+ setCurrentIndex(lastCurrentIndex_);
return true;
}
break;
diff --git a/src/frontends/qt/CategorizedCombo.h
b/src/frontends/qt/CategorizedCombo.h
index be351ff..9e03449 100644
--- a/src/frontends/qt/CategorizedCombo.h
+++ b/src/frontends/qt/CategorizedCombo.h
@@ -74,6 +74,8 @@ private:
struct Private;
///
Private * const d;
+ ///
+ int lastCurrentIndex_;
};
diff --git a/src/frontends/qt/LayoutBox.cpp b/src/frontends/qt/LayoutBox.cpp
index 49d3086..5b15e98 100644
--- a/src/frontends/qt/LayoutBox.cpp
+++ b/src/frontends/qt/LayoutBox.cpp
@@ -401,6 +401,7 @@ void LayoutBox::Private::countCategories()
void LayoutBox::showPopup()
{
+ lastCurrentIndex_ = currentIndex();
d->owner_.message(_("Enter characters to filter the layout list."));
bool enabled = view()->updatesEnabled();
@@ -425,6 +426,7 @@ bool LayoutBox::eventFilter(QObject * o, QEvent * e)
case Qt::Key_Escape:
if (!modified && !d->filter_.isEmpty()) {
d->resetFilter();
+ setCurrentIndex(lastCurrentIndex_);
return true;
}
break;
diff --git a/src/frontends/qt/LayoutBox.h b/src/frontends/qt/LayoutBox.h
index a3d174e..bbccb74 100644
--- a/src/frontends/qt/LayoutBox.h
+++ b/src/frontends/qt/LayoutBox.h
@@ -60,6 +60,7 @@ private:
friend class LayoutItemDelegate;
class Private;
Private * const d;
+ int lastCurrentIndex_;
};
} // namespace frontend
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Translation of new index features step 2
commit 8e8825baa71662a6c68e2ba8f63568a853f93834 Author: jpc Date: Sun Dec 4 11:18:41 2022 +0100 Translation of new index features step 2 --- lib/doc/fr/UserGuide.lyx | 243 +++--- 1 files changed, 165 insertions(+), 78 deletions(-) diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 5f6d4cd..98b6588 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -34110,7 +34110,7 @@ Index \begin_inset Index idx range none pageformat default -status collapsed +status open \begin_layout Plain Layout Index @@ -34154,11 +34154,26 @@ type "icon" arg "index-insert" \end_inset - de la barre d'outils mais voyez. - Une boîte est insérée contenant le texte qui apparaîtra dans l'index. + de la barre d'outils (mais voyez la section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Convenience-Functions-Index" + +\end_inset + + pour quelques méthodes plus sophistiquée). + Un insert avec une étiquette verte est insérée: il contient le texte qui + apparaîtra dans l'index (si vous lisez ceci en \SpecialChar LyX +, voyez la référence d'index + dans le titre de la présente section). Le mot dans lequel le curseur se trouve ou la portion de texte qui est actuellement sélectionnée est proposé comme entrée d'index par \SpecialChar LyX -. + (i.e. + copié dans l'insert). \end_layout \begin_layout Standard @@ -34190,8 +34205,64 @@ Index \end_inset apparaîtra à l'endroit où l'index sera imprimé dans la sortie finale. - La boîte de l'index n'est pas cliquable comme les autre boîtes de \SpecialChar LyX -. + Implicitement, l'insert de l'index n'est pas cliquable comme les autre + boîtes de \SpecialChar LyX +, puisqu'il n'y a aucun réglage à préciser. + Ceci change si vous sélectionnez +\begin_inset Quotes cld +\end_inset + +Utilisez plusieurs index +\begin_inset Quotes crd +\end_inset + + (voir la section +\begin_inset space ~ +\end_inset + + +\begin_inset CommandInset ref +LatexCommand ref +reference "subsec:Ligatures" +plural "false" +caps "false" +noprefix "false" + +\end_inset + +). + Dans ce cas, l'insert devient gris et cliquable, puisqu'il peut y avoir + de réglages à faire. +\end_layout + +\begin_layout Standard +Implicitement, une entrée d'index est simplement un mot ou un phrase dans + l'index (ordonné alphabétiquement), avec une référence à la ou les pages + où l’entrée d'index a été insérée dans le document. + Cependant, vous pouvez paramétrer les entrées d'index pour qu'elles apparaissen +t différemment. + Vous pouvez grouper les entrée dans des arborescences, vous référer à une + série de pages plutôt qu'à une seule page, introduire une référence à une + autre entrée de l'index à la place ou en plus du numéro de page, vous pouvez + mettre en forme les références de pages (en gras par exemple pour certaines + pages spécifiques) et vous pouvez modifier l'ordre des entrées dans l'index. + Ces fonctionnalités sont disponibles en \SpecialChar LyX + soit comme des +\begin_inset Quotes cld +\end_inset + +sous-entrées +\begin_inset Quotes crd +\end_inset + + via le menu +\family sans +Insertion\SpecialChar menuseparator +Propriétés de l'index +\family default + qui apparaît si le curseur se trouve dans une entrée d'index, ou bien par + le menu des paramètres d'index qui peut être ouvert par un clic droit dans + l'insert d'index. \end_layout \begin_layout Standard @@ -34216,7 +34287,7 @@ Rassembler les entrées d'index \begin_inset Index idx range none pageformat default -status open +status collapsed \begin_layout Plain Layout Index @@ -34235,6 +34306,13 @@ Rassembler les entrées \end_inset +\begin_inset CommandInset label +LatexCommand label +name "subsec:Rassembler-les-entrées" + +\end_inset + + \end_layout \begin_layout Standard @@ -34358,15 +34436,19 @@ Pages consécutives Implicitement une entrée d'index se réfère à la seule page où cette entrée a été insérée. Si vous voulez vous référer plutôt à une série de pages, vous pouvez le - faire en insérant deux entrée s d'index: l'une marque le début de la série + faire en insérant deux entrées d'index: l'une marque le début de la série de pages, l'autre marque la fin. - Les deux entrées doivent contenir la même entrée d'index (et éventuellement - les sous-entrées). + Les deux entrées doivent contenir le même texte d'entrée d'index (et éventuelle +ment les sous-entrées). Pour marquer le début et la fin, sélectionner l'option \family sans -Page Range +Page initiale \family default - adéquate dans les paramètres de l'insert d'index. + ou +\family sans +Page finale +\family default + dans les paramètres de l'insert d'index. Le début et la fin de la série de pages sont indiquées dans l'insert via \begin_inset Quotes cld @@ -34389,11 +34471,13 @@ Page Range \begin_layout Standard -\lang english -Note that you have to take care that range markers are complete. - If a range s
[LyX/master] Workaround for #11676
commit 891ba7263ecdd0fec077e318f41009527a4ab513
Author: Juergen Spitzmueller
Date: Sun Dec 4 11:09:00 2022 +0100
Workaround for #11676
Avoid the crash we get with this combination. Having identified the real
cause would of course have been better. But it seems no one has a clue.
---
src/DocIterator.cpp |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/DocIterator.cpp b/src/DocIterator.cpp
index 7c1924c..94b7792 100644
--- a/src/DocIterator.cpp
+++ b/src/DocIterator.cpp
@@ -549,6 +549,11 @@ void DocIterator::updateInsets(Inset * inset)
size_t const n = slices_.size();
slices_.resize(0);
for (size_t i = 0 ; i < n; ++i) {
+ if (dit[i].empty() && prevMath().lyxCode() == MATH_SCRIPT_CODE)
+ // Workaround: With empty optional argument and a
trailing script,
+ // we have empty slices in math macro args (#11676)
+ // FIXME: Find real cause!
+ continue;
LBUFERR(inset);
push_back(dit[i]);
top().inset_ = inset;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
