[LyX/master] Update of de/Math
commit 8742f77f3a65e09985d9337edb47a859663e6225
Author: Juergen Spitzmueller
Date: Tue Feb 27 07:17:47 2024 +0100
Update of de/Math
---
lib/doc/de/Math.lyx | 73 ++---
1 file changed, 70 insertions(+), 3 deletions(-)
diff --git a/lib/doc/de/Math.lyx b/lib/doc/de/Math.lyx
index 6d8d82c0df..082281a41b 100644
--- a/lib/doc/de/Math.lyx
+++ b/lib/doc/de/Math.lyx
@@ -152,6 +152,7 @@
\use_default_options false
\begin_modules
subequations
+logicalmkup
\end_modules
\maintain_unincluded_children no
\language ngerman
@@ -177,6 +178,8 @@ subequations
\output_sync 0
\bibtex_command default
\index_command makeindex
+\float_placement class
+\float_alignment class
\paperfontsize 12
\spacing single
\use_hyperref true
@@ -215,6 +218,7 @@ subequations
\suppress_date false
\justification true
\use_refstyle 0
+\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\notefontcolor #ff
@@ -21922,7 +21926,7 @@ A=\frac{B}{c}\cdot\maltese
\begin_inset Formula
\[
-\maltese A\textrm{\Large\maltese\textit{A}}\textrm{\tiny\maltese\textit{A}}
+\maltese A\textrm{{\Large \maltese\textit{A}}}\textrm{{\tiny
\maltese\textit{A}}}
\]
\end_inset
@@ -38370,6 +38374,69 @@ hinzufügen
\end_layout
+\begin_layout Subsection
+Mathe-Makros für externe Befehle
+\end_layout
+
+\begin_layout Standard
+Zuweilen braucht man ein \SpecialChar LaTeX
+-Paket,
+ das einen Mathebefehl definiert,
+ welcher nicht von Haus aus in \SpecialChar LyX
+ unterstützt wird.
+ Die Lösung ist einfach:
+ Binden Sie einfach das Paket in den Vorspann ein und tippen Sie den Befehl im
Mathe-Modus.
+ Wie immer bei Dingen,
+ die im Vorspann definiert werden,
+ ist die Darstellung im \SpecialChar LyX
+-Arbeitsbereich nicht ideal.
+\end_layout
+
+\begin_layout Standard
+Ab LyX 2.4 gibt es hierfür folgende Lösung:
+ Definieren Sie einfach ein Mathe-Makro mit leerem \SpecialChar TeX
+-Kästchen!
+ Der \SpecialChar LyX
+-Teil wird für die Drastellung verwendet,
+ es wird aber kein \SpecialChar LaTeX
+-Code ausgegeben.
+ Beispielsweise definiert das Paket
+\series bold
+godelnum
+\series default
+ ein Makro
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+Godelnum
+\end_layout
+
+\end_inset
+
+,
+ welches ein eizlenes Argument in eckige Anführungszeichen setzt.
+ Um hierfür eine elegante Darstellung in \SpecialChar LyX
+ zu bekommen,
+ definieren Sie einfach:
+\end_layout
+
+\begin_layout Standard
+\begin_inset FormulaMacro
+\newcommand{\Godelnum}[1]{}
+{\ulcorner#1\urcorner}
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+Der gleiche Trick funktioniert natürlich auch für Befehle,
+ die Sie im Vorspann selbst definiert haben.
+\end_layout
+
\begin_layout Section
Computeralgebrasysteme
\end_layout
@@ -40773,11 +40840,11 @@ nolink "false"
-Klammer steht.
\begin_inset Formula
\begin{flalign}
-\hspace{30pt}F_{A} & =\rho·V·g & \footnotesize\begin{array}{ll}
+\hspace{30pt}F_{A} & =\rho·V·g & {\footnotesize \begin{array}{ll}
\rho & \textrm{Dichte}\\
V & \textrm{Volumen}\\
g & \textrm{Fallbeschleunigung}
-\end{array} & & {}\label{eq:innerhalb}
+\end{array}} & & {}\label{eq:innerhalb}
\end{flalign}
\end_inset
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Math.lyx: some formatting fixes
commit d0a4b8025675af4a7cd5244b7a6bc6e54ba0afed Author: Juergen Spitzmueller Date: Tue Feb 27 07:17:31 2024 +0100 Math.lyx: some formatting fixes --- lib/doc/Math.lyx | 40 +++- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/lib/doc/Math.lyx b/lib/doc/Math.lyx index a393eeb362..bc311a6695 100644 --- a/lib/doc/Math.lyx +++ b/lib/doc/Math.lyx @@ -38454,33 +38454,55 @@ Math Macros for External Commands \begin_layout Standard Sometimes, - you may need to use a LaTeX package which defines a math command that is not natively supported in LyX. + you may need to use a \SpecialChar LaTeX + package which defines a math command that is not natively supported in \SpecialChar LyX +. This is easy enough to do: Just include the package in the preamble and type out the command in math. As with commands defined in the preamble, however, - the display in LyX will not be `nice'. + the display in \SpecialChar LyX + will not be +\begin_inset Quotes els +\end_inset + +nice +\begin_inset Quotes ers +\end_inset + +. \end_layout \begin_layout Standard -As of LyX 2.4, +As of \SpecialChar LyX + 2.4, this problem has been solved. - Just define a math macro with empty LaTeX slot! - The LyX part will be used for display, - but no corresponding LaTeX will be output. + Just define a math macro with empty \SpecialChar TeX + slot! + The \SpecialChar LyX + part will be used for display, + but no corresponding \SpecialChar LaTeX + will be output. For example, the +\series bold +godelnum +\series default + package defines a \begin_inset Flex Code status collapsed \begin_layout Plain Layout -godelnum.sty + +\backslash +Godelnum \end_layout \end_inset - package defines a Godelnum macro that puts a single argument into corner quotes. - To get a nice LyX display of this macro, + macro that puts a single argument into corner quotes. + To get a nice \SpecialChar LyX + display of this macro, just do: \end_layout -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Consider bookauthor in preview
commit ead6eb8944eaadedaf1d449d7c2a5543f98e0915
Author: Juergen Spitzmueller
Date: Tue Feb 27 05:40:57 2024 +0100
Consider bookauthor in preview
Hence, also support the inbook type
---
lib/layouts/stdciteformats.inc | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/layouts/stdciteformats.inc b/lib/layouts/stdciteformats.inc
index 7a48a7bd25..d88218d76b 100644
--- a/lib/layouts/stdciteformats.inc
+++ b/lib/layouts/stdciteformats.inc
@@ -49,6 +49,8 @@ CiteFormat default
!makeed {%ifmultiple:editor%[[%B_edstext%]][[%B_edtext%]]}
# author or editor, as fullnames, following the schemes above
!authoredit {%fullnames:author%[[%fullnames:author%,
]][[{%fullnames:editor%[[%fullnames:editor%, %!makeed%, ]]}]]}
+ # by author or editor, as fullnames, following the schemes above
+ !byauthoredit {%fullbynames:bookauthor%[[%fullbynames:bookauthor%,
]][[{%fullbynames:editor%[[%fullbynames:editor%, %!makeed%, ]]}]]}
# "vol. 1, no.
!volnum {%volume%[[ %B_voltext% %volume%, {%number%[[%B_numtext%
%number%]]}]]}
!fulltitle %title%{%subtitle%[[: %subtitle%]]}
@@ -63,7 +65,7 @@ CiteFormat default
#
# Entry types. Note that final punctuation will be added later, if
needed.
#
- !insomething %fullnames:author%, %!quotetitle%,
%B_in%{%fullbynames:editor%[[ %fullbynames:editor%, %!makeed%,]]}
{!!}%!fullbooktitle%{!!}%!volnum%{%edition%[[ %edition%]]}
(%!locpub%%year%)%!pages%{%note%[[. %note%]]}
+ !insomething %fullnames:author%, %!quotetitle%, %B_in% %!byauthoredit%
{!!}%!fullbooktitle%{!!}%!volnum%{%edition%[[ %edition%]]}
(%!locpub%%year%)%!pages%{%note%[[. %note%]]}
article %fullnames:author%, %!quotetitle%, %!emphjournal% {%volume%[[
%volume%{%number%[[, %number%]]}]]} (%year%)%!pages%{%note%[[. %note%]]}
@@ -72,6 +74,7 @@ CiteFormat default
collection %!booklike%
proceedings %!booklike%
+ inbook %!insomething%
incollection %!insomething%
inproceedings %!insomething%
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 8e0bc01d
commit 27c01ee1d37e979f044329bcf07b9e910ed2b7ad
Author: Thibaut Cuvelier
Date: Tue Feb 27 00:45:10 2024 +0100
Amend 8e0bc01d
std::set::find only appeared in C++20. Rather use std::set::find for
compatibility.
---
src/insets/InsetBibtex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 8a2a697648..2e6f7f7fb7 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -1220,7 +1220,7 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
if (docbookTag == "SPECIFIC") {
delayedTags[match[1]] = match[2];
} else {
- if
(alreadyOutputDocBookTags.contains(docbookTag)) {
+ if
(alreadyOutputDocBookTags.find(docbookTag) != alreadyOutputDocBookTags.end()) {
xs << XMLStream::ESCAPE_NONE <<
[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] DocBook: in a table, fix a typo in a condition.
commit baccce7d2de92dcf57eb2afa8492e56a4805b1af
Author: Thibaut Cuvelier
Date: Mon Feb 26 16:09:26 2024 +0100
DocBook: in a table, fix a typo in a condition.
Before this patch, all table cells had a semicolon at the beginning of
their style:
+
Table 1
-
+
Table 2
-
+
Table 3
-
+
Row 1
-
-
+
+
Col 3, row 1
-
+
Row 2
-
-
+
+
Col 3, row 2
@@ -187,31 +187,31 @@ I am no more code.
I am a table caption above the table.
-
+
Table 1
-
+
Table 2
-
+
Table 3
-
+
Row 1
-
-
+
+
Col 3, row 1
-
+
Row 2
-
-
+
+
Col 3, row 2
@@ -220,31 +220,31 @@ I am no more code.
-
+
Table that has no caption 1
-
+
Table that has no caption 2
-
+
Table that has no caption 3
-
+
Row 1
-
-
+
+
Col 3, row 1
-
+
Row 2
-
-
+
+
Col 3, row 2
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 9b4f175f74..5242775e7f 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3842,7 +3842,7 @@ docstring Tabular::xmlRow(XMLStream & xs, const row_type
row, OutputParams const
const std::vector styles =
computeCssStylePerCell(row, c, cell);
std::string attr_str_prefix = "style='" + style.str();
- if (!styles.empty())
+ if (!style.str().empty())
attr_str_prefix += "; ";
for (auto it = styles.begin(); it != styles.end();
++it) {
attr_str_prefix += *it;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: when a similar tag is present multiple times in the bibliography entry, output it only once.
commit 8e0bc01d50fc7d7af454cb8bed4d098f85b3f73b
Author: Thibaut Cuvelier
Date: Mon Feb 26 16:04:22 2024 +0100
DocBook: when a similar tag is present multiple times in the bibliography
entry, output it only once.
Other copies have an error message.
---
autotests/export/docbook/basic.xml | 32 +++
src/insets/InsetBibtex.cpp | 80 ++
2 files changed, 68 insertions(+), 44 deletions(-)
diff --git a/autotests/export/docbook/basic.xml
b/autotests/export/docbook/basic.xml
index 87c951f359..c03a26c12d 100644
--- a/autotests/export/docbook/basic.xml
+++ b/autotests/export/docbook/basic.xml
@@ -1,5 +1,5 @@
-
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">
@@ -67,30 +67,8 @@
-
-
- I
- a
- m
- a
- f
- o
- r
- m
- u
- l
- a
- w
- i
- t
- h
- a
- r
- e
- f
- .
-
-
+ Iamaformulawitharef
+ .
(1)
@@ -285,8 +263,8 @@ I am no more code.
I am the sixth section and I really like bibliographies
-This text has references. First reference: .
Second reference: . Both at the same time:
, . A book: .
-Many things, just testing for completeness: , , , , , .
+This text has references. First reference: .
Second reference: . Both at the same time:
, . A book: .
+Many things, just testing for completeness: , , , , , .
I am the seventh section and I deal with indices
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index 6d38631f81..8a2a697648 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -1128,7 +1128,6 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
make_pair("url", "uri")
};
// Relations between documents.
- // TODO: some elements should be mutually exclusive; right now, all of
them are output.
vector> relations = { //
make_pair("journal", "journal"),
make_pair("journaltitle", "journal"),
@@ -1149,7 +1148,6 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
toDocBookTag["fullbynames:editor"] = "SPECIFIC"; // No direct
translation to DocBook: .
toDocBookTag["institution"] = "SPECIFIC"; // No direct translation to
DocBook: .
- // TODO: some elements should be mutually exclusive; right now, all of
them are output.
toDocBookTag["title"] = "title";
toDocBookTag["fulltitle"] = "title";
toDocBookTag["quotetitle"] = "title";
@@ -1162,7 +1160,6 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
toDocBookTag["year"] = "SPECIFIC"; // No direct translation to DocBook:
.
toDocBookTag["month"] = "SPECIFIC"; // No direct translation to
DocBook: .
- // TODO: some elements should be mutually exclusive; right now, all of
them are output.
toDocBookTag["journal"] = "SPECIFIC"; // No direct translation to
DocBook: .
toDocBookTag["journaltitle"] = "SPECIFIC"; // No direct translation to
DocBook: .
toDocBookTag["fulljournaltitle"] = "SPECIFIC"; // No direct translation
to DocBook: .
@@ -1210,22 +1207,35 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
map delayedTags;
// Read all tags from HTML and convert those that have a 1:1
matching.
+ // Avoid outputting the same tag twice in DocBook: several
bibliography tags might map to the same DocBook
+ // element, avoid outputting the same DocBook tag twice to keep
a valid output. "SPECIFIC" tags are handled in
+ // a more specific way later on (among the delayed tags).
+ set alreadyOutputDocBookTags;
while (tagIt != tagEnd) {
string tag = tagIt->str(); // regex_match cannot work
with temporary strings.
++tagIt;
if (regex_match(tag, match, tagRegex)) {
- if (toDocBookTag[match[1]] == "SPECIFIC") {
+ const string docbookTag =
toDocBookTag[match[1]];
+ if (docbookTag == "SPECIFIC") {
delayedTags[match[1]] = match[2];
} else {
- xs <<
xml::StartTag(toDocBookTag[match[1]]);
- xs << from_utf8(match[2].str());
- xs <<
xml::EndTag(toDocBookTag[match[1]]);
- xs << xml::CR();
+ if
(alreadyOutputDocBookTags.contains(docbookTag)) {
+ xs << XMLStream::ESCAPE_NONE <<
+
[LyX/master] DocBook: in bibliographies, fix support for editors.
commit 2be72a1534af143bda34b382189198667c10136b
Author: Thibaut Cuvelier
Date: Mon Feb 26 15:50:12 2024 +0100
DocBook: in bibliographies, fix support for editors.
Also, add TODOs for similar problems lurking around.
---
autotests/export/docbook/basic.xml | 57 +++---
src/insets/InsetBibtex.cpp | 38 -
2 files changed, 65 insertions(+), 30 deletions(-)
diff --git a/autotests/export/docbook/basic.xml
b/autotests/export/docbook/basic.xml
index b589ee63b9..87c951f359 100644
--- a/autotests/export/docbook/basic.xml
+++ b/autotests/export/docbook/basic.xml
@@ -1,7 +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">
+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">
I am a title
@@ -24,43 +24,39 @@
-
-
- w
- i
- t
- h
-
- a
-
- f
- o
- r
- m
- u
- l
- a
-
+
+ w
+ i
+ t
+ h
+
+ a
+
+ f
+ o
+ r
+ m
+ u
+ l
+ a
.
-Now, we're outside quotes.
+Now, were outside quotes.
Formula!
-
- F
- o
- r
- m
- u
- l
- a
- !
-
+ F
+ o
+ r
+ m
+ u
+ l
+ a
+ !
@@ -420,6 +416,9 @@ I am no more code.
+
+The editor
+
An optional note
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index b073f619e6..6d38631f81 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -1128,6 +1128,7 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
make_pair("url", "uri")
};
// Relations between documents.
+ // TODO: some elements should be mutually exclusive; right now, all of
them are output.
vector> relations = { //
make_pair("journal", "journal"),
make_pair("journaltitle", "journal"),
@@ -1144,9 +1145,11 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
toDocBookTag["fullnames:author"] = "SPECIFIC"; // No direct translation
to DocBook: .
toDocBookTag["publisher"] = "SPECIFIC"; // No direct translation to
DocBook: .
toDocBookTag["address"] = "SPECIFIC"; // No direct translation to
DocBook: .
- toDocBookTag["editor"] = "editor";
+ toDocBookTag["editor"] = "SPECIFIC"; // No direct translation to
DocBook: .
+ toDocBookTag["fullbynames:editor"] = "SPECIFIC"; // No direct
translation to DocBook: .
toDocBookTag["institution"] = "SPECIFIC"; // No direct translation to
DocBook: .
+ // TODO: some elements should be mutually exclusive; right now, all of
them are output.
toDocBookTag["title"] = "title";
toDocBookTag["fulltitle"] = "title";
toDocBookTag["quotetitle"] = "title";
@@ -1159,6 +1162,7 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
toDocBookTag["year"] = "SPECIFIC"; // No direct translation to DocBook:
.
toDocBookTag["month"] = "SPECIFIC"; // No direct translation to
DocBook: .
+ // TODO: some elements should be mutually exclusive; right now, all of
them are output.
toDocBookTag["journal"] = "SPECIFIC"; // No direct translation to
DocBook: .
toDocBookTag["journaltitle"] = "SPECIFIC"; // No direct translation to
DocBook: .
toDocBookTag["fulljournaltitle"] = "SPECIFIC"; // No direct translation
to DocBook: .
@@ -1359,6 +1363,38 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
eraseTag("fullnames:author");
}
+ //
+ // Example: http://tdg.docbook.org/tdg/5.1/editor.html
+ if (hasTag("editor") || hasTag("fullbynames:editor")) {
+ // If several editor tags are present, only
output one.
+ const docstring editorName =
getTag(hasTag("editor") ? "editor" : "fullbynames:editor");
+
+ // Arbitrarily decide that the editor is always
a person. There is no reliable information in the input
+ // to make the distinction between a person
() and an organisation ().
+ xs << xml::StartTag("editor");
+ xs << xml::CR();
+ xs << xml::StartTag("personname");
+ xs << editorName;
+ xs << xml::EndTag("personname");
+ xs << xml::CR();
+ xs << xml::EndTag("editor");
+ xs << xml::CR();
+
+ if (hasTag("editor") &&
hasTag("fullbynames:editor")) {
+ xs
[LyX/master] Use C++11 string literals to make code easier to read.
commit 6b1441036f35767c0b60af510222ba792b17b829
Author: Thibaut Cuvelier
Date: Mon Feb 26 15:24:36 2024 +0100
Use C++11 string literals to make code easier to read.
---
src/insets/InsetIndex.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 68669b0b7e..64bb398099 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -505,9 +505,9 @@ void InsetIndex::docbook(XMLStream & xs, OutputParams const
& runparams) const
// Generate the attributes.
docstring id = xml::cleanID(newIndexTerms);
if (hasStartRange) {
- attrs = indexType + " class=\"startofrange\"
xml:id=\"" + id + "\"";
+ attrs = indexType + R"( class="startofrange"
xml:id=")" + id + "\"";
} else {
- attrs = " class=\"endofrange\" startref=\"" +
id + "\"";
+ attrs = R"( class="endofrange" startref=")" +
id + "\"";
}
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: restore index ranges.
commit 3fdf3aafe8a2da25c10152c97e6e7824ace42e96
Author: Thibaut Cuvelier
Date: Mon Feb 26 15:15:32 2024 +0100
DocBook: restore index ranges.
---
src/insets/InsetIndex.cpp | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 54058b8ea7..68669b0b7e 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -386,7 +386,10 @@ void InsetIndex::docbook(XMLStream & xs, OutputParams
const & runparams) const
}
// Handle ranges. Happily, in the raw LaTeX mode, (| and |) can only be
at the end of the string!
- const bool hasInsetRange = params_.range !=
InsetIndexParams::PageRange::None;
+ // Handle both modern ranges (params_.range) and legacy ones (with a
suffix |( or |) as in pure LaTeX).
+ const bool hasInsetRange = params_.range !=
InsetIndexParams::PageRange::None ||
+ latexString.find(from_ascii("|(")) !=
lyx::docstring::npos ||
+ latexString.find(from_ascii("|)")) !=
lyx::docstring::npos;
const bool hasStartRange = params_.range ==
InsetIndexParams::PageRange::Start ||
latexString.find(from_ascii("|(")) !=
lyx::docstring::npos;
const bool hasEndRange = params_.range ==
InsetIndexParams::PageRange::End ||
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: simplify building an error message.
commit 5dd36404f2234395aa709f3723607a485e464dbb
Author: Thibaut Cuvelier
Date: Mon Feb 26 15:09:10 2024 +0100
DocBook: simplify building an error message.
---
src/insets/InsetIndex.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index c7e88f0cd2..54058b8ea7 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -450,7 +450,7 @@ void InsetIndex::docbook(XMLStream & xs, OutputParams const
& runparams) const
// TODO: Could handle formatting as significance="preferred"?
if (!command.empty()) {
docstring error = from_utf8("Unsupported feature: an index
entry contains a | with an unsupported command, ")
- + command + from_utf8(". ") +
from_utf8("Complete entry: \"") + latexString + from_utf8("\"");
+ + command + from_utf8(". Complete
entry: \"") + latexString + from_utf8("\"");
LYXERR0(error);
xs << XMLStream::ESCAPE_NONE << (from_utf8("\n"));
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] DocBook: update bibliography handling for 337f9534260.
commit c71f7039148ba112ed3d0e56b19bce063a04323a Author: Thibaut Cuvelier Date: Mon Feb 26 14:36:01 2024 +0100 DocBook: update bibliography handling for 337f9534260. --- autotests/export/docbook/basic.lyx | 129 - src/insets/InsetBibtex.cpp | 8 +++ 2 files changed, 105 insertions(+), 32 deletions(-) diff --git a/autotests/export/docbook/basic.lyx b/autotests/export/docbook/basic.lyx index 3c4a5b6fb0..d1078b9721 100644 --- a/autotests/export/docbook/basic.lyx +++ b/autotests/export/docbook/basic.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 599 +\lyxformat 620 \begin_document \begin_header \save_transient_properties true @@ -57,6 +57,7 @@ \suppress_date false \justification true \use_refstyle 1 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -87,6 +88,7 @@ \html_css_as_file 0 \html_be_strict false \docbook_table_output 0 +\docbook_mathml_prefix 1 \end_header \begin_body @@ -147,7 +149,8 @@ I am a quote \end_layout \begin_layout Standard -Now, we're outside quotes. +Now, + we're outside quotes. \end_layout \begin_layout Standard @@ -177,6 +180,7 @@ reference "sec:Sec-2kqgsdiflhqsdlifgjuzer=povtuizmvnuer=t vmsrmfli uh =a'\"rtpf plural "false" caps "false" noprefix "false" +nolink "false" \end_inset @@ -184,8 +188,9 @@ noprefix "false" \end_layout \begin_layout Standard -Also, a formula with an user-defined macro that outputs well in LaTeX but - cannot in MathML: +Also, + a formula with an user-defined macro that outputs well in LaTeX but cannot in MathML: + \begin_inset Formula $\testmacro$ \end_inset @@ -268,6 +273,7 @@ reference "sec:Sec-1" plural "false" caps "false" noprefix "false" +nolink "false" \end_inset @@ -284,7 +290,8 @@ First item. \begin_inset Newline newline \end_inset -Second line of the first item, after a line break. +Second line of the first item, + after a line break. \end_layout @@ -365,7 +372,8 @@ I repeat that in a footnote. \end_layout \begin_layout Standard -On the other hand, +On the other hand, + \begin_inset Foot status open @@ -392,7 +400,9 @@ I am the fifth section and I deal with floats \end_layout \begin_layout Standard -Now, three tables: +Now, + three tables: + \end_layout \begin_layout Standard @@ -463,7 +473,8 @@ Row 1 \begin_inset Text \begin_layout Plain Layout -Col 3, row 1 +Col 3, + row 1 \end_layout \end_inset @@ -492,7 +503,8 @@ Row 2 \begin_inset Text \begin_layout Plain Layout -Col 3, row 2 +Col 3, + row 2 \end_layout \end_inset @@ -602,7 +614,8 @@ Row 1 \begin_inset Text \begin_layout Plain Layout -Col 3, row 1 +Col 3, + row 1 \end_layout \end_inset @@ -631,7 +644,8 @@ Row 2 \begin_inset Text \begin_layout Plain Layout -Col 3, row 2 +Col 3, + row 2 \end_layout \end_inset @@ -717,7 +731,8 @@ Row 1 \begin_inset Text \begin_layout Plain Layout -Col 3, row 1 +Col 3, + row 1 \end_layout \end_inset @@ -746,7 +761,8 @@ Row 2 \begin_inset Text \begin_layout Plain Layout -Col 3, row 2 +Col 3, + row 2 \end_layout \end_inset @@ -765,7 +781,9 @@ Col 3, row 2 \end_layout \begin_layout Standard -Then, one figure: +Then, + one figure: + \end_layout \begin_layout Standard @@ -809,7 +827,8 @@ I am the sixth section and I really like bibliographies \begin_layout Standard This text has references. - First reference: + First reference: + \begin_inset CommandInset citation LatexCommand cite key "big" @@ -818,7 +837,8 @@ literal "false" \end_inset . - Second reference: + Second reference: + \begin_inset CommandInset citation LatexCommand cite key "small" @@ -827,7 +847,8 @@ literal "false" \end_inset . - Both at the same time: + Both at the same time: + \begin_inset CommandInset citation LatexCommand cite key "big,small" @@ -836,7 +857,8 @@ literal "false" \end_inset . - A book: + A book: + \begin_inset CommandInset citation LatexCommand cite key "Gro60" @@ -849,7 +871,9 @@ literal "false" \end_layout \begin_layout Standard -Many things, just testing for completeness: +Many things, + just testing for completeness: + \begin_inset CommandInset citation LatexCommand cite key "article,book,booklet,conference,inbook,incollection" @@ -866,8 +890,12 @@ I am the seventh section and I deal with indices \end_layout \begin_layout Standard -First, a term to index: +First, + a term to index: + \begin_inset Index idx +range none +pageformat default status open \begin_layout Plain Layout @@ -877,8 +905,11 @@ Term to index \end_inset . - Then a term to add to the second index: + Then a term to add to the second index: + \begin_inset Index oth +range none +pageformat default status open \begin_layout Plain Layout @@ -892,8 +923,11 @@ Term to add to the second index \end_layout \begin_layout Standard -Then several terms for the first index: +Then several terms for the
[LyX/master] Update sk.po
commit 8282a477f5d1bca82bd1123cef1fcfabae076dd8 Author: Kornel Benko Date: Mon Feb 26 10:46:30 2024 +0100 Update sk.po Wrong shortcut case --- po/sk.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/sk.po b/po/sk.po index 6093e7d9c7..8ec702f855 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX-2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2024-02-12 11:10-0500\n" -"PO-Revision-Date: 2024-02-10 09:44+\n" +"POT-Creation-Date: 2024-02-26 10:41+0100\n" +"PO-Revision-Date: 2024-02-26 09:45+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -21891,7 +21891,7 @@ msgstr "Zabalený obrázok|o" #: lib/ui/stdmenus.inc:506 msgid "Wrapped Table|T" -msgstr "Zabalená tabuľka|T" +msgstr "Zabalená tabuľka|t" #: lib/ui/stdmenus.inc:510 msgid "Table of Contents|C" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] French Math manual: last update before 2.4.0
commit 9ca00ddc69600501aa1609c71f4bdc22f518595b Author: jpc Date: Mon Feb 26 10:01:57 2024 +0100 French Math manual: last update before 2.4.0 --- lib/doc/fr/Math.lyx | 1057 ++- 1 file changed, 957 insertions(+), 100 deletions(-) diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 4a4d423afa..611acccd96 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -202,6 +202,7 @@ subequations \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \notefontcolor #ff @@ -271,16 +272,20 @@ literal "false" \begin_inset Note Note -status open +status collapsed \begin_layout Plain Layout auteur: - Uwe Stöhr + Uwe +\nospellcheck on +Stöhr \end_layout \begin_layout Plain Layout traducteur: - Siegfried Meunier-Guttin-Cluzel + Siegfried +\nospellcheck on +Meunier-Guttin-Cluzel \end_layout \begin_layout Plain Layout @@ -297,29 +302,49 @@ Avril 2014 : \begin_layout Plain Layout Juin 2014 : - relecture complète du document pour 2.1 par J.-P. + relecture complète du document pour 2.1 par J. +\nospellcheck on +-P +\nospellcheck default +. Chrétien \end_layout \begin_layout Plain Layout Décembre 2015 : - mise à jour pour LyX 2.2 (JPC) + mise à jour pour LyX 2.2 ( +\nospellcheck on +JPC +\nospellcheck default +) \end_layout \begin_layout Plain Layout Juillet 2016 : nouvelle mise à jour pour 2.2, - une note ajoutée (JPC) + une note ajoutée ( +\nospellcheck on +JPC +\nospellcheck default +) \end_layout \begin_layout Plain Layout Août 2017 : - revue pour 2.3 (JPC) + revue pour 2.3 ( +\nospellcheck on +JPC +\nospellcheck default +) \end_layout \begin_layout Plain Layout Avril 2018 : - revue pour 2.4 (JPC) + revue pour 2.4 ( +\nospellcheck on +JPC +\nospellcheck default +) \end_layout \end_inset @@ -353,29 +378,63 @@ status open \begin_layout Plain Layout Pour pouvoir exporter ce document en PDF, PS, - ou DVI les paquetages \SpecialChar LaTeX + ou +\nospellcheck on +DVI +\nospellcheck default + les paquetages +\nospellcheck on +\SpecialChar LaTeX + +\nospellcheck default \series bold -braket, +\nospellcheck on +braket +\nospellcheck default +, cancel, - eurosym, - mathdots, - mathtools, - mhchem, - undertilde + +\nospellcheck on +eurosym +\nospellcheck default +, + +\nospellcheck on +mathdots +\nospellcheck default +, + +\nospellcheck on +mathtools +\nospellcheck default +, + +\nospellcheck on +mhchem +\nospellcheck default +, + +\nospellcheck on +undertilde \series default +\nospellcheck default et \series bold +\nospellcheck on was \series default +\nospellcheck default et le paquetage de langue allemande devraient être installés. S'ils ne sont pas installés, vous pouvez quand même exporter votre document, mais les sections où ces paquetages sont nécessaires ne seront pas visibles sur la sortie finale. \series bold +\nospellcheck on mhchem \series default +\nospellcheck default fait exception: s'il n'est pas installé, on ne peut pas exporter ce fichier. @@ -388,7 +447,15 @@ On peut trouver la dernière version de ce document ici: \series bold -https://wiki.lyx.org/LyX/Manuals#Math +https://wiki. +\nospellcheck on +lyx +\nospellcheck default +.org/LyX/ +\nospellcheck on +Manuals +\nospellcheck default +#Math \end_layout \end_inset @@ -465,7 +532,11 @@ Utiliser automatiquement le paquetage math AMS \family default - n'utilise les maths- + n'utilise les +\nospellcheck on +maths- +\nospellcheck default + \begin_inset ERT status collapsed @@ -492,7 +563,11 @@ que si on utilise des constructions mathématiques qui sont reconnues par \Speci \end_layout \begin_layout Standard -Ce document ne liste pas la totalité des commandes math- +Ce document ne liste pas la totalité des commandes +\nospellcheck on +math- +\nospellcheck default + \begin_inset ERT status collapsed @@ -514,7 +589,11 @@ pour des raisons de bon sens status collapsed \begin_layout Plain Layout -On trouve une liste de toutes les commandes math- +On trouve une liste de toutes les commandes +\nospellcheck on +math- +\nospellcheck default + \begin_inset ERT status collapsed @@ -623,7 +702,11 @@ hors ligne c'est-à-dire qui apparaîtra plus grosse et qui aura son propre paragraphe, appuyez sur \family sans -Ctrl+Shift+M +Ctrl+ +\nospellcheck on +Shift +\nospellcheck default ++M \family default ou \family sans @@ -661,8 +744,11 @@ Pour afficher des parties d'une formule en ligne avec la même taille qu'une for \series bold \backslash + +\nospellcheck on displaystyle \series default +\nospellcheck default \begin_inset Index idx range none @@ -898,7 +984,11 @@ Pour les formules multi-lignes, \series bold \backslash -intertext, + +\nospellcheck on +intertext +\nospellcheck default +, \series default voir @@ -963,8 +1053,11 @@ Mathématique, \series bold \backslash +
