[LyX/master] de.po

2022-02-16 Thread Juergen Spitzmueller 
commit a179395bd9600dd9d632a2662027c031a8318502
Author: Juergen Spitzmueller 
Date:   Thu Feb 17 08:53:52 2022 +0100

de.po
---
 po/de.gmo |  Bin 623724 -> 624009 bytes
 po/de.po  |   79 
 2 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index a623117..df61191 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 1d8be99..010afda 100644
--- a/po/de.po
+++ b/po/de.po
@@ -94,8 +94,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2022-02-16 13:07+0100\n"
-"PO-Revision-Date: 2022-02-16 13:10+0100\n"
+"POT-Creation-Date: 2022-02-17 08:23+0100\n"
+"PO-Revision-Date: 2022-02-17 08:53+0100\n"
 "Last-Translator: Jürgen Spitzmüller \n"
 "Language-Team: Deutsch \n"
 "Language: de\n"
@@ -19649,7 +19649,7 @@ msgid "Copy as Reference|R"
 msgstr "Als Querverweis kopieren|k"
 
 #: lib/ui/stdcontext.inc:61 lib/ui/stdcontext.inc:375 lib/ui/stdmenus.inc:108
-#: lib/ui/stdtoolbars.inc:86 src/Text3.cpp:1576
+#: lib/ui/stdtoolbars.inc:86 src/Text3.cpp:1584
 #: src/mathed/InsetMathNest.cpp:555
 msgid "Cut"
 msgstr "Ausschneiden"
@@ -19660,7 +19660,7 @@ msgid "Copy"
 msgstr "Kopieren"
 
 #: lib/ui/stdcontext.inc:63 lib/ui/stdcontext.inc:377 lib/ui/stdmenus.inc:110
-#: lib/ui/stdtoolbars.inc:88 src/Text3.cpp:1520
+#: lib/ui/stdtoolbars.inc:88 src/Text3.cpp:1528
 #: src/frontends/qt/GuiToolbar.cpp:441 src/mathed/InsetMathGrid.cpp:1565
 #: src/mathed/InsetMathNest.cpp:533
 msgid "Paste"
@@ -27297,7 +27297,7 @@ msgstr ""
 "\\lyxdeleted im LaTeX-Vorspann neu."
 
 #: src/Buffer.cpp:1086 src/BufferParams.cpp:475 src/frontends/qt/GuiLog.cpp:293
-#: src/insets/InsetIndex.cpp:676
+#: src/insets/InsetIndex.cpp:691
 msgid "Index"
 msgstr "Stichwortverzeichnis"
 
@@ -29448,27 +29448,39 @@ msgstr "Literaturverzeichnis-Prozessor wird noch 
einmal ausgeführt."
 msgid "Running Index Processor."
 msgstr "Indexprozessor wird ausgeführt."
 
-#: src/LaTeX.cpp:592
-msgid "Running MakeIndex for nomencl."
-msgstr "MakeIndex wird für nomencl ausgeführt."
+#: src/LaTeX.cpp:438
+msgid "Index Processor Error"
+msgstr "Indexprozessor-Fehler"
 
-#: src/LaTeX.cpp:1096
+#: src/LaTeX.cpp:439
+msgid ""
+"The index processor did not run successfully. Please check the output of "
+"View > Messages!"
+msgstr ""
+"Der Durchlauf des Index-Prozessors war nicht erfolgreich. Bitte prüfen Sie "
+"die Ausgabe von Ansicht > Statusmeldungen!"
+
+#: src/LaTeX.cpp:598
+msgid "Running Nomenclature Processor."
+msgstr "Nomenklatur-Prozessor wird ausgeführt."
+
+#: src/LaTeX.cpp:1102
 msgid "(NOTE: The erroneous command is in the preamble)"
 msgstr "(ACHTUNG: Der fehlerhafte Befehl befindet sich in der Präambel)"
 
-#: src/LaTeX.cpp:1588 src/LaTeX.cpp:1594 src/LaTeX.cpp:1603
+#: src/LaTeX.cpp:1594 src/LaTeX.cpp:1600 src/LaTeX.cpp:1609
 msgid "BibTeX error: "
 msgstr "BibTeX-Fehler: "
 
-#: src/LaTeX.cpp:1610
+#: src/LaTeX.cpp:1616
 msgid "Biber error: "
 msgstr "Biber-Fehler: "
 
