[LyX/master] Properly resolve undefined citations with Xe/Lua and bibliography environment
commit 7b6707fc52e6b87230cf773106fdc31d93beb4c0
Author: Juergen Spitzmueller
Date: Sat Apr 8 19:25:30 2023 +0200
Properly resolve undefined citations with Xe/Lua and bibliography
environment
These need an extra LaTeX run
---
src/LaTeX.cpp |6 --
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index 917d129..7d9810a 100644
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -401,11 +401,13 @@ int LaTeX::run(TeXErrors & terr)
// After the bibliography was processed, we need more passes of LaTeX
// in order to resolve the citations. We need to do this before the
index
// is being generated (since we need the correct pagination, see #2696).
+ // With bibliography environment, another LaTeX run might be needed
+ // as well to resolve citations.
// Also, memoir (at least) writes an empty *idx file in the first place.
// A further latex run is needed in that case as well.
FileName const idxfile(changeExtension(file.absFileName(), ".idx"));
- if (run_bibtex || (idxfile.exists() && idxfile.isFileEmpty())) {
- while ((head.sumchange() || rerun || (scanres & RERUN))
+ if (run_bibtex || (scanres & UNDEF_CIT) || (idxfile.exists() &&
idxfile.isFileEmpty())) {
+ while ((head.sumchange() || rerun || (scanres & RERUN) ||
(scanres & UNDEF_CIT))
&& count < MAX_RUN) {
// Yes rerun until message goes away, or until
// MAX_RUNS are reached.
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] de.po
commit 8c5b65ae6c96ddd6e995f562f45e3d604b520cc0 Author: Juergen Spitzmueller Date: Sat Apr 8 17:32:31 2023 +0200 de.po po/de.po | 1077 +++--- 1 files changed, 540 insertions(+), 537 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix accelerators
commit 8a99092d77420dc253612dcce043bae6f9eac477 Author: Juergen Spitzmueller Date: Sat Apr 8 17:27:06 2023 +0200 Fix accelerators --- lib/ui/stdtoolbars.inc | 24 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index 2e6663a..5792316 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -301,27 +301,27 @@ ToolbarSet End Toolbar "toolbar-toggle_math" "Show math toolbar" - Item "[[Toolbar]]On" "toolbar-set math on" - Item "[[Toolbar]]Off" "toolbar-set math off" - Item "[[Toolbar]]Automatic" "toolbar-set math auto" + Item "[[Toolbar]]" "toolbar-set math on" + Item "[[Toolbar]]O" "toolbar-set math off" + Item "[[Toolbar]]" "toolbar-set math auto" End Toolbar "toolbar-toggle_math_panels" "Show math panels" - Item "[[Toolbar]]On" "toolbar-set math_panels on" - Item "[[Toolbar]]Off" "toolbar-set math_panels off" - Item "[[Toolbar]]Automatic" "toolbar-set math_panels auto" + Item "[[Toolbar]]" "toolbar-set math_panels on" + Item "[[Toolbar]]O" "toolbar-set math_panels off" + Item "[[Toolbar]]" "toolbar-set math_panels auto" End Toolbar "toolbar-toggle_table" "Show table toolbar" - Item "[[Toolbar]]On" "toolbar-set table on" - Item "[[Toolbar]]Off" "toolbar-set table off" - Item "[[Toolbar]]Automatic" "toolbar-set table auto" + Item "[[Toolbar]]" "toolbar-set table on" + Item "[[Toolbar]]O" "toolbar-set table off" + Item "[[Toolbar]]" "toolbar-set table auto" End Toolbar "toolbar-toggle_review" "Show review toolbar" - Item "[[Toolbar]]On" "toolbar-set review on" - Item "[[Toolbar]]Off" "toolbar-set review off" - Item "[[Toolbar]]Automatic" "toolbar-set review auto" + Item "[[Toolbar]]" "toolbar-set review on" + Item "[[Toolbar]]O" "toolbar-set review off" + Item "[[Toolbar]]" "toolbar-set review auto" End # The following three toolbars are disabled because of missing icons. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Typo
commit 9b2fb3b051c49207f099b300e93c29efb2aaf812 Author: Juergen Spitzmueller Date: Sat Apr 8 17:27:31 2023 +0200 Typo --- lib/layouts/rsphrase.module |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module index f4540df..749e165 100644 --- a/lib/layouts/rsphrase.module +++ b/lib/layouts/rsphrase.module @@ -3,7 +3,7 @@ #DescriptionBegin #Provides two insets and one environment to typeset numbers and phrases of #chemical risk and safety statements. -#Now obsoleted and officialy replaced by GHS Hazard-Precautionary statement system in the EU. +#Now obsoleted and officially replaced by GHS Hazard-Precautionary statement system in the EU. #DescriptionEnd #Author: Uwe Stöhr -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix crash when copying multiple cells in table
commit 6ec6db8cd9073bcb856e6a055d12ff95802e22be
Author: Juergen Spitzmueller
Date: Sat Apr 8 16:55:41 2023 +0200
Fix crash when copying multiple cells in table
while having done "backwards" selection (selBegin() in a later
column/row than selEnd())
---
src/insets/InsetTabular.cpp | 26 ++
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 163f162..69f9e73 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -7516,10 +7516,15 @@ docstring InsetTabular::asString(idx_type stidx,
idx_type enidx,
{
LASSERT(stidx <= enidx, return docstring());
docstring retval;
- col_type const col1 = tabular.cellColumn(stidx);
- col_type const col2 = tabular.cellColumn(enidx);
- row_type const row1 = tabular.cellRow(stidx);
- row_type const row2 = tabular.cellRow(enidx);
+ col_type col1 = tabular.cellColumn(stidx);
+ col_type col2 = tabular.cellColumn(enidx);
+ row_type row1 = tabular.cellRow(stidx);
+ row_type row2 = tabular.cellRow(enidx);
+ // stidx might be in a later column or row than enidx
+ if (col1 > col2)
+ swap(col1, col2);
+ if (row1 > row2)
+ swap(row1, row2);
bool first = true;
for (col_type col = col1; col <= col2; col++)
for (row_type row = row1; row <= row2; row++) {
@@ -7537,10 +7542,15 @@ ParagraphList InsetTabular::asParList(idx_type stidx,
idx_type enidx)
{
LASSERT(stidx <= enidx, return ParagraphList());
ParagraphList retval;
- col_type const col1 = tabular.cellColumn(stidx);
- col_type const col2 = tabular.cellColumn(enidx);
- row_type const row1 = tabular.cellRow(stidx);
- row_type const row2 = tabular.cellRow(enidx);
+ col_type col1 = tabular.cellColumn(stidx);
+ col_type col2 = tabular.cellColumn(enidx);
+ row_type row1 = tabular.cellRow(stidx);
+ row_type row2 = tabular.cellRow(enidx);
+ // stidx might be in a later column or row than enidx
+ if (col1 > col2)
+ swap(col1, col2);
+ if (row1 > row2)
+ swap(row1, row2);
for (col_type col = col1; col <= col2; col++)
for (row_type row = row1; row <= row2; row++)
for (auto const & par : tabular.cellInset(row,
col)->paragraphs())
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * cs.po
commit 77d07c0fd0c1c471eb2298fd0e48e21b0de15795
Author: Pavel Sanda
Date: Sat Apr 8 09:08:34 2023 +0200
* cs.po
---
po/cs.po | 115 ++
1 files changed, 41 insertions(+), 74 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index cb89b20..6bb8fde 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7592,9 +7592,8 @@ msgstr "Reference"
#: lib/layouts/powerdot.layout:419 lib/layouts/siamltex.layout:367
#: lib/layouts/simplecv.layout:211 lib/layouts/stdstruct.inc:92
#: lib/layouts/svcommon.inc:682
-#, fuzzy
msgid "Bib preamble"
-msgstr "Preambule náhledu"
+msgstr "Bib preambule"
#: lib/layouts/IEEEtran.layout:399 lib/layouts/aastex.layout:475
#: lib/layouts/agutex.layout:245 lib/layouts/amsdefs.inc:294
@@ -7607,9 +7606,8 @@ msgstr "Preambule náhledu"
#: lib/layouts/powerdot.layout:420 lib/layouts/siamltex.layout:368
#: lib/layouts/simplecv.layout:212 lib/layouts/stdstruct.inc:93
#: lib/layouts/svcommon.inc:683
-#, fuzzy
msgid "Bibliography Preamble"
-msgstr "Styl bibliografie"
+msgstr "Preambule bibliografie"
#: lib/layouts/IEEEtran.layout:400 lib/layouts/aastex.layout:476
#: lib/layouts/agutex.layout:246 lib/layouts/amsdefs.inc:295
@@ -7704,7 +7702,7 @@ msgstr "Triky pro titulek a preambuli"
#: lib/layouts/InStar.module:3 lib/layouts/fix-cm.module:3
#: lib/layouts/fixltx2e.module:3 lib/layouts/minimalistic.module:3
msgid "Fixes & Hacks"
-msgstr ""
+msgstr "Opravy"
#: lib/layouts/InStar.module:13
msgid ""
@@ -8345,9 +8343,8 @@ msgid "\\Alph{appendix}."
msgstr "\\Alph{appendix}."
#: lib/layouts/aastex62.layout:253 lib/layouts/copernicus.layout:315
-#, fuzzy
msgid "Subappendix"
-msgstr "Příloha"
+msgstr "Subappendix"
#: lib/layouts/aastex62.layout:257 lib/layouts/copernicus.layout:319
msgid "Subsection Appendix"
@@ -8358,9 +8355,8 @@ msgid "\\Alph{appendix}\\arabic{subappendix}."
msgstr "\\Alph{appendix}\\arabic{subappendix}."
#: lib/layouts/aastex62.layout:269 lib/layouts/copernicus.layout:327
-#, fuzzy
msgid "Subsubappendix"
-msgstr "Subsubsection Appendix"
+msgstr "Subsubappendix"
#: lib/layouts/aastex62.layout:273 lib/layouts/copernicus.layout:331
msgid "Subsubsection Appendix"
@@ -8533,9 +8529,8 @@ msgid "ACM SIG Proceedings (SP, Obsolete)"
msgstr "ACM SIG Proceedings (SP, Obsolete)"
#: lib/layouts/acmart.layout:3 lib/examples/Articles:0
-#, fuzzy
msgid "Association for Computing Machinery (ACM)"
-msgstr "Association for Computing Machinery (ACM) article"
+msgstr "Association for Computing Machinery (ACM)"
#: lib/layouts/acmart.layout:86 lib/layouts/acmsiggraph-0-92.layout:335
#: lib/layouts/acmsiggraph.layout:291 lib/layouts/amsdefs.inc:215
@@ -9299,9 +9294,8 @@ msgid "table"
msgstr "tabulka"
#: lib/layouts/aguplus.inc:236
-#, fuzzy
msgid "Plano Table"
-msgstr "Planotable"
+msgstr "Plano Table"
#: lib/layouts/agutex.layout:3 lib/examples/Articles:0
msgid "American Geophysical Union (AGUTeX)"
@@ -9325,16 +9319,14 @@ msgid "Author affiliation:"
msgstr "Author affiliation:"
#: lib/layouts/algorithm2e.module:2
-#, fuzzy
msgid "Algorithm2e Float"
-msgstr "Algorithm2e"
+msgstr "Plovoucí Algorithm2e"
#: lib/layouts/algorithm2e.module:3 lib/layouts/bicaption.module:3
#: lib/layouts/figs-within-sections.module:3
#: lib/layouts/tabs-within-sections.module:3
-#, fuzzy
msgid "Floats & Captions"
-msgstr "Nastavení třídy"
+msgstr "Plovoucí objekty & popisky"
#: lib/layouts/algorithm2e.module:8
msgid ""
@@ -9353,9 +9345,8 @@ msgstr "Seznam algoritmů"
#: lib/layouts/amsart.layout:3 lib/layouts/amsbook.layout:3
#: lib/examples/Articles:0
-#, fuzzy
msgid "American Mathematical Society (AMS)"
-msgstr "American Mathematical Society (AMS) Book"
+msgstr "American Mathematical Society (AMS)"
#: lib/layouts/amsart.layout:87
msgid "SpecialSection"
@@ -10443,19 +10434,16 @@ msgid "Beamerposter"
msgstr "Beamerposter"
#: lib/layouts/bicaption.module:2
-#, fuzzy
msgid "Bilingual Captions"
-msgstr "Vícejazyčné popisky"
+msgstr "Dvojjazyčné popisky"
#: lib/layouts/bicaption.module:7
-#, fuzzy
msgid ""
"Provides two styles to typeset bilingual captions. For a description see "
"Help > Specific Manuals > Multilingual Captions."
msgstr ""
"Poskytuje dvojici stylů pro sazbu vícejazyčných popisků. Pro detaily "
-"nahlédněte do souboru MultilingualCaptions.lyx, který je uložený v "
-"příkladech."
+"nahlédněte do Nápověda > Specializované manuály > Vícejazyčné popisky."
#: lib/layouts/bicaption.module:11
msgid "Caption setup"
@@ -10514,16 +10502,14 @@ msgstr "Braillovo písmo"
#: lib/layouts/braille.module:3
msgid "Accessibility"
-msgstr ""
+msgstr "Zpřístupnění"
#: lib/layouts/braille.module:7
-#, fuzzy
msgid ""
"Defines an environment to typeset Braille. For more details see Help > "
"Specific Manuals > Braille."
msgstr ""
-"Definuje prostředí pro sazbu Braillova slepeckého písma. Detaily viz soubor "
-"Braille.lyx v příkladech."
+"Definuje prostředí pro sazbu Braillova
