[LyX/master] Fix bug #13017.
commit 59b08c8171d751aafe1aa34b9c1acce5406cc880
Author: Richard Kimberly Heck
Date: Thu Jan 11 17:23:52 2024 -0500
Fix bug #13017.
The problem is caused by removing temporary aux, etc, files while
we are in the process of exporting. As Jürgen suggested, we really
do not need to remove these files until we are preparing to export:
They are not used internally. So now we just schedule the removal
and do it then.
---
src/Buffer.cpp |5 -
src/Buffer.h | 13 +++--
src/frontends/qt/GuiView.cpp |1 +
src/insets/InsetCitation.cpp |6 +++---
4 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 732ca7e..29dfe4b 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2444,7 +2444,7 @@ void Buffer::invalidateBibinfoCache() const
{
d->bibinfo_cache_valid_ = false;
d->cite_labels_valid_ = false;
- removeBiblioTempFiles();
+ scheduleBiblioTempRemoval();
// also invalidate the cache for the parent buffer
Buffer const * const pbuf = d->parent();
if (pbuf)
@@ -2702,6 +2702,7 @@ void Buffer::removeBiblioTempFiles() const
Buffer const * const pbuf = parent();
if (pbuf)
pbuf->removeBiblioTempFiles();
+ removeBiblioTemps = false;
}
@@ -4475,6 +4476,8 @@ void Buffer::setMathFlavor(OutputParams & op) const
Buffer::ExportStatus Buffer::doExport(string const & target, bool
put_in_tempdir,
bool includeall, string & result_file) const
{
+ if (removeBiblioTemps)
+ removeBiblioTempFiles();
LYXERR(Debug::FILES, "target=" << target);
OutputParams runparams(¶ms().encoding());
string format = target;
diff --git a/src/Buffer.h b/src/Buffer.h
index de27084..ee37098 100644
--- a/src/Buffer.h
+++ b/src/Buffer.h
@@ -538,9 +538,6 @@ public:
/// dereferenced label name
void getLabelList(std::vector> &) const;
- /// This removes the .aux and .bbl files from the temp dir.
- void removeBiblioTempFiles() const;
-
///
void changeLanguage(Language const * from, Language const * to);
@@ -704,6 +701,8 @@ private:
///
ExportStatus doExport(std::string const & target, bool put_in_tempdir,
std::string & result_file) const;
+ /// This removes the .aux and .bbl files from the temp dir.
+ void removeBiblioTempFiles() const;
/// target is a format name optionally followed by a space
/// and a destination file-name
ExportStatus doExport(std::string const & target, bool put_in_tempdir,
@@ -806,18 +805,20 @@ public:
/// of loaded child documents).
docstring_list const &
getBibfiles(UpdateScope scope = UpdateMaster) const;
-
+ ///
+ void scheduleBiblioTempRemoval() const { removeBiblioTemps = true; }
/// routines for dealing with possible self-inclusion
void pushIncludedBuffer(Buffer const * buf) const;
void popIncludedBuffer() const;
bool isBufferIncluded(Buffer const * buf) const;
private:
void clearIncludeList() const;
-
-private:
+ ///
friend class MarkAsExporting;
/// mark the buffer as busy exporting something, or not
void setExportStatus(bool e) const;
+ ///
+ mutable bool removeBiblioTemps = false;
///
References & getReferenceCache(docstring const & label);
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 79ffc0a..c2ca367 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -527,6 +527,7 @@ public:
string last_export_format;
string processing_format;
+ // Buffers that are being exported
static QSet busyBuffers;
unsigned int smallIconSize;
diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index b1d01f4..5082e11 100644
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -50,7 +50,7 @@ namespace lyx {
InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p)
: InsetCommand(buf, p)
{
- buffer().removeBiblioTempFiles();
+ buffer().scheduleBiblioTempRemoval();
cleanKeys();
}
@@ -61,7 +61,7 @@ InsetCitation::~InsetCitation()
/* We do not use buffer() because Coverity believes that this
* may throw an exception. Actually this code path is not
* taken when buffer_ == 0 */
- buffer_->removeBiblioTempFiles();
+ buffer_->scheduleBiblioTempRemoval();
}
@@ -142,7 +142,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest &
cmd)
openCitation();
break;
case LFUN_INSET_MODIFY: {
- buffer().removeBiblioTempFiles();
+ buffer().scheduleBiblioTempRemoval();
cache.recalculate = t
[LyX/master] Update fr/Intro.lyx for 2.4.0
commit 082031ac8fbc5badbc05afc359d3851109ffe542 Author: jpc Date: Thu Jan 11 18:47:39 2024 +0100 Update fr/Intro.lyx for 2.4.0 --- lib/doc/fr/Intro.lyx | 12 +--- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx index a0b415f..428ea0e 100644 --- a/lib/doc/fr/Intro.lyx +++ b/lib/doc/fr/Intro.lyx @@ -640,7 +640,7 @@ voulez Ça ne veut pas dire qu'il manque à \SpecialChar LyX des fonctions utiles. Ça signifie simplement que ce n'est pas l'outil adapté — - vous n'utilisez pas un tournevis pour enfoncer des clous (sauf si votre tournevis est garanti à vie). + vous n'utilisez pas un tournevis pour enfoncer des clous. \end_layout \begin_layout Subsection @@ -966,8 +966,6 @@ dvi \family default , ou le convertir vers d'autres formats comme PostScript, - PDF, - etc. \end_layout \begin_layout Standard @@ -1151,8 +1149,8 @@ Pour répondre plus facilement à vos questions tout en décrivant toutes les fo Ils ont chacun leur rôle, comme indiqué un peu plus loin. Mais avant de parcourir tous ces fichiers, - il vaut mieux lire ce chapitre avec attention, - parce qu'il contient des informations et commentaires qui pourront vous faire gagner du temps. + il vaut mieux lire cette section avec attention, + parce qu'elle contient des informations et commentaires qui pourront vous faire gagner du temps. \end_layout \begin_layout Standard @@ -1325,7 +1323,7 @@ sec:Contrib \end_inset . - Vous pouvez vous rendre à la section mentionnée en cliquant sur le bouton + Vous pouvez vous rendre à l'élément mentionnée en cliquant sur le bouton \family sans Aller \begin_inset space ~ @@ -1356,7 +1354,7 @@ le style Mise En évidence \emph default sert à mettre l'accent sur un point et à écrire les paramètres génériques, - les titres de livres, + les titres des livres et des manuels, les noms de sections d'autres manuels, et les notes des auteurs; \end_layout -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix date
commit f7f300486400f844dc19aac5bbfb519200e9b028 Author: Richard Kimberly Heck Date: Thu Jan 11 11:32:57 2024 -0500 Fix date --- configure.ac |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 34a0eb9..bb71081 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process with autoconf to generate configure script -*- sh -*- AC_INIT([LyX],[2.4.0~RC1],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2022-01-11"]) +AC_SUBST(LYX_DATE, ["2024-01-11"]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remerge strings
commit ed95bbd8f5f0b3ecc5c72a550fca484dfc62178e Author: Richard Kimberly Heck Date: Thu Jan 11 11:08:15 2024 -0500 Remerge strings po/ar.po| 540 ++-- po/bg.po| 576 ++-- po/cs.po| 548 ++-- po/de.po| 536 ++-- po/en.po| 484 ++-- po/es.po| 550 ++-- po/eu.po| 552 ++-- po/fi.po| 546 ++-- po/fr.po| 538 ++-- po/he.po| 156 +- po/hu.po| 546 ++-- po/ia.po| 538 ++-- po/id.po| 536 ++-- po/it.po| 536 ++-- po/ja.po| 250 +- po/nb.po| 550 ++-- po/nl.po| 8449 ++- po/nn.po| 548 ++-- po/pl.po| 546 ++-- po/pt_BR.po | 560 ++-- po/pt_PT.po | 550 ++-- po/ru.po| 554 ++-- po/sk.po| 536 ++-- po/sv.po| 552 ++-- po/uk.po| 847 +++--- po/zh_CN.po | 550 ++-- po/zh_TW.po | 552 ++-- 27 files changed, 12423 insertions(+), 9803 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update bind format
commit e8bf672eba2fec42a4b46af8ac0be2016ec33804 Author: Richard Kimberly Heck Date: Thu Jan 11 11:07:41 2024 -0500 Update bind format --- lib/bind/he/cua.bind |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/lib/bind/he/cua.bind b/lib/bind/he/cua.bind index aa86f7d..6b8a51f 100644 --- a/lib/bind/he/cua.bind +++ b/lib/bind/he/cua.bind @@ -22,6 +22,8 @@ # Load the default cua.bind # ../ just means that no localized bindfile # should be loaded here +Format 5 + \bind_file ../cua.bind # Add binding to switch to Hebrew -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update docs
commit d302d6b20f7994a74637555a2ce92ba55e97c294 Author: Richard Kimberly Heck Date: Thu Jan 11 11:06:40 2024 -0500 Update docs development/MacOSX/ReadMe/Leame.lyx|2 +- development/MacOSX/ReadMe/LiesMich.lyx |2 +- development/MacOSX/ReadMe/LisezMoi.lyx |2 +- development/MacOSX/ReadMe/ReadMe.lyx |2 +- lib/doc/Development.lyx|2 +- lib/doc/DummyDocument1.lyx |2 +- lib/doc/DummyDocument2.lyx |2 +- lib/doc/Formula-numbering.lyx |2 +- lib/doc/LFUNs.lyx | 2444 ++-- lib/doc/MergedManuals.lyx |2 +- lib/doc/ar/Intro.lyx |2 +- lib/doc/ar/Shortcuts.lyx |2 +- lib/doc/ar/Tutorial.lyx|2 +- lib/doc/ar/UserGuide.lyx |2 +- lib/doc/ca/Intro.lyx |2 +- lib/doc/ca/Shortcuts.lyx |2 +- lib/doc/da/Intro.lyx |2 +- lib/doc/de/Additional.lyx |2 +- lib/doc/de/DummyDocument1.lyx |2 +- lib/doc/de/DummyDocument2.lyx |2 +- lib/doc/de/EmbeddedObjects.lyx |2 +- lib/doc/de/Formelnummerierung.lyx |2 +- lib/doc/de/Intro.lyx |2 +- lib/doc/de/Math.lyx|2 +- lib/doc/de/Shortcuts.lyx |2 +- lib/doc/de/Tutorial.lyx|2 +- lib/doc/el/Intro.lyx |2 +- lib/doc/es/Additional.lyx |2 +- lib/doc/es/Customization.lyx |2 +- lib/doc/es/DocumentoPostizo1.lyx |2 +- lib/doc/es/DocumentoPostizo2.lyx |2 +- lib/doc/es/EmbeddedObjects.lyx |2 +- lib/doc/es/Formula-numbering.lyx |2 +- lib/doc/es/Math.lyx|2 +- lib/doc/es/Tutorial.lyx|2 +- lib/doc/es/UserGuide.lyx |2 +- lib/doc/eu/Intro.lyx |2 +- lib/doc/eu/Tutorial.lyx|2 +- lib/doc/fr/Additional.lyx |2 +- lib/doc/fr/Customization.lyx |2 +- lib/doc/fr/DocumentBidon1.lyx |2 +- lib/doc/fr/DocumentBidon2.lyx |2 +- lib/doc/fr/EmbeddedObjects.lyx |2 +- lib/doc/fr/Formula-numbering.lyx |2 +- lib/doc/fr/Intro.lyx |2 +- lib/doc/fr/Math.lyx|2 +- lib/doc/fr/Shortcuts.lyx |2 +- lib/doc/fr/Tutorial.lyx|2 +- lib/doc/fr/UserGuide.lyx |2 +- lib/doc/gl/Intro.lyx |2 +- lib/doc/gl/Tutorial.lyx|2 +- lib/doc/he/Intro.lyx |2 +- lib/doc/he/Tutorial.lyx|2 +- lib/doc/hu/Intro.lyx |2 +- lib/doc/hu/Tutorial.lyx|2 +- lib/doc/id/Intro.lyx |2 +- lib/doc/id/Shortcuts.lyx |2 +- lib/doc/id/Tutorial.lyx|2 +- lib/doc/it/Intro.lyx |2 +- lib/doc/it/Tutorial.lyx|2 +- lib/doc/ja/Additional.lyx |2 +- lib/doc/ja/Customization.lyx |2 +- lib/doc/ja/DummyDocument1.lyx |2 +- lib/doc/ja/DummyDocument2.lyx |2 +- lib/doc/ja/EmbeddedObjects.lyx |2 +- lib/doc/ja/Formula-numbering.lyx |2 +- lib/doc/ja/Intro.lyx |2 +- lib/doc/ja/LaTeXConfig.lyx |2 +- lib/doc/ja/Math.lyx|2 +- lib/doc/ja/MergedManuals.lyx |2 +- lib/doc/ja/Shortcuts.lyx |2 +- lib/doc/ja/Tutorial.lyx|2 +- lib/doc/ja/UserGuide.lyx |2 +- lib/doc/nb/Intro.lyx |2 +- lib/doc/nb/Tutorial.lyx|2 +- lib/doc/nl/Intro.lyx |2 +- lib/doc/nl/Shortcuts.lyx |2 +- lib/doc/nl/Tutorial.lyx|2 +- lib/doc/
[LyX/master] Ready for RC1
commit 1c00e91e288abf5af7165236790d02b0a8d33c2c Author: Richard Kimberly Heck Date: Thu Jan 11 11:05:50 2024 -0500 Ready for RC1 --- configure.ac |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 9e99f81..34a0eb9 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT([LyX],[2.4.0~beta5],[lyx-de...@lists.lyx.org],[lyx]) +AC_INIT([LyX],[2.4.0~RC1],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2023-08-31"]) +AC_SUBST(LYX_DATE, ["2022-01-11"]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update GMO files
commit ad8d8b37c401bc2cdb7708127a5e737c23fda96b Author: Richard Kimberly Heck Date: Thu Jan 11 11:04:57 2024 -0500 Update GMO files --- po/fr.gmo| Bin 656233 -> 656259 bytes po/ja.gmo| Bin 670327 -> 678728 bytes po/nl.gmo| Bin 535238 -> 632308 bytes po/pt_BR.gmo | Bin 646615 -> 646632 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/po/fr.gmo b/po/fr.gmo index 98499e1..2935c4e 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/ja.gmo b/po/ja.gmo index 4081f3e..9bfc026 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/nl.gmo b/po/nl.gmo index b3177ff..df54dc5 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index e7b241f..804 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Beta 5
commit b816036e798764e58aea7c944499cc4e4f7f7f96 Author: Richard Kimberly Heck Date: Thu Aug 31 01:10:20 2023 -0400 Beta 5 --- configure.ac |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index d93bf4e..9e99f81 100644 --- a/configure.ac +++ b/configure.ac @@ -1,9 +1,9 @@ dnl Process with autoconf to generate configure script -*- sh -*- -AC_INIT([LyX],[2.4.0~RC1.devel],[lyx-de...@lists.lyx.org],[lyx]) +AC_INIT([LyX],[2.4.0~beta5],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2023-06-26"]) +AC_SUBST(LYX_DATE, ["2023-08-31"]) AC_PREREQ([2.65]) AC_CONFIG_SRCDIR(src/main.cpp) AC_CONFIG_HEADERS([config.h]) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