-#: src/LaTeX.cpp:1637
+#: src/LaTeX.cpp:1643
 msgid "Makeindex error: "
 msgstr "Makeindex-Fehler: "
 
-#: src/LaTeX.cpp:1646
+#: src/LaTeX.cpp:1652
 msgid "Xindy error: "
 msgstr "Xindy-Fehler: "
 
@@ -30572,40 +30584,40 @@ msgstr "Bereits im Regexp-Modus"
 msgid "Regexp editor mode"
 msgstr "Regexp-Editor-Modus"
 
-#: src/Text3.cpp:1610
+#: src/Text3.cpp:1618
 msgid "Layout "
 msgstr "Format "
 
-#: src/Text3.cpp:1611 src/Text3.cpp:2182
+#: src/Text3.cpp:1619 src/Text3.cpp:2193
 msgid " not known"
 msgstr " unbekannt"
 
-#: src/Text3.cpp:2181
+#: src/Text3.cpp:2192
 msgid "Table Style "
 msgstr "Tabellenstil"
 
-#: src/Text3.cpp:2374 src/frontends/qt/GuiApplication.cpp:1873
+#: src/Text3.cpp:2385 src/frontends/qt/GuiApplication.cpp:1873
 msgid "Missing argument"
 msgstr "Fehlendes Argument"
 
-#: src/Text3.cpp:2539
+#: src/Text3.cpp:2550
 msgid "Invalid argument (number exceeds stack size)!"
 msgstr "Ungültiges Argument (Zahl größer als Zwischenspeicher)!"
 
-#: src/Text3.cpp:2543
+#: src/Text3.cpp:2554
 msgid "Invalid argument (must be a non-negative number)!"
 msgstr "Ungültiges Argument (muss eine nicht-negative Zahl sein)!"
 
-#: src/Text3.cpp:2548 src/Text3.cpp:2562
+#: src/Text3.cpp:2559 src/Text3.cpp:2573
 #, c-format
 msgid "Text properties applied: %1$s"
 msgstr "Angewendete Texteigenschaften: %1$s"
 
-#: src/Text3.cpp:2721
+#: src/Text3.cpp:2732
 msgid "Path to thesaurus directory not set!"
 msgstr "Pfad zum Thesaurus-Wörterbuch nicht festlegt!"
 
-#: src/Text3.cpp:2722
+#: src/Text3.cpp:2733
 msgid ""
 "The path to the thesaurus directory has not been specified.\n"
 "The thesaurus is not functional.\n"
@@ -30617,7 +30629,7 @@ msgstr ""
 "Im Benutzerhandbuch, Abschnitt 6.15.11, finden Sie Hinweise,\n"
 "um den Thesaurus einzurichten."
 
-#: src/Text3.cpp:2848 src/Text3.cpp:2859
+#: src/Text3.cpp:2859 src/Text3.cpp:2870
 msgid "Paragraph layout set"
 msgstr "Absatzformat

[LyX/master] Typo

2022-02-16 Thread Juergen Spitzmueller 
commit 755146287cc668661af98989e12614d572cdc001
Author: Juergen Spitzmueller 
Date:   Thu Feb 17 08:21:36 2022 +0100

Typo
---
 src/insets/InsetIndex.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 2e1e19c..fe0890c 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -149,7 +149,7 @@ void InsetIndex::latex(otexstream & ios, OutputParams const 
& runparams_in) cons
// version of the content to get sorting right,
// e.g. \index{LyX@\LyX}, \index{text@\textbf{text}}.
// We do this on all levels.
-   // We don't do it if the level already contains a '@', thouugh.
+   // We don't do it if the level already contains a '@', though.
if (contains(*it, '\\') && !contains(*it, '@')) {
// Plaintext might return nothing (e.g. for ERTs).
// In that case, we use LaTeX.
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] InsetIndex: Some comments and indentation fixes

2022-02-16 Thread Juergen Spitzmueller 
commit 266a5e04d403af4a9e576b7726481185d11274d9
Author: Juergen Spitzmueller 
Date:   Thu Feb 17 08:19:33 2022 +0100

InsetIndex: Some comments and indentation fixes
---
 src/insets/InsetIndex.cpp |   67 +++-
 1 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/src/insets/InsetIndex.cpp b/src/insets/InsetIndex.cpp
