[LyX/2.4.x] Translation of French Additional manual completed
commit 04f47465416257f3014549eb2377bb4204f0ec6c Author: jpc Date: Mon Apr 22 18:22:01 2024 +0200 Translation of French Additional manual completed --- lib/doc/fr/Additional.lyx | 1424 + 1 file changed, 918 insertions(+), 506 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index ad4b807b9a..7ba8a28bc8 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -43,6 +43,7 @@ graphicboxes varwidth enotez customHeadersFooters +theorems-named \end_modules \maintain_unincluded_children no \language french @@ -458,13 +459,27 @@ Importation de la dernière mise à jour de 2.3 dans 2.4 (JPC): \begin_layout Plain Layout Mise à jour pour 2.4.0 (JPC) : - 05/06/2021 (JPC) + 05/06/2021 \end_layout \begin_layout Plain Layout Suite à une restructuration complète du manuel, - retranscription de ces modifications avant revue de la traduction pour 2.4.0 : - 05/03/2024 (JPC) + retranscription de ces modifications avant revue de la traduction pour 2.4.0 (JPC): + 05/03/2024 +\end_layout + +\begin_layout Plain Layout +Mise à jour finale pour 2.4.0 (JPC): + 22/04/2024, + +\nospellcheck on +CVS +\nospellcheck default +/ +\nospellcheck on +SVN +\nospellcheck default + restent non traduits \end_layout \end_inset @@ -16895,70 +16910,96 @@ nolink "false" \end_layout \begin_layout Section - -\lang english Maths \end_layout \begin_layout Subsection - -\lang english -AMS Theorems +Théorèmes AMS \end_layout \begin_layout Standard - -\lang english -This modules defines theorem environments and the proof environment using the extended AMS machinery. - Both numbered and unnumbered types are provided. - By default, - the theorems are numbered consecutively throughout the document. - This can be changed by loading one of the +Ces modules définissent les environnements de théorème et de preuve en utilisant le mécanismes AMS. + Les types numérotés et non numérotés sont fournis. + Implicitement, + les théorèmes sont numérotés consécutivement à travers tout le document. + Ceci peut être modifié en chargeant l'un des modules \family sans -AMS Theorems (Numbered by \SpecialChar ldots + Théorèmes +\begin_inset space ~ +\end_inset + +AMS +\begin_inset space ~ +\end_inset + +(numérotés +\begin_inset space ~ +\end_inset + +par +\begin_inset space ~ +\end_inset + +\SpecialChar ldots ) \family default - modules. - It cannot be used if the modules +. + Ils ne peuvent pas être utilisés si les modules \family sans -Standard Theorems + Théorèmes +\begin_inset space ~ +\end_inset + +standard \family default - or + ou \family sans -Standard Theorems (Unnumbered) +Théorèmes +\begin_inset space ~ +\end_inset + +standard +\begin_inset space ~ +\end_inset + +(non +\begin_inset space ~ +\end_inset + +numérotés) \family default - have been loaded. + ont été chargés. \end_layout \begin_layout Subsection - -\lang english -AMS Theorems (Extended) +Théorèmes AMS (étendu) \end_layout \begin_layout Standard - -\lang english -This module defines some additional theorem environments for use with the +Ce module définit quelques environnements de théorème supplémentaires pour une utilisation avec le module \family sans -AMS Theorems +Théorèmes +\begin_inset space ~ +\end_inset + +AMS \family default - package (which must be loaded). - It includes + (qui doit être chargé). + Il inclut \family sans -Criterion +Critère \family default , \family sans Algorithm \family default -, +e, \family sans Axiom \family default -, +e, \family sans Condition @@ -16976,7 +17017,7 @@ Notation , \family sans -Summary +Résumé \family default , @@ -16986,55 +17027,75 @@ Conclusion , \family sans -Fact +Fa \family default -, +it, \family sans -Assumption +Hypothèse \family default , \family sans -Case +Cas \family default - and + et \family sans Question \family default - in both numbered and unnumbered forms. + à la fois sous forme numérotée et non numérotée. \end_layout \begin_layout Subsection - -\lang english -AMS Theorems (Extended, - Numbered by Type within Chapters) +Théorèmes AMS (étendu, + numérotation par type et par chapitre) \end_layout \begin_layout Standard - -\lang english -This module defines some additional theorem environments for use with the +Ce module définit quelques environnements de théorème supplémentaires pour une utilisation avec le module \family sans -AMS Theorems (Numbered by Type within Chapters) +Théorèmes +\begin_inset space ~ +\end_inset + +AMS (numérotation +\begin_inset space ~ +\end_inset + +par +\begin_inset space ~ +\end_inset + +type +\begin_inset space ~ +\end_inset + +et +\begin_inset space ~ +\end_inset + +par +\begin_inset space ~ +\end_inset + +chapitre) \family default - module (which must be loaded). - It includes + (qui doit être chargé). + Il inclut \family sans -Criterion +Critère \family default , \family sa
[LyX/master] Try to make sure that math insets have a properly set buffer_ member
commit f3c5ff9cb72c5231f1e1e81452e67d6f12dadecb
Author: Jean-Marc Lasgouttes
Date: Fri Oct 14 22:42:21 2022 +0200
Try to make sure that math insets have a properly set buffer_ member
Set the buffer of contents that is added to a MathData object through
MathData::insert() (both versions)
MathData::push_back()
asArray()
Also in math macros, initialize look_ with the relevant buffer.
This reduces the number of insets hat do not have a proper buffer.
See #13050 for discussion of this issue.
---
src/mathed/InsetMathMacroTemplate.cpp | 8 +---
src/mathed/MathData.cpp | 24 ++--
src/mathed/MathData.h | 7 +--
src/mathed/MathSupport.cpp| 3 +++
4 files changed, 35 insertions(+), 7 deletions(-)
diff --git a/src/mathed/InsetMathMacroTemplate.cpp
b/src/mathed/InsetMathMacroTemplate.cpp
index 9fe10491e2..c28c0d100f 100644
--- a/src/mathed/InsetMathMacroTemplate.cpp
+++ b/src/mathed/InsetMathMacroTemplate.cpp
@@ -394,7 +394,7 @@ void InsetNameWrapper::draw(PainterInfo & pi, int x, int y)
const
InsetMathMacroTemplate::InsetMathMacroTemplate(Buffer * buf)
- : InsetMathNest(buf, 3), numargs_(0), argsInLook_(0), optionals_(0),
+ : InsetMathNest(buf, 3), look_(buf), numargs_(0), argsInLook_(0),
optionals_(0),
type_(MacroTypeNewcommand), redefinition_(false), lookOutdated_(true),
premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0)
{
@@ -405,8 +405,8 @@ InsetMathMacroTemplate::InsetMathMacroTemplate(Buffer * buf)
InsetMathMacroTemplate::InsetMathMacroTemplate(Buffer * buf, docstring const &
name, int numargs,
int optionals, MacroType type, vector const & optionalValues,
MathData const & def, MathData const & display)
- : InsetMathNest(buf, optionals + 3), numargs_(numargs),
argsInLook_(numargs),
- optionals_(optionals), optionalValues_(optionalValues),
+ : InsetMathNest(buf, optionals + 3), look_(buf), numargs_(numargs),
+ argsInLook_(numargs), optionals_(optionals),
optionalValues_(optionalValues),
type_(type), redefinition_(false), lookOutdated_(true),
premetrics_(false), labelBoxAscent_(0), labelBoxDescent_(0)
{
@@ -536,6 +536,8 @@ void InsetMathMacroTemplate::createLook(int args) const
look_.push_back(MathAtom(
new InsetDisplayLabelBox(buffer_, MathAtom(
new InsetMathWrapper(&cell(displayIdx(, _("LyX"),
*this)));
+
+ look_.setContentsBuffer();
}
diff --git a/src/mathed/MathData.cpp b/src/mathed/MathData.cpp
index 24b4d86fb9..4c33934828 100644
--- a/src/mathed/MathData.cpp
+++ b/src/mathed/MathData.cpp
@@ -52,11 +52,18 @@ MathData::MathData(Buffer * buf, const_iterator from,
const_iterator to)
{}
+void MathData::setContentsBuffer()
+{
+ if (buffer_)
+ for (MathAtom & at : *this)
+ at.nucleus()->setBuffer(*buffer_);
+}
+
+
void MathData::setBuffer(Buffer & b)
{
buffer_ = &b;
- for (MathAtom & at : *this)
- at.nucleus()->setBuffer(b);
+ setContentsBuffer();
}
@@ -78,6 +85,8 @@ void MathData::insert(size_type pos, MathAtom const & t)
{
LBUFERR(pos <= size());
base_type::insert(begin() + pos, t);
+ if (buffer_)
+ operator[](pos)->setBuffer(*buffer_);
}
@@ -85,6 +94,17 @@ void MathData::insert(size_type pos, MathData const & ar)
{
LBUFERR(pos <= size());
base_type::insert(begin() + pos, ar.begin(), ar.end());
+ if (buffer_)
+ for (size_type i = 0 ; i < ar.size() ; ++i)
+ operator[](pos + i)->setBuffer(*buffer_);
+}
+
+
+void MathData::push_back(MathAtom const & t)
+{
+ base_type::push_back(t);
+ if (buffer_)
+ back()->setBuffer(*buffer_);
}
diff --git a/src/mathed/MathData.h b/src/mathed/MathData.h
index 865742df4c..c2d731efcb 100644
--- a/src/mathed/MathData.h
+++ b/src/mathed/MathData.h
@@ -59,7 +59,6 @@ public:
using base_type::clear;
using base_type::begin;
using base_type::end;
- using base_type::push_back;
using base_type::pop_back;
using base_type::back;
using base_type::front;
@@ -85,6 +84,8 @@ public:
void insert(size_type pos, MathAtom const & at);
/// inserts multiple atoms at position pos
void insert(size_type pos, MathData const & ar);
+ /// inserts single atom at end
+ void push_back(MathAtom const & at);
/// erase range from pos1 to pos2
void erase(iterator pos1, iterator pos2);
@@ -187,8 +188,10 @@ public:
void updateMacros(Cursor * cur, MacroContext const & mc, UpdateType,
int nesting);
///
void updateBuffer(ParIterator const &, UpdateType, bool const deleted =
false);
- ///
+ /// Change associated buffer for this object and its contents
[LyX/2.4.1-devel] Sanitize cursors after a buffer has been reloaded
commit 21096f696a0de7a95b0a12b1d9530c3b4aa399e7
Author: Jean-Marc Lasgouttes
Date: Tue Apr 16 11:45:09 2024 +0200
Sanitize cursors after a buffer has been reloaded
When a buffer is reloaded, its content may remain the same, but the
memory allocation is new, so that the inset pointers in cursors are
now wrong. This requires to sanitize the cursors held by the buffer
views.
Before the biginset branch, some full metrics computation call that is
now removed probably did that as a side effect. Now we have to be more
precise.
To this effect, introduce WorkAreaManager::sanitizeCursors() and use
it in Buffer::reload().
(cherry picked from commit c1fd622c51752d790576600f5911813ff8dac3fa)
---
src/Buffer.cpp| 3 +++
src/frontends/WorkArea.h | 7 +++
src/frontends/WorkAreaManager.cpp | 12
src/frontends/WorkAreaManager.h | 2 ++
src/frontends/qt/GuiWorkArea.h| 4 ++--
5 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index de7f4d217c..38d236964a 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -5562,6 +5562,9 @@ Buffer::ReadStatus Buffer::reload()
Buffer const * oldparent = d->parent();
d->setParent(nullptr);
ReadStatus const status = loadLyXFile();
+ // The inset members in cursors held by buffer views are now wrong.
+ workAreaManager().sanitizeCursors();
+ setBusy(false);
if (status == ReadSuccess) {
updateBuffer();
changed(true);
diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index d6912fc7fa..c0e673554a 100644
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -18,6 +18,8 @@
namespace lyx {
+class BufferView;
+
namespace frontend {
/**
@@ -40,6 +42,11 @@ public:
/// Update window titles of all users.
virtual void updateWindowTitle() = 0;
+
+ ///
+ virtual BufferView & bufferView() = 0;
+ ///
+ virtual BufferView const & bufferView() const = 0;
};
} // namespace frontend
diff --git a/src/frontends/WorkAreaManager.cpp
b/src/frontends/WorkAreaManager.cpp
index 8d32c6b6d8..324d5571af 100644
--- a/src/frontends/WorkAreaManager.cpp
+++ b/src/frontends/WorkAreaManager.cpp
@@ -13,6 +13,9 @@
#include "WorkAreaManager.h"
+#include "BufferView.h"
+#include "Cursor.h"
+
#include "Application.h"
#include "WorkArea.h"
@@ -69,6 +72,15 @@ void WorkAreaManager::scheduleRedraw()
}
+void WorkAreaManager::sanitizeCursors()
+{
+ for (WorkArea * wa : work_areas_) {
+ wa->bufferView().cursor().sanitize();
+ wa->bufferView().resetInlineCompletionPos();
+ }
+}
+
+
} // namespace frontend
} // namespace lyx
diff --git a/src/frontends/WorkAreaManager.h b/src/frontends/WorkAreaManager.h
index 94c528b3a6..73548592fa 100644
--- a/src/frontends/WorkAreaManager.h
+++ b/src/frontends/WorkAreaManager.h
@@ -49,6 +49,8 @@ public:
/// If there is no work area, create a new one in the current view
using the
/// buffer buf. Returns false if not possible.
bool unhide(Buffer * buf) const;
+ /// Fix cursors in all buffer views held by work areas.
+ void sanitizeCursors();
private:
typedef std::list::iterator iterator;
diff --git a/src/frontends/qt/GuiWorkArea.h b/src/frontends/qt/GuiWorkArea.h
index 148b79b73a..86bbfda939 100644
--- a/src/frontends/qt/GuiWorkArea.h
+++ b/src/frontends/qt/GuiWorkArea.h
@@ -59,9 +59,9 @@ public:
/// is GuiView in fullscreen mode?
bool isFullScreen() const;
///
- BufferView & bufferView();
+ BufferView & bufferView() override;
///
- BufferView const & bufferView() const;
+ BufferView const & bufferView() const override;
///
void scheduleRedraw(bool update_metrics) override;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] small changes backported from master
commit 3941c487e85a5c2a2b7897c9a6da3ac2d00b1da2 Author: Jean-Marc Lasgouttes Date: Fri Apr 19 17:16:00 2024 +0200 small changes backported from master --- INSTALL | 6 +++--- README | 8 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/INSTALL b/INSTALL index 5c9c4d7489..ec959ff6a8 100644 --- a/INSTALL +++ b/INSTALL @@ -55,9 +55,9 @@ Requirements First of all, you will need a C++11 standard conforming compiler, like g++ (at least 4.9, to have proper srd::regex) or clang++. -LyX makes great use of the C++ Standard Template Library (STL). -This means that gcc users will have to install the relevant libstdc++ -library to be able to compile this version of LyX. +LyX makes great use of the C++ Standard Library. This means that gcc +users will have to install the relevant libstdc++ library to be able +to compile this version of LyX. For full LyX usability we suggest to use Qt 5.6 and higher, or at the very least Qt 5.4. It is also possible to compile against Qt 6. The diff --git a/README b/README index b6b7a2ffb3..3d8da5aeea 100644 --- a/README +++ b/README @@ -27,8 +27,8 @@ What do I need to run LyX? Either: * a Unix-like system (including Windows with Cygwin) -* Windows Vista or newer -* Mac OS 10.4 or newer +* Windows 7 or newer +* Mac OS 10.13 or newer A decent LaTeX2e installation (e.g. TeX Live for Linux, MikTeX for Windows). @@ -42,7 +42,7 @@ How does the LyX version scheme work? number "2.x.y" indicates a stable release '2.x', maintenance release 'y'. In other words, LyX 2.3.0 was the first stable release in the 2.3-series of LyX. At the time of writing, the -latest maintenance release in the 2.3-series is LyX 2.3.4. +latest maintenance release in the 2.3-series is LyX 2.3.7. Please note that maintenance releases are designed primarily to fix bugs, and that the file format will _never_ change due to a @@ -101,7 +101,7 @@ Okay, I've installed LyX. What now? the "Introduction" item under the Help menu. You should follow the instructions there, which tell you to read (or at least skim) the Tutorial. After that, you should also read "Help>LaTeX -configuration" which provides info on your LaTeX configuration +Configuration" which provides info on your LaTeX configuration as LyX sees it. You might be missing a package or two that you'd like to have. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] Typo
commit a8a94fdfb3190f3908f64a89dc45224250500b9e Author: jpc Date: Mon Apr 22 10:27:07 2024 +0200 Typo --- lib/doc/Additional.lyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx index 01ebe77b82..2ac974b26f 100644 --- a/lib/doc/Additional.lyx +++ b/lib/doc/Additional.lyx @@ -20249,7 +20249,7 @@ Hyphenatable Text Markup (Soul) \end_layout \begin_layout Standard -This modul defines text styles to highlight, +This module defines text styles to highlight, space-out, strike-through, underline and capitalize/small-cap text by means of the -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] Remove non supported Article classes in UserGuide
commit 723af05069d1f75d244a1ce84938a3f737e8e06b Author: jpc Date: Mon Apr 22 09:18:52 2024 +0200 Remove non supported Article classes in UserGuide --- lib/doc/UserGuide.lyx | 40 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index 553a4b04ba..bc6ecfa843 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -3641,14 +3641,6 @@ Additional Features A&A Journal articles in the style and format used in Astronomy & Astrophysics \end_layout -\begin_layout Description -ACS For submissions to the journals published by the American Chemistry Society -\end_layout - -\begin_layout Description -AGU For submissions to the journals published by the American Geophysical Union -\end_layout - \begin_layout Description AMS Layouts for articles and books in the style and format used by the American Mathematical Society (AMS). There are three article layouts available. @@ -3699,7 +3691,7 @@ vitae classes to create curriculum vitae \end_layout \begin_layout Description -Elsarticle Layout for journals of the Elsevier publishing group +Elsevier Layout for journals of the Elsevier publishing group \end_layout \begin_layout Description @@ -3714,14 +3706,6 @@ Hollywood Used to type spec scripts for the US film industry. . \end_layout -\begin_layout Description -IEEEtran Layout for the journals published by the Institute of Electrical and Electronics Engineers (IEEE) -\end_layout - -\begin_layout Description -IOP Layout for journals of the Institute of Physics publishing group -\end_layout - \begin_layout Description Kluwer Layout for journals of the Kluwer publishing group \end_layout @@ -3757,14 +3741,6 @@ TeX Slides Used to make transparencies \end_layout -\begin_layout Description -SPIE -\begin_inset space ~ -\end_inset - -Proceedings Layout for the journals published by The International Society for Optical Engineering (SPIE) -\end_layout - \begin_layout Description Springer Layouts for journals of the Springer publishing group \end_layout @@ -3773,7 +3749,7 @@ Springer Layouts for journals of the Springer publishing group We will not go into detail about how to use these different document classes here. You can find details about the non-standard classes in chapter \emph on -Special Document Classes +Document Classes \emph default of the \emph on @@ -3835,13 +3811,7 @@ Unavailable Nothing is wrong. \SpecialChar LyX includes many more document classes than you will ever need to use, - and some of them, - like -\family sans -IOP -\family default -, - are highly specialized. + and some of them are highly specialized. \SpecialChar LyX tries to support as many different types of documents as possible, and it includes almost one hundred different layout files, @@ -3897,9 +3867,7 @@ Although \SpecialChar LyX and many users have done so. Chapter \emph on -Installing New Document Classes, - Layouts, - and Templates +Installing New Document Classes \emph default of the \emph on -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