index 3cce6af..2e1e19c 100644
--- a/src/insets/InsetIndex.cpp
+++ b/src/insets/InsetIndex.cpp
@@ -80,6 +80,8 @@ void InsetIndex::latex(otexstream & ios, OutputParams const & 
runparams_in) cons
os << '{';
}
 
+   // Get the LaTeX output from InsetText. We need to deconstruct this 
later
+   // in order to check if we need to generate a sorting key
odocstringstream ourlatex;
otexstream ots(ourlatex);
InsetText::latex(ots, runparams);
@@ -88,27 +90,31 @@ void InsetIndex::latex(otexstream & ios, OutputParams const 
& runparams_in) cons
os << ourlatex.str() << "}";
return;
}
-   // get contents of InsetText as LaTeX and plaintext
+
+   // For the sorting key, we use the plaintext version
odocstringstream ourplain;
InsetText::plaintext(ourplain, runparams);
-   // FIXME: do Tex/Row correspondence (I don't currently understand what 
is
-   // being generated from latexstr below)
+
+   // These are the LaTeX and plaintext representations
docstring latexstr = ourlatex.str();
docstring plainstr = ourplain.str();
 
-   // this will get what follows | if anything does
+   // This will get what follows | if anything does,
+   // the command (e.g., see, textbf) for pagination
+   // formatting
docstring cmd;
 
-   // check for the | separator
-   // FIXME This would go wrong on an escaped "|", but
-   // how far do we want to go here?
+   // Check for the | separator to strip the cmd.
+   // This goes wrong on an escaped "|", but as the escape
+   // character can be changed in style files, we cannot
+   // prevent that.
size_t pos = latexstr.find(from_ascii("|"));
if (pos != docstring::npos) {
-   // put the bit after "|" into cmd...
+   // Put the bit after "|" into cmd...
cmd = latexstr.substr(pos + 1);
// ...and erase that stuff from latexstr
latexstr = latexstr.erase(pos);
-   // ...and similarly from plainstr
+   // ...as well as from plainstr
size_t ppos = plainstr.find(from_ascii("|"));
if (ppos < plainstr.size())
plainstr.erase(ppos);
@@ -116,8 +122,10 @@ void InsetIndex::latex(otexstream & ios, OutputParams 
const & runparams_in) cons
LYXERR0("The `|' separator was not found in the 
plaintext version!");
}
 
-   // Separate the entries and subentries, i.e., split on "!"
-   // FIXME This would do the wrong thing with escaped ! characters
+   // Separate the entries and subentries, i.e., split on "!".
+   // This goes wrong on an escaped "!", but as the escape
+   // character can be changed in style files, we cannot
+   // prevent that.
std::vector const levels =
getVectorFromString(latexstr, from_ascii("!"), true);
std::vector const levels_plain =
@@ -128,19 +136,23 @@ void InsetIndex::latex(otexstream & ios, OutputParams 
const & runparams_in) cons
vector::const_iterator it2 = levels_plain.begin();
bool first = true;
for (; it != end; ++it) {
-   // write the separator except the first time
+   // The separator needs to be put back when
+   // writing the levels, except for the first level
if (!first)
os << '!';
else
first = false;
 
-   // correctly sort macros and formatted strings
-   // if we do find a command, prepend a plain text
+   // Now here comes the reason for this whole procedure:
+   // We try to correctly sort macros and formatted strings.
+   // If we find a command, prepend a plain text
// version of the content to get sorting right,
-   // e.g. \index{LyX@\LyX}, \index{text@\textbf{text}}
-   // Don't do that if the user entered '@' himself, though.
+   // e.g. \index{LyX@\LyX}, \index{text@\textbf{text}}.
+   // We do this on all levels.
+   // We don't do it if the level already contains a '@', thouugh.
if (contains(*it, '\\') && !contains(*it, '@')) {
-   // Plaintext might return nothing (e.g. for ERTs)
+   // Plaintext might return nothing (e.g. for ERTs).
+   // In that case, we use LaTeX.
docs

[LyX/master] Report if index processor failed (#7820)

2022-02-16 Thread Juergen Spitzmueller 
commit 44d56764305fee8fcea79cb48682682bffd17f4d
Author: Juergen Spitzmueller 
Date:   Thu Feb 17 07:25:00 2022 +0100

Report if index processor failed (#7820)
---
 src/LaTeX.cpp |6 ++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 7734b02..c4dd18e 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -432,6 +432,12 @@ int LaTeX::run(TeXErrors & terr)

runMakeIndex(onlyFileName(idxfile.absFileName()), runparams);
if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
return ret;
+   else if (ret != Systemcall::OK) {
+   iscanres |= INDEX_ERROR;
+   terr.insertError(0,
+_("Index Processor Error"),
+_("The index processor did not run 
successfully. Please check the output of View > Messages!"));
+   }
FileName const ilgfile(changeExtension(file.absFileName(), 
".ilg"));
if (ilgfile.exists())
iscanres = scanIlgFile(terr);
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] ctests: log fixed upstream Polyglossia issues

2022-02-16 Thread Scott Kostyshak 
commit 23b7b95e68ee2ac778838fc1a9d037130133ef56
Author: Scott Kostyshak 
Date:   Wed Feb 16 22:05:02 2022 -0500

ctests: log fixed upstream Polyglossia issues

Thanks to Jürgen for fixing the upstream issue.

Also add a row "ctest" to give the pattern of the ctests that
failed.
---
 development/autotests/ctests-costs-benefits.txt |   10 ++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/development/autotests/ctests-costs-benefits.txt 
b/development/autotests/ctests-costs-benefits.txt
index 6be712c..cc66eb9 100644
--- a/development/autotests/ctests-costs-benefits.txt
+++ b/development/autotests/ctests-costs-benefits.txt
@@ -19,6 +19,9 @@ The "Benefit" row gives the amount of days in-between when an 
issue is found
 because of the ctests and when an issue is reported by someone not using the
 ctests.
 
+The "ctest" row gives a ctest pattern for the tests that were affected by the
+regression.
+
 Examples where convergence tests took time and annoyance to figure out that
 they were actually "false positives" (i.e., no bug that is worth the time or
 complexity to fix):
@@ -80,3 +83,10 @@ Benefit: Not clear. The regressions were in the development 
version so they
 
 Report : 
https://www.mail-archive.com/search?l=mid&q=20211207200100.o27ojaftehrjfcza%40poole
 Fix: 2eaf30c5
+
+
+Report : (private message to Jürgen: 
LyXMessage-ID:<20220216020703.la2fd5gu7yz7y7dc@gary>)
+Fix: 
https://github.com/reutenauer/polyglossia/commit/c7489ebaf8c66a7e4fe2529de7068ebb79c68812
+Benefit: Not clear. The regressions were in the development version so they
+ could have easily been caught before release.
+ctests : export/export/lyx2lyx/revert-languages-polyglossia-primary_lyx22
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Update sk.po

2022-02-16 Thread Kornel Benko 
commit 58a8884b0643ff8dcf35697e09e49894a804171b
Author: Kornel Benko 
Date:   Wed Feb 16 14:44:43 2022 +0100

Update sk.po
---
 po/sk.po |   22 +-
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/po/sk.po b/po/sk.po
index 5a35011..9814567 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: 2022-02-13 12:47+0100\n"
-"PO-Revision-Date: 2022-02-13 12:46+\n"
+"POT-Creation-Date: 2022-02-16 14:35+0100\n"
+"PO-Revision-Date: 2022-02-16 13:40+\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -29148,17 +29148,21 @@ msgstr "   voľby: "
 msgid "Waiting for LaTeX run number %1$d"
 msgstr "Čakanie na %1$d spracovanie LaTeX-u"
 
+#: src/LaTeX.cpp:328
+msgid "Running Bibliography Processor."
+msgstr "Spúšťam generáciu bibliografie."
+
+#: src/LaTeX.cpp:389
+msgid "Re-Running Bibliography Processor."
+msgstr "Opakujem generáciu bibliografie."
+
 #: src/LaTeX.cpp:324 src/LaTeX.cpp:461
 msgid "Running Index Processor."
 msgstr "Spúšťam generáciu registra."
 
-#: src/LaTeX.cpp:377 src/LaTeX.cpp:438
-msgid "Running BibTeX."
-msgstr "Spúšťam BibTeX."
-
-#: src/LaTeX.cpp:611
-msgid "Running MakeIndex for nomencl."
-msgstr "Spúšťam makeindex pre nomencl."
+#: src/LaTeX.cpp:592
+msgid "Running Nomenclature Processor."
+msgstr "Spúšťam generáciu nomenklatúry."
 
 #: src/LaTeX.cpp:1115
 msgid "(NOTE: The erroneous command is in the preamble)"
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Reset font formatting of inset entries on creation (#11961)

2022-02-16 Thread Juergen Spitzmueller 
commit 92aa12317e1e7cbaa83c4b7c3298ac340efe3a0a
Author: Juergen Spitzmueller 
Date:   Wed Feb 16 14:25:25 2022 +0100

Reset font formatting of inset entries on creation (#11961)
---
 src/Text3.cpp |   17 ++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 9143e26..185008b 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -243,7 +243,8 @@ static void ipaChar(Cursor & cur, InsetIPAChar::Kind kind)
 
 
 static bool doInsertInset(Cursor & cur, Text * text,
-   FuncRequest const & cmd, bool edit, bool pastesel)
+ FuncRequest const & cmd, bool edit,
+ bool pastesel, bool resetfont = false)
 {
Buffer & buffer = cur.bv().buffer();
BufferParams const & bparams = buffer.params();
@@ -346,6 +347,13 @@ static bool doInsertInset(Cursor & cur, Text * text,
cur.clearSelection(); // bug 393
cur.finishUndo();
if (inset_text) {
+   if (resetfont) {
+   // Reset of font (not language) is requested.
+   // Used by InsetIndex (#11961).
+   Language const * lang = cur.getFont().language();
+   Font font(bparams.getFont().fontInfo(), lang);
+   cur.paragraph().resetFonts(font);
+   }
inset_text->fixParagraphsFont();
cur.pos() = 0;
cur.pit() = 0;
@@ -2105,16 +2113,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
case LFUN_INDEX_INSERT:
case LFUN_PREVIEW_INSERT:
case LFUN_SCRIPT_INSERT:
-   case LFUN_IPA_INSERT:
+   case LFUN_IPA_INSERT: {
+   // Indexes reset font formatting (#11961)
+   bool const resetfont = cmd.action() == LFUN_INDEX_INSERT;
// Open the inset, and move the current selection
// inside it.
-   doInsertInset(cur, this, cmd, true, true);
+   doInsertInset(cur, this, cmd, true, true, resetfont);
cur.posForward();
cur.setCurrentFont();
// Some insets are numbered, others are shown in the outline 
pane so
// let's update the labels and the toc backend.
cur.forceBufferUpdate();
break;
+   }
 
case LFUN_FLEX_INSERT: {
// Open the inset, and move the current selection
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Use copy

2022-02-16 Thread Juergen Spitzmueller 
commit 6adb083384e1c47a11595fc9b06ba3c9b4f9ae63
Author: Juergen Spitzmueller 
Date:   Wed Feb 16 14:24:46 2022 +0100

Use copy
---
 src/Text3.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 777a580..9143e26 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -326,7 +326,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
if (inset_text) {
Font const & font = inset->inheritFont()
? cur.bv().textMetrics(text).displayFont(cur.pit(), 
cur.pos())
-   : buffer.params().getFont();
+   : bparams.getFont();
inset_text->setOuterFont(cur.bv(), font.fontInfo());
}
 
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] Oops.

2022-02-16 Thread Juergen Spitzmueller 
commit 1888a2ccb5a7606a06a11a177c6202fe4f041aea
Author: Juergen Spitzmueller 
Date:   Wed Feb 16 13:17:30 2022 +0100

Oops.
---
 src/LaTeX.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 9cfd735..7734b02 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -588,8 +588,8 @@ int LaTeX::runMakeIndex(string const & f, OutputParams 
const & rp,
 int LaTeX::runMakeIndexNomencl(FileName const & fname,
string const & nlo, string const & nls)
 {
-   LYXERR(Debug::LATEX, "Running Nocmenclature Processor.");
-   message(_("Running Nocmenclature Processor."));
+   LYXERR(Debug::LATEX, "Running Nomenclature Processor.");
+   message(_("Running Nomenclature Processor."));
string tmp = lyxrc.nomencl_command + ' ';
// onlyFileName() is needed for cygwin
tmp += quoteName(onlyFileName(changeExtension(fname.absFileName(), 
nlo)));
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] More generic message

2022-02-16 Thread Juergen Spitzmueller 
commit cc4de1501c18dce1d35f253e0b06b5188a24dd45
Author: Juergen Spitzmueller 
Date:   Wed Feb 16 13:16:24 2022 +0100

More generic message

Nomencl processor can be something else than makeindex.
---
 src/LaTeX.cpp |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index c38f5cb..9cfd735 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -588,8 +588,8 @@ int LaTeX::runMakeIndex(string const & f, OutputParams 
const & rp,
 int LaTeX::runMakeIndexNomencl(FileName const & fname,
string const & nlo, string const & nls)
 {
-   LYXERR(Debug::LATEX, "Running MakeIndex for nomencl.");
-   message(_("Running MakeIndex for nomencl."));
+   LYXERR(Debug::LATEX, "Running Nocmenclature Processor.");
+   message(_("Running Nocmenclature Processor."));
string tmp = lyxrc.nomencl_command + ' ';
// onlyFileName() is needed for cygwin
tmp += quoteName(onlyFileName(changeExtension(fname.absFileName(), 
nlo)));
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

[LyX/master] de.po

2022-02-16 Thread Juergen Spitzmueller 
commit cd75f429b0f7e38088da51975ba4743ec253367a
Author: Juergen Spitzmueller 
Date:   Wed Feb 16 13:11:15 2022 +0100

de.po
---
 po/de.gmo |  Bin 623556 -> 623724 bytes
 po/de.po  |   85 +
 2 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/po/de.gmo b/po/de.gmo
index b25fa6c..a623117 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 06508e9..1d8be99 100644
--- a/po/de.po
+++ b/po/de.po
@@ -94,8 +94,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.4git\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2022-02-12 17:36+0100\n"
-"PO-Revision-Date: 2022-02-12 17:40+0100\n"
+"POT-Creation-Date: 2022-02-16 13:07+0100\n"
+"PO-Revision-Date: 2022-02-16 13:10+0100\n"
 "Last-Translator: Jürgen Spitzmüller \n"
 "Language-Team: Deutsch \n"
 "Language: de\n"
@@ -17091,8 +17091,8 @@ msgstr "Fußnote"
 msgid "Greyedout"
 msgstr "Grauschrift"
 
-#: lib/layouts/stdinsets.inc:208 src/insets/InsetERT.cpp:542
-#: src/insets/InsetERT.cpp:543
+#: lib/layouts/stdinsets.inc:208 src/insets/InsetERT.cpp:251
+#: src/insets/InsetERT.cpp:252
 msgid "ERT"
 msgstr "ERT"
 
@@ -19649,7 +19649,7 @@ msgid "Copy as Reference|R"
 msgstr "Als Querverweis kopieren|k"
 
 #: lib/ui/stdcontext.inc:61 lib/ui/stdcontext.inc:375 lib/ui/stdmenus.inc:108
-#: lib/ui/stdtoolbars.inc:86 src/Text3.cpp:1571
+#: lib/ui/stdtoolbars.inc:86 src/Text3.cpp:1576
 #: src/mathed/InsetMathNest.cpp:555
 msgid "Cut"
 msgstr "Ausschneiden"
@@ -19660,7 +19660,7 @@ msgid "Copy"
 msgstr "Kopieren"
 
 #: lib/ui/stdcontext.inc:63 lib/ui/stdcontext.inc:377 lib/ui/stdmenus.inc:110
-#: lib/ui/stdtoolbars.inc:88 src/Text3.cpp:1515
+#: lib/ui/stdtoolbars.inc:88 src/Text3.cpp:1520
 #: src/frontends/qt/GuiToolbar.cpp:441 src/mathed/InsetMathGrid.cpp:1565
 #: src/mathed/InsetMathNest.cpp:533
 msgid "Paste"
@@ -27297,7 +27297,7 @@ msgstr ""
 "\\lyxdeleted im LaTeX-Vorspann neu."
 
 #: src/Buffer.cpp:1086 src/BufferParams.cpp:475 src/frontends/qt/GuiLog.cpp:293
-#: src/insets/InsetIndex.cpp:674
+#: src/insets/InsetIndex.cpp:676
 msgid "Index"
 msgstr "Stichwortverzeichnis"
 
@@ -29436,35 +29436,39 @@ msgstr "   Optionen: "
 msgid "Waiting for LaTeX run number %1$d"
 msgstr "Warten auf LaTeX-Durchlauf Nr. %1$d"
 
-#: src/LaTeX.cpp:324 src/LaTeX.cpp:461
+#: src/LaTeX.cpp:328
+msgid "Running Bibliography Processor."
+msgstr "Literaturverzeichnis-Prozessor wird ausgeführt."
+
+#: src/LaTeX.cpp:389
+msgid "Re-Running Bibliography Processor."
+msgstr "Literaturverzeichnis-Prozessor wird noch einmal ausgeführt."
+
+#: src/LaTeX.cpp:429
 msgid "Running Index Processor."
 msgstr "Indexprozessor wird ausgeführt."
 
-#: src/LaTeX.cpp:377 src/LaTeX.cpp:438
-msgid "Running BibTeX."
-msgstr "BibTeX wird ausgeführt."
-
-#: src/LaTeX.cpp:611
+#: src/LaTeX.cpp:592
 msgid "Running MakeIndex for nomencl."
 msgstr "MakeIndex wird für nomencl ausgeführt."
 
-#: src/LaTeX.cpp:1115
+#: src/LaTeX.cpp:1096
 msgid "(NOTE: The erroneous command is in the preamble)"
 msgstr "(ACHTUNG: Der fehlerhafte Befehl befindet sich in der Präambel)"
 
-#: src/LaTeX.cpp:1607 src/LaTeX.cpp:1613 src/LaTeX.cpp:1622
+#: src/LaTeX.cpp:1588 src/LaTeX.cpp:1594 src/LaTeX.cpp:1603
 msgid "BibTeX error: "
 msgstr "BibTeX-Fehler: "
 
-#: src/LaTeX.cpp:1629
+#: src/LaTeX.cpp:1610
 msgid "Biber error: "
 msgstr "Biber-Fehler: "
 
-#: src/LaTeX.cpp:1656
+#: src/LaTeX.cpp:1637
 msgid "Makeindex error: "
 msgstr "Makeindex-Fehler: "
 
-#: src/LaTeX.cpp:1665
+#: src/LaTeX.cpp:1646
 msgid "Xindy error: "
 msgstr "Xindy-Fehler: "
 
@@ -30552,56 +30556,56 @@ msgstr ", Grenze: "
 msgid "No font change defined."
 msgstr "Keine Schriftänderung definiert."
 
-#: src/Text3.cpp:195
+#: src/Text3.cpp:200
 msgid "Math editor mode"
 msgstr "Mathe-Editor-Modus"
 
-#: src/Text3.cpp:197
+#: src/Text3.cpp:202
 msgid "No valid math formula"
 msgstr "Keine gültige Matheformel"
 
-#: src/Text3.cpp:205 src/mathed/InsetMathNest.cpp:1032
+#: src/Text3.cpp:210 src/mathed/InsetMathNest.cpp:1032
 msgid "Already in regular expression mode"
 msgstr "Bereits im Regexp-Modus"
 
-#: src/Text3.cpp:218
+#: src/Text3.cpp:223
 msgid "Regexp editor mode"
 msgstr "Regexp-Editor-Modus"
 
-#: src/Text3.cpp:1605
+#: src/Text3.cpp:1610
 msgid "Layout "
 msgstr "Format "
 
-#: src/Text3.cpp:1606 src/Text3.cpp:2176
+#: src/Text3.cpp:1611 src/Text3.cpp:2182
 msgid " not known"
 msgstr " unbekannt"
 
-#: src/Text3.cpp:2175
+#: src/Text3.cpp:2181
 msgid "Table Style "
 msgstr "Tabellenstil"
 
-#: src/Text3.cpp:2368 src/frontends/qt/GuiApplication.cpp:1873
+#: src/Text3.cpp:2374 src/frontends/qt/GuiApplication.cpp:1873
 msgid "Missing argument"
 msgstr "Fehlendes Argument"
 
-#: src/Text3.cpp:2537
+#: src/Text3.cpp:2539
 msgid "Invalid argument (number exceeds stack size)!"
 msgstr "Ungültiges Argument (Zahl größer als Zwischenspeicher)!"
 
-#: src/Text3.cpp:2541
+#: src/Text3.cpp:2543
 msgid "Invalid argument (must be a non-negative num

[LyX/master] Fix run of index processor in the export chain (#2696)

2022-02-16 Thread Juergen Spitzmueller 
commit 8cb7fb26d758f46bb6582761b88cbec0c3db872e
Author: Juergen Spitzmueller 
Date:   Wed Feb 16 12:03:38 2022 +0100

Fix run of index processor in the export chain (#2696)

It does not make sense to issue the index processor before the
pagination is fixed. Particularly, if (classic) BibTeX is run,
we need one or more extra LaTeX runs after that before issuing
the index processor, since the citation labels and references are
only expanded then, which might change pagination. As a consequence,
we ended up in wrong index references.

This fixes a 16 year old bug report.
---
 src/LaTeX.cpp |  139 
 1 files changed, 60 insertions(+), 79 deletions(-)

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index ce3d73e..c38f5cb 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -306,63 +306,14 @@ int LaTeX::run(TeXErrors & terr)
head.update();
 
// 1
-   // At this point we must run external programs if needed.
-   // makeindex will be run if a .idx file changed or was generated.
-   // And if there were undefined citations or changes in references
-   // the .aux file is checked for signs of bibtex. Bibtex is then run
-   // if needed.
-
-   // memoir (at least) writes an empty *idx file in the first place.
-   // A second latex run is needed.
-   FileName const idxfile(changeExtension(file.absFileName(), ".idx"));
-   rerun = idxfile.exists() && idxfile.isFileEmpty();
-
-   // run makeindex
-   if (head.haschanged(idxfile)) {
-   // no checks for now
-   LYXERR(Debug::LATEX, "Running MakeIndex.");
-   message(_("Running Index Processor."));
-   // onlyFileName() is needed for cygwin
-   int const ret = 
-   
runMakeIndex(onlyFileName(idxfile.absFileName()), runparams);
-   if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
-   return ret;
-   FileName const ilgfile(changeExtension(file.absFileName(), 
".ilg"));
-   if (ilgfile.exists())
-   iscanres = scanIlgFile(terr);
-   rerun = true;
-   }
-
-   FileName const nlofile(changeExtension(file.absFileName(), ".nlo"));
-   // If all nomencl entries are removed, nomencl writes an empty nlo file.
-   // DepTable::hasChanged() returns false in this case, since it does not
-   // distinguish empty files from non-existing files. This is why we need
-   // the extra checks here (to trigger a rerun). Cf. discussions in #8905.
-   // FIXME: Sort out the real problem in DepTable.
-   if (head.haschanged(nlofile) || (nlofile.exists() && 
nlofile.isFileEmpty())) {
-   int const ret = runMakeIndexNomencl(file, ".nlo", ".nls");
-   if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
-   return ret;
-   rerun = true;
-   }
-
-   FileName const glofile(changeExtension(file.absFileName(), ".glo"));
-   if (head.haschanged(glofile)) {
-   int const ret = runMakeIndexNomencl(file, ".glo", ".gls");
-   if (ret)
-   return ret;
-   rerun = true;
-   }
-
-
-   // check if we're using biber instead of bibtex
+   // At this point we must run the bibliography processor if needed.
+   // First, check if we're using biber instead of bibtex --
// biber writes no info to the aux file, so we just check
-   // if a bcf file exists (and if it was updated)
+   // if a bcf file exists (and if it was updated).
FileName const bcffile(changeExtension(file.absFileName(), ".bcf"));
biber |= head.exist(bcffile);
 
-   // run bibtex
-   // if (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex)
+   // If (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex)
// We do not run bibtex/biber on an "includeall" call (whose purpose is
// to set up/maintain counters and references for includeonly) since
// (1) bibliographic references will be updated on the subsequent 
includeonly run
@@ -373,8 +324,8 @@ int LaTeX::run(TeXErrors & terr)
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
// no checks for now
-   LYXERR(Debug::LATEX, "Running BibTeX.");
-   message(_("Running BibTeX."));
+   LYXERR(Debug::LATEX, "Running Bibliography Processor.");
+   message(_("Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info);
int exit_code;
rerun |= runBibTeX(bibtex_info, runparams, exit_code);
@@ -391,7 +342,7 @@ int LaTeX::run(TeXErrors & terr)
}
 
// 2
-   // we know on this point that latex has been run once