[LyX/master] Update sk.po
commit 036419119eca3d3e234db91acad536d7592aa284 Author: Kornel Benko Date: Mon Jun 3 09:00:44 2024 +0200 Update sk.po --- po/sk.po | 44 ++-- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/po/sk.po b/po/sk.po index 4888a87827..f01cb28667 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-05-17 11:50+0200\n" -"PO-Revision-Date: 2024-05-17 10:08+\n" +"POT-Creation-Date: 2024-06-03 08:10+0200\n" +"PO-Revision-Date: 2024-06-03 06:54+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -31857,20 +31857,20 @@ msgstr "Manuály" #: src/frontends/qt/FindAndReplace.cpp:301 #, c-format msgid "" -"%1$s: the end was reached while searching forward.\n" -"Continue searching from the beginning?" +"The end was reached while searching forward.\n" +"Continue searching from the beginning? (Scope:%1$s)" msgstr "" -"%1$s: dosiahol som koniec hľadajúc dopredu.\n" -"Pokračovať hľadaním od začiatku?" +"Dosiahol som koniec hľadajúc dopredu.\n" +"Pokračovať hľadaním od začiatku? (Rozsah:%1$s)" #: src/frontends/qt/FindAndReplace.cpp:304 #, c-format msgid "" -"%1$s: the beginning was reached while searching backward.\n" -"Continue searching from the end?" +"The beginning was reached while searching backward.\n" +"Continue searching from the end? (Scope:%1$s)" msgstr "" -"%1$s: Dosiahol som začiatok hľadajúc spätne.\n" -"Pokračovať hľadaním od konca?" +"Dosiahol som začiatok hľadajúc spätne.\n" +"Pokračovať hľadaním od konca? (Rozsah:%1$s)" #: src/frontends/qt/FindAndReplace.cpp:327 msgid "Advanced search in progress (press ESC to cancel) . . ." @@ -35914,6 +35914,30 @@ msgstr "Kartu &skryť" msgid "&Close Tab" msgstr "Kartu &zavrieť" +#: src/frontends/qt/GuiWorkArea.cpp:2329 +msgid "Close &Other Tabs" +msgstr "Zatvoriť všetky &iné karty" + +#: src/frontends/qt/GuiWorkArea.cpp:2331 +msgid "Close Tabs to the &Right" +msgstr "Zatvoriť karty v&pravo" + +#: src/frontends/qt/GuiWorkArea.cpp:2333 +msgid "Close Tabs to the &Left" +msgstr "Zatvoriť karty v&ľavo" + +#: src/frontends/qt/GuiWorkArea.cpp:2338 +msgid "Move Tab to &Start" +msgstr "Presunúť kartu na z&ačiatok" + +#: src/frontends/qt/GuiWorkArea.cpp:2340 +msgid "Move Tab to &End" +msgstr "Presunúť kartu na &koniec" + +#: src/frontends/qt/GuiWorkArea.cpp:2345 +msgid "Open Enclosing &Folder" +msgstr "&Otvoriť uzatvárajúci adresár" + #: src/frontends/qt/GuiWorkArea.cpp:2193 msgid "The file %1 changed on disk." msgstr "Súbor %1 na disku je zmenený." -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Adv. F&R: strange dialog text
commit 5fdbd2cf326189b9d26109a3297dc9685ce0aba6
Author: Kornel Benko
Date: Mon Jun 3 08:23:35 2024 +0200
Adv. F&R: strange dialog text
Fixes #12997
Added 'Scope' to better indicate the searched area.
---
src/frontends/qt/FindAndReplace.cpp | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/frontends/qt/FindAndReplace.cpp
b/src/frontends/qt/FindAndReplace.cpp
index d61636af62..444c378fa6 100644
--- a/src/frontends/qt/FindAndReplace.cpp
+++ b/src/frontends/qt/FindAndReplace.cpp
@@ -298,11 +298,11 @@ docstring getQuestionString(FindAndReplaceOptions const &
opt)
break;
}
docstring message = opt.forward ?
- bformat(_("%1$s: the end was reached while searching forward.\n"
- "Continue searching from the beginning?"),
+ bformat(_("The end was reached while searching forward.\n"
+ "Continue searching from the beginning?
(Scope:%1$s)"),
scope) :
- bformat(_("%1$s: the beginning was reached while searching
backward.\n"
- "Continue searching from the end?"),
+ bformat(_("The beginning was reached while searching
backward.\n"
+ "Continue searching from the end? (Scope:%1$s)"),
scope);
return message;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Adv. F&R: strange dialog text
commit a8a408223a303b297f4e3c4012acf609836a9f70
Author: Kornel Benko
Date: Mon Jun 3 08:13:28 2024 +0200
Adv. F&R: strange dialog text
Fixes #12997
Added 'Scope' to better indicate the searched area.
---
src/frontends/qt/FindAndReplace.cpp | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/frontends/qt/FindAndReplace.cpp
b/src/frontends/qt/FindAndReplace.cpp
index d61636af62..444c378fa6 100644
--- a/src/frontends/qt/FindAndReplace.cpp
+++ b/src/frontends/qt/FindAndReplace.cpp
@@ -298,11 +298,11 @@ docstring getQuestionString(FindAndReplaceOptions const &
opt)
break;
}
docstring message = opt.forward ?
- bformat(_("%1$s: the end was reached while searching forward.\n"
- "Continue searching from the beginning?"),
+ bformat(_("The end was reached while searching forward.\n"
+ "Continue searching from the beginning?
(Scope:%1$s)"),
scope) :
- bformat(_("%1$s: the beginning was reached while searching
backward.\n"
- "Continue searching from the end?"),
+ bformat(_("The beginning was reached while searching
backward.\n"
+ "Continue searching from the end? (Scope:%1$s)"),
scope);
return message;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Fix bug #13066
commit 63b23ce288919e86eabcdfb4cfd498d26fdfc96a
Author: Richard Kimberly Heck
Date: Sun Jun 2 23:06:11 2024 -0400
Fix bug #13066
Patch from Lorenzo
(cherry picked from commit 0c70f340c0fe33daa68b2a3eb4b3347fef1a9a95)
---
lib/layouts/stdinsets.inc| 15 +--
src/insets/InsetListings.cpp | 8 ++--
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 764fbff3f2..2a8afacad3 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -375,20 +375,7 @@ InsetLayout Listings
NeedCProtect true
RefPrefix lst
EditExternal true
- HTMLTag pre
- HTMLStyle
- div.float-listings {
- border: 2px solid black;
- padding: 1ex;
- margin: 1ex;
- }
- div.listings-caption {
- text-align: center;
- border: 2px solid black;
- padding: 1ex;
- margin: 1ex;
- }
- EndHTMLStyle
+ HTMLTag code
DocBookTagprogramlisting
End
diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 8268cebd68..b022acad5e 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -440,9 +440,7 @@ void InsetListings::latex(otexstream & os, OutputParams
const & runparams) const
docstring InsetListings::xhtml(XMLStream & os, OutputParams const & rp) const
{
bool const isInline = params().isInline();
- if (isInline)
- os << xml::CompTag("br");
- else {
+ if (!isInline) {
os << xml::StartTag("div", "class='float-listings'");
docstring caption = getCaptionHTML(rp);
if (!caption.empty())
@@ -466,9 +464,7 @@ docstring InsetListings::xhtml(XMLStream & os, OutputParams
const & rp) const
docstring def = InsetText::insetAsXHTML(os, newrp, InsetText::JustText);
os << xml::EndTag(tag);
- if (isInline) {
- os << xml::CompTag("br");
- } else {
+ if (!isInline) {
if (!def.empty()) {
os << '\n' << def;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix bug #13066
commit 0c70f340c0fe33daa68b2a3eb4b3347fef1a9a95
Author: Richard Kimberly Heck
Date: Sun Jun 2 23:06:11 2024 -0400
Fix bug #13066
Patch from Lorenzo
---
lib/layouts/stdinsets.inc| 15 +--
src/insets/InsetListings.cpp | 8 ++--
2 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 364b9b76e6..b0846947d1 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -375,20 +375,7 @@ InsetLayout Listings
NeedCProtect true
RefPrefix lst
EditExternal true
- HTMLTag pre
- HTMLStyle
- div.float-listings {
- border: 2px solid black;
- padding: 1ex;
- margin: 1ex;
- }
- div.listings-caption {
- text-align: center;
- border: 2px solid black;
- padding: 1ex;
- margin: 1ex;
- }
- EndHTMLStyle
+ HTMLTag code
DocBookTagprogramlisting
End
diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 24c8a21a63..89b71e7e4d 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -440,9 +440,7 @@ void InsetListings::latex(otexstream & os, OutputParams
const & runparams) const
docstring InsetListings::xhtml(XMLStream & os, OutputParams const & rp) const
{
bool const isInline = params().isInline();
- if (isInline)
- os << xml::CompTag("br");
- else {
+ if (!isInline) {
os << xml::StartTag("div", "class='float-listings'");
docstring caption = getCaptionHTML(rp);
if (!caption.empty())
@@ -466,9 +464,7 @@ docstring InsetListings::xhtml(XMLStream & os, OutputParams
const & rp) const
docstring def = InsetText::insetAsXHTML(os, newrp, InsetText::JustText);
os << xml::EndTag(tag);
- if (isInline) {
- os << xml::CompTag("br");
- } else {
+ if (!isInline) {
if (!def.empty()) {
os << '\n' << def;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix table crash reported on Windows.
commit 3e796c680a11593bd09433be22bec45dcfe0d7a7
Author: Richard Kimberly Heck
Date: Sun Jun 2 14:12:23 2024 -0400
Fix table crash reported on Windows.
---
src/insets/InsetTabular.cpp | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 2f32e3dd8d..1f7cc33ba4 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -808,6 +808,8 @@ void Tabular::deleteRow(row_type const row, bool const
force)
if (nrows() == 1)
return;
+ LASSERT(row < nrows(), return);
+
// If we are in change tracking mode, and the row is not marked
// as inserted by the same author, we do not delete it, but mark
// it deleted.
@@ -976,6 +978,8 @@ void Tabular::deleteColumn(col_type const col, bool const
force)
if (ncols() == 1)
return;
+ LASSERT(col < ncols(), return);
+
// If we are in change tracking mode, and the column is not marked
// as inserted by the same author, we do not delete it, but mark
// it deleted.
@@ -6779,8 +6783,11 @@ void InsetTabular::tabularFeatures(Cursor & cur,
}
}
- for (row_type r = sel_row_start; r <= sel_row_end; ++r)
+ for (row_type r = sel_row_end; r >= sel_row_start; --r) {
tabular.deleteRow(r);
+ if (r == 0)
+ break;
+ }
if (sel_row_start >= tabular.nrows())
--sel_row_start;
cur.idx() = tabular.cellIndex(sel_row_start, column);
@@ -6802,8 +6809,11 @@ void InsetTabular::tabularFeatures(Cursor & cur,
tabular.leftLine(tabular.cellIndex(r,
0)));
}
- for (col_type c = sel_col_start; c <= sel_col_end; ++c)
+ for (col_type c = sel_col_end; c >= sel_col_start; --c) {
tabular.deleteColumn(c);
+ if (c == 0)
+ break;
+ }
if (sel_col_start >= tabular.ncols())
--sel_col_start;
cur.idx() = tabular.cellIndex(row, sel_col_start);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update layouts
commit 7c041af6425001d7779f5e44d72918d8591ea37d Author: Scott Kostyshak Date: Sun Jun 2 22:52:37 2024 -0400 Update layouts lib/citeengines/basic.citeengine | 2 +- lib/citeengines/biblatex-natbib.citeengine | 2 +- lib/citeengines/biblatex.citeengine | 2 +- lib/citeengines/jurabib.citeengine | 2 +- lib/citeengines/natbib.citeengine| 2 +- lib/layouts/AEA.layout | 2 +- lib/layouts/IEEEtran-CompSoc.layout | 2 +- lib/layouts/IEEEtran-TransMag.layout | 2 +- lib/layouts/IEEEtran.layout | 2 +- lib/layouts/InStar.module| 2 +- lib/layouts/RJournal.layout | 2 +- lib/layouts/a0poster.layout | 2 +- lib/layouts/aa.layout| 2 +- lib/layouts/aapaper.inc | 2 +- lib/layouts/aapaper.layout | 2 +- lib/layouts/aastex.layout| 2 +- lib/layouts/aastex6.layout | 2 +- lib/layouts/aastex62.layout | 2 +- lib/layouts/aastex63.layout | 2 +- lib/layouts/achemso.layout | 2 +- lib/layouts/acm-sigs-alt.layout | 2 +- lib/layouts/acm-sigs.inc | 2 +- lib/layouts/acm-sigs.layout | 2 +- lib/layouts/acmart.layout| 2 +- lib/layouts/acmsiggraph-0-92.layout | 2 +- lib/layouts/acmsiggraph.layout | 2 +- lib/layouts/agums.layout | 2 +- lib/layouts/aguplus.inc | 2 +- lib/layouts/agutex.layout| 2 +- lib/layouts/algorithm2e.module | 2 +- lib/layouts/amsart.layout| 2 +- lib/layouts/amsbook.layout | 2 +- lib/layouts/amsdefs.inc | 2 +- lib/layouts/apa.layout | 2 +- lib/layouts/apa6.layout | 2 +- lib/layouts/apa7.layout | 2 +- lib/layouts/apax.inc | 2 +- lib/layouts/arab-article.layout | 2 +- lib/layouts/article-beamer.layout| 2 +- lib/layouts/article.layout | 2 +- lib/layouts/beamer.layout| 2 +- lib/layouts/beamerposter.layout | 2 +- lib/layouts/bicaption.module | 2 +- lib/layouts/book.layout | 2 +- lib/layouts/braille.module | 2 +- lib/layouts/broadway.layout | 2 +- lib/layouts/bxjsarticle.layout | 2 +- lib/layouts/bxjsbook.layout | 2 +- lib/layouts/bxjsreport.layout| 2 +- lib/layouts/bxjsslide.layout | 2 +- lib/layouts/chess.layout | 2 +- lib/layouts/chessboard.module| 2 +- lib/layouts/cl2emult.layout | 2 +- lib/layouts/copernicus.layout| 2 +- lib/layouts/ctex-article.layout | 2 +- lib/layouts/ctex-book.layout | 2 +- lib/layouts/ctex-report.layout | 2 +- lib/layouts/customHeadersFooters.module | 2 +- lib/layouts/db_stdcharstyles.inc | 2 +- lib/layouts/db_stdclass.inc | 2 +- lib/layouts/db_stdstarsections.inc | 2 +- lib/layouts/db_stdstruct.inc | 2 +- lib/layouts/db_stdtitle.inc | 2 +- lib/layouts/dinbrief.layout | 2 +- lib/layouts/docbook-book.layout | 2 +- lib/layouts/docbook-chapter.layout | 2 +- lib/layouts/docbook-section.layout | 2 +- lib/layouts/docbook.layout | 2 +- lib/layouts/doublecol-new.layout | 2 +- lib/layouts/dtk.layout | 2 +- lib/layouts/ectaart.layout | 2 +- lib/layouts/egs.layout | 2 +- lib/layouts/elsart.layout| 2 +- lib/layouts/elsarticle.layout| 2 +- lib/layouts/endnotes.module | 2 +- lib/layouts/enotez.module| 2 +- lib/layouts/entcs.layout | 2 +- lib/layouts/enumitem.module | 2 +- lib/layouts/eqs-within-sections.module | 2 +- lib/layouts/europasscv.layout
[LyX/master] Whitespace
commit 2e227cceaff5c4647760c53daf85370358050410
Author: Scott Kostyshak
Date: Sun Jun 2 22:52:18 2024 -0400
Whitespace
---
src/BufferParams.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 892aff5867..1740e8c764 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1831,7 +1831,7 @@ bool BufferParams::writeLaTeX(otexstream & os,
LaTeXFeatures & features,
case DEFAULT:
break;
}
-
+
if (paragraph_separation) {
if (!tclass.halfparskip().empty() && getDefSkip().kind() ==
VSpace::HALFLINE)
clsoptions << tclass.halfparskip() << ",";
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Copy French manuals from 2.4.x branch
commit 160084af3c16eb0f646f35a47eb05360acd6d105
Author: Richard Kimberly Heck
Date: Sun Jun 2 22:23:38 2024 -0400
Copy French manuals from 2.4.x branch
---
lib/doc/fr/Customization.lyx | 159 +--
1 file changed, 34 insertions(+), 125 deletions(-)
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 9955dc4579..75d83a8ee0 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -284,6 +284,12 @@ Mise à jour pour 2.4.0,
dernière révision avant publication
\end_layout
+\begin_layout Plain Layout
+Mise à jour pour 2.4.0,
+ 25 avril 2024 (JPC) ,
+ dernier contrôle
+\end_layout
+
\end_inset
@@ -3298,8 +3304,8 @@ lyx.pot
n'existe pas,
il peut être recréé avec la commande
-\begin_inset Flex Noun
-status collapsed
+\begin_inset Flex Strong
+status open
\begin_layout Plain Layout
make lyx.pot
@@ -4373,7 +4379,7 @@ name "sec:clavier"
\begin_layout Standard
\begin_inset Note Note
-status collapsed
+status open
\begin_layout Plain Layout
En révisant ce document en mars 2008,
@@ -5202,7 +5208,7 @@ Touches mortes
Il y a une autre façon d'ajouter le support pour des caractères internationaux
par l'intermédiaire des touches mortes.
Une touche morte marche en combinaison avec une lettre pour produire un
caractère accentué.
Ici,
- nous allons expliquer comment créer une touche morte vraiment simple pour
montrer comment elles marchent.
+ nous allons expliquer comment créer une touche morte vraiment simple pour
montrer comment elles fonctionnent.
\end_layout
\begin_layout Standard
@@ -8837,7 +8843,7 @@ Format
\end_inset
.
- Le numéro de format du présent fichier est le numéro 81.
+ Le numéro de format du présent fichier est le numéro 620.
mais chaque version de \SpecialChar LyX
peut lire les fichiers de format d'une version plus ancienne,
comme elle peut lire les documents crées avec une version plus ancienne.
@@ -11941,7 +11947,7 @@ La description d'un style de paragraphe ressemble à ceci
status collapsed
\begin_layout Plain Layout
-qui peut servir soit à définir un nouvel format soit à en modifier un déjà
existant.
+qui peut servir soit à définir un nouveau format soit à en modifier un déjà
existant.
\end_layout
\end_inset
@@ -12115,7 +12121,7 @@ AutoNests
\end_inset
inclut une liste de formats (séparés par une virgule) devant être englobés
dans et après le format courant.
- N'a de sens que pour des formats englobables comme des environnements.
+ N'a de sens que pour des formats susceptibles d'englobement comme des
environnements.
Doit être terminé par
\begin_inset Quotes cld
\end_inset
@@ -13886,7 +13892,7 @@ Itemize
\end_inset
produit des symboles pour les différents niveaux.
- The bullet types displayed can be set via
+ Les types de puces affichés peuvent être définis via
\begin_inset Flex Noun
status collapsed
@@ -14777,76 +14783,13 @@ NeedCProtect
status collapsed
\begin_layout Plain Layout
-
-\emph on
-0
-\end_layout
-
-\end_inset
-
-,
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-1
-\end_layout
-
-\end_inset
-
-] protège si nécessaire les macros qui contiennent ce format avec
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-cprotect
-\end_layout
-
-\end_inset
-
- (cf.
- le paquetage
-\family sans
-cprotect
-\family default
-) et par suite autorise du texte verbatim dans les macros
-\begin_inset Note Note
-status open
-
-\begin_layout Description
-
-\lang english
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-NeedCProtect
-\end_layout
-
-\end_inset
-
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-1
\end_layout
\end_inset
,
-\begin_inset space \thinspace{}
+\begin_inset space ~
\end_inset
@@ -14856,7 +14799,6 @@ status collapsed
\begin_layout Plain Layout
\emph on
-\lang english
0
\end_layout
@@ -14871,33 +14813,28 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
-\lang english
1
\end_layout
\end_inset
-] Value
+] avec la valeur
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-
-\lang english
1
\end_layout
\end_inset
- causes macros that contain this layout to be protected with
+ ,
+ protège si nécessaire les macros qui contiennent ce format avec
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-\lang english
-
\backslash
cprotect
\end_layout
@@ -14905,72 +14842,59 @@ cprotect
\end_inset
(cf.
- package
+ le paquetage
\family sans
cprotect
\family default
-) if necessary and thus allows (some) verbatim stuff in macros.
- With the default setting (value
+) et par suite autorise du texte verbatim dans les macros.
+ Avec la valeur implicite
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-
-\
[LyX/2.4.1-devel] Cmake build: Initialize variable 'CMAKE_INSTALL_PREFIX' before use
commit 6186506033098b52726abd6ccbddc2236f4310ed
Author: Kornel Benko
Date: Fri May 24 20:26:04 2024 +0200
Cmake build: Initialize variable 'CMAKE_INSTALL_PREFIX' before use
Spotted by Eugene Chornyi
(cherry picked from commit ea74574d8f02481732b591306410e3c49faae87d)
---
CMakeLists.txt | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcbdee812a..58c6b1eb52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -526,8 +526,19 @@ endif()
if(LYX_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's
choice install prefix" FORCE)
set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's
choice install prefix" FORCE)
endif()
-set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice
install prefix" FORCE)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
+ if (UNIX)
+ # use the default "/usr/local"
+ # but respect the user-choice on the command-line
+ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default
install prefix" FORCE)
+ endif()
+ if(WIN32)
+ set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX
default install prefix" FORCE)
+ endif()
+ endif()
if(UNIX)
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
@@ -561,17 +572,6 @@ else()
set(PACKAGE ${PACKAGE_BASE})
endif()
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
- if (UNIX)
- # use the default "/usr/local"
- # but respect the user-choice on the command-line
- set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default
install prefix" FORCE)
- endif()
-endif()
-if(WIN32)
- set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install
prefix" FORCE)
-endif()
if(IS_ABSOLUTE)
set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
else()
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Cmake build: Make QT5-compilation be default
commit 29282c1e13bb738fd84ba2a883520f9250997989
Author: Kornel Benko
Date: Sat Apr 6 12:36:47 2024 +0200
Cmake build: Make QT5-compilation be default
(cherry picked from commit c971974f331c249fa4d57953d8d93c107c154024)
---
CMakeLists.txt | 36 ++--
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f473ee4bc5..dcbdee812a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -662,23 +662,31 @@ endif()
set(min_qt5_version "5.6")
if(LYX_USE_QT MATCHES "AUTO")
- # try qt6 first
- find_package(Qt6Core CONFIG QUIET)
- if (Qt6Core_FOUND)
- set(LYX_USE_QT "QT6" CACHE STRING "Valid qt version" FORCE)
- message(STATUS "Qt6Core_VERSION = ${Qt6Core_VERSION}")
- else()
- find_package(Qt5Core CONFIG QUIET)
- if(Qt5Core_FOUND)
- set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version"
FORCE)
- message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
- if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
- message(FATAL_ERROR "No appropriate QT-version
found")
- endif()
+ # try qt5 first
+ find_package(Qt5Core CONFIG QUIET)
+ if(Qt5Core_FOUND)
+ message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
+ if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
+ message(STATUS "No appropriate QT-version found")
+ set(Qt5Core_FOUND OFF)
else()
- message(FATAL_ERROR "No appropriate QT-version found")
+ set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version"
FORCE)
+ set(Qt6Core_FOUND OFF)
endif()
endif()
+ if (NOT Qt5Core_FOUND)
+ foreach(_mod Core Gui Widgets Concurrent Svg)
+ find_package(Qt6${_mod} CONFIG QUIET)
+ if (NOT Qt6${_mod}_FOUND)
+ message(FATAL_ERROR "Not found Qt6${_mod},
aborting use of QT6")
+ set(Qt6Core_FOUND OFF)
+ break()
+ else()
+ message(STATUS "Found Qt6${_mod}")
+ endif()
+ endforeach()
+ set(LYX_USE_QT "QT6" CACHE STRING "Valid qt version" FORCE)
+ endif()
endif()
# When shared libs are supported enable this option
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Merge branch '2.4.x' into 2.4.1-devel
commit 701c7632213c688b2cc621279f2a42cc8e644a38 Merge: 1d7c8325f2 342a0f5438 Author: Richard Kimberly Heck Date: Sun Jun 2 21:49:54 2024 -0400 Merge branch '2.4.x' into 2.4.1-devel ANNOUNCE | 25 +- INSTALL|6 +- README |8 +- .../Win32/packaging/installer/src/dictionaries.nsh |4 +- development/Win32/packaging/installer/src/main.nsh |3 +- development/cmake/modules/LyXMacros.cmake |4 +- development/tools/lyx-build|2 +- development/tools/update-po.sh | 12 +- lib/CREDITS|8 +- lib/RELEASE-NOTES | 31 +- lib/attic/doc/id_UserGuide.lyx |2 +- lib/configure.py |4 +- lib/doc/Additional.lyx | 269 +- lib/doc/LFUNs.lyx |2 +- lib/doc/UserGuide.lyx | 42 +- lib/doc/de/UserGuide.lyx |2 +- lib/doc/fr/Additional.lyx | 4316 +++- lib/doc/fr/EmbeddedObjects.lyx | 239 +- lib/doc/fr/Intro.lyx |6 +- lib/doc/fr/Math.lyx| 51 +- lib/doc/fr/Tutorial.lyx| 15 +- lib/doc/fr/UserGuide.lyx | 181 +- lib/doc/ja/UserGuide.lyx |2 +- lib/doc/ru/UserGuide.lyx |2 +- lib/examples/fr/Modules/Linguistics.lyx|2 +- lib/generate_contributions.py | 11 +- lib/layouttranslations.review |6 +- lib/org.lyx.LyX.metainfo.xml |1 + po/ar.po | 2000 - po/bg.po | 2037 - po/cs.po | 1007 ++--- po/en.po | 1942 - po/es.po | 2010 - po/eu.po | 2013 - po/fi.po | 2005 - po/fr.gmo | Bin 656494 -> 657647 bytes po/fr.po | 1323 +++--- po/he.po | 2000 - po/hu.po | 2007 - po/ia.po | 1999 - po/id.po | 1996 - po/it.po | 1996 - po/ja.gmo | Bin 678876 -> 678815 bytes po/ja.po | 1996 - po/nb.po | 2010 - po/nl.po | 1996 - po/nn.po | 2008 - po/pl.po | 2006 - po/pt_BR.gmo | Bin 646632 -> 646894 bytes po/pt_BR.po| 2005 - po/pt_PT.po| 2010 - po/ru.po | 1996 - po/sv.po | 2012 - po/uk.po | 1996 - po/zh_CN.gmo | Bin 447576 -> 471508 bytes po/zh_CN.po| 2257 +- po/zh_TW.po| 2012 - src/CutAndPaste.cpp| 45 +- src/LaTeXPackages.cpp | 39 +- src/LaTeXPackages.h|2 +- src/LyXAction.cpp |2 +- src/Text.cpp |2 +- src/TextMetrics.cpp| 13 +- src/frontends/qt/GuiInfo.cpp |1 + src/frontends/qt/GuiPrefs.cpp | 29 +- src/frontends/qt/GuiWorkArea.cpp |2 + src/graphics/GraphicsConverter.cpp |2 + src/insets/InsetCommandParams.cpp |9 +- src/insets/InsetCommandParams.h|2 +- src/insets/InsetInfo.cpp | 42 +- src/insets/InsetInfo.h |5 - src/insets/InsetLayout.h |2 +- src/insets/InsetNote.cpp |7 +- src/lyxfind.cpp
[LyX/2.4.1-devel] Begin 2.4.1 development
commit d752ba33764c7273f76bd6e9bc6798d8c1ae7e16 Author: Richard Kimberly Heck Date: Fri May 31 19:43:36 2024 -0400 Begin 2.4.1 development --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index fa5bda2bbd..9c6a48329c 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],[lyx-de...@lists.lyx.org],[lyx]) +AC_INIT([LyX],[2.4.1-devel],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2024-05-25"]) +AC_SUBST(LYX_DATE, ["2024-05-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
[LyX/2.4.1-devel] Fix display of math hull inset in RTL context
commit 342a0f543812e21dade99b7fa46ea674075b8199
Author: Jean-Marc Lasgouttes
Date: Thu May 16 14:56:28 2024 +0200
Fix display of math hull inset in RTL context
The inversion of margin was done in the wrong way for RTL support.
(cherry picked from commit b469c142ad579d3338fc81ab3e1c6ee7b4e270ec)
---
src/TextMetrics.cpp | 13 -
status.24x | 1 +
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp
index 6968279c23..a694c997ea 100644
--- a/src/TextMetrics.cpp
+++ b/src/TextMetrics.cpp
@@ -2001,8 +2001,14 @@ void TextMetrics::drawParagraph(PainterInfo & pi,
pit_type const pit, int const
return;
size_t const nrows = pm.rows().size();
// Remember left and right margin for drawing math numbers
- Changer changeleft = changeVar(pi.leftx, x + leftMargin(pit));
- Changer changeright = changeVar(pi.rightx, x + width() -
rightMargin(pit));
+ Changer changeleft, changeright;
+ if (text_->isRTL(pit)) {
+ changeleft = changeVar(pi.leftx, x + rightMargin(pit));
+ changeright = changeVar(pi.rightx, x + width() -
leftMargin(pit));
+ } else {
+ changeleft = changeVar(pi.leftx, x + leftMargin(pit));
+ changeright = changeVar(pi.rightx, x + width() -
rightMargin(pit));
+ }
// Use fast lane in nodraw stage.
if (pi.pain.isNull()) {
@@ -2049,9 +2055,6 @@ void TextMetrics::drawParagraph(PainterInfo & pi,
pit_type const pit, int const
}
}
- if (text_->isRTL(pit))
- swap(pi.leftx, pi.rightx);
-
BookmarksSection::BookmarkPosList bpl =
theSession().bookmarks().bookmarksInPar(bv_->buffer().fileName(), pm.id());
diff --git a/status.24x b/status.24x
index f3e8f6b07c..154a255304 100644
--- a/status.24x
+++ b/status.24x
@@ -41,6 +41,7 @@ What's new
* USER INTERFACE
+- fix display of equation numbers in right-to-left context.
* INTERNALS
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Minor update
commit 002ca266207abcf5f31c06e6943bb689f3e27d3b Author: Richard Kimberly Heck Date: Fri May 31 19:41:22 2024 -0400 Minor update --- ANNOUNCE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ANNOUNCE b/ANNOUNCE index 27a66fa894..6ddcebd70c 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -3,7 +3,7 @@ Public release of LyX version 2.4.0 We are proud to announce the release of the new LyX 2.4 series. -After long 5 years of development the 2.4 series has a rich set +After long 6 years of development the 2.4 series has a rich set of new features compared to the current stable series. An overview of the new features can be found here: -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Amend 4730ec78: FindAdv: sometimes a space is added on some math symbols
commit 4bdc7b74ed2e3fc9eea89b5b87df3feb3117fb9f
Author: Kornel Benko
Date: Fri May 31 09:07:19 2024 +0200
Amend 4730ec78: FindAdv: sometimes a space is added on some math symbols
Restrict the removing to math insets
---
src/lyxfind.cpp | 60 ++---
1 file changed, 40 insertions(+), 20 deletions(-)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 2db9035848..761ab21091 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1276,6 +1276,16 @@ static string latexNamesToUtf8(docstring strIn, bool
withformat)
return add;
}
+static bool isPartOfMath(Paragraph const & par)
+{
+ if (par.size() < 1)
+ return false;
+ const Inset * isInset = par.getInset(par.size()-1);
+ if (isInset == nullptr)
+ return false;
+ return isInset->inMathed();
+}
+
static docstring stringifySearchBuffer(Buffer & buffer, FindAndReplaceOptions
const & opt)
{
docstring str;
@@ -1298,6 +1308,8 @@ static docstring stringifySearchBuffer(Buffer & buffer,
FindAndReplaceOptions co
runparams.find_add_feature(OutputParams::SearchNonOutput);
}
string t("");
+ // Only check if the very last entry is inside math to remove
trailing space
+ bool isMathInset = false;
for (pos_type pit = pos_type(0); pit <
(pos_type)buffer.paragraphs().size(); ++pit) {
Paragraph const & par = buffer.paragraphs().at(pit);
string add = latexNamesToUtf8(par.asString(pos_type(0),
par.size(),
@@ -1306,12 +1318,13 @@ static docstring stringifySearchBuffer(Buffer & buffer,
FindAndReplaceOptions co
LYXERR(Debug::FINDVERBOSE, "Adding to search string: '"
<< add << "'");
t += add;
+ isMathInset = isPartOfMath(par);
}
// Even in ignore-format we have to remove "\text{},
\lyxmathsym{}" parts
while (regex_replace(t, t,
"(text|lyxmathsym|ensuremath)\\{([^\\}]*)\\}", "$2"));
// remove trailing space, it may have been added by
plaintext() in InsetMathHull.cpp
size_t t_size = t.size();
- if (opt.ignoreformat && (t_size > 1) && (t[t_size-1] == ' '))
+ if (opt.ignoreformat && (t_size > 1) && (t[t_size-1] == ' ') &&
isMathInset)
str = from_utf8(t.substr(0, t_size-1));
else
str = from_utf8(t);
@@ -4098,9 +4111,16 @@ string MatchStringAdv::convertLF2Space(docstring const
&s, bool ignore_format) c
return(t.str());
}
+static string showPos(DocIterator const & cur)
+{
+ stringstream a;
+ a << "[idx(" << cur.idx() << "),pit(" << cur.pit() << "),pos("
<< cur.pos() << "),depth(" << cur.depth() << ")]";
+ return(a.str());
+}
+
docstring stringifyFromCursor(DocIterator const & cur, int len)
{
- LYXERR(Debug::FINDVERBOSE, "Stringifying with len=" << len << " from
cursor at pos: " << cur);
+ LYXERR(Debug::FINDVERBOSE, "Stringifying with len=" << len << " from
cursor at " << showPos(cur));
if (cur.inTexted()) {
Paragraph const & par = cur.paragraph();
// TODO what about searching beyond/across paragraph breaks ?
@@ -4122,8 +4142,8 @@ docstring stringifyFromCursor(DocIterator const & cur,
int len)
if (ignoreFormats.getNonContent()) {
runparams.find_add_feature(OutputParams::SearchNonOutput);
}
- LYXERR(Debug::FINDVERBOSE, "Stringifying with cur: "
- << cur << ", from pos: " << cur.pos() << ", end: " <<
end);
+ LYXERR(Debug::FINDVERBOSE, "Stringifying with cur = "
+ << showPos(cur) << ", to end: " << end);
docstring res =
from_utf8(latexNamesToUtf8(par.asString(cur.pos(), end,
option,
&runparams), false));
@@ -4143,7 +4163,7 @@ docstring stringifyFromCursor(DocIterator const & cur,
int len)
LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Stringified math from
pos(" << cur.pos() << ") len(" << len << "): " << res);
return res;
}
- LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Don't know how to stringify
from here: " << cur);
+ LYXERR(Debug::FINDVERBOSE|Debug::FIND, "Don't know how to stringify
from here: " << showPos(cur));
return docstring();
}
@@ -4154,7 +4174,7 @@ docstring stringifyFromCursor(DocIterator const & cur,
int len)
docstring latexifyFromCursor(DocIterator const & cur, int len)
{
/*
- LYXERR(Debug::FINDVERBOSE, "Latexifying with len=" << len << " from
cursor at pos: "
[LyX/2.4.1-devel] New status file, and status for last commit
commit e80fdf38e4dc095316547371d22284676e2e6c7d Author: Richard Kimberly Heck Date: Wed May 29 10:49:58 2024 -0400 New status file, and status for last commit --- status.24x | 69 ++ 1 file changed, 69 insertions(+) diff --git a/status.24x b/status.24x new file mode 100644 index 00..f3e8f6b07c --- /dev/null +++ b/status.24x @@ -0,0 +1,69 @@ +-*- text -*- + +This file describes what has been done in the preparation of LyX 2.4.1. +All comments are welcome. + +We try to group things by topic and in decreasing order of importance. +Please feel free to re-arrange if that seems like a good idea. + + +What's new +== + +** Updates: +*** + +* DOCUMENT INPUT/OUTPUT + + +* MISCELLANEOUS + + +* TEX2LYX IMPROVEMENTS + + +* USER INTERFACE + + +* DOCUMENTATION AND LOCALIZATION + + +* BUILD/INSTALLATION + + + +** Bug fixes: +* + +* DOCUMENT INPUT/OUTPUT + + + +* USER INTERFACE + + +* INTERNALS + + +* DOCUMENTATION AND LOCALIZATION + + +* LYX2LYX + + + +* TEX2LYX + + + +* LYXHTML + + + +* ADVANCED FIND AND REPLACE + +- Fix regression causing some math not to be found. + + +* BUILD/INSTALLATION + -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] FindAdv: sometimes a space is added on some math symbols
commit 4730ec78f544b6fd51defd063e5294b14e89
Author: Kornel Benko
Date: Wed May 29 14:09:20 2024 +0200
FindAdv: sometimes a space is added on some math symbols
For example '\int '.
Should fix regression #13070
Spotted by Alexander Dunlap
---
src/lyxfind.cpp | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 6e3b324bfa..2db9035848 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -1309,7 +1309,12 @@ static docstring stringifySearchBuffer(Buffer & buffer,
FindAndReplaceOptions co
}
// Even in ignore-format we have to remove "\text{},
\lyxmathsym{}" parts
while (regex_replace(t, t,
"(text|lyxmathsym|ensuremath)\\{([^\\}]*)\\}", "$2"));
- str = from_utf8(t);
+ // remove trailing space, it may have been added by
plaintext() in InsetMathHull.cpp
+ size_t t_size = t.size();
+ if (opt.ignoreformat && (t_size > 1) && (t[t_size-1] == ' '))
+ str = from_utf8(t.substr(0, t_size-1));
+ else
+ str = from_utf8(t);
}
return str;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Wininstaller Qt6.7 changed file name
commit 6637fa0d329d23927b17af730bb4020f8ff9bc57
Author: Eugene Chornyi
Date: Sun May 26 09:35:10 2024 +0200
Wininstaller Qt6.7 changed file name
(cherry picked from commit a6d0d7ea92b686fc102b05970830ee11fc51e47b)
---
development/Win32/packaging/installer/src/main.nsh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/development/Win32/packaging/installer/src/main.nsh
b/development/Win32/packaging/installer/src/main.nsh
index b3713862d1..5062267720 100644
--- a/development/Win32/packaging/installer/src/main.nsh
+++ b/development/Win32/packaging/installer/src/main.nsh
@@ -629,7 +629,8 @@ Section -ProgramFiles
File "${FILES_QT}\bin\platforms\qwindows.dll"
SetOutPath "$INSTDIR\bin\styles"
- File "${FILES_QT}\bin\styles\qwindowsvistastyle.dll"
+ File /nonfatal "${FILES_QT}\bin\styles\qwindowsvistastyle.dll"
+ File /nonfatal "${FILES_QT}\bin\styles\qmodernwindowsstyle.dll"
# Resources
SetOutPath "$INSTDIR\Resources"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Remerge strings.
commit 597a453197240925c4cd9c51054317ad384c0ccf Author: Richard Kimberly Heck Date: Sat May 25 17:50:58 2024 -0400 Remerge strings. po/ar.po| 394 ++-- po/bg.po| 394 ++-- po/cs.po| 394 ++-- po/de.po| 394 ++-- po/en.po| 394 ++-- po/es.po| 394 ++-- po/eu.po| 394 ++-- po/fi.po| 394 ++-- po/fr.po| 394 ++-- po/he.po| 394 ++-- po/hu.po| 394 ++-- po/ia.po| 394 ++-- po/id.po| 394 ++-- po/it.po| 394 ++-- po/ja.po| 394 ++-- po/nb.po| 394 ++-- po/nl.po| 394 ++-- po/nn.po| 394 ++-- po/pl.po| 394 ++-- po/pt_BR.po | 394 ++-- po/pt_PT.po | 394 ++-- po/ru.po| 394 ++-- po/sk.po| 394 ++-- po/sv.po| 394 ++-- po/uk.po| 394 ++-- po/zh_CN.po | 394 ++-- po/zh_TW.po | 394 ++-- 27 files changed, 5319 insertions(+), 5319 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] New 2.4.0 release
commit 18eb95a6ea1b9d3a82edbabcd7a8b9b2026948d0 Author: Richard Kimberly Heck Date: Sat May 25 17:50:41 2024 -0400 New 2.4.0 release --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 53ad4401f7..fa5bda2bbd 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],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2024-05-13"]) +AC_SUBST(LYX_DATE, ["2024-05-25"]) 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/2.4.1-devel] Cmake build: Initialize variable 'CMAKE_INSTALL_PREFIX' before use
commit ea74574d8f02481732b591306410e3c49faae87d
Author: Kornel Benko
Date: Fri May 24 20:26:04 2024 +0200
Cmake build: Initialize variable 'CMAKE_INSTALL_PREFIX' before use
Spotted by Eugene Chornyi
---
CMakeLists.txt | 24
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 363f413153..024a1a619b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -526,8 +526,19 @@ endif()
if(LYX_INSTALL_PREFIX)
set(CMAKE_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's
choice install prefix" FORCE)
set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's
choice install prefix" FORCE)
endif()
-set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice
install prefix" FORCE)
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+ # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
+ if (UNIX)
+ # use the default "/usr/local"
+ # but respect the user-choice on the command-line
+ set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default
install prefix" FORCE)
+ endif()
+ if(WIN32)
+ set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX
default install prefix" FORCE)
+ endif()
+ endif()
if(UNIX)
set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
@@ -561,17 +572,6 @@ else()
set(PACKAGE ${PACKAGE_BASE})
endif()
-if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
- # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
- if (UNIX)
- # use the default "/usr/local"
- # but respect the user-choice on the command-line
- set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default
install prefix" FORCE)
- endif()
-endif()
-if(WIN32)
- set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install
prefix" FORCE)
-endif()
if(IS_ABSOLUTE)
set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
else()
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] InsetNote: pass on inset-modify lfuns addressed at other insets (#13068)
commit cc77602066cffdc030ce6b7b71eaa78d0bcf737f
Author: Juergen Spitzmueller
Date: Fri May 24 14:19:18 2024 +0200
InsetNote: pass on inset-modify lfuns addressed at other insets (#13068)
(cherry picked from commit ae1ddcbda0615b742184f4263cd1ad550eb38c32)
---
src/insets/InsetNote.cpp | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/insets/InsetNote.cpp b/src/insets/InsetNote.cpp
index b12b755fba..b0e2b5f0cc 100644
--- a/src/insets/InsetNote.cpp
+++ b/src/insets/InsetNote.cpp
@@ -141,6 +141,11 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
+ if (cmd.getArg(0) != "note") {
+ // not for us; might be handled higher up
+ cur.undispatched();
+ return;
+ }
// Do not do anything if converting to the same type of Note.
// A quick break here is done instead of disabling the LFUN
// because disabling the LFUN would lead to a greyed out
@@ -150,7 +155,7 @@ void InsetNote::doDispatch(Cursor & cur, FuncRequest & cmd)
InsetNoteParams params;
string2params(to_utf8(cmd.argument()), params);
if (params_.type == params.type)
- break;
+ break;
cur.recordUndoInset(this);
string2params(to_utf8(cmd.argument()), params_);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Return a reference, not a copy.
commit 39c7199afc5e2e84e89028429b63373810949d19
Author: Richard Kimberly Heck
Date: Sun May 19 16:55:48 2024 -0400
Return a reference, not a copy.
Stupid mistake from 2009. Thanks to Scott and JMarc for tracking
it down.
(cherry picked from commit de5f63eeb398046027180162272cc83099fdef55)
---
src/insets/InsetLayout.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/insets/InsetLayout.h b/src/insets/InsetLayout.h
index 6700100252..7593d844d5 100644
--- a/src/insets/InsetLayout.h
+++ b/src/insets/InsetLayout.h
@@ -200,7 +200,7 @@ public:
///
bool docbookrenderasimage() const { return docbookrenderasimage_; }
///
- std::set required() const { return required_; }
+ std::set required() const & { return required_; }
///
bool isMultiPar() const { return multipar_; }
///
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] *RELEASE-NOTES: add cprotect
commit bedea67d3c4864337e373a6d4669cfbd89020729 Author: Pavel Sanda Date: Mon May 20 01:08:16 2024 +0200 *RELEASE-NOTES: add cprotect --- lib/RELEASE-NOTES | 4 1 file changed, 4 insertions(+) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 3178372492..f83a9fa71e 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -114,6 +114,10 @@ * LyX now supports Hebrew and Hungarian quotation styles. +* cprotect.sty is now generally needed and should be required as + a dependency for installation. + + !!!The following pref variables were added in 2.4: -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Amend(1) 5eaa03a1, Adapt to recognise AC_INIT empty buildtype
commit 8edc87b68179b6b033b9ef9e2973cd6d478e3cc3
Author: Kornel Benko
Date: Wed May 15 12:16:59 2024 +0200
Amend(1) 5eaa03a1, Adapt to recognise AC_INIT empty buildtype
---
development/cmake/modules/LyXMacros.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/development/cmake/modules/LyXMacros.cmake
b/development/cmake/modules/LyXMacros.cmake
index ce35e34fe9..a5c8c961c7 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -430,7 +430,7 @@ function(determineversionandbuildtype configfile package
version dirs date build
setstripped(PACKAGE_VERSION ${_PV})
setstripped(PACKAGE_BUGREPORT ${_PBU})
set(${package} ${PACKAGE_BASE} ${PACKAGE_VERSION} ${PACKAGE_BUGREPORT}
PARENT_SCOPE)
- if(PACKAGE_VERSION MATCHES
"^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?[-~]?\([A-Za-z]+[0-9]*\).*$")
+ if(PACKAGE_VERSION MATCHES
"^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?[-~]?\([A-Za-z]+[0-9]*\)?.*$")
set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Amend 207eaeee9071cb
commit 8f65ae16e14c7909aa122532b19422ff32d3446e Author: Juergen Spitzmueller Date: Thu May 16 07:33:29 2024 +0200 Amend 207eaeee9071cb The upstream encoding needs to be updated after this routine (see comment in OutputParams.h:183ff.) (cherry picked from commit 2d95f8fc160d6ecc63acb81ffac16a99339083b2) --- src/output_latex.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 1c1faf7435..9b504a72cb 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -494,6 +494,9 @@ void TeXEnvironment(Buffer const & buf, Text const & text, if (pit != runparams.par_end) LYXERR(Debug::OUTFILE, "TeXEnvironment for paragraph " << par_begin << " done."); + + // set upstream encoding + runparams_in.encoding = runparams.encoding; } -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update build file
commit 2db9eb463dbdf4d66ec767f1ad6900c2d00c301b Author: Richard Kimberly Heck Date: Mon May 13 17:39:44 2024 -0400 Update build file --- development/tools/lyx-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/development/tools/lyx-build b/development/tools/lyx-build index 14b5cd6f05..f4ff053362 100755 --- a/development/tools/lyx-build +++ b/development/tools/lyx-build @@ -14,7 +14,7 @@ # Where we will do our work BASE="/cvs/lyx/lyx-release"; # Where our git repository lives -SRCDIR="/cvs/lyx/lyx-devel"; +SRCDIR="/cvs/lyx/lyx-stable"; # editor if [ -z "$EDITOR" ]; then EDITOR=vi; fi -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Cmake build: Adapt to recognise AC_INIT empty buildtype
commit 5eaa03a12c33734c4adb033dbf9a040e5d979144
Author: Kornel Benko
Date: Tue May 14 17:07:18 2024 +0200
Cmake build: Adapt to recognise AC_INIT empty buildtype
---
development/cmake/modules/LyXMacros.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/development/cmake/modules/LyXMacros.cmake
b/development/cmake/modules/LyXMacros.cmake
index 045a63f31a..ce35e34fe9 100644
--- a/development/cmake/modules/LyXMacros.cmake
+++ b/development/cmake/modules/LyXMacros.cmake
@@ -459,7 +459,7 @@ function(determineversionandbuildtype configfile package
version dirs date build
set(${buildtype} "development" PARENT_SCOPE)
elseif(LYX_BUILD_TYPE MATCHES "^\(alpha|beta|rc|pre\)[0-9]*$")
set(${buildtype} "prerelease" PARENT_SCOPE)
- elseif(LYX_BUILD_TYPE MATCHES "^$")
+ elseif("${LYX_BUILD_TYPE}" MATCHES "^$")
set(${buildtype} "release" PARENT_SCOPE)
else()
set(${buildtype} "unknown" PARENT_SCOPE)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] 2.4.0!
commit e6ee31ef535bdc168e16b0baa8b97e034b41722d Author: Richard Kimberly Heck Date: Mon May 13 17:34:41 2024 -0400 2.4.0! --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 08221b1692..53ad4401f7 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~devel],[lyx-de...@lists.lyx.org],[lyx]) +AC_INIT([LyX],[2.4.0],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2024-04-01"]) +AC_SUBST(LYX_DATE, ["2024-05-13"]) 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/2.4.1-devel] Close notes about status of translation
commit e1cb3cf25a6b2d99207f9064edb8e3c490c5 Author: jpc Date: Mon May 13 11:33:56 2024 +0200 Close notes about status of translation --- lib/doc/fr/Additional.lyx | 2 +- lib/doc/fr/EmbeddedObjects.lyx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index 7ba8a28bc8..dc2fac3716 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -356,7 +356,7 @@ Options avancées de \SpecialChar LyX \begin_layout Subtitle Version 2.4.x \begin_inset Note Note -status open +status collapsed \begin_layout Plain Layout Informations de révision : diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index 0a3e56761d..f6f9d8cb9a 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -294,7 +294,7 @@ literal "false" \begin_inset Note Note -status open +status collapsed \begin_layout Plain Layout -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Typo
commit 0b9c832977a9d18cbf842e5c7b5dc1947ed5a190 Author: jpc Date: Mon May 13 10:24:29 2024 +0200 Typo --- lib/doc/fr/Customization.lyx | 6 -- 1 file changed, 6 deletions(-) diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 7098ac0d82..75d83a8ee0 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -14819,21 +14819,15 @@ status collapsed \end_inset ] avec la valeur -\lang english - \begin_inset Flex Code status collapsed \begin_layout Plain Layout - -\lang english 1 \end_layout \end_inset - -\lang french , protège si nécessaire les macros qui contiennent ce format avec \begin_inset Flex Code -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Translate documentation of NeedCProtect
commit b24a3d207c38aa2ee2d6364ba0b4a0e558852449
Author: jpc
Date: Mon May 13 10:16:16 2024 +0200
Translate documentation of NeedCProtect
---
lib/doc/fr/Customization.lyx | 112 +++
1 file changed, 18 insertions(+), 94 deletions(-)
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 34d0e5d3f2..7098ac0d82 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -14783,76 +14783,13 @@ NeedCProtect
status collapsed
\begin_layout Plain Layout
-
-\emph on
-0
-\end_layout
-
-\end_inset
-
-,
-\begin_inset space \thinspace{}
-\end_inset
-
-
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-1
-\end_layout
-
-\end_inset
-
-] protège si nécessaire les macros qui contiennent ce format avec
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-cprotect
-\end_layout
-
-\end_inset
-
- (cf.
- le paquetage
-\family sans
-cprotect
-\family default
-) et par suite autorise du texte verbatim dans les macros
-\begin_inset Note Note
-status open
-
-\begin_layout Description
-
-\lang english
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-NeedCProtect
-\end_layout
-
-\end_inset
-
- [
-\begin_inset Flex Code
-status collapsed
-
-\begin_layout Plain Layout
-
-\lang english
-1
\end_layout
\end_inset
,
-\begin_inset space \thinspace{}
+\begin_inset space ~
\end_inset
@@ -14862,7 +14799,6 @@ status collapsed
\begin_layout Plain Layout
\emph on
-\lang english
0
\end_layout
@@ -14877,14 +14813,14 @@ status collapsed
status collapsed
\begin_layout Plain Layout
-
-\lang english
1
\end_layout
\end_inset
-] Value
+] avec la valeur
+\lang english
+
\begin_inset Flex Code
status collapsed
@@ -14896,14 +14832,15 @@ status collapsed
\end_inset
- causes macros that contain this layout to be protected with
+
+\lang french
+ ,
+ protège si nécessaire les macros qui contiennent ce format avec
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-\lang english
-
\backslash
cprotect
\end_layout
@@ -14911,72 +14848,59 @@ cprotect
\end_inset
(cf.
- package
+ le paquetage
\family sans
cprotect
\family default
-) if necessary and thus allows (some) verbatim stuff in macros.
- With the default setting (value
+) et par suite autorise du texte verbatim dans les macros.
+ Avec la valeur implicite
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-
-\lang english
0
\end_layout
\end_inset
-),
-
+,
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-\lang english
-
\backslash
cprotect
\end_layout
\end_inset
- is used if a nested element requires it.
- Value
+ est utilisé si un élément imbriqué le demande.
+ La valeur
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-
-\lang english
-1
\end_layout
\end_inset
- prevents any use of
+ empêche toute utilisation de
\begin_inset Flex Code
status collapsed
\begin_layout Plain Layout
-\lang english
-
\backslash
cprotect
\end_layout
\end_inset
- within this layout,
- even if required by a nested element.
-\end_layout
-
-\end_inset
-
-
+ dans le format,
+ même si un élément imbriqué le demande.
+
\end_layout
\begin_layout Description
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Document NeedCProtect -1
commit ea004cdb28e9b440347a9487d127e55765940c79
Author: Juergen Spitzmueller
Date: Mon May 13 06:53:19 2024 +0200
Document NeedCProtect -1
---
lib/doc/Customization.lyx| 74 +++-
lib/doc/de/Customization.lyx | 76 -
lib/doc/fr/Customization.lyx | 155 ++
lib/doc/ja/Customization.lyx | 156 +++
4 files changed, 458 insertions(+), 3 deletions(-)
diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index ab2212ce11..7130edc8fc 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -15112,6 +15112,20 @@ NeedCProtect
\begin_inset Flex Code
status collapsed
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
\begin_layout Plain Layout
\emph on
@@ -15134,7 +15148,17 @@ status collapsed
\end_inset
-] This causes macros that contain this layout to be protected with
+] Value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+ causes macros that contain this layout to be protected with
\begin_inset Flex Code
status collapsed
@@ -15152,6 +15176,54 @@ cprotect
cprotect
\family default
) if necessary and thus allows (some) verbatim stuff in macros.
+ With the default setting (value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
+\end_inset
+
+),
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ is used if a nested element requires it.
+ Value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+ prevents any use of
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ within this layout,
+ even if required by a nested element.
\end_layout
\begin_layout Description
diff --git a/lib/doc/de/Customization.lyx b/lib/doc/de/Customization.lyx
index 7f0032dca8..c01bfa9b03 100644
--- a/lib/doc/de/Customization.lyx
+++ b/lib/doc/de/Customization.lyx
@@ -13743,6 +13743,20 @@ NeedCProtect
\begin_inset Flex Code
status collapsed
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
\begin_layout Plain Layout
\emph on
@@ -13765,7 +13779,17 @@ status collapsed
\end_inset
-] bewirkt,
+] Wert
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+1
+\end_layout
+
+\end_inset
+
+ bewirkt,
dass Makros,
die dieses Layout enthalten,
mittels
@@ -13784,9 +13808,57 @@ cprotect
\family sans
cprotect
\family default
-) gechützt werden,
+) geschützt werden,
falls nötig.
Damit wird die Verwendung (mancher) Verbatim-Dinge in Makros ermöglicht.
+ In der Voreinstellung (Wert
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+0
+\end_layout
+
+\end_inset
+
+) wird
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ verwendet,
+ sobald ein eingebettetes Element dies verlangt.
+ Der Wert
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+-1
+\end_layout
+
+\end_inset
+
+ unterbindet die Verwendung von
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\backslash
+cprotect
+\end_layout
+
+\end_inset
+
+ selbst dann,
+ wenn eingebettete Elemente dies verlangen.
\end_layout
\begin_layout Description
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index db1be0b439..34d0e5d3f2 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -14822,6 +14822,161 @@ cprotect
cprotect
\family default
) et par suite autorise du texte verbatim dans les macros
+\begin_inset Note Note
+status open
+
+\begin_layout Description
+
+\lang english
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+NeedCProtect
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+-1
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\emph on
+\lang english
+0
+\end_layout
+
+\end_inset
+
+,
+\begin_inset space \thinspace{}
+\end_inset
+
+
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+1
+\end_layout
+
+\end_inset
+
+] Value
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+1
+\end_layout
+
+\end_inset
+
+ causes macros that contain this layout to be protected with
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\lang english
+
+\backslash
+c
[LyX/2.4.1-devel] Remerge strings for 2.4.0 release
commit 544cf0794eddcd44bc872e5a28c1a97ada109b1b Author: Richard Kimberly Heck Date: Fri May 10 13:14:09 2024 -0400 Remerge strings for 2.4.0 release po/ar.po| 38 po/bg.po| 70 +- po/cs.gmo | Bin 627292 -> 628450 bytes po/cs.po| 51 +++--- po/de.gmo | Bin 653560 -> 654674 bytes po/de.po| 59 - po/en.po| 26 +++--- po/es.po| 50 - po/eu.po| 46 +++--- po/fi.po| 44 ++--- po/fr.po| 38 po/he.po| 40 - po/hu.po| 44 ++--- po/ia.po| 38 po/id.po| 44 ++--- po/it.po| 38 po/ja.po| 38 po/nb.po| 46 +++--- po/nl.po| 50 - po/nn.po| 44 ++--- po/pl.po| 44 ++--- po/pt_BR.po | 52 +-- po/pt_PT.po | 46 +++--- po/ru.po| 44 ++--- po/sk.gmo | Bin 636748 -> 637804 bytes po/sk.po| 46 +++--- po/sv.po| 46 +++--- po/uk.po| 72 ++-- po/zh_CN.po | 46 +++--- po/zh_TW.po | 46 +++--- 30 files changed, 625 insertions(+), 621 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Amend 207eaeee9071cb
commit 50cd148bd260222e30b6e429d135c45f8c2f1f14 Author: Juergen Spitzmueller Date: Sun May 12 08:52:09 2024 +0200 Amend 207eaeee9071cb FragileFrame, as opposed to normal frame, supports cprotect (and needs it in the usual circumstances) (cherry picked from commit eeb3f9e719d15c4117a510e8a214d1c1b2c5a33c) --- lib/layouts/beamer.layout | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 9649aeb531..58caf67c7d 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -576,6 +576,7 @@ Style FragileFrame Tooltip "Frame options (see beamer manual)" PresetArg "fragile" EndArgument + NeedCProtect 0 End Style AgainFrame -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Introduce NeedCProtect -1 layout option
commit f05fd787548e8b3082051b7d45bb4119f97a55dc
Author: Juergen Spitzmueller
Date: Sun May 12 07:52:16 2024 +0200
Introduce NeedCProtect -1 layout option
It turns out beamer frame does not allow \cprotect and errors if it is
used. Hence we need to prevent it in this context entirely.
(cherry picked from commit 207eaeee9071cb828a2ab7f4680f8ff92e379af8)
---
lib/layouts/beamer.layout | 1 +
src/Layout.cpp| 13 +++--
src/Layout.h | 3 +++
src/OutputParams.h| 5 +
src/Paragraph.cpp | 2 ++
src/insets/InsetText.cpp | 2 +-
src/output_latex.cpp | 13 -
7 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index e9d9c5d904..9649aeb531 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -553,6 +553,7 @@ Style Frame
ExampleBlock,AlertBlock,Bibliography,Quotation,Quote,Verse,Corollary,Definition,Definitions,
Example,Examples,Fact,Lemma,Proof,Theorem,LyX-Code
EndAutoNests
+ NeedCProtect-1
End
Style PlainFrame
diff --git a/src/Layout.cpp b/src/Layout.cpp
index 8e54891fb9..d7b9cb2e9c 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -162,6 +162,7 @@ Layout::Layout()
inpreamble = false;
needprotect = false;
needcprotect = false;
+ nocprotect = false;
needmboxprotect = false;
keepempty = false;
font = inherit_font;
@@ -465,9 +466,17 @@ bool Layout::readIgnoreForcelocal(Lexer & lex, TextClass
const & tclass,
lex >> needprotect;
break;
- case LT_NEED_CPROTECT:
- lex >> needcprotect;
+ case LT_NEED_CPROTECT: {
+ int i;
+ lex >> i;
+ nocprotect = false;
+ needcprotect = false;
+ if (i == -1)
+ nocprotect = true;
+ else if (i == 1)
+ needcprotect = true;
break;
+ }
case LT_NEED_MBOXPROTECT:
lex >> needmboxprotect;
diff --git a/src/Layout.h b/src/Layout.h
index 6581155007..144603f06c 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -399,6 +399,9 @@ public:
/** true when the verbatim stuff of this layout needs to be
\cprotect'ed. */
bool needcprotect;
+ /** true when the verbatim stuff of this layout never should be
+ \cprotect'ed. */
+ bool nocprotect;
/** true when specific commands in this paragraph need to be
protected in an \mbox. */
bool needmboxprotect;
diff --git a/src/OutputParams.h b/src/OutputParams.h
index 9d9a7ae8f8..2e7d84e9c7 100644
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -108,6 +108,11 @@ public:
*/
bool moving_arg = false;
+ /** no_cprotect == true means that the layout in which this is
+* does not allow \cprotect'ing.
+ */
+ bool no_cprotect = false;
+
/** intitle == true means that the environment in which the
inset is typeset is part of a title (before a \\maketitle).
Footnotes in such environments have moving arguments.
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 49713a8b9a..0f495f50f8 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1172,6 +1172,7 @@ void Paragraph::Private::latexInset(BufferParams const &
bparams,
? textinset->hasCProtectContent(runparams.moving_arg)
&& !textinset->text().isMainText()
&& inset->lyxCode() != BRANCH_CODE
+ && !runparams.no_cprotect
: false;
unsigned int count2 = basefont.latexWriteStartChanges(os,
bparams,
rp, running_font,
@@ -3014,6 +3015,7 @@ void Paragraph::latex(BufferParams const & bparams,
?
textinset->hasCProtectContent(runparams.moving_arg)
&& !textinset->text().isMainText()
&& inInset().lyxCode() != BRANCH_CODE
+ && !runparams.no_cprotect
: false;
column +=
current_font.latexWriteStartChanges(ots, bparams,
runparams, basefont, last_font, false,
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index d65cbf9f31..121b763e2f 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -494,7 +494,7 @@ void InsetText::latex(otexstream & os, OutputParams const &
runparams) const
// FIXME UNIC
[LyX/2.4.1-devel] Typo
commit 578f4f764c0b7463e9edcac43cd1a9f10fde7d60 Author: jpc Date: Fri Apr 26 18:33:33 2024 +0200 Typo --- lib/examples/fr/Modules/Linguistics.lyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/examples/fr/Modules/Linguistics.lyx b/lib/examples/fr/Modules/Linguistics.lyx index 12e7772ef8..cbd0b62f0e 100644 --- a/lib/examples/fr/Modules/Linguistics.lyx +++ b/lib/examples/fr/Modules/Linguistics.lyx @@ -1805,7 +1805,7 @@ Liste des tableaux est accessible via \family sans Insertion\SpecialChar menuseparator -Listes & TdM +Listes/Matières/TdM \family default (il y a deux occurrences dans le menu, c'est la seconde qui est la bonne en principe -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update LFUNs
commit 4d39fd835bc736cd9f9738bacfa9cc37e5b96bfd Author: Richard Kimberly Heck Date: Fri May 10 13:11:08 2024 -0400 Update LFUNs lib/doc/LFUNs.lyx | 2444 ++--- 1 file changed, 653 insertions(+), 1791 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Last review of French Tutorial manual before 2.4.0
commit bcf35e52cd0ac39ad746ac0d1a8b901d434998af
Author: jpc
Date: Fri Apr 26 18:16:22 2024 +0200
Last review of French Tutorial manual before 2.4.0
---
lib/doc/fr/Tutorial.lyx | 15 +--
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/lib/doc/fr/Tutorial.lyx b/lib/doc/fr/Tutorial.lyx
index 1bfb698ba2..082d5492e4 100644
--- a/lib/doc/fr/Tutorial.lyx
+++ b/lib/doc/fr/Tutorial.lyx
@@ -68,6 +68,7 @@
\suppress_date false
\justification true
\use_refstyle 0
+\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\index Index
@@ -234,6 +235,11 @@ Mise à jour pour 2.4.0,
JPC 23/04/2021 - Modification des référencements aux modèles et aux exemples
\end_layout
+\begin_layout Plain Layout
+Dernière revue avant 2.4.0,
+ JPC 26/04/2024
+\end_layout
+
\end_inset
@@ -2468,11 +2474,11 @@ Article
Voici une liste très succincte de quelques classes de document.
Voyez la section
\emph on
-Classes de document spéciales
+Classes de document
\emph default
- du manuel d'
+ du manuel des
\emph on
-Options
+ Options
\begin_inset space ~
\end_inset
@@ -4885,9 +4891,6 @@ Fractions
\end_layout
\begin_layout Standard
-\begin_inset Formula $\frac{}{}$
-\end_inset
-
Pour créer une fraction,
cliquez sur le bouton
\family sans
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Last review of French Math manual before 2.4.0
commit e69875c316409d4f2f2d5db204bb8ce85254867f Author: jpc Date: Fri Apr 26 11:43:30 2024 +0200 Last review of French Math manual before 2.4.0 --- lib/doc/fr/Math.lyx | 5 + 1 file changed, 5 insertions(+) diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx index 5e2b76a19c..b5ba738f50 100644 --- a/lib/doc/fr/Math.lyx +++ b/lib/doc/fr/Math.lyx @@ -361,6 +361,11 @@ JPC dernière revue avant 2.4.0 (JPC) \end_layout +\begin_layout Plain Layout +26 avril 2024 : + ultimes vérifications avant 2.4.0 (JPC) +\end_layout + \end_inset -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Last review of French Customization manual before 2.4.0
commit 391c64f0fc9e50af5a9e295519edc76a49cb1413
Author: jpc
Date: Thu Apr 25 18:00:16 2024 +0200
Last review of French Customization manual before 2.4.0
---
lib/doc/fr/Customization.lyx | 49 ++--
1 file changed, 20 insertions(+), 29 deletions(-)
diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx
index 11d3457edb..db1be0b439 100644
--- a/lib/doc/fr/Customization.lyx
+++ b/lib/doc/fr/Customization.lyx
@@ -284,6 +284,12 @@ Mise à jour pour 2.4.0,
dernière révision avant publication
\end_layout
+\begin_layout Plain Layout
+Mise à jour pour 2.4.0,
+ 25 avril 2024 (JPC) ,
+ dernier contrôle
+\end_layout
+
\end_inset
@@ -3298,8 +3304,8 @@ lyx.pot
n'existe pas,
il peut être recréé avec la commande
-\begin_inset Flex Noun
-status collapsed
+\begin_inset Flex Strong
+status open
\begin_layout Plain Layout
make lyx.pot
@@ -4373,7 +4379,7 @@ name "sec:clavier"
\begin_layout Standard
\begin_inset Note Note
-status collapsed
+status open
\begin_layout Plain Layout
En révisant ce document en mars 2008,
@@ -5202,7 +5208,7 @@ Touches mortes
Il y a une autre façon d'ajouter le support pour des caractères internationaux
par l'intermédiaire des touches mortes.
Une touche morte marche en combinaison avec une lettre pour produire un
caractère accentué.
Ici,
- nous allons expliquer comment créer une touche morte vraiment simple pour
montrer comment elles marchent.
+ nous allons expliquer comment créer une touche morte vraiment simple pour
montrer comment elles fonctionnent.
\end_layout
\begin_layout Standard
@@ -8837,7 +8843,7 @@ Format
\end_inset
.
- Le numéro de format du présent fichier est le numéro 81.
+ Le numéro de format du présent fichier est le numéro 620.
mais chaque version de \SpecialChar LyX
peut lire les fichiers de format d'une version plus ancienne,
comme elle peut lire les documents crées avec une version plus ancienne.
@@ -11941,7 +11947,7 @@ La description d'un style de paragraphe ressemble à ceci
status collapsed
\begin_layout Plain Layout
-qui peut servir soit à définir un nouvel format soit à en modifier un déjà
existant.
+qui peut servir soit à définir un nouveau format soit à en modifier un déjà
existant.
\end_layout
\end_inset
@@ -12115,7 +12121,7 @@ AutoNests
\end_inset
inclut une liste de formats (séparés par une virgule) devant être englobés
dans et après le format courant.
- N'a de sens que pour des formats englobables comme des environnements.
+ N'a de sens que pour des formats susceptibles d'englobement comme des
environnements.
Doit être terminé par
\begin_inset Quotes cld
\end_inset
@@ -13886,7 +13892,7 @@ Itemize
\end_inset
produit des symboles pour les différents niveaux.
- The bullet types displayed can be set via
+ Les types de puces affichés peuvent être définis via
\begin_inset Flex Noun
status collapsed
@@ -16660,9 +1,9 @@ layouttranslations
doit inclure ces directives s'il y a lieu.
Notez bien que les traductions des styles de paragraphe ne changeront jamais
avec les publications de maintenance des versions de \SpecialChar LyX
(e.g.
- de la version 2.1.x à la version 2.1.y).
+ de la version 2.4.x à la version 2.4.y).
Il est cependant très probable qu'à l'occasion d'une publication majeure (e.g.
- de 2.0.x à 2.1.0),
+ de 2.3.x à 2.4.0),
de nouvelles traductions ou corrections soient introduites
\end_layout
@@ -16715,20 +16721,7 @@ Input stdfloats.inc
status collapsed
\begin_layout Plain Layout
-N'oubliez pas de jeter aussi un
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-oe{}
-\end_layout
-
-\end_inset
-
-il sur les compteurs dans la section suivante.
+N'oubliez pas de jeter aussi un œil sur les compteurs dans la section suivante.
\end_layout
\end_inset
@@ -17956,7 +17949,7 @@ InsetLayout
les boîtes,
les tables,
les algorithmes,
- les URL et les captions,
+ les URL et les légendes,
aussi bien que de définir des inserts flexibles.
\end_layout
@@ -21443,8 +21436,6 @@ vrai
\end_layout
\begin_layout Subsection
-
-\lang english
Arguments
\begin_inset CommandInset label
LatexCommand label
@@ -30281,7 +30272,7 @@ LyXDir/lib/xtemplates/
\end_inset
- directory.
+.
Chaque cadre est défini dans un fichier spécifique
\family typewriter
@@ -31856,7 +31847,7 @@ Transform
\end_inset
- and
+ et
\begin_inset Flex Code
status collapsed
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Last review of French Math manual before 2.4.0
commit 2b3a1decfc92cec41384cae1543c03bf74a9bd83
Author: jpc
Date: Fri Apr 26 11:42:41 2024 +0200
Last review of French Math manual before 2.4.0
---
lib/doc/fr/Math.lyx | 46 +-
1 file changed, 29 insertions(+), 17 deletions(-)
diff --git a/lib/doc/fr/Math.lyx b/lib/doc/fr/Math.lyx
index 611acccd96..5e2b76a19c 100644
--- a/lib/doc/fr/Math.lyx
+++ b/lib/doc/fr/Math.lyx
@@ -347,6 +347,20 @@ JPC
)
\end_layout
+\begin_layout Plain Layout
+Avril 2021 :
+ revue pour 2.4 (
+\nospellcheck on
+JPC
+\nospellcheck default
+)
+\end_layout
+
+\begin_layout Plain Layout
+26 février 2024 :
+ dernière revue avant 2.4.0 (JPC)
+\end_layout
+
\end_inset
@@ -795,7 +809,8 @@ Seules les formules en ligne sont autorisées dans les
tableaux.
La visibilité de la barre d'outils mathématique se règle avec le menu
\family sans
Affichage\SpecialChar menuseparator
-Barres d'outils
+Barres d'outils\SpecialChar menuseparator
+Math
\family default
.
Trois options sont proposées:
@@ -4504,7 +4519,11 @@ F
\begin_layout Plain Layout
\backslash
-Lambda^
+Lambda
+\begin_inset space ~
+\end_inset
+
+^
\begin_inset space \textvisiblespace{}
\end_inset
@@ -7001,7 +7020,7 @@ arraystretch
\begin_layout Standard
Pour insérer une petite matrice dans une ligne de texte,
- on eut également utiliser la commande
+ on peut également utiliser la commande
\series bold
\backslash
@@ -16233,6 +16252,10 @@ C=D
\end_inset
+\begin_inset VSpace smallskip
+\end_inset
+
+
\end_layout
\begin_layout Standard
@@ -29492,7 +29515,7 @@ La fonction modulo est un peu spéciale,
\end_layout
\begin_layout Standard
-Les variantes pour une formule hors ligne
+Les variantes pour une formule en ligne
\begin_inset space ~
\end_inset
@@ -29670,7 +29693,7 @@ b
\begin_inset VSpace defskip
\end_inset
-Dans une formule en ligne,
+Dans une formule hors ligne,
il y a plus d'espace inséré avant les noms de fonction,
sauf
\series bold
@@ -34503,18 +34526,7 @@ N
\family default
).
Le numéro de la formule est affiché dans \SpecialChar LyX
- après la formule sous la forme d'un dièse entre parenthèse
-\begin_inset Foot
-status collapsed
-
-\begin_layout Plain Layout
-En anglais le dièse est le symbole du numéro (NdT).
-\end_layout
-
-\end_inset
-
-.
- Le dièse est remplacé dans la sortie finale par le numéro de la formule entre
parenthèses.
+ après la formule sous la forme d'un numéro entre parenthèses.
\end_layout
\begin_layout Standard
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Last review of French Intro manual before 2.4.0
commit 857cfb1dcd5acee98793755f584730ebea926e55 Author: jpc Date: Thu Apr 25 18:26:47 2024 +0200 Last review of French Intro manual before 2.4.0 --- lib/doc/fr/Intro.lyx | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/doc/fr/Intro.lyx b/lib/doc/fr/Intro.lyx index 86bb5fabde..315f372df1 100644 --- a/lib/doc/fr/Intro.lyx +++ b/lib/doc/fr/Intro.lyx @@ -155,6 +155,11 @@ Mise a jour avant la publication de 2.4.0, 11 janvier 2024 (JPC) \end_layout +\begin_layout Plain Layout +Dernière revue avant la publication de 2.4.0, + 25 avril 2024 (JPC) +\end_layout + \end_inset @@ -2797,7 +2802,6 @@ config.log , et dites quel compilateur vous utilisez (une partie de cette information se trouve via \family sans -\lang english Aide\SpecialChar menuseparator À propos de LyX \family default -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] 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/2.4.1-devel] Check spelling of the French EmbeddedObjects manual
commit d8a3369e21f4d667a530c1e8e5cd54afb8667c69 Author: jpc Date: Wed Apr 24 10:44:06 2024 +0200 Check spelling of the French EmbeddedObjects manual --- lib/doc/fr/EmbeddedObjects.lyx | 237 - 1 file changed, 161 insertions(+), 76 deletions(-) diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index 7e9121ae05..0a3e56761d 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -185,6 +185,8 @@ varwidth \output_sync 0 \bibtex_command default \index_command default +\float_placement class +\float_alignment class \paperfontsize 12 \spacing single \use_hyperref true @@ -222,7 +224,7 @@ varwidth \paperorientation portrait \suppress_date false \justification true -\use_refstyle 0 +\use_refstyle 1 \use_formatted_ref 0 \use_minted 0 \use_lineno 0 @@ -2347,7 +2349,7 @@ immédiate \family default de la fenêtre de dialogue, chaque modification d'un champ de la fenêtre est appliquée directement. - Si vous déplacez le curseur vers une autre celule du tableau, + Si vous déplacez le curseur vers une autre cellule du tableau, la fenêtre s'adapte avec les valeurs des paramètres de la nouvelle cellule. Si vous modifiez les valeurs des longueurs qui se trouvent dans la fenêtre de dialogue, vous devez appuyer sur @@ -16372,7 +16374,7 @@ L'option \backslash cmidrule \series default - n'est pas actuellment reconnue par \SpecialChar LyX + n'est pas actuellement reconnue par \SpecialChar LyX , pas plus que les paramètres de \emph on @@ -16380,15 +16382,15 @@ rognage \emph default . Si vous en avez besoin, - vous pouvez insérer manuellment une commande + vous pouvez insérer manuellement une commande \series bold \backslash cmidrule \series default avec les réglages appropriés en tant que code \SpecialChar TeX - comme première saisie dans la première cellute d'une ligne. - Cette ligne est ensuite tracée dan sle résultat imprimable au-dessus de la ligne courante. + comme première saisie dans la première cellule d'une ligne. + Cette ligne est ensuite tracée dans le résultat imprimable au-dessus de la ligne courante. Le tableau \begin_inset space ~ \end_inset @@ -22894,7 +22896,7 @@ Si vous utilisez des polices de taille plus grande que la taille normale, strut \series default en code \SpecialChar TeX - au debut d'une ligne du tableau. + au début d'une ligne du tableau. Le tableau \begin_inset space ~ \end_inset @@ -28039,11 +28041,11 @@ literal "true" Les options \family sans -Plural +Pluriel \family default et \family sans -Capitalized +Majuscules \family default ne sont disponibles que si vous utilisez le paquetage \SpecialChar LaTeX @@ -28053,7 +28055,7 @@ refstyle . \family sans -Plural +Pluriel \family default met le nom au pluriel, e. @@ -28075,7 +28077,7 @@ tableaux ; \family sans -Capitalized +Majuscules \family default met une capitale au nom, e. @@ -28142,12 +28144,16 @@ nolink "false" \begin_inset Newline newline \end_inset -Ceci perlmet d'utiliser l'étiquette en code TeX. +Ceci permet d'utiliser l'étiquette en code TeX. L'option \family sans -No Prefix +Sans +\begin_inset space ~ +\end_inset + +préfixe \family default - enelève le préfixe du nom de l'étiquette: + enlève le préfixe du nom de l'étiquette: \begin_inset CommandInset ref LatexCommand labelonly @@ -28798,7 +28804,15 @@ Les réglages pour les flottants peuvent être définis en deux endroits avec \S Document\SpecialChar menuseparator Paramètres\SpecialChar ldots \SpecialChar menuseparator -Paramètres de flottant +Paramètres +\begin_inset space ~ +\end_inset + +de +\begin_inset space ~ +\end_inset + +flottant \family default , vous pouvez positionner quelques options utilisées implicitement par tous les flottants du document (placement dans la page et alignement des contenus), @@ -28814,15 +28828,23 @@ Paramètres\SpecialChar ldots \family default une fenêtre de dialogue s'ouvre dans laquelle vous pouvez, maintenant seulement pour le flottant concerné, - modifier le placement global et les options d'aligenement, + modifier le placement global et les options d’alignement, et préciser d'autres options qui ne sont disponibles que pour des flottants individuels. - Toutes ce soptions, + Toutes ces options, que ce soit pour \family sans Document\SpecialChar menuseparator Paramètres\SpecialChar ldots \SpecialChar menuseparator -Paramètres de flottant +Paramètres +\begin_inset space ~ +\end_inset + +de +\begin_inset space ~ +\end_inset + +flottant \family default ou localement pour \family sans @@ -28873,7 +28895,15 @@ Aussi bien dans Document\SpecialChar menuseparator Paramètres\SpecialChar ldots \SpecialChar menuseparator -Paramètres de flottant +Paramètres +\begin_inset space ~ +\end_inset + +de +\begin_inset space ~ +\end_inset + +flottant \family default que dans \family sans @@ -2,7 +28918,15 @@ Paramètres\Spec
[LyX/2.4.1-devel] 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.1-devel] 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.1-devel] 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
[LyX/2.4.1-devel] Update fr.po
commit b3e5f363a617e2433ea0b94b57af2fdd9abe51a7
Author: jpc
Date: Sun Apr 21 17:19:08 2024 +0200
Update fr.po
---
po/fr.gmo | Bin 656514 -> 657647 bytes
po/fr.po | 87 ++
2 files changed, 48 insertions(+), 39 deletions(-)
diff --git a/po/fr.gmo b/po/fr.gmo
index b1d2a3f08e..6e7a6ef794 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index b1f8d50111..85a7fdf2cf 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -363,7 +363,7 @@ msgstr ""
"Project-Id-Version: LyX 2.4\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
"POT-Creation-Date: 2024-04-21 11:22+0200\n"
-"PO-Revision-Date: 2024-04-19 11:22+0200\n"
+"PO-Revision-Date: 2024-04-21 17:18+0200\n"
"Last-Translator: Jean-Pierre Chrétien \n"
"Language-Team: lyxfr\n"
"Language: fr\n"
@@ -2896,8 +2896,8 @@ msgstr "&Nouvel index :"
msgid ""
"Enter the name of the desired index (e.g. \"Index of Names\") and hit \"Add\""
msgstr ""
-"Saisir le nom de l'index désiré (e. g. « Index des noms ») et appuyez sur "
-"« Add »"
+"Saisir le nom de l'index désiré (e. g. « Index des noms ») et appuyez sur « "
+"Add »"
#: src/frontends/qt/ui/IndicesUi.ui:131
msgid "Add a new index to the list"
@@ -4060,8 +4060,8 @@ msgstr "Format papier"
#: src/frontends/qt/ui/PageLayoutUi.ui:45
msgid "Choose a particular paper size, or set your own with \"Custom\""
msgstr ""
-"Choisir une taille de papier spécifique, ou préciser la vôtre avec "
-"« réglable »"
+"Choisir une taille de papier spécifique, ou préciser la vôtre avec « "
+"réglable »"
#: src/frontends/qt/ui/PageLayoutUi.ui:126
msgid "&Orientation:"
@@ -13265,12 +13265,12 @@ msgstr ""
"document. Une liste des annotations peut être produite en utilisant le style "
"de paragraphe « Liste de FIXMEs ». Les annotations peuvent être paramétrées "
"via le préambule LaTeX, voir la documentation de FiXme pour les détails. "
-"Nota : implicitement, les annotations ne sont affichées qu'en mode "
-"« brouillon » (si l'option « draft » a été ajoutée dans Document > "
-"Paramètres > Classe de document > Options de classe > Réglable). Pour les "
-"afficher dans tous les cas, ajouter fxsetup{draft} dans Documents > "
-"Paramètres > Préambule. Noter également qu'il faut la version 4 ou "
-"supérieure du paquetage FiXme pour certaines fonctionnalités."
+"Nota : implicitement, les annotations ne sont affichées qu'en mode « "
+"brouillon » (si l'option « draft » a été ajoutée dans Document > Paramètres "
+"> Classe de document > Options de classe > Réglable). Pour les afficher dans "
+"tous les cas, ajouter fxsetup{draft} dans Documents > Paramètres > "
+"Préambule. Noter également qu'il faut la version 4 ou supérieure du "
+"paquetage FiXme pour certaines fonctionnalités."
#: lib/layouts/fixme.module:18 lib/layouts/fixme.module:56
msgid "Fixme"
@@ -18450,8 +18450,8 @@ msgid ""
"the table number, as in 'Table 2.1'."
msgstr ""
"Réinitialiser la numérotation des tableaux au début de chaque section et "
-"ajouter le numéro de section au numéro de tableau, comme dans « Tableau "
-"2.1 »."
+"ajouter le numéro de section au numéro de tableau, comme dans « Tableau 2.1 "
+"»."
#: lib/layouts/tarticle.layout:3
msgid "Japanese Article (Standard Class, vertical Writing)"
@@ -19348,10 +19348,10 @@ msgid ""
"suppresses the output of TODO notes."
msgstr ""
"Fournit des inserts personnalisables pour créer des instances TODO dans un "
-"document (en utilisant le paquetage todonotes). Pour pouvoir engendrer une "
-"« Liste de TODO », le module fournit un style de paragraphe. Saisir "
-"« final » dans la liste des options de classe supprime l'affichage des notes "
-"TODO dans la sortie."
+"document (en utilisant le paquetage todonotes). Pour pouvoir engendrer une « "
+"Liste de TODO », le module fournit un style de paragraphe. Saisir « final » "
+"dans la liste des options de classe supprime l'affichage des notes TODO dans "
+"la sortie."
#: lib/layouts/todonotes.module:15 lib/layouts/todonotes.module:120
msgid "TODO"
@@ -28962,8 +28962,8 @@ msgstr "Pas d'information pour exporter au format %1$s."
#, c-format
msgid "Hint: use non-TeX fonts or set input encoding to '%1$s'"
msgstr ""
-"Astuce : utiliser les polices non-TeX ou positionner l'encodage d'entrée à "
-"« %1$s »"
+"Astuce : utiliser les polices non-TeX ou positionner l'encodage d'entrée à « "
+"%1$s »"
#: src/Buffer.cpp:4524
msgid "Couldn't export file"
@@ -30460,8 +30460,8 @@ msgstr "Format introuvable"
#, c-format
msgid "Flex inset %1$s is undefined after reloading `%2$s' layout."
msgstr ""
-"L'insert flexible %1$s n'est pas défini après rechargement du format "
-"« %2$s »."
+"L'insert flexible %1$s n'est pas défini après rechargement du format « %2$s "
+"»."
#: src/CutAndPaste.cpp:901
#, c-format
@@ -30469,8 +30469,8 @@ msgid ""
"Flex inset %1$s is undefined because of conversion from `%2$s' layout to "
"`%3$s'."
msgstr ""
-"L'in
[LyX/2.4.1-devel] * metainfo.xml - homepage missing
commit 2f6fba2749aa189f6ef73ebde24cfee9d091a137 Author: Pavel Sanda Date: Sun Apr 21 03:49:12 2024 +0200 * metainfo.xml - homepage missing --- lib/org.lyx.LyX.metainfo.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/org.lyx.LyX.metainfo.xml b/lib/org.lyx.LyX.metainfo.xml index 2c03194efc..f1553677c1 100644 --- a/lib/org.lyx.LyX.metainfo.xml +++ b/lib/org.lyx.LyX.metainfo.xml @@ -27,4 +27,5 @@ lyx-devel_AT_lists.lyx.org + https://www.lyx.org -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * cs.po
commit a5e7ff70f7612e70eb09c8fb19f48e18936a4f35 Author: Pavel Sanda Date: Sun Apr 21 11:57:29 2024 +0200 * cs.po --- po/cs.po | 13 + 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/po/cs.po b/po/cs.po index b719502d12..4652924039 100644 --- a/po/cs.po +++ b/po/cs.po @@ -30108,17 +30108,16 @@ msgstr "" #: src/LaTeXPackages.cpp:89 msgid "Invalid package list format!" -msgstr "" +msgstr "Chybný formát seznamu balíčků!" #: src/LaTeXPackages.cpp:90 msgid "" "The format of your LaTeX packages list is wrong. Please file a bug report." -msgstr "" +msgstr "Formát seznamu vašich LaTeX-ových balíčků je chybný. Pošlete nám prosím chybový výpis." #: src/LaTeXPackages.cpp:98 src/LaTeXPackages.cpp:104 -#, fuzzy msgid "Outdated configuration script detected!" -msgstr "Nelze přečíst konfigurační soubor" +msgstr "Nalezen zastaralý konfigurační skript!" #: src/LaTeXPackages.cpp:99 msgid "" @@ -30126,6 +30125,9 @@ msgid "" "The script has been renamed to 'chkconfig.ltx.bak'.\n" "If you did not copy the script there by purpose, you can safely delete it." msgstr "" +"Byl detekován zastaralý konfigurační skript 'chkconfig.ltx' ve vašem uživatelském adresáři.\n" +"Tento skript byl přejmenován na 'chkconfig.ltx.bak'.\n" +"Pokud jste původní konfigurační skript nezkopírovali do uživatelského adresáře záměrně, můžete ho bez obav smazat." #: src/LaTeXPackages.cpp:105 #, c-format @@ -30134,6 +30136,9 @@ msgid "" "(%1$s).\n" "Please delete or update this file!" msgstr "" +"Byl detekován zastaralý konfigurační skript 'chkconfig.ltx' ve vašem uživatelském adresáři.\n" +"(%1$s).\n" +"Je potřeba ho aktualizovat anebo smazat." #: src/LyX.cpp:136 msgid "Could not read configuration file" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update sk.po
commit 462cb3c3c66f2e5e049d33852a7aa02551587d53 Author: Kornel Benko Date: Sun Apr 21 12:11:59 2024 +0200 Update sk.po --- po/sk.po | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/po/sk.po b/po/sk.po index 859840aea7..47776b4678 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-04-21 11:22+0200\n" -"PO-Revision-Date: 2024-03-07 10:52+\n" +"POT-Creation-Date: 2024-04-21 11:30+0200\n" +"PO-Revision-Date: 2024-04-21 10:01+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -20674,7 +20674,7 @@ msgstr "Presunúť sekciu nadol|r" #: lib/ui/stdcontext.inc:394 lib/ui/stdcontext.inc:713 msgid "Move Section Up|U" -msgstr "Presunúť sekciu nahor|r" +msgstr "Presunúť sekciu nahor|P" #: lib/ui/stdcontext.inc:396 msgid "Insert Regular Expression" @@ -30162,19 +30162,18 @@ msgstr "" "nie je dostupný na vašom systéme. LyX sa stiahne na štandardný font." #: src/LaTeXPackages.cpp:89 -#, fuzzy msgid "Invalid package list format!" -msgstr "Neplatný regulárny výraz!" +msgstr "Neplatný formát zoznamu balíkov!" #: src/LaTeXPackages.cpp:90 msgid "" "The format of your LaTeX packages list is wrong. Please file a bug report." msgstr "" +"Formát vášho zoznamu balíkov LaTeX je nesprávny. Chybu nám prosím nahláste." #: src/LaTeXPackages.cpp:98 src/LaTeXPackages.cpp:104 -#, fuzzy msgid "Outdated configuration script detected!" -msgstr "Nemôžem čítať konfiguračný súbor" +msgstr "Zistil sa zastaraný konfiguračný skript!" #: src/LaTeXPackages.cpp:99 msgid "" @@ -30182,6 +30181,10 @@ msgid "" "The script has been renamed to 'chkconfig.ltx.bak'.\n" "If you did not copy the script there by purpose, you can safely delete it." msgstr "" +"Vo vašom používateľskom adresári sme zistili zastaraný skript 'chkconfig." +"ltx'.\n" +"Skript bol premenovaný na 'chkconfig.ltx.bak'.\n" +"Ak ste tam skript neskopírovali účelovo, môžete ho pokojne odstrániť." #: src/LaTeXPackages.cpp:105 #, c-format @@ -30190,6 +30193,9 @@ msgid "" "(%1$s).\n" "Please delete or update this file!" msgstr "" +"Vo vašom používateľskom adresári (%1$s) sme zistili zastaraný skript " +"'chkconfig.ltx'.\n" +"Odstráňte alebo aktualizujte tento súbor!" #: src/LyX.cpp:136 msgid "Could not read configuration file" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] de.po
commit 075fdbd4f95c2a4f85803fd3c3b66928ae500de7 Author: Juergen Spitzmueller Date: Sun Apr 21 11:25:12 2024 +0200 de.po --- po/de.po | 23 +-- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/po/de.po b/po/de.po index 87317afa09..8f678ac317 100644 --- a/po/de.po +++ b/po/de.po @@ -96,14 +96,14 @@ msgstr "" "Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2024-04-21 11:22+0200\n" -"PO-Revision-Date: 2024-03-05 15:57+0100\n" +"PO-Revision-Date: 2024-04-21 11:25+0200\n" "Last-Translator: Juergen Spitzmueller \n" -"Language-Team: German \n" +"Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 18.12.1\n" +"X-Generator: Lokalize 24.02.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: src/frontends/qt/ui/AboutUi.ui:27 @@ -30467,17 +30467,18 @@ msgstr "" #: src/LaTeXPackages.cpp:89 msgid "Invalid package list format!" -msgstr "" +msgstr "Ungültiges Paketlisten-Format!" #: src/LaTeXPackages.cpp:90 msgid "" "The format of your LaTeX packages list is wrong. Please file a bug report." msgstr "" +"Das Format Ihrer LaTeX-Paket-Liste is inkorrekt. Bitte reichen Sie einen" +" Bugreport ein!" #: src/LaTeXPackages.cpp:98 src/LaTeXPackages.cpp:104 -#, fuzzy msgid "Outdated configuration script detected!" -msgstr "Die Konfigurationsdatei konnte nicht gelesen werden" +msgstr "Veraltete Konfigurationsdatei entdeckt!" #: src/LaTeXPackages.cpp:99 msgid "" @@ -30485,6 +30486,11 @@ msgid "" "The script has been renamed to 'chkconfig.ltx.bak'.\n" "If you did not copy the script there by purpose, you can safely delete it." msgstr "" +"Wir haben eine veraltete Version der Datei 'chkconfig.ltx' in Ihrem" +" Benutzerverzeichnis gefunden.\n" +"Die Datei wurde nun umbenannt in 'chkconfig.ltx.bak'.\n" +"Wenn Sie die Datei nicht absichtlich hierher kopiert haben, können Sie sie" +" bedenkenlos löschen." #: src/LaTeXPackages.cpp:105 #, c-format @@ -30493,6 +30499,10 @@ msgid "" "(%1$s).\n" "Please delete or update this file!" msgstr "" +"Wir haben eine veraltete Version der Datei 'chkconfig.ltx' in Ihrem" +" Benutzerverzeichnis gefunden\n" +"(%1$s).\n" +"Bitte aktualisieren oder löschen Sie diese Datei!" #: src/LyX.cpp:136 msgid "Could not read configuration file" @@ -43747,3 +43757,4 @@ msgstr "Unbekannter Benutzer" #~ msgid " (auto)" #~ msgstr " (automatisch)" + -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] remerge strings
commit 4d8316402d078aa92b19d3c538e08cac0221f230 Author: Juergen Spitzmueller Date: Sun Apr 21 11:24:02 2024 +0200 remerge strings po/ar.po | 1616 +++-- po/bg.po | 1671 +++--- po/cs.gmo| Bin 627180 -> 627292 bytes po/cs.po | 593 ++-- po/de.gmo| Bin 653622 -> 653560 bytes po/de.po | 940 --- po/en.po | 1556 ++- po/es.po | 1628 +++-- po/eu.po | 1627 +++-- po/fi.po | 1619 +++-- po/fr.po | 954 --- po/he.po | 1618 +++-- po/hu.po | 1621 +++-- po/ia.po | 1617 +++-- po/id.po | 1620 +++-- po/it.po | 1614 +++-- po/ja.gmo| Bin 678876 -> 678815 bytes po/ja.po | 1614 +++-- po/nb.po | 1624 +++-- po/nl.po | 1626 +++-- po/nn.po | 1622 +++-- po/pl.po | 1620 +++-- po/pt_BR.gmo | Bin 646632 -> 646894 bytes po/pt_BR.po | 369 ++-- po/pt_PT.po | 1624 +++-- po/ru.po | 1620 +++-- po/sk.gmo| Bin 636629 -> 636748 bytes po/sk.po | 1621 +++-- po/sv.po | 1626 +++-- po/uk.po | 1648 -- po/zh_CN.gmo | Bin 447576 -> 471508 bytes po/zh_CN.po | 1768 ++ po/zh_TW.po | 1626 +++-- 33 files changed, 20835 insertions(+), 19467 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Handle the case of outdated chkconfig.ltx in user directory
commit 237b0404ff45af46d2815d65b3590d309ce4e2bf
Author: Juergen Spitzmueller
Date: Sat Apr 20 14:57:12 2024 +0200
Handle the case of outdated chkconfig.ltx in user directory
(cherry picked from commit b8ff824a4f4ab4d3e213b55bf8117fd95b7b9657)
---
src/LaTeXPackages.cpp | 39 ---
src/LaTeXPackages.h | 2 +-
2 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/LaTeXPackages.cpp b/src/LaTeXPackages.cpp
index e708df1dfe..0f4129eabe 100644
--- a/src/LaTeXPackages.cpp
+++ b/src/LaTeXPackages.cpp
@@ -22,9 +22,12 @@
#include "support/debug.h"
#include "support/FileName.h"
#include "support/filetools.h"
+#include "support/gettext.h"
#include "support/lstrings.h"
#include "support/Package.h"
+#include "frontends/alert.h"
+
using namespace std;
using namespace lyx::support;
@@ -35,7 +38,7 @@ namespace lyx {
LaTeXPackages::Packages LaTeXPackages::packages_;
-void LaTeXPackages::getAvailable()
+void LaTeXPackages::getAvailable(bool retry)
{
Lexer lex;
support::FileName const real_file = libFileSearch("", "packages.lst");
@@ -73,10 +76,40 @@ void LaTeXPackages::getAvailable()
}
}
// Check if the pkglist has current format.
- // Reconfigure and re-parse if not.
+ // Reconfigure once and re-parse if not.
if (lstformat != "2") {
+ // If we have already reconfigured, check if there is an
outdated config file
+ // which produces the outdated lstformat
+ if (retry) {
+ // check if we have an outdated chkconfig.ltx file in
user dir
+ support::FileName chkconfig =
fileSearch(addPath(package().user_support().absFileName(), ""),
+
"chkconfig.ltx", string(), must_exist);
+ if (chkconfig.empty()) {
+ // nothing found. So we can only warn
+ frontend::Alert::warning(_("Invalid package
list format!"),
+ _("The format of your LaTeX packages
list is wrong. Please file a bug report."));
+ return;
+ }
+ // Found. Try to rename and warn.
+ support::FileName chkconfig_bak;
+ chkconfig_bak.set(chkconfig.absFileName() + ".bak");
+ if (chkconfig.renameTo(chkconfig_bak))
+ // renaming succeeded
+ frontend::Alert::warning(_("Outdated
configuration script detected!"),
+ _("We have detected an outdated script
'chkconfig.ltx' in your user directory.\n"
+ "The script has been renamed to
'chkconfig.ltx.bak'.\n"
+ "If you did not copy the script there
by purpose, you can safely delete it."));
+ else {
+ // renaming failed
+ frontend::Alert::warning(_("Outdated
configuration script detected!"),
+ bformat(_("We have detected an outdated
script 'chkconfig.ltx' in your user directory\n"
+ "(%1$s).\n"
+ "Please delete or update this
file!"), from_utf8(chkconfig.absFileName(;
+ return;
+ }
+ }
package().reconfigureUserLyXDir("");
- getAvailable();
+ getAvailable(true);
}
}
diff --git a/src/LaTeXPackages.h b/src/LaTeXPackages.h
index dba6d039f6..12f3e4ec0b 100644
--- a/src/LaTeXPackages.h
+++ b/src/LaTeXPackages.h
@@ -25,7 +25,7 @@ namespace lyx {
class LaTeXPackages {
public:
/// Which of the required packages are installed?
- static void getAvailable();
+ static void getAvailable(bool retry = false);
/// Is the (required) package available?
static bool isAvailable(std::string const & name);
/// Is the (required) package available at least as of
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Convert $${python} placeholder for graphic conversions
commit cc75da1c3e109e4fd6b1305a707c70929000ddd6
Author: José Matos
Date: Sun Apr 14 21:30:02 2024 +0100
Convert $${python} placeholder for graphic conversions
(cherry picked from commit cdcaf0e7b6cc45bc74175667c390c3148c4730e9)
---
src/graphics/GraphicsConverter.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/graphics/GraphicsConverter.cpp
b/src/graphics/GraphicsConverter.cpp
index 669f08d2ff..34d37a4066 100644
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -362,6 +362,7 @@ static void build_script(string const & doc_fname,
string const token_base = "$$b";
string const token_to= "$$o";
string const token_todir = "$$d";
+ string const token_python = "$${python}";
EdgePath::const_iterator it = edgepath.begin();
EdgePath::const_iterator end = edgepath.end();
@@ -405,6 +406,7 @@ static void build_script(string const & doc_fname,
command = subst(command, token_base, "' + '\"' + infile_base +
'\"' + '");
command = subst(command, token_to,"' + '\"' + outfile +
'\"' + '");
command = subst(command, token_todir, "' + '\"' + outdir + '\"'
+ '");
+ command = subst(command, token_python, os::python());
build_conversion_command(command, script);
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] French UserGuide: check spelling and remove no more exiting article classes
commit e38b4294185af609bbe54dd337f6e6c691e02522 Author: jpc Date: Fri Apr 19 18:54:01 2024 +0200 French UserGuide: check spelling and remove no more exiting article classes --- lib/doc/fr/UserGuide.lyx | 179 +++ 1 file changed, 73 insertions(+), 106 deletions(-) diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 1b3774f640..94a96500eb 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -1001,7 +1001,7 @@ nolink "false" \end_inset ). - Vous pouvez également ajouter vos propres modèles à cette liste en engesgistrant un fichier \SpecialChar LyX + Vous pouvez également ajouter vos propres modèles à cette liste en enregistrant un fichier \SpecialChar LyX via \family sans Fichier\SpecialChar menuseparator @@ -1953,7 +1953,7 @@ F3 \family default (ou \family sans - Maj+Entréee + Maj+Entrée \family default ou le raccourci \family sans @@ -3881,7 +3881,7 @@ Il y a aussi quelques classes non standard, En voici quelques-unes, la liste complète avec des explications détaillées se trouve au chapitre \emph on -Classes Spéciales de Documents +Classes de Documents \emph default dans le manuel \emph on @@ -3896,18 +3896,6 @@ A&A articles de publications dans le style et le format utilisés par Astronomy & Astrophysics; \end_layout -\begin_layout Description -ACS articles de publications dans le style et le format utilisés par l' -\lang english -American Chemistry Society; -\end_layout - -\begin_layout Description -AGU articles de publications dans le style et le format utilisés par l' -\lang english -American Geophysical Union; -\end_layout - \begin_layout Description AMS articles de publications et livres dans le style et le format utilisés par l'AMS ( \lang english @@ -3960,7 +3948,7 @@ vitae classe utile pour écrire un curriculum vitæ; \end_layout \begin_layout Description -Elsarticle disposition pour les revues publiées par le groupe Elsevier; +Elsevier disposition pour les revues publiées par le groupe Elsevier; \end_layout \begin_layout Description @@ -3975,20 +3963,6 @@ Hollywood utilisé pour taper des scripts pour l'industrie cinématographique de ; \end_layout -\begin_layout Description -IEEEtran disposition pour les journaux publiés par l'IEEE ( -\lang english -Institute of Electrical and Electronics Engineers); -\end_layout - -\begin_layout Description -IOP disposition pour les journaux publiés par l'IOP (Institute of Physics); -\end_layout - -\begin_layout Description -Kluwer disposition pour les revues publiées par le groupe Kluwer. -\end_layout - \begin_layout Description KOMA-Script remplace les classes standard, en offrant de nombreuses fonctions intéressantes comme le formatage des légendes, @@ -4028,18 +4002,6 @@ Optical Society of America Slides sert à faire des transparents pour des présentations; \end_layout -\begin_layout Description -SPIE -\begin_inset space ~ -\end_inset - -Proceedings disposition pour les journaux publiés par SPIE ( -\lang english -The International Society for Optical Engineering -\lang french -); -\end_layout - \begin_layout Description Springer disposition pour les revues publiés par le groupe Springer. \end_layout @@ -4057,7 +4019,7 @@ avancées , chapitre \emph on -Classes de document spéciales +Classes de document \emph default . Ici, @@ -4073,7 +4035,15 @@ Vous remarquerez probablement que de nombreuses classes énumérées par le menu \family sans Document\SpecialChar menuseparator Paramètres\SpecialChar menuseparator -Classes de document +Classes +\begin_inset space ~ +\end_inset + +de +\begin_inset space ~ +\end_inset + +document \begin_inset Index idx range none pageformat default @@ -4115,13 +4085,7 @@ Indisponibles Tout va bien. \SpecialChar LyX inclut beaucoup plus de classes que vous n'utiliserez jamais, - et certaines d'entre elles, - comme -\family sans -IOP -\family default -, - sont très spécialisées. + et certaines d'entre elles sont très spécialisées. \SpecialChar LyX essaie de reconnaître des documents aussi variés que possible, et il inclut une centaine de fichiers de format, @@ -4182,8 +4146,7 @@ Bien que \SpecialChar LyX et nombreux sont ceux qui l'ont fait. Le chapitre \emph on -Installer de nouvelles classes de document, - formats et modèles +Installer de nouvelles classes \emph default du manuel de \emph on @@ -16156,7 +16119,7 @@ L'option \family sans Active les fonctionnalités micro-typographiques \family default - active les fonctionnalités micro-typographiques via the paquetage \SpecialChar LaTeX + active les fonctionnalités micro-typographiques via le paquetage \SpecialChar LaTeX \series bold microtype @@ -16199,7 +16162,7 @@ status collapsed \begin_layout Plain Layout Ou des macros \SpecialChar LaTeX , - si lme caractère littéral n'est pas connu dans l'encodage d'enrée de \SpecialChar LaTeX + si le caractère littéral n'est pas connu da
[LyX/2.4.1-devel] Cmake install: Forgotten to install tabletemplates.
commit d85e2819732ad0d51d79e40aefbc5468339495e3
Author: Kornel Benko
Date: Sat Apr 20 19:33:25 2024 +0200
Cmake install: Forgotten to install tabletemplates.
(cherry picked from commit d05e295ddc22c65183a203e97240898a055d2d12)
---
development/cmake/Install.cmake | 1 +
1 file changed, 1 insertion(+)
diff --git a/development/cmake/Install.cmake b/development/cmake/Install.cmake
index 9fd3f38bf9..76b53d8ff5 100755
--- a/development/cmake/Install.cmake
+++ b/development/cmake/Install.cmake
@@ -137,6 +137,7 @@ lyx_install("data" ${TOP_SRC_DIR}/libscripts
*.R .
lyx_install("data" ${TOP_SRC_DIR}/libscripts saxon*.*
.)
lyx_install("data" ${TOP_SRC_DIR}/libdocbook *
. epub3 xhtml5 xhtml lib common)
lyx_install("data" ${TOP_SRC_DIR}/libxtemplates *.xtemplate
.)
+lyx_install("data" ${TOP_SRC_DIR}/lib tabletemplates *.lyx
.)
lyx_install("data" ${TOP_SRC_DIR}/3rdparty scripts/evince_sync *
.)
lyx_install("font" ${TOP_SRC_DIR}/lib/fonts .*
.)
lyx_install("tex" ${TOP_SRC_DIR}/lib/tex.*
.)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Typos in Additional.lyx, seen while translating in French
commit 217315be0fc892f13f3fdea3790ae4fe1b015514
Author: jpc
Date: Fri Apr 19 11:41:53 2024 +0200
Typos in Additional.lyx, seen while translating in French
---
lib/doc/Additional.lyx | 267 +++--
1 file changed, 212 insertions(+), 55 deletions(-)
diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 1c4fb906d4..01ebe77b82 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
@@ -13286,7 +13286,9 @@ Linguistics
This module provides specific environments useful for linguistics (numbered
examples,
glosses,
semantic markup,
- OT tableau floats).
+ OT tableau floats,
+ Discourse Representation Structures,
+ phonetic symbols).
You can obtain information about this module in
\family sans
\bar under
@@ -13385,7 +13387,7 @@ FiXme Notes
\begin_layout Standard
This module provides “FiXme” (marginal) annotations for document revision
purposes.
- A list of annotations can be produced by using the “List of FIXMEs” paragraph
style.
+ A list of annotations can be produced by using the “List of FIXMEs” in the
outline panel.
The annotations are customizable via the LaTeX preamble.
See the
\family typewriter
@@ -13403,18 +13405,23 @@ literal "false"
.
\end_layout
-\begin_layout Paragraph
-Note:
-\end_layout
-
\begin_layout Standard
-by default,
+
+\series bold
+Note
+\series default
+:
+ by default,
the notes are only displayed in “draft” mode (if the option “draft” has been
inserted in
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
Document Class\SpecialChar menuseparator
-Class Options\SpecialChar menuseparator
+Class
+\begin_inset space ~
+\end_inset
+
+Options\SpecialChar menuseparator
Custom
\family default
).
@@ -13430,7 +13437,11 @@ fxsetup{draft}
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
\SpecialChar LaTeX
- Preamble
+
+\begin_inset space ~
+\end_inset
+
+Preamble
\family default
.
\end_layout
@@ -13444,15 +13455,31 @@ This module provides various kinds of annotations for
PDF output.
See
\family sans
Help\SpecialChar menuseparator
-Specific Manuals\SpecialChar menuseparator
-PDF comments
+Specific
+\begin_inset space ~
+\end_inset
+
+Manuals\SpecialChar menuseparator
+PDF
+\begin_inset space ~
+\end_inset
+
+comments
\family default
and
\family sans
File\SpecialChar menuseparator
-Open Example\SpecialChar menuseparator
+Open
+\begin_inset space ~
+\end_inset
+
+Example\SpecialChar menuseparator
Modules\SpecialChar menuseparator
-PDF Comments
+PDF
+\begin_inset space ~
+\end_inset
+
+Comments
\family default
.
\end_layout
@@ -13478,15 +13505,31 @@ literal "false"
\family sans
Help\SpecialChar menuseparator
-Specific Manuals\SpecialChar menuseparator
-PDF forms
+Specific
+\begin_inset space ~
+\end_inset
+
+Manuals\SpecialChar menuseparator
+PDF
+\begin_inset space ~
+\end_inset
+
+forms
\family default
and
\family sans
File\SpecialChar menuseparator
-Open Example\SpecialChar menuseparator
+Open
+\begin_inset space ~
+\end_inset
+
+Example\SpecialChar menuseparator
Modules\SpecialChar menuseparator
-PDF Form
+PDF
+\begin_inset space ~
+\end_inset
+
+Form
\family default
.
\end_layout
@@ -13534,7 +13577,11 @@ final
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
Document Class\SpecialChar menuseparator
-Class Options\SpecialChar menuseparator
+Class
+\begin_inset space ~
+\end_inset
+
+Options\SpecialChar menuseparator
Custom
\family default
) suppresses the output of TODO notes.
@@ -13594,16 +13641,32 @@ tcolorbox
See
\family sans
Help\SpecialChar menuseparator
-Specific Manuals\SpecialChar menuseparator
+Specific
+\begin_inset space ~
+\end_inset
+
+Manuals\SpecialChar menuseparator
Colored boxes
\family default
,
\family sans
File\SpecialChar menuseparator
-Open Example\SpecialChar menuseparator
+Open
+\begin_inset space ~
+\end_inset
+
+Example\SpecialChar menuseparator
Modules\SpecialChar menuseparator
-Fancy Color Boxes
+Fancy
+\begin_inset space ~
+\end_inset
+
+Color
+\begin_inset space ~
+\end_inset
+
+Boxes
\family default
and the
\begin_inset CommandInset href
@@ -14020,7 +14083,11 @@ Width)
inset to
\family sans
Insert\SpecialChar menuseparator
-Custom Inset
+Custom
+\begin_inset space ~
+\end_inset
+
+Inset
\family default
using the
\family typewriter
@@ -14118,12 +14185,13 @@ fixltx2e
.
\end_layout
-\begin_layout Paragraph
-Note:
-\end_layout
-
\begin_layout Standard
-recent \SpecialChar LaTeX
+
+\series bold
+Note
+\series default
+:
+ recent \SpecialChar LaTeX
kernels (as of 2015/01/01) include the functionality of
\family sans
fixltx2e
@@ -14246,15 +14314,31 @@ Language
See
\family sans
File\SpecialChar menuseparator
-Open Example\SpecialChar menuseparator
+Open
+\begin_inset space ~
+\end_inset
+
+Example\SpecialChar menuseparator
Modules\SpecialChar menuseparator
-Multilingual Captions
+Multilingual
+\begin
[LyX/2.4.1-devel] Update translation of the French Additional manual, section 4.12 missing
commit 70089a8f402cad59cfcb041bb0690b7855beab66
Author: jpc
Date: Fri Apr 19 10:54:40 2024 +0200
Update translation of the French Additional manual, section 4.12
missing
---
lib/doc/fr/Additional.lyx | 1364 ++---
1 file changed, 666 insertions(+), 698 deletions(-)
diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx
index 575e09e97b..66a8703d3b 100644
--- a/lib/doc/fr/Additional.lyx
+++ b/lib/doc/fr/Additional.lyx
@@ -42,6 +42,7 @@ enumitem
graphicboxes
varwidth
enotez
+customHeadersFooters
\end_modules
\maintain_unincluded_children no
\language french
@@ -331,7 +332,7 @@ enotez
\dynamic_quotes 0
\papercolumns 1
\papersides 2
-\paperpagestyle headings
+\paperpagestyle fancy
\tablestyle default
\tracking_changes false
\output_changes false
@@ -15523,15 +15524,11 @@ ou
\end_layout
\begin_layout Section
-
-\lang english
-List enhancements
+Améliorations des listes
\end_layout
\begin_layout Subsection
-
-\lang english
-Customizable Lists
+Listes personnalisables
\begin_inset CommandInset label
LatexCommand label
name "subsec:Customizable-Lists"
@@ -15542,55 +15539,48 @@ name "subsec:Customizable-Lists"
\end_layout
\begin_layout Standard
-
-\lang english
-This module uses the
+Ce modulez utilise le paquetage
\family sans
- enumitem
+
+\family typewriter
+enumitem
\family default
- package to enable the customization of various list environments.
+ pour permettre le paramétrage de divers environnements de liste.
\end_layout
\begin_layout Subsubsection
-
-\lang english
-Custom Enumerate Lists
+Paramétrage des énumérations
\end_layout
\begin_layout Standard
\noindent
-
-\lang english
-The default numbering of numbered lists can be changed by adding an optional
argument (menu
+La numérotation implicite des énumérations peut être modifiée pour ajouter un
argument facultatif (menu
\family sans
\bar under
I
\bar default
-nsert\SpecialChar menuseparator
+nsertion\SpecialChar menuseparator
+Options
+\begin_inset space ~
+\end_inset
-\bar under
-S
-\bar default
-hort Title
+d'énumération
\family default
-) to the first item of each level in the list.
- There you add the command
+) au premier élément de chaque niveau de la liste.
+ Vous ajoutez la commande
\end_layout
\begin_layout Standard
\family sans
-\lang english
label=
\backslash
roman{enumi}
\end_layout
\begin_layout Standard
-
-\lang english
-in \SpecialChar TeX
- Code (shortcut
+en code \SpecialChar TeX
+ Code (raccourci
\begin_inset Info
type "shortcut"
arg "ert-insert"
@@ -15602,16 +15592,19 @@ arg "ert-insert"
\begin_layout Standard
\family sans
-\lang english
enumi
\family default
- is the first level counter of the enumeration.
- To change the numbering for the list sublevels,
- replace the “
-\family sans
+ est le premier niveau de compteur de l'énumération.
+ Pour modifier la numérotation des sous-niveaux de liste,
+ remplacer le
+\begin_inset Quotes cld
+\end_inset
+
i
-\family default
-” in the command by the small Roman numeral of the level (
+\begin_inset Quotes crd
+\end_inset
+
+ de la commande par le numéro romain du niveau concerné (
\family sans
enumi
\family default
@@ -15634,79 +15627,73 @@ enumiv
\end_layout
\begin_layout Standard
-
-\lang english
-The command
+La commande
\family sans
\backslash
roman
\family default
- outputs the counter as a small Roman numeral.
- For capital Roman numerals replace
+ produit un numéro romain en bas de casse.
+ Pour obtenir une numérotation romaine en capitales,
+ remplacer
\family sans
\backslash
roman
\family default
- with
+ par
\family sans
\backslash
Roman
\family default
- in the command above.
- For Arabic numerals use
+ dans la commande ci-dessus.
+ Pour les chiffres arabes,
+ utiliser
\family sans
\backslash
arabic
\family default
.
- To
-\begin_inset Quotes eld
+ Pour
+\begin_inset Quotes cld
\end_inset
-number
-\begin_inset Quotes erd
+numéroter
+\begin_inset Quotes crd
\end_inset
- items with capital or small Latin letters use
+ les éléments avec des lettre latines en capitales ou en bas de casse,
+ utiliser
\family sans
\backslash
Alph
\family default
- or
+ ou
\family sans
\backslash
alph
\family default
,
- respectively.
+ respectivement.
\end_layout
\begin_layout Standard
\noindent
-
-\lang english
\begin_inset Note Greyedout
status open
\begin_layout Plain Layout
\series bold
-\lang english
Note:
\series default
- You can only number 26
-\begin_inset space ~
-\end_inset
-
-items with Latin letters,
- because this numbering is limited to single letters.
+ vous ne pouvez numéroter que 26 éléments avec des lettres latines,
+ parce que cette numérotation ne peut utiliser qu'une seule lettre.
\end_layout
\end_inset
@@ -15715,22 +15702,16 @@ items with Latin letters,
\end_layout
\begin_layout Standard
-
-\lang english
-Here is a list with custom numbering:
[LyX/2.4.1-devel] #13049 add window activation for preferences to avoid it be hidden by main window on mac after alert prompts
commit 5554fe9aeb51478b60e6bc04ebf9727d9b081b63
Author: Stephan Witt
Date: Fri Apr 5 10:47:49 2024 +0200
#13049 add window activation for preferences to avoid it be hidden by main
window on mac after alert prompts
(cherry picked from commit 4c1db7cad866d99af2f2474d8467cc8581eb0eef)
---
src/frontends/qt/GuiPrefs.cpp | 29 +++--
1 file changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/frontends/qt/GuiPrefs.cpp b/src/frontends/qt/GuiPrefs.cpp
index d531dd4cde..230d377a2b 100644
--- a/src/frontends/qt/GuiPrefs.cpp
+++ b/src/frontends/qt/GuiPrefs.cpp
@@ -190,6 +190,16 @@ static void setComboxFont(QComboBox * cb, string const &
family,
}
+static void activatePrefsWindow(GuiPreferences * form_)
+{
+ if (guiApp->platformName() == "cocoa") {
+ QWidget * dialog_ = form_->asQWidget();
+ dialog_->raise();
+ dialog_->activateWindow();
+ }
+}
+
+
/
//
// PrefOutput
@@ -1783,6 +1793,7 @@ void PrefConverters::on_needauthCB_toggled(bool checked)
int ret = frontend::Alert::prompt(
_("SECURITY WARNING!"), _("Unchecking this option has the
effect that potentially harmful converters would be run without asking your
permission first. This is UNSAFE and NOT recommended, unless you know what you
are doing. Are you sure you would like to proceed? The recommended and safe
answer is NO!"),
0, 0, _("&No"), _("&Yes"));
+ activatePrefsWindow(form_);
if (ret == 1)
changed();
else
@@ -2148,6 +2159,7 @@ void PrefFileformats::on_formatED_editingFinished()
_("You cannot change a format's short name "
"if the format is used by a converter. "
"Please remove the converter first."));
+ activatePrefsWindow(form_);
updateView();
return;
}
@@ -2303,6 +2315,7 @@ void PrefFileformats::on_formatRemovePB_clicked()
Alert::error(_("Format in use"),
_("Cannot remove a Format used by a Converter. "
"Remove the converter first."));
+ activatePrefsWindow(form_);
return;
}
@@ -2551,12 +2564,14 @@ void PrefUserInterface::applyRC(LyXRC & rc) const
uiStyleCO->currentIndex()).toString();
if (rc.ui_style != fromqstr(uistyle)) {
rc.ui_style = fromqstr(uistyle);
- if (rc.ui_style == "default")
+ if (rc.ui_style == "default") {
// FIXME: This should work with
frontend::GuiApplication::setStyle(QString())
//Qt bug
https://bugreports.qt.io/browse/QTBUG-58268
frontend::Alert::warning(_("Restart needed"),
_("Resetting the user
interface style to 'Default'"
" requires a restart of
LyX."));
+ activatePrefsWindow(form_);
+ }
else
frontend::GuiApplication::setStyle(uistyle);
}
@@ -3312,6 +3327,7 @@ bool PrefShortcuts::validateNewShortcut(FuncRequest const
& func,
if (func.action() == LFUN_UNKNOWN_ACTION) {
Alert::error(_("Failed to create shortcut"),
_("Unknown or invalid LyX function"));
+ activatePrefsWindow(form_);
return false;
}
@@ -3321,12 +3337,14 @@ bool PrefShortcuts::validateNewShortcut(FuncRequest
const & func,
if (lyxaction.getActionType(func.action()) == LyXAction::Hidden) {
Alert::error(_("Failed to create shortcut"),
_("This LyX function is hidden and cannot be bound."));
+ activatePrefsWindow(form_);
return false;
}
if (k.length() == 0) {
Alert::error(_("Failed to create shortcut"),
_("Invalid or empty key sequence"));
+ activatePrefsWindow(form_);
return false;
}
@@ -3343,6 +3361,7 @@ bool PrefShortcuts::validateNewShortcut(FuncRequest const
& func,
k.print(KeySequence::ForGui), new_action_string);
int ret = Alert::prompt(_("Redefine shortcut?"),
text, 0, 1, _("&Redefine"),
_("&Cancel"));
+ activatePrefsWindow(form_);
if (ret != 0)
return false;
QString const sequence_text =
toqstr(k.print(KeySequence::ForGui));
@@ -3366,6 +3385,7 @@ bool PrefShortcuts::validateNewShortcut(FuncRequest const
& func,
[LyX/2.4.1-devel] Typo in fr.po
commit 2867cc397d2a234036c32dfcfd388c6d83afb8fe Author: jpc Date: Fri Apr 19 11:22:45 2024 +0200 Typo in fr.po --- po/fr.gmo | Bin 656513 -> 656514 bytes po/fr.po | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/fr.gmo b/po/fr.gmo index d9af9d027e..b1d2a3f08e 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 21541e7330..8e694942c1 100644 --- a/po/fr.po +++ b/po/fr.po @@ -363,7 +363,7 @@ msgstr "" "Project-Id-Version: LyX 2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2024-03-06 09:55+0100\n" -"PO-Revision-Date: 2024-04-10 18:57+0200\n" +"PO-Revision-Date: 2024-04-19 11:22+0200\n" "Last-Translator: Jean-Pierre Chrétien \n" "Language-Team: lyxfr\n" "Language: fr\n" @@ -6011,7 +6011,7 @@ msgstr "" #: src/frontends/qt/ui/SpellcheckerUi.ui:80 msgid "S&kip" -msgstr "I&gorer" +msgstr "I&gnorer" #: src/frontends/qt/ui/SpellcheckerUi.ui:87 msgid "Repla&cement:" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Typos iun Franch Additional manual
commit 556e75d3ad6d0727a0c4441b9c143eef7b9477a5 Author: jpc Date: Fri Apr 19 11:21:08 2024 +0200 Typos iun Franch Additional manual --- lib/doc/fr/Additional.lyx | 113 +++--- 1 file changed, 76 insertions(+), 37 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index 66a8703d3b..ad4b807b9a 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -8991,7 +8991,7 @@ Modern CV moderncv.cls \family default . - Elle pêrmet la création de CV personnalisables. + Elle permet la création de CV personnalisables. \family sans Fichier\SpecialChar menuseparator @@ -9313,16 +9313,21 @@ beamer.cls Fichier\SpecialChar menuseparator Nouveau avec modèle\SpecialChar menuseparator Présentations\SpecialChar menuseparator - -\bar under Beamer \family default -\bar default ou \family sans Aide\SpecialChar menuseparator -Manuels spécifiques\SpecialChar menuseparator -Présentations Beamer Presentations +Manuels +\begin_inset space ~ +\end_inset + +spécifiques\SpecialChar menuseparator +Présentations +\begin_inset space ~ +\end_inset + +Beamer \family default proposent une aide à l'utilisation. La documentation est disponible via @@ -10184,7 +10189,7 @@ Restriction \begin_layout Itemize \family sans -Pied_Droite +Pied_Droit \family default (Right_Footer) \end_layout @@ -2,7 +7,7 @@ nolink "false" . En 2023, - Dipos reste maintenue alors que la maintenance de + Diapos reste maintenue alors que la maintenance de \family sans Foil\SpecialChar TeX s'est arrêtée en 2008. @@ -11206,7 +11211,7 @@ Paramètres \family sans ordinaire \family default - Le rendu final contient des numéros de page dans le coin inférieur droit. + le rendu final contient des numéros de page dans le coin inférieur droit; \end_layout \begin_layout Description @@ -11214,9 +11219,9 @@ ordinaire \family sans en-têtes \family default - Comme ordinaire, + comme ordinaire, mais imprime aussi tous les marqueurs temporels que vous aurez placés. - C'est le choix implicite. + C'est le choix implicite; \end_layout \begin_layout Description @@ -11224,7 +11229,7 @@ en-têtes \family sans vide \family default - Le rendu final ne contient pas de numéros de page, + le rendu final ne contient pas de numéros de page, de marqueurs temporels ni de marqueurs d'alignement. \end_layout @@ -13848,8 +13853,6 @@ INSERT – insérez un plan rapproché \end_layout \begin_layout Chapter - -\lang english Modules \end_layout @@ -13915,9 +13918,7 @@ personnalisables \end_layout \begin_layout Subsection - -\lang english -LinguistiqueLinguistics +Linguistique \end_layout \begin_layout Standard @@ -13958,7 +13959,7 @@ Braille \end_layout \begin_layout Standard -The module permet l'écriture du Braille. +Ce module permet l'écriture du Braille. Il requiert le paquetage \SpecialChar LaTeX \family typewriter @@ -14087,7 +14088,7 @@ Préambule \SpecialChar LaTeX \end_layout \begin_layout Subsection -PDF Comments +Commentaires PDF \end_layout \begin_layout Standard @@ -14095,21 +14096,41 @@ Ce module fournit diverses sortes d'annotations pour l'impression PDF. Voir \family sans Aide\SpecialChar menuseparator -Manuels spécifiques\SpecialChar menuseparator -Commentaires PDF +Manuels +\begin_inset space ~ +\end_inset + +spécifiques\SpecialChar menuseparator +Commentaires +\begin_inset space ~ +\end_inset + +PDF \family default et \family sans Fichier\SpecialChar menuseparator -Ouvrir un exemple\SpecialChar menuseparator +Ouvrir +\begin_inset space ~ +\end_inset + +un +\begin_inset space ~ +\end_inset + +exemple\SpecialChar menuseparator Modules\SpecialChar menuseparator -Commentaires PDF +Commentaires +\begin_inset space ~ +\end_inset + +PDF \family default . \end_layout \begin_layout Subsection -PDF Form +Formulaires PDF \end_layout \begin_layout Standard @@ -14128,14 +14149,30 @@ literal "false" \family sans Aide\SpecialChar menuseparator Manuels spécifiques\SpecialChar menuseparator -Formulaires PDF +Formulaires +\begin_inset space ~ +\end_inset + +PDF \family default et \family sans Fichier\SpecialChar menuseparator -Ouvrir un exemple\SpecialChar menuseparator +Ouvrir +\begin_inset space ~ +\end_inset + +un +\begin_inset space ~ +\end_inset + +exemple\SpecialChar menuseparator Modules\SpecialChar menuseparator -Formulaires PDF. +Formulaires +\begin_inset space ~ +\end_inset + +PDF. \end_layout \begin_layout Subsection @@ -14579,7 +14616,7 @@ Facteur-V pour ajouter un multiplicateur vertical. Si ce multiplicateur est omis, le facteur horizontal est utilisé. - Insérer des facteurs différents crée un dsitorsion comme ici: + Insérer des facteurs différents crée un distorsion comme ici: \end_layout @@ -18471,7 +18508,7 @@ today L'épaisseur de la barre horizontale dessinée au dessous de l'en-tête et au dessus du pied de page peut elle aussi être modifiée.
[LyX/2.4.1-devel] * pt_BR.po from Georger
commit f49c52a5b6ba05720515166c91c5508cfbf9f4ae Author: Pavel Sanda Date: Sat Apr 13 03:07:17 2024 +0200 * pt_BR.po from Georger po/pt_BR.po | 1578 ++- 1 file changed, 801 insertions(+), 777 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * another update fo zh_CN.po
commit ebbbfca21392110a05c503124ac2e787992bc2df Author: Pavel Sanda Date: Fri Apr 19 00:15:38 2024 +0200 * another update fo zh_CN.po --- po/zh_CN.po | 83 - 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index e81875d871..46e462f7c4 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -24,7 +24,7 @@ msgstr "" "Project-Id-Version: zh_CN\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-04-10 10:09+0800\n" +"PO-Revision-Date: 2024-04-13 13:30+0800\n" "Last-Translator: Jiaxu Zi <3119932...@qq.com>\n" "Language-Team: 简体中文 \n" "Language: zh_CN\n" @@ -51,7 +51,7 @@ msgstr "无系统目录" #: src/frontends/qt/ui/AboutUi.ui:156 msgid "[[do]]&Open" -msgstr "" +msgstr "打开(&O)" #: src/frontends/qt/ui/AboutUi.ui:191 #, fuzzy @@ -60,7 +60,7 @@ msgstr "用户目录: " #: src/frontends/qt/ui/AboutUi.ui:222 msgid "Open user directory in file browser" -msgstr "" +msgstr "在文件浏览器中打开用户目录" #: src/frontends/qt/ui/AboutUi.ui:225 #, fuzzy @@ -91,7 +91,7 @@ msgstr "复制版本信息到剪切板" #: src/frontends/qt/ui/AboutUi.ui:364 #, fuzzy msgid "Copy &Version Info" -msgstr "插入版本信息" +msgstr "插入版本信息(&V)" #: src/frontends/qt/ui/BibitemUi.ui:26 src/frontends/qt/ui/BibitemUi.ui:45 msgid "The bibliography key" @@ -119,7 +119,7 @@ msgstr "年: " #: src/frontends/qt/ui/BibitemUi.ui:96 msgid "The year with \"Author (Year)\" citations (without parentheses)." -msgstr "" +msgstr "采用“作者 (年份)”格式引用的年份（不带括号）。" #: src/frontends/qt/ui/BibitemUi.ui:105 src/frontends/qt/GuiBibitem.cpp:64 #, fuzzy @@ -334,7 +334,7 @@ msgstr "添加文献引用到目录" #: src/frontends/qt/ui/BibtexUi.ui:94 msgid "&Inherit from Master" -msgstr "" +msgstr "继承自 Master (&I)" #: src/frontends/qt/ui/BibtexUi.ui:101 msgid "Remove the selected database" @@ -2349,7 +2349,7 @@ msgstr "链接类型" msgid "" "Link to the web or any other target with an \"authority\" component (i." "e., :// in the URI)" -msgstr "" +msgstr "使用包含“权威”组件（即URI中的://）的链接指向网络或其他目标。" #: src/frontends/qt/ui/HyperlinkUi.ui:136 msgid "&Web" @@ -2500,7 +2500,7 @@ msgstr "格式(&F):" msgid "" "Customize the format of the page number here. Note that the format is not " "used with \"See\" and \"See also\" references." -msgstr "" +msgstr "在此处自定义页码格式。请注意，该格式不用于“参见”和“参阅”类引用。" #: src/frontends/qt/ui/IndexUi.ui:105 msgid "Enter custom command here (without leading backslash)." @@ -2684,6 +2684,8 @@ msgid "" "Attempt to display formatted cross-references as they would appear in the " "output, e.g., as \"Theorem 1\" rather than just as the label." msgstr "" +"尝试按照其在输出中显示的样子来展示格式化交叉引用，例如，显示为“Theorem 1”，" +"而非仅显示标签。" #: src/frontends/qt/ui/LaTeXUi.ui:214 msgid "Format cross-references in the &work area" @@ -3369,6 +3371,8 @@ msgid "" "Line numbering (lineno package) options (e.g. right, modulo, switch(*), " "pagewise). Please refer to the lineno package manual for details." msgstr "" +"行号标注（lineno包）选项（例如：right，modulo，switch(*)，pagewise）。" +"详细信息请参阅lineno包手册。" #: src/frontends/qt/ui/NumberingUi.ui:82 msgid "&List in Table of Contents" @@ -3488,6 +3492,8 @@ msgid "" "Namespace prefix to use for MathML formulae. For instance, with the m prefix, the MathML tags will be output like m:math." msgstr "" +"用于MathML公式所使用的命名空间前缀。例如，使用m前缀时，MathML标签将输出为m:math的形式。" #: src/frontends/qt/ui/OutputUi.ui:327 msgid "No prefix (namespace defined inline for each tag)" @@ -3657,7 +3663,7 @@ msgstr "附加选项(&P)" #: src/frontends/qt/ui/PDFSupportUi.ui:461 msgid "" "Additional hyperref options (comma-separated) to be passed via \\hypersetup." -msgstr "" +msgstr "通过 \\hypersetup 传递的其他超链接选项（以逗号分隔）。" #: src/frontends/qt/ui/PDFSupportUi.ui:464 msgid "Hyperse&tup" @@ -4411,7 +4417,7 @@ msgstr "首字放大" #: src/frontends/qt/ui/PrefIdentityUi.ui:63 msgid "Initials of your name" -msgstr "" +msgstr "您名字的首字母" #: src/frontends/qt/ui/PrefIdentityUi.ui:72 msgid "&E-mail:" @@ -6194,7 +6200,7 @@ msgstr "输出大小" #: src/frontends/qt/ui/TocUi.ui:327 msgid "Only non-output items" -msgstr "" +msgstr "仅非输出项" #: src/frontends/qt/ui/TocUi.ui:335 msgid "Sho&w:" @@ -8493,7 +8499,7 @@ msgstr "ORCID" #: lib/layouts/aastex62.layout:162 msgid "Enter the 16 digit ORCID as ---" -msgstr "" +msgstr "输入16位ORCID，格式为---" #: lib/layouts/aastex62.layout:177 lib/layouts/apa.layout:197 #: lib/layouts/apax.inc:177 lib/layouts/copernicus.layout:90 @@ -9654,7 +9660,7 @@ msgstr "导言区" #: lib/layouts/stdlists.inc:81 lib/layouts/stdlists.inc:128 #: lib/layouts/stdlyxlist.inc:24 lib/layouts/theorems-case.inc:63 msgid "LaTeX code to be inserted before the first item" -msgstr "" +msgstr "插入首项之前的 LaTeX 代码" #: lib/layouts/amsdefs.inc:42 msgid "Short title which appears in the running headers" @@ -10300,7 +10306,7 @@ msgstr "暂停序数" #: lib/layouts/beamer.layout:772 lib/layouts/powerdot.layout:533 msgid "Number of slide where the context below th
[LyX/2.4.1-devel] Improved copy operation for user directory contents of previous major releases
commit 5cc72815cc1e9659c40af694ab8c321dceb09f41
Author: Stephan Witt
Date: Thu Apr 11 18:30:29 2024 +0200
Improved copy operation for user directory contents of previous major
releases
- avoid copying of configure.log
- avoid copying of chkconfig.ltx
There is a report of a hang on first start of LyX with new major release.
The removal of the chkconfig.ltx (leftover from early LyX versions) fixed
the issue.
(cherry picked from commit 945a02e2e176e0f8fb9c599700c693032a01fa5d)
---
lib/configure.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/configure.py b/lib/configure.py
index 80cc787230..df0251268a 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -157,8 +157,8 @@ def copy_tree(src, dst, preserve_symlinks=False, level=0):
link_dest = os.readlink(src_name)
os.symlink(link_dest, dst_name)
outputs.append(dst_name)
-elif level == 0 and name == 'cache':
-logger.info("Skip cache %s", src_name)
+elif level == 0 and name in [ 'cache', 'configure.log',
'chkconfig.ltx' ]:
+logger.info("Skip copy of %s", src_name)
elif os.path.isdir(src_name):
outputs.extend(
copy_tree(src_name, dst_name, preserve_symlinks, level=(level
+ 1)))
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Clarify release note.
commit 8c0e81db9a7507b8daeec2a5512b0b2def30adeb Author: Juergen Spitzmueller Date: Sat Apr 13 07:12:34 2024 +0200 Clarify release note. --- lib/RELEASE-NOTES | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 78ba3d750d..3178372492 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -332,11 +332,11 @@ !!Known issues in version 2.4.0 -* Various versions Qt6 have a problem with key events handling (QTBUG-123848). - This issue is documented in bug #12641 (e.g. LyX is unresponsive to - Control-Command keyboard shortcuts). - The fix for the Qt bug will be included in Qt 6.8.0 and 6.7.1 and might also - be backported to Qt 6.5.6 and 6.2.13. +* Various versions of Qt6 (> 6.2) have problems with key events handling on MacOS. + In LyX, this results in Control-Command keyboard shortcuts not working if + LyX is compiled against such a version for MacOS (see bug #12641). + This is a Qt bug (QTBUG-123848) which will be fixed in Qt 6.8.0 and 6.7.1. + The fix might also be backported to Qt 6.5.6 and 6.2.13. * Gnome environments defaulting to Wayland + mutter compositor might be missing proper window decorations. This is a generic problem which can be for Qt-based -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update credits
commit 437f0822f7dd4b9ca8a50526a6dac2d85818a6ee Author: Pavel Sanda Date: Thu Apr 11 09:42:29 2024 +0200 Update credits --- lib/generate_contributions.py | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index 3d0db11273..60f979aa76 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -2354,7 +2354,16 @@ contributors = [ "", "", "", - u"bug reports and small fixes") ] + u"bug reports and small fixes"), + + contributor(u"Jiaxu Zi", + "3119932298 () qq ! com", + "GPL", + "Re: Update zh_CN Translation", + "m=171281941029208", + "10 April 2024", + u"Chinese translation") ] + if __name__ == "__main__": -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update Qt bug documentation (#12641)
commit 8810e9418fe68ad1b608f756afd1806c69cc105c Author: Juergen Spitzmueller Date: Fri Apr 12 11:13:15 2024 +0200 Update Qt bug documentation (#12641) --- lib/RELEASE-NOTES | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 7b103e6f93..78ba3d750d 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -332,8 +332,11 @@ !!Known issues in version 2.4.0 -* Compiling LyX 2.4 on MacOS with Qt6 makes currently LyX unresponsive to - Control-Command keyboard shortcuts (bug #12641). +* Various versions Qt6 have a problem with key events handling (QTBUG-123848). + This issue is documented in bug #12641 (e.g. LyX is unresponsive to + Control-Command keyboard shortcuts). + The fix for the Qt bug will be included in Qt 6.8.0 and 6.7.1 and might also + be backported to Qt 6.5.6 and 6.2.13. * Gnome environments defaulting to Wayland + mutter compositor might be missing proper window decorations. This is a generic problem which can be for Qt-based -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] update zh_CN translation
commit 1bd5fb97fa06b3f4e85539505f01ffb1f76b0674 Author: Jiaxu Zi <3119932...@qq.com> Date: Wed Apr 10 17:19:28 2024 +0800 update zh_CN translation --- po/zh_CN.po | 161 ++-- 1 file changed, 101 insertions(+), 60 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index a918d4d3ae..03fd21c92f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -85,7 +85,7 @@ msgstr "发行说明" #: src/frontends/qt/ui/AboutUi.ui:361 msgid "Copy version information to clipboard" -msgstr "" +msgstr "复制版本信息到剪切板" #: src/frontends/qt/ui/AboutUi.ui:364 #, fuzzy @@ -131,6 +131,8 @@ msgid "" "full list for author-year citation, you can put the full list here and the " "abbreviated list above." msgstr "" +"如果您希望同时使用包含“et al.”的作者缩写列表以及作者-年份引用的完整列表，" +"您可以在此处放置完整列表，而在上方放置缩写列表。" #: src/frontends/qt/ui/BibitemUi.ui:122 src/frontends/qt/GuiBibitem.cpp:93 msgid "" @@ -392,6 +394,8 @@ msgid "" "If your bibliography databases use a different encoding than the LyX " "document, specify it here" msgstr "" +"若您的参考文献数据库所采用的编码与 LyX 文档的编码不一致，" +"请在此处指定该编码。" #: src/frontends/qt/ui/BibtexUi.ui:270 msgid "The BibTeX style" @@ -759,7 +763,7 @@ msgstr "新分支(&N):" #: src/frontends/qt/ui/BranchesUi.ui:169 msgid "Reset branch color to default (standard background)" -msgstr "" +msgstr "重置分支颜色至默认（标准背景）" #: src/frontends/qt/ui/BranchesUi.ui:172 #, fuzzy @@ -915,7 +919,7 @@ msgstr "跟踪修订" #: src/frontends/qt/ui/ChangeTrackingUi.ui:30 msgid "If checked, changes will be shown in the PDF/DVI/PS output" -msgstr "" +msgstr "如果勾选，更改将在PDF/DVI/PS输出中显示" #: src/frontends/qt/ui/ChangeTrackingUi.ui:33 #, fuzzy @@ -924,7 +928,7 @@ msgstr "在输出中显示修订文字" #: src/frontends/qt/ui/ChangeTrackingUi.ui:40 msgid "Use change bars in addition to change tracking markup" -msgstr "" +msgstr "除了使用更改跟踪标记外，还使用更改线" #: src/frontends/qt/ui/ChangeTrackingUi.ui:43 #, fuzzy @@ -1312,7 +1316,7 @@ msgstr "旧文档(&O):" #: src/frontends/qt/ui/CompareUi.ui:145 msgid "Specify the original version of the document here (comparison source)" -msgstr "" +msgstr "在此处指定文档的原始版本（比较源）" #: src/frontends/qt/ui/CompareUi.ui:155 src/frontends/qt/ui/PrefUi.ui:51 msgid "Bro&wse..." @@ -1325,7 +1329,7 @@ msgstr "新文档(&N):" #: src/frontends/qt/ui/CompareUi.ui:181 msgid "Specify the modified version of the document here (comparison target)" -msgstr "" +msgstr "在此处指定文档的修改版本（比较目标）" #: src/frontends/qt/ui/CompareUi.ui:191 src/frontends/qt/ui/ExternalUi.ui:89 #: src/frontends/qt/ui/GraphicsUi.ui:75 src/frontends/qt/ui/IncludeUi.ui:28 @@ -1337,7 +1341,7 @@ msgstr "浏览(&B)..." #: src/frontends/qt/ui/CompareUi.ui:227 src/frontends/qt/ui/CompareUi.ui:240 msgid "" "Changes in the workarea are allocated to the selected author or category" -msgstr "" +msgstr "工作区中的更改被分配给所选作者或类别" #: src/frontends/qt/ui/CompareUi.ui:230 #, fuzzy @@ -1361,13 +1365,14 @@ msgstr "动作" #: src/frontends/qt/ui/CounterUi.ui:63 msgid "Select the action to perform on selected counter" -msgstr "" +msgstr "选择对所选计数器执行的操作" #: src/frontends/qt/ui/CounterUi.ui:79 msgid "" "If checked, modification affects the counter only in the LyX workarea, not " "in the output" -msgstr "" +msgstr "如果已勾选，修改仅影响 LyX 工作区中的计数器，而不影响输出" + #: src/frontends/qt/ui/CounterUi.ui:85 #, fuzzy @@ -1761,7 +1766,7 @@ msgstr "替换是保留首字大小写(&P)" #: src/frontends/qt/ui/FindAndReplaceUi.ui:413 msgid "Do not search in content that is not output (e.g., notes)" -msgstr "" +msgstr "不要在未输出的内容（如注释）中进行搜索" #: src/frontends/qt/ui/FindAndReplaceUi.ui:416 msgid "Ignore &non-output content" @@ -1771,7 +1776,7 @@ msgstr "" msgid "" "If the search string is formatted in a non-default way, only find strings " "formatted like the search string in the checked respects" -msgstr "" +msgstr "如果搜索字符串以非默认方式格式化，则仅查找在所选方面格式类似于搜索字符串的字符串" #: src/frontends/qt/ui/FindAndReplaceUi.ui:441 msgid "Adhe&re to search string formatting of" @@ -1866,7 +1871,7 @@ msgstr "居中" #: src/frontends/qt/ui/FloatPlacementUi.ui:124 msgid "Right-align float contents" -msgstr "" +msgstr "右对齐浮动内容" #: src/frontends/qt/ui/FloatPlacementUi.ui:127 #, fuzzy @@ -1963,7 +1968,7 @@ msgstr "衬线字体(&R):" msgid "" "Select the roman (serif) typeface. To filter the list of fonts, just start " "typing while the list is expanded." -msgstr "" +msgstr "选择罗马（衬线）字体。要在字体列表中进行筛选，只需在列表展开时开始输入即可。" #: src/frontends/qt/ui/FontUi.ui:142 msgid "Use a real small caps shape, if the font provides one" @@ -2002,7 +2007,7 @@ msgstr "无衬线字体(&S):" msgid "" "Select the Sans Serif (grotesque) typeface. To filter the list of fonts, " "just start typing while the list is expanded." -msgstr "" +msgstr "选择无衬线（哥特式）字体。要在字体列表中进行筛选，只需在列表展开时开始输入即可。" #: src/frontends/qt/ui/FontUi.ui:237 msgid "S&cale (%):" @@ -2025,7 +2030,7 @@ msgstr "等宽字体(&T)" msgid "" "Select the typewriter (monospaced) typeface. To filter the list of fonts, " "just start typing while the list is expanded." -msgstr "" +msgstr "选择等宽字体。要在字体列表中进行筛选，只需在列表展开时开始输入即可。"
[LyX/2.4.1-devel] * CREDITS regenerate
commit 1e7f4476db539966a6ac087fdfd3e4b3883e8c16 Author: Pavel Sanda Date: Thu Apr 11 09:45:38 2024 +0200 * CREDITS regenerate --- lib/CREDITS | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/CREDITS b/lib/CREDITS index 9bddefacf5..e4c373901f 100644 --- a/lib/CREDITS +++ b/lib/CREDITS @@ -451,6 +451,9 @@ @bAndrew Parsloe @iE-mail: aparsloe () clear ! net ! nz Module updates +@bIdan Pazi +@iE-mail: idan.kp () gmail ! com + Windows-specific fixes @bBo Peng @iE-mail: ben.bob () gmail ! com Conversion of all shell scripts to Python, shortcuts dialog, session, view-source, auto-view, embedding features and scons build system. @@ -667,7 +670,7 @@ @bMartin Vermeer @iE-mail: martin.vermeer () hut ! fi support for optional argument in sections/captions svjour/svjog, egs and llncs document classes. Lot of bug hunting (and fixing!) -@bVeselin +@bVeselin Jeliazkov @iE-mail: vveesskkoo () gmail ! com Bulgarian localization @bJürgen Vigna @@ -745,6 +748,9 @@ @bXiaokun Zhu @iE-mail: xiaokun () aero ! gla ! ac ! uk bug reports and small fixes +@bJiaxu Zi +@iE-mail: 3119932298 () qq ! com + Chinese translation If your name doesn't appear here although you've done something for LyX, or your entry is wrong or incomplete, just drop some e-mail to l...@lyx.org. Thanks. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * zh_CN.po - update credits
commit da9cab6c18b6f3aeed82b54d14baae75bc1a1925 Author: Pavel Sanda Date: Thu Apr 11 09:37:36 2024 +0200 * zh_CN.po - update credits --- po/zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 03fd21c92f..e81875d871 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,6 +6,7 @@ # Bo Peng , 2007. # Min Ding , 2014. # Winfred Huang , 2018. +# Jiaxu Zi <3119932...@qq.com>, 2024. # Note from Winfred Huang: # 本翻译文件依照俄文版处理了一部分无需翻译照抄原文的条目， # 依照日文版处理了一部分需要翻译的条目。少部分条目之翻译为 @@ -23,8 +24,8 @@ msgstr "" "Project-Id-Version: zh_CN\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2024-02-12 11:10-0500\n" -"PO-Revision-Date: 2020-07-22 10:09+0800\n" -"Last-Translator: Winfred Huang \n" +"PO-Revision-Date: 2024-04-10 10:09+0800\n" +"Last-Translator: Jiaxu Zi <3119932...@qq.com>\n" "Language-Team: 简体中文 \n" "Language: zh_CN\n" "MIME-Version: 1.0\n" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update Win installer for new dictionary links. Untested.
commit 65398c1b7749c9e45c20ca9636dfcd50a1982448
Author: Pavel Sanda
Date: Wed Apr 10 21:13:41 2024 +0200
Update Win installer for new dictionary links. Untested.
---
development/Win32/packaging/installer/src/dictionaries.nsh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/development/Win32/packaging/installer/src/dictionaries.nsh
b/development/Win32/packaging/installer/src/dictionaries.nsh
index 6cd9b3901b..36e4f056f0 100644
--- a/development/Win32/packaging/installer/src/dictionaries.nsh
+++ b/development/Win32/packaging/installer/src/dictionaries.nsh
@@ -54,7 +54,7 @@ Function DownloadHunspell
Push $9
${IfNot} ${FileExists} "$INSTDIR\Resources\dicts\$R9"
-inetc::get /TIMEOUT=5000
"https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/$R9";
"$INSTDIR\Resources\dicts\$R9" /END
+inetc::get /TIMEOUT=5000
"https://www.lyx.org/trac/export/HEAD/dictionaries/dicts/$R9";
"$INSTDIR\Resources\dicts\$R9" /END
Pop $9
${If} $9 != "OK"
MessageBox MB_OK|MB_ICONEXCLAMATION "$(HunspellFailed)" #
$(HunspellFailed) uses $R9
@@ -70,7 +70,7 @@ Function DownloadThesaurus
Push $9
${IfNot} ${FileExists} "$INSTDIR\Resources\thes\$R9"
-inetc::get /TIMEOUT=5000
"https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/thes/$R9";
"$INSTDIR\Resources\thes\$R9" /END
+inetc::get /TIMEOUT=5000
"https://www.lyx.org/trac/export/HEAD/dictionaries/thes/$R9";
"$INSTDIR\Resources\thes\$R9" /END
Pop $9
${If} $9 != "OK"
MessageBox MB_OK|MB_ICONEXCLAMATION "$(ThesaurusFailed)" #
$(ThesaurusFailed) uses $R9
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Docs - update URL for dictionaries after recent infra movements
commit 644b8c87506c60bcbf35c3b0fa9af924d88a7ed4 Author: Pavel Sanda Date: Wed Apr 10 21:12:36 2024 +0200 Docs - update URL for dictionaries after recent infra movements --- lib/attic/doc/id_UserGuide.lyx | 2 +- lib/doc/UserGuide.lyx | 2 +- lib/doc/de/UserGuide.lyx | 2 +- lib/doc/fr/UserGuide.lyx | 2 +- lib/doc/ja/UserGuide.lyx | 2 +- lib/doc/ru/UserGuide.lyx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/attic/doc/id_UserGuide.lyx b/lib/attic/doc/id_UserGuide.lyx index 0cba3bb596..2168cd1a4a 100644 --- a/lib/attic/doc/id_UserGuide.lyx +++ b/lib/attic/doc/id_UserGuide.lyx @@ -32449,7 +32449,7 @@ status open \begin_layout Plain Layout -https://www.lyx.org/trac/browser/lyxsvn/dictionaries/trunk/thes/ +https://www.lyx.org/trac/export/HEAD/dictionaries/thes/ \end_layout \end_inset diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index d32f5960e3..553a4b04ba 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -41149,7 +41149,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/ +https://www.lyx.org/trac/export/HEAD/dictionaries/dicts/ \end_layout \end_inset diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 30366aa07f..bacbcc1a1f 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -40396,7 +40396,7 @@ status open \begin_layout Plain Layout -https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/ +https://www.lyx.org/trac/export/HEAD/dictionaries/dicts/ \end_layout \end_inset diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 1523df1aac..1b3774f640 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -42316,7 +42316,7 @@ status open \begin_layout Plain Layout -https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/ +https://www.lyx.org/trac/export/HEAD/dictionaries/dicts/ \end_layout \end_inset diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx index 334ccd0ac1..b8359a59a6 100644 --- a/lib/doc/ja/UserGuide.lyx +++ b/lib/doc/ja/UserGuide.lyx @@ -43961,7 +43961,7 @@ status open \begin_layout Plain Layout -https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/ +https://www.lyx.org/trac/export/HEAD/dictionaries/dicts/ \end_layout \end_inset diff --git a/lib/doc/ru/UserGuide.lyx b/lib/doc/ru/UserGuide.lyx index 615f07b092..041589b8ef 100644 --- a/lib/doc/ru/UserGuide.lyx +++ b/lib/doc/ru/UserGuide.lyx @@ -37281,7 +37281,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/trac/export/HEAD/lyxsvn/dictionaries/trunk/dicts/ +https://www.lyx.org/trac/export/HEAD/dictionaries/dicts/ \end_layout \end_inset -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] French Additional manual, translation of chapter 4 up to sec. 4.9
commit cd4e8d04b3b40f53298af95a1936eb60b8cad8a7 Author: jpc Date: Wed Apr 10 18:50:42 2024 +0200 French Additional manual, translation of chapter 4 up to sec. 4.9 --- lib/doc/fr/Additional.lyx | 978 +++--- 1 file changed, 580 insertions(+), 398 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index f340ba497e..575e09e97b 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -39,6 +39,9 @@ shapepar hanging initials enumitem +graphicboxes +varwidth +enotez \end_modules \maintain_unincluded_children no \language french @@ -14199,26 +14202,20 @@ literal "false" \end_layout \begin_layout Section - -\lang english -Bibliography +Bibliographie \end_layout \begin_layout Subsection - -\lang english -APA Style with Natbib +Style APA avec Natbib \end_layout \begin_layout Standard - -\lang english -This module adds support for using natbib together with apacite (the bibliography style need not be +Ce module ajoute les fonctionnalités utiles pour utiliser natbib avec apacite (le style bibliographique n'a pas à être nécessairement \family typewriter -apacite + apacite \family default — - it could be + il peut être \family typewriter apacite \family default @@ -14228,98 +14225,85 @@ apacite apacitex \family default , - or any bibliography that works with both the natbib and apacite packages.) + ou n'importe quel style qui fonctionne avec à la fois les paquetages natbib et apacite). \end_layout \begin_layout Section - -\lang english -Boxes +Boîtes \end_layout \begin_layout Subsection - -\lang english -Fancy Colored Boxes +Boîtes colorées sophistiquées \end_layout \begin_layout Standard - -\lang english -This module adds ten custom insets that support colored boxes via the +Ce module ajoute dix inserts personnalisés produisant des boîtes colorées à l'aide du paquetage \family typewriter -tcolorbox + tcolorbox \family default - package. - See +. + \family sans -Help\SpecialChar menuseparator -Specific Manuals\SpecialChar menuseparator -Colored boxes +Voir Aide\SpecialChar menuseparator +Manuels spécifiques\SpecialChar menuseparator +Boîtes colorées \family default , \family sans -File\SpecialChar menuseparator -Open Example\SpecialChar menuseparator +Fichier\SpecialChar menuseparator +Ouvrir un exemple\SpecialChar menuseparator Modules\SpecialChar menuseparator -Fancy Color Boxes +Boîtes colorées sophistiquées \family default - and the +et la \begin_inset CommandInset href LatexCommand href -name "tcolorbox documentation" +name "documentation tcolorbox" target "http://mirrors.ctan.org/macros/latex/contrib/tcolorbox/tcolorbox.pdf"; literal "false" \end_inset - for details. + pour les détails. \end_layout \begin_layout Subsection - -\lang english -Graphic boxes +Boîtes graphiques \end_layout \begin_layout Standard - -\lang english -This provides the custom insets +Ce module fournit les inserts personnalisés \family sans -Reflectbox +BoîteMiroir \family default , \family sans -Resizebox +BoîteRetaillée \family default , \family sans -Rotatebox +BoîtePivotée \family default - and + et \family sans -Scalebox +BoîteÉchelle \family default - to scale and rotate its content. + pour mettre à l'échelle et faire pivoter le contenu. \end_layout \begin_layout Standard \family sans -\lang english -Reflectbox +BoîteMiroir \family default - is a simple way of reversing text without any other enhancement: + offre un moyen simple de mettre le texte en miroir sans autre amélioration. \end_layout \begin_layout Standard - -\lang english \begin_inset Flex Reflectbox status open @@ -14335,19 +14319,16 @@ Great Western Railway \end_layout \begin_layout Standard - -\lang english -(You will need to use Ctrl-R to see any of these examples.) +(Vous devrez utiliser Ctrl-R (visionner) pour afficher l'un quelconque de ces exemples). \end_layout \begin_layout Standard \family sans -\lang english -Resizebox +BoîteRetaillée \family default - allows you to specify the dimensions of the text or image; - permissible units are em, +vous permet de spécifier les dimensions du texte ou de l'image; + les unités possibles sont em, ex, in, pt, @@ -14360,21 +14341,19 @@ Resizebox nc, bp, or sp; - if you enter + si vous saisissez \family typewriter ! \family default - for + pour \family typewriter -Height +Hauteur \family default - it scales by the width factor: + la mise à l'échelle utilise le facteur de largeur: \end_layout \begin_layout Standard - -\lang english \begin_inset Flex Resizebox status open @@ -14415,18 +14394,21 @@ Great Western Railway \begin_layout Standard \family sans -\lang english -Rotatebox +BoîtePivotée +\family default + vous permet de faire tourner son contenu autour du point de référence de la boîte. + Si vous voulez la faire tourner autour d'un point différent, + pl
[LyX/2.4.1-devel] Update fr.po: a couple of typos and shortcut conflicts resolution
commit 2c5a92d053e83d26a3adfe49da26edfed3b23bd7 Author: jpc Date: Wed Apr 10 18:57:58 2024 +0200 Update fr.po: a couple of typos and shortcut conflicts resolution --- po/fr.gmo | Bin 656498 -> 656513 bytes po/fr.po | 10 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/po/fr.gmo b/po/fr.gmo index 0ac78123f6..d9af9d027e 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/fr.po b/po/fr.po index 92ea86438a..21541e7330 100644 --- a/po/fr.po +++ b/po/fr.po @@ -363,7 +363,7 @@ msgstr "" "Project-Id-Version: LyX 2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2024-03-06 09:55+0100\n" -"PO-Revision-Date: 2024-04-02 17:50+0200\n" +"PO-Revision-Date: 2024-04-10 18:57+0200\n" "Last-Translator: Jean-Pierre Chrétien \n" "Language-Team: lyxfr\n" "Language: fr\n" @@ -10305,7 +10305,7 @@ msgstr "SousParagraphe" #: lib/layouts/powerdot.layout:365 lib/layouts/stdlists.inc:33 #: lib/layouts/stdlists.inc:75 lib/layouts/theorems-case.inc:71 msgid "Custom Item|s" -msgstr "Élément paramétrable|É" +msgstr "Élément paramétrable|p" #: lib/layouts/apa.layout:404 lib/layouts/apa.layout:442 #: lib/layouts/apax.inc:504 lib/layouts/apax.inc:542 @@ -12718,7 +12718,7 @@ msgstr "Notes" #: lib/layouts/enotez.module:2 msgid "Endnotes (Extended)" -msgstr "Endnotes (étendues)" +msgstr "Notes en fin de document (étendues)" #: lib/layouts/enotez.module:10 msgid "" @@ -14015,7 +14015,7 @@ msgstr "Boîtes permettant de mettre à l'échelle et faire tourner leur contenu #: lib/layouts/graphicboxes.module:12 lib/layouts/graphicboxes.module:15 msgid "Reflectbox" -msgstr "BoiteMiroir" +msgstr "BoîteMiroir" #: lib/layouts/graphicboxes.module:27 lib/layouts/graphicboxes.module:29 msgid "Scalebox" @@ -21223,7 +21223,7 @@ msgstr "Promouvoir la section|m" #: lib/ui/stdcontext.inc:392 msgid "Demote Section|m" -msgstr "Rétrograder la section|é" +msgstr "Rétrograder la section|R" #: lib/ui/stdcontext.inc:393 msgid "Move Section Down|D" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Fix compilation with msvc 2019
commit 25f11742036f762aa1a83d377bc416a519bca6ef
Author: Jean-Marc Lasgouttes
Date: Sun Apr 7 20:41:13 2024 +0200
Fix compilation with msvc 2019
'uint' is not defined, 'unsigned int' is better.
(cherry picked from commit c7f53afd319fc9028be74f8949cec00063972462)
---
src/Text.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Text.cpp b/src/Text.cpp
index d5a1069fa1..778c41820e 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -5958,7 +5958,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
// Argument?
if (!arg.empty()) {
if (isStrUnsignedInt(arg)) {
- num = convert(arg);
+ num = convert(arg);
if (num >= freeFonts.size()) {
cur.message(_("Invalid argument (number
exceeds stack size)!"));
break;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * layouttranslations.review, ack from Yitzhak.
commit 3540350d331202607320dd917aabea190f3f1b16
Author: Pavel Sanda
Date: Sun Apr 7 22:01:49 2024 +0200
* layouttranslations.review, ack from Yitzhak.
---
lib/layouttranslations.review | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index 03f909759e..6dddf03d27 100644
--- a/lib/layouttranslations.review
+++ b/lib/layouttranslations.review
@@ -22,12 +22,12 @@ ro sr
(30.11.2017, LyX 2.3.0 release )
Additionally to the top ones, these languages should be reviewed for the
following strings
"List of Listings"
-da fi gl he ko nb nn pl ro sl sr tr zh_CN zh_TW
+da fi gl ko nb nn pl ro sl sr tr zh_CN zh_TW
"Nomenclature[[output]]" -> The string that is output to PDF for the
nomenclature list
"see equation[[nomencl]]"
"page[[nomencl]]"
-da fi gl he ko nb nn pl ro sl sr tr zh_CN zh_TW
+da fi gl ko nb nn pl ro sl sr tr zh_CN zh_TW
-
LyX 2.4.0 release
@@ -35,7 +35,7 @@ LyX 2.4.0 release
"Notes[[Endnotes]]" -> The header string of endnotes (with "Endnotes (Basic)"
and "Footnotes as Endnotes
(Basic)" modules). This is to be distinguished from "Notes" used by the Notes
inset (which is more an
annotation than a list of (end)notes)
-ar el en eu fi he hu nb nl nn pl sv tr zh_CN zh_TW
+ar el en eu fi hu nb nl nn pl sv tr zh_CN zh_TW
Note that the localized enotez package has the following translations that
probably should be used:
Croatian: Bilje\v{s}ke
French: Remarques
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Do not include in InsetInfo.h
commit 89afdb050f2b59aeed09bb199cb698d904e2144d
Author: Jean-Marc Lasgouttes
Date: Thu Apr 4 17:35:54 2024 +0200
Do not include in InsetInfo.h
This is used by getDate/getTime, which actually should not be
InsetInfoParams methods, but functions in anonymous namespace.
(cherry picked from commit 51562ff37732f4949441bd8c2b55692b0719093a)
---
src/frontends/qt/GuiInfo.cpp | 1 +
src/insets/InsetInfo.cpp | 42 +-
src/insets/InsetInfo.h | 5 -
3 files changed, 22 insertions(+), 26 deletions(-)
diff --git a/src/frontends/qt/GuiInfo.cpp b/src/frontends/qt/GuiInfo.cpp
index 5ba0b19b46..232697fa5c 100644
--- a/src/frontends/qt/GuiInfo.cpp
+++ b/src/frontends/qt/GuiInfo.cpp
@@ -31,6 +31,7 @@
#include "support/gettext.h"
#include "support/lstrings.h"
+#include
using namespace std;
using namespace lyx::support;
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 3048456e84..df83f96b98 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -180,10 +180,9 @@ bool translateString(docstring const & in, docstring &
out, string const & lcode
out = translateIfPossible(in, lcode);
return in != out;
}
-} // namespace anon
-docstring InsetInfoParams::getDate(string const & iname, QDate const date)
const
+docstring getDate(string const & iname, QDate const date, Language const *
lang)
{
QLocale loc;
if (lang)
@@ -208,7 +207,7 @@ docstring InsetInfoParams::getDate(string const & iname,
QDate const date) const
}
-docstring InsetInfoParams::getTime(string const & iname, QTime const time)
const
+docstring getTime(string const & iname, QTime const time, Language const *
lang)
{
QLocale loc;
if (lang)
@@ -222,6 +221,7 @@ docstring InsetInfoParams::getTime(string const & iname,
QTime const time) const
else
return qstring_to_ucs4(loc.toString(time, toqstr(iname)));
}
+} // namespace anon
vector> InsetInfoParams::getArguments(Buffer const *
buf,
@@ -313,17 +313,17 @@ vector>
InsetInfoParams::getArguments(Buffer const * buf,
date = (gdate.isValid()) ? gdate : QDate::currentDate();
} else
date = QDate::currentDate();
- result.push_back(make_pair("long",getDate("long", date)));
- result.push_back(make_pair("short", getDate("short", date)));
- result.push_back(make_pair("loclong", getDate("loclong",
date)));
- result.push_back(make_pair("locmedium", getDate("locmedium",
date)));
- result.push_back(make_pair("locshort", getDate("locshort",
date)));
- result.push_back(make_pair("ISO", getDate("ISO", date)));
- result.push_back(make_pair("", getDate("", date)));
- result.push_back(make_pair("", getDate("", date)));
- result.push_back(make_pair("MMM", getDate("MMM", date)));
- result.push_back(make_pair("", getDate("", date)));
- result.push_back(make_pair("ddd", getDate("ddd", date)));
+ result.push_back(make_pair("long",getDate("long", date, lang)));
+ result.push_back(make_pair("short", getDate("short", date,
lang)));
+ result.push_back(make_pair("loclong", getDate("loclong", date,
lang)));
+ result.push_back(make_pair("locmedium", getDate("locmedium",
date, lang)));
+ result.push_back(make_pair("locshort", getDate("locshort",
date, lang)));
+ result.push_back(make_pair("ISO", getDate("ISO", date, lang)));
+ result.push_back(make_pair("", getDate("", date,
lang)));
+ result.push_back(make_pair("", getDate("", date,
lang)));
+ result.push_back(make_pair("MMM", getDate("MMM", date, lang)));
+ result.push_back(make_pair("", getDate("", date,
lang)));
+ result.push_back(make_pair("ddd", getDate("ddd", date, lang)));
result.push_back(make_pair("custom", _("Custom")));
break;
}
@@ -344,9 +344,9 @@ vector>
InsetInfoParams::getArguments(Buffer const * buf,
time = (gtime.isValid()) ? gtime : QTime::currentTime();
} else
time = QTime::currentTime();
- result.push_back(make_pair("long",getTime("long", time)));
- result.push_back(make_pair("short", getTime("short", time)));
- result.push_back(make_pair("ISO", getTime("ISO", time)));
+ result.push_back(make_pair("long",getTime("long", time, lang)));
+ result.push_back(make_pair("short", getTime("short", time,
lang)));
+ result.push_back(make_pair("ISO", getTime("ISO", time, lang)));
result.push_back(make_pair("custom", _("Custom")));
break
[LyX/2.4.1-devel] French Additional manual, translation of chapter 4 up to sec. 4.3
commit 36f8cd0a8ee6604a4f5341fffafd2e8ec44915ac Author: jpc Date: Sat Apr 6 18:42:09 2024 +0200 French Additional manual, translation of chapter 4 up to sec. 4.3 --- lib/doc/fr/Additional.lyx | 336 +- 1 file changed, 154 insertions(+), 182 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index fc6956d2ed..f340ba497e 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -13850,141 +13850,118 @@ Modules \end_layout \begin_layout Section - -\lang english -Academic Field Specifics +Particularités d'un domaine académique \end_layout \begin_layout Subsection - -\lang english -Chemistry: - Hazard and Precautionary Statements +Chimie: + mentions de danger et conseils de prudence \end_layout \begin_layout Standard - -\lang english -This module provides two insets and a paragraph style to typeset numbers and phrases of chemical hazard and precautionary statements. - For a description see +Ce module fournit deux inserts et un style de paragraphe pour imprimer les nombres et les phrases des mentions de danger et des conseils de prudence pour la chimie. + Pour une description, + voir \family sans -File\SpecialChar menuseparator -Open Example\SpecialChar menuseparator +Fichier\SpecialChar menuseparator +Ouvrir un exemple\SpecialChar menuseparator Modules\SpecialChar menuseparator -Hazard and Precautionary Statements +Chimie: + mentions de danger et conseils de prudence \family default - and + et \family sans -Help\SpecialChar menuseparator -Specific Manuals\SpecialChar menuseparator -Hazard and Precautionary Statements -\family default -. +Aide\SpecialChar menuseparator +Manuels spécifiques\SpecialChar menuseparator +Chimie: + mentions de danger et conseils de prudence. \end_layout \begin_layout Subsection - -\series bold -\lang english -Chemistry: - Risk and Safety Statements +Chimie: + énoncés de risque et sécurité \end_layout \begin_layout Standard - -\lang english -This module provides two insets, +Ce module fournit deux inserts , \family sans -R-S number +numéro R-S \family default - and + et \family sans -R-S phrase +phrase R-S \family default , - accessible via the menu + accessibles via le menu \family sans \bar under I \bar default -nsert\SpecialChar menuseparator -Custom +nsertion\SpecialChar menuseparator +Inserts \begin_inset space ~ \end_inset -Insets +personnalisables \family default - and an environment to typeset numbers and phrases of chemical risk and safety statements. + et un environnement pour imprimer les énoncés de risque et sécurité. + Ces énoncés sont devenus obsolètes, + voir les mentions de danger et conseils de prudence ci-dessus. \end_layout \begin_layout Subsection \lang english -Linguistics +LinguistiqueLinguistics \end_layout \begin_layout Standard - -\lang english -This module provides specific environments useful for linguistics (numbered examples, - glosses, - semantic markup, - OT tableau floats). - You can obtain information about this module in +Ce document décrit quelques fonctionnalités de \SpecialChar LyX + utiles aux linguistes. + Il montre comment utiliser ces fonctionnalités de base pour produire des exemples numérotés, + des gloses interlinéaires, + des tableaux résultant de la théorie de l'optimalité, + un balisage sémantique, + des structures arborescentes, + des structures de représentation du discours (DRS) et des symboles phonétiques (API). + Vous pouvez trouver des informations sur ce module via \family sans -\bar under -H -\bar default -elp\SpecialChar menuseparator -S -\bar under -p -\bar default -ecific -\begin_inset space ~ -\end_inset - -Manuals\SpecialChar menuseparator + Aide\SpecialChar menuseparator +Manuels spécifiques\SpecialChar menuseparator \bar under L \bar default -inguistics +inguistique \family default - and + et \family sans -File\SpecialChar menuseparator -Open Example\SpecialChar menuseparator +Fichier\SpecialChar menuseparator +Ouvrir un exemple\SpecialChar menuseparator Modules\SpecialChar menuseparator -Linguistics +Linguisti \family default -. +que. \end_layout \begin_layout Section - -\lang english -Accessibility +Accessibilité \end_layout \begin_layout Subsection - -\lang english Braille \end_layout \begin_layout Standard - -\lang english -This module supports the Braille script. - It requires the \SpecialChar LaTeX - package +The module permet l'écriture du Braille. + Il requiert le paquetage \SpecialChar LaTeX + \family typewriter braille.sty \family default . - This and its documentation can be obtained from + Ce paquetage et sa documentation sont accessibles via \begin_inset CommandInset href LatexCommand href name "CTAN" @@ -13994,31 +13971,16 @@ literal "false" \end_inset . - See + Voir \family sans -\bar under -H -\bar default -elp\SpecialChar menuseparator -S -\bar under -p -\bar default -ecific -\begin_inset sp
[LyX/2.4.1-devel] Fix assertion when pasting paragraph with insets in lyxrc.ct_markup_copied
commit 87b3bea823080b493e2e2f22b3ee9a45de97e34d
Author: Juergen Spitzmueller
Date: Sat Apr 6 09:47:22 2024 +0200
Fix assertion when pasting paragraph with insets in lyxrc.ct_markup_copied
This has to be done after the inset buffers have been initialized.
(cherry picked from commit 9198ed5965809a1e951d1b721899d0051e619e34)
---
src/CutAndPaste.cpp | 45 +
1 file changed, 25 insertions(+), 20 deletions(-)
diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp
index 7fd76f98bc..276285dfbc 100644
--- a/src/CutAndPaste.cpp
+++ b/src/CutAndPaste.cpp
@@ -292,26 +292,6 @@ pasteSelectionHelper(DocIterator const & cur,
ParagraphList const & parlist,
if
(!target_inset->insetAllowed(inset->lyxCode()))
tmpbuf->eraseChar(i--, false);
}
-
- if (lyxrc.ct_markup_copied) {
- // Only remove deleted text and change
- // the rest to inserted if ct is active,
- // otherwise leave markup as is
- if (buffer.params().track_changes) {
- if (tmpbuf->size() > 0) {
- if (!isFullyDeleted(insertion))
- tmpbuf->acceptChanges(0,
tmpbuf->size());
- else
- tmpbuf->rejectChanges(0,
tmpbuf->size());
- }
- tmpbuf->setChange(Change(Change::INSERTED));
- }
- } else
- // Resolve all markup to inserted or unchanged
- // Deleted text has already been removed on copy
- // (copySelectionHelper)
- tmpbuf->setChange(Change(buffer.params().track_changes ?
-Change::INSERTED :
Change::UNCHANGED));
}
bool const target_empty = pars[pit].empty();
@@ -495,6 +475,31 @@ pasteSelectionHelper(DocIterator const & cur,
ParagraphList const & parlist,
}
insertion.swap(in.paragraphs());
+ // We need to do this here, after the inset handling above,
+ // as acceptChanges() and rejectChanges() might access inset buffers.
+ tmpbuf = insertion.begin();
+ for (; tmpbuf != insertion.end(); ++tmpbuf) {
+ if (lyxrc.ct_markup_copied) {
+ // Only remove deleted text and change
+ // the rest to inserted if ct is active,
+ // otherwise leave markup as is
+ if (buffer.params().track_changes) {
+ if (tmpbuf->size() > 0) {
+ if (!isFullyDeleted(insertion))
+ tmpbuf->acceptChanges(0,
tmpbuf->size());
+ else
+ tmpbuf->rejectChanges(0,
tmpbuf->size());
+ }
+ tmpbuf->setChange(Change(Change::INSERTED));
+ }
+ } else
+ // Resolve all markup to inserted or unchanged
+ // Deleted text has already been removed on copy
+ // (copySelectionHelper)
+ tmpbuf->setChange(Change(buffer.params().track_changes ?
+Change::INSERTED :
Change::UNCHANGED));
+ }
+
// Split the paragraph for inserting the buf if necessary.
if (!target_empty)
breakParagraphConservative(buffer.params(), pars, pit, pos);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Cmake build: Make QT5-compilation be default
commit c971974f331c249fa4d57953d8d93c107c154024
Author: Kornel Benko
Date: Sat Apr 6 12:36:47 2024 +0200
Cmake build: Make QT5-compilation be default
---
CMakeLists.txt | 36 ++--
1 file changed, 22 insertions(+), 14 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fb6cf284a..363f413153 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -662,23 +662,31 @@ endif()
set(min_qt5_version "5.6")
if(LYX_USE_QT MATCHES "AUTO")
- # try qt6 first
- find_package(Qt6Core CONFIG QUIET)
- if (Qt6Core_FOUND)
- set(LYX_USE_QT "QT6" CACHE STRING "Valid qt version" FORCE)
- message(STATUS "Qt6Core_VERSION = ${Qt6Core_VERSION}")
- else()
- find_package(Qt5Core CONFIG QUIET)
- if(Qt5Core_FOUND)
- set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version"
FORCE)
- message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
- if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
- message(FATAL_ERROR "No appropriate QT-version
found")
- endif()
+ # try qt5 first
+ find_package(Qt5Core CONFIG QUIET)
+ if(Qt5Core_FOUND)
+ message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
+ if(Qt5Core_VERSION VERSION_LESS ${min_qt5_version})
+ message(STATUS "No appropriate QT-version found")
+ set(Qt5Core_FOUND OFF)
else()
- message(FATAL_ERROR "No appropriate QT-version found")
+ set(LYX_USE_QT "QT5" CACHE STRING "Valid qt version"
FORCE)
+ set(Qt6Core_FOUND OFF)
endif()
endif()
+ if (NOT Qt5Core_FOUND)
+ foreach(_mod Core Gui Widgets Concurrent Svg)
+ find_package(Qt6${_mod} CONFIG QUIET)
+ if (NOT Qt6${_mod}_FOUND)
+ message(FATAL_ERROR "Not found Qt6${_mod},
aborting use of QT6")
+ set(Qt6Core_FOUND OFF)
+ break()
+ else()
+ message(STATUS "Found Qt6${_mod}")
+ endif()
+ endforeach()
+ set(LYX_USE_QT "QT6" CACHE STRING "Valid qt version" FORCE)
+ endif()
endif()
# When shared libs are supported enable this option
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * LFUNs.lyx - regenerate
commit cc4256e3bc8ad4c4b968324f54aee40c53a32640 Author: Pavel Sanda Date: Fri Apr 5 20:01:19 2024 +0200 * LFUNs.lyx - regenerate lib/doc/LFUNs.lyx | 2446 +++-- 1 file changed, 1792 insertions(+), 654 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * quote-insert lfun description
commit 167534f6cffde63a60cffee58d5d932706c8c2ed Author: Pavel Sanda Date: Fri Apr 5 19:47:20 2024 +0200 * quote-insert lfun description --- src/LyXAction.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 19f12038a8..e7abbc51c1 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3466,7 +3466,7 @@ void LyXAction::init() * \var lyx::FuncCode lyx::LFUN_QUOTE_INSERT * \li Action: Inserts quotes according to the type and quote-language preference. * \li Notion: Currently 15 different quote styles are distinguished (see params). - * \li Syntax: quote-insert [] [] [
[LyX/2.4.1-devel] Revert "Update sk.po"
commit 4690de2bca0cf9750fe3b145d785613becfea58e Author: jpc Date: Fri Apr 5 17:48:43 2024 +0200 Revert "Update sk.po" This reverts commit 148001f6fe5575cb3752f11a76360d0372d74ade. --- po/sk.po | 15 --- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/po/sk.po b/po/sk.po index b848decde2..e4fac1562a 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-04-02 09:51+0200\n" -"PO-Revision-Date: 2024-04-02 09:29+\n" +"POT-Creation-Date: 2024-03-07 11:49+0100\n" +"PO-Revision-Date: 2024-03-07 10:52+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -21742,12 +21742,8 @@ msgid "End of Sentence|E" msgstr "Koniec vety|K" #: lib/ui/stdmenus.inc:418 -msgid "Plain Double Quotation Mark|Q" -msgstr "Prostá dvojitá úvodzovka|P" - -#: lib/ui/stdmenus.inc:419 -msgid "Plain Single Quotation Mark|S" -msgstr "Jednoduchá úvodzovka|J" +msgid "Plain Quotation Mark|Q" +msgstr "Prosté úvodzovky|P" #: lib/ui/stdmenus.inc:419 msgid "Inner Quotation Mark|n" @@ -44193,6 +44189,3 @@ msgstr "Neznámy používateľ" #~ msgid "No, &Dismiss Changes" #~ msgstr "Nie, zmeny &zahodiť" - -#~ msgid "Plain Quotation Mark|Q" -#~ msgstr "Prosté úvodzovky|P" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] * ANNOUNCE
commit 0ac87a2bebadb364c9666e3474422f1c11686ae2 Author: Pavel Sanda Date: Wed Apr 3 21:49:05 2024 +0200 * ANNOUNCE --- ANNOUNCE | 25 ++--- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 7ab3aff7d0..27a66fa894 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -1,15 +1,11 @@ -Public release of LyX version 2.4.0 RC4 -= +Public release of LyX version 2.4.0 +=== -We are proud to announce the first public release candidate of the new LyX 2.4 -series. This pre-release is meant for testing and should not be used for -serious work. For curious users who would like to test in order to help catch -bugs before the 2.4.0 release, please back up all of your documents and be -prepared for the worst to happen. Most users (who desire a stable LyX version) -should not use this pre-release. +We are proud to announce the release of the new LyX 2.4 series. -The 2.4 series has a rich set of new features compared to the current stable -series. An overview of the new features can be found here: +After long 5 years of development the 2.4 series has a rich set +of new features compared to the current stable series. +An overview of the new features can be found here: https://wiki.lyx.org/LyX/NewInLyX24 @@ -17,10 +13,9 @@ As this release ships with new features, we strongly recommend that packagers of LyX on various platforms and distributions read RELEASE-NOTES in order to get the new dependencies right. -You can download LyX 2.4.0 RC4 from http://ftp.lyx.org/pub/lyx/devel/ or -from a mirror listed at https://www.lyx.org/Download#toc11. +You can download LyX 2.4.0 from https://www.lyx.org/Download -We appreciate your help in testing this pre-release! +We hope you will enjoy the result! If a file from an earlier version of LyX is opened *and saved* with any version of 2.4.x, then the original file will automatically be @@ -37,9 +32,9 @@ The file RELEASE-NOTES also lists some known issues and problems compared to the current stable releases (LyX 2.3.x). As with any major release, this one comes with a lot of new features but -also some bugs. If you think you have found a bug in LyX 2.4.0 RC4, either +also some bugs. If you think you have found a bug in LyX 2.4.0, either email the LyX developers' mailing list (lyx-devel at lists.lyx.org), -or open a bug report at https://www.lyx.org/trac/wiki/BugTrackerHome. +or open a bug report at https://www.lyx.org/trac/wiki/BugTrackerHome . Please specify if the behavior you are reporting is different from behavior in a previous LyX version. -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update update-po.sh script
commit 37641cb08b8ebb0503df4509de4082e96df3e19b Author: Richard Kimberly Heck Date: Thu Apr 4 17:09:16 2024 -0400 Update update-po.sh script (cherry picked from commit b360b9ebf7c2b1bbb0fe674790ed78065c3780c0) (cherry picked from commit eb57c93aab05d586e8b06ef8a7277850f1591e24) --- development/tools/update-po.sh | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/development/tools/update-po.sh b/development/tools/update-po.sh index 596c3fbbe9..25be194359 100755 --- a/development/tools/update-po.sh +++ b/development/tools/update-po.sh @@ -26,7 +26,7 @@ done if [ -z "$FARM" ]; then echo "You must set the FARM variable to run this script, e.g.:"; - echo "# FARM=/cvs/lyx-www/ bash check-po.sh"; + echo "# FARM=/cvs/lyx-www/ bash update-po.sh"; exit 1; fi @@ -93,7 +93,7 @@ fi if diff -w -q "$I18NFILE $FARM/$I18NFILE" >/dev/null 2>&1; then echo No string differences found. - git checkout ./*.po; + git checkout ./*.po ./*.gmo; exit 0; fi @@ -138,11 +138,13 @@ if ! cd "$FARM"; then fi echo Updating the www-user tree... -# note that we're assuming this one is svn. -svn up; +if ! git pull; then + echo "Problem updating www-user tree"; + exit 1; +fi echo Moving $I18NFILE...; mv "$LYXROOT/po/$I18NFILE" .; echo Committing...; -$DEBUG svn commit -m "* $I18NFILE: update stats" $I18NFILE; +$DEBUG git commit -m "* $I18NFILE: update stats" $I18NFILE; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Couple of corrections in RELEASE-NOTES (mainly typos)
commit d35288f4cd4359bde642473889fa28ad560cd7bc Author: Juergen Spitzmueller Date: Fri Apr 5 13:44:19 2024 +0200 Couple of corrections in RELEASE-NOTES (mainly typos) --- lib/RELEASE-NOTES | 20 +--- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/lib/RELEASE-NOTES b/lib/RELEASE-NOTES index 3273085211..7b103e6f93 100644 --- a/lib/RELEASE-NOTES +++ b/lib/RELEASE-NOTES @@ -35,7 +35,7 @@ * Continuous spellcheck is now on by default, but only if the user does not have an existing preferences file. In that case, the old setting is preserved. -* Document (or selection statistics) is now shown in status bar and can be +* Document (or selection) statistics is now shown in status bar and can be disabled by the context menu. * The actual enabled state of the synchronize TeX output option of the document @@ -44,11 +44,11 @@ * When using the document compare function, there is now an option to display the differences using a special "Document Compare" author. -* InsetRef now supports starred commands. The starred commands stop hyperref from - creating a link (and are only available when hyperref is used). There is a - checkbox "No Hyperlink" for this purpose. +* The cross reference inset now supports starred commands. The starred commands + stop hyperref from creating a link (and are only available when hyperref is used). + There is a checkbox "No Hyperlink" for this purpose. -* Alt-Escape can be used to 'float' and redock widgets like the table of contents +* Alt-Escape can be used to 'float' and redock widgets such as the table of contents or source view. * Edit > Paste operation now preserves newlines in text by default. @@ -109,10 +109,11 @@ be found when processing your documents. Package maintainers of distributions (e.g. openSUSE or Debian derivates) where ghostscript conversions of ImageMagick are banned can simply - add dependencies for poppler-utils and libtiff-tools to workaround + add dependencies for poppler-utils and libtiff-tools to work around the problem. -* LyX now supports hebrew and hungarian quotation styles. +* LyX now supports Hebrew and Hungarian quotation styles. + !!!The following pref variables were added in 2.4: @@ -138,6 +139,7 @@ !!!The following pref variables were changed in 2.4: +* none. !!!The following pref variables are obsoleted in 2.4: @@ -251,6 +253,7 @@ * date-insert: obsoleted by info-insert date. + !!!The following LyX function has been added and then removed in 2.4 development cycle. * bidi: used as a first solution to provide icons that change @@ -281,6 +284,7 @@ !!!The following preferences files have been removed from the tarball in 2.4: +* none. !!!The following metadata files have been added to the tarball in 2.4: @@ -300,6 +304,7 @@ * The dependency on sgmltools was dropped, see DocBook 5 section. + !!! Dependencies to generate ePub files: * The DocBook XSLT 1.0 style sheets are a required dependency to generate @@ -368,6 +373,7 @@ or layout and argument to the appropriate list, or dictionary in the function "convert_hebrew_parentheses(document)" in lyx_2_4.py. + !! If upgrading from a LyX version before 2.3.0 * Please additionally see the release notes from the versions in-between: -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Fix label escaping in InsetMathRef (#12980)
commit 1dad179256a7d3f9cc0e5bf609b835c88d005c4e
Author: Juergen Spitzmueller
Date: Tue Apr 2 08:15:53 2024 +0200
Fix label escaping in InsetMathRef (#12980)
This was completely broken: the IDs have been escaped in the LyX file
(which they absolutely shouldn't) but not in all LaTeX output (which
they should).
(cherry picked from commit 98080ca0d548b754433a99f9f097054134117184)
---
src/insets/InsetCommandParams.cpp | 9 ++---
src/insets/InsetCommandParams.h | 2 +-
src/mathed/InsetMathRef.cpp | 22 --
src/mathed/MathExtern.cpp | 15 ++-
src/mathed/MathFactory.cpp| 2 +-
5 files changed, 30 insertions(+), 20 deletions(-)
diff --git a/src/insets/InsetCommandParams.cpp
b/src/insets/InsetCommandParams.cpp
index 034f9d59c8..9c3552a4b7 100644
--- a/src/insets/InsetCommandParams.cpp
+++ b/src/insets/InsetCommandParams.cpp
@@ -569,7 +569,7 @@ docstring InsetCommandParams::prepareCommand(OutputParams
const & runparams,
}
-docstring InsetCommandParams::getCommand(OutputParams const & runparams, bool
starred) const
+docstring InsetCommandParams::getCommand(OutputParams const & runparams, bool
starred, bool unhandled) const
{
docstring s = '\\' + from_ascii(cmdName_);
if (starred)
@@ -579,20 +579,23 @@ docstring InsetCommandParams::getCommand(OutputParams
const & runparams, bool st
ParamInfo::const_iterator end = info_.end();
for (; it != end; ++it) {
std::string const & name = it->name();
+ ParamInfo::ParamHandling handling = unhandled ?
+ ParamInfo::HANDLING_NONE
+ : it->handling();
switch (it->type()) {
case ParamInfo::LYX_INTERNAL:
break;
case ParamInfo::LATEX_REQUIRED: {
docstring const data =
- prepareCommand(runparams, (*this)[name],
it->handling());
+ prepareCommand(runparams, (*this)[name],
handling);
s += '{' + data + '}';
noparam = false;
break;
}
case ParamInfo::LATEX_OPTIONAL: {
docstring data =
- prepareCommand(runparams, (*this)[name],
it->handling());
+ prepareCommand(runparams, (*this)[name],
handling);
if (!data.empty()) {
s += '[' + protectArgument(data) + ']';
noparam = false;
diff --git a/src/insets/InsetCommandParams.h b/src/insets/InsetCommandParams.h
index 134b46a604..f05fb61ddc 100644
--- a/src/insets/InsetCommandParams.h
+++ b/src/insets/InsetCommandParams.h
@@ -136,7 +136,7 @@ public:
///
void Write(std::ostream & os, Buffer const * buf) const;
/// Build the complete LaTeX command
- docstring getCommand(OutputParams const &, bool starred = false) const;
+ docstring getCommand(OutputParams const &, bool starred = false, bool
unhandled = false) const;
/// Return the command name
std::string const & getCmdName() const { return cmdName_; }
/// Set the name to \p n. This must be a known name. All parameters
diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index ad2e499167..082a341cf4 100644
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -76,7 +76,7 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
switch (cmd.action()) {
case LFUN_INSET_MODIFY: {
string const arg0 = cmd.getArg(0);
- string const arg1 = cmd.getArg(1);
+ string const arg1 = cmd.getArg(1);
if (arg0 == "ref") {
if (arg1 == "changetarget") {
string const oldtarget = cmd.getArg(2);
@@ -295,25 +295,27 @@ void InsetMathRef::write(TeXMathStream & os) const
LYXERR0("Unassigned buffer_ in InsetMathRef::write!");
LYXERR0("LaTeX output may be wrong!");
}
+ // are we writing to the LyX file?
+ if (!os.latex()) {
+ // if so, then this is easy
+ InsetMathCommand::write(os);
+ return;
+ }
bool const use_refstyle =
buffer_ && buffer().params().use_refstyle;
bool special_case = cmd == "formatted" ||
cmd == "labelonly" ||
(cmd == "eqref" && use_refstyle);
- // are we writing to the LyX file or not in a special case?
- if (!os.latex() || !special_case) {
- // if so, then this is easy
- InsetMathCommand::write(os);
- return;
- }
// we need to translate 'formatted' to prettyref or refsty
[LyX/2.4.1-devel] Compilation fix with Qt < 5.7
commit 0cd169d6baecb4e6854c408a7452a843e57070e6
Author: Jean-Marc Lasgouttes
Date: Wed Apr 3 12:39:09 2024 +0200
Compilation fix with Qt < 5.7
Qt::ImAnchorRectangle has only been introduced in Qt 5.7. Since it is
used to answer a query from the IM machinery, there is no need for
it with older Qt versions.
(cherry picked from commit 6260689fd552a5e83d2970dcfd4d5ba7e09443e7)
---
src/frontends/qt/GuiWorkArea.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/frontends/qt/GuiWorkArea.cpp b/src/frontends/qt/GuiWorkArea.cpp
index a4b874097c..341fddc3b8 100644
--- a/src/frontends/qt/GuiWorkArea.cpp
+++ b/src/frontends/qt/GuiWorkArea.cpp
@@ -1422,10 +1422,12 @@ QVariant
GuiWorkArea::inputMethodQuery(Qt::InputMethodQuery query) const
return QVariant(d->im_cursor_rect_);
break;
}
+#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)
case Qt::ImAnchorRectangle: {
return QVariant(d->im_anchor_rect_);
break;
}
+#endif
default:
return QWidget::inputMethodQuery(query);
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Translation of French Additional.lyx: chapter 3 completed
commit a8338bb712aedc718eb185eef34010a782c6e880 Author: jpc Date: Tue Apr 2 11:51:49 2024 +0200 Translation of French Additional.lyx: chapter 3 completed --- lib/doc/fr/Additional.lyx | 115 +- 1 file changed, 52 insertions(+), 63 deletions(-) diff --git a/lib/doc/fr/Additional.lyx b/lib/doc/fr/Additional.lyx index ba756a6839..fc6956d2ed 100644 --- a/lib/doc/fr/Additional.lyx +++ b/lib/doc/fr/Additional.lyx @@ -13029,36 +13029,35 @@ seminar Rapports \end_layout -\begin_layout Subsection - -\lang english -report -\end_layout - \begin_layout Standard - -\lang english -Report classes are sort of a hybrid between book and article classes: - like book classes, - they provide parts, - chapters and sections but does not provide frontmatter, - mainmatter, - and backmatter; - like article classes, - they provide abstract paragraph styles and are one-sided by default. - Also, - they do not start a new chapter on the right hand page (even in two-side mode). +Les classes +\family sans +Rapports +\family default + constituent en quelque sorte une hybridation entre les classes +\family sans +Livres +\family default + et les classes +\family sans +Articles +\family default +: + comme les livres, + elles proposent des parties, + des chapitres et des sections, + mais ne prévoient pas de préliminaires (frontmatter), + de corps principal (mainmatter) et de compléments (backmatter); + comme les articles, + elles proposent des styles pour le résumé et sont implicitement en recto seul. + En outre, + elles ne positionnent pas un nouveau chapitre en page impaire, + même en mode recto-verso. \end_layout \begin_layout Standard - -\lang english -All externally maintained -\family sans -report -\family default - document classes that are officially supported by \SpecialChar LyX - are described in the Collections (section +Toutes le classes Rapports en maintenance externe qui sont reconnues officiellement par \SpecialChar LyX + sont décrites dans les Collections (section \begin_inset space ~ \end_inset @@ -13074,19 +13073,14 @@ nolink "false" \end_layout \begin_layout Itemize - -\lang english -For -\family sans -Japanese Report (Standard Class, - vertical Writing) -\family default - and +pour \family sans -Japanese Report (Standard Class) +Rapport japonais (classe standard, + écriture verticale), + Rapport japonais (classe standard) \family default -, - see section + et les autres classes pour le japonais, + voir la section \begin_inset space ~ \end_inset @@ -13103,20 +13097,21 @@ nolink "false" \begin_layout Itemize -\lang english -For \family sans -KOMA-Script Report +pour Report KOMA-Script \family default , - see section + voir la section \begin_inset space ~ \end_inset \begin_inset CommandInset ref LatexCommand ref -reference "subsec:KOMA-Script" +reference "subsec:Koma-Script" +plural "false" +caps "false" +noprefix "false" nolink "false" \end_inset @@ -13125,14 +13120,12 @@ nolink "false" \end_layout \begin_layout Itemize - -\lang english -For +pour \family sans -Report (Standard Class with Extra Font Sizes) +Report (classe standard avec tailles de police supplémentaires) \family default , - see section + voir la section \begin_inset space ~ \end_inset @@ -13147,22 +13140,20 @@ nolink "false" . \end_layout -\begin_layout Subsection - -\lang english -For +\begin_layout Itemize +pour \family sans -Polish Report (MW Bundle) +Rapport polonais (paquet MW) \family default , - see section + voir la section \begin_inset space ~ \end_inset \begin_inset CommandInset ref LatexCommand ref -reference "subsec:Polish-M.W.collection" +reference "subsec:Collection-plonaise-M.W." plural "false" caps "false" noprefix "false" @@ -13178,18 +13169,16 @@ Scripts \end_layout \begin_layout Standard - -\lang english -In the +Dans la catégorie \family sans Scripts \family default - category, - we assemble document classes that help to write drama or movie scripts. - The category is also open for other scripts, - such as lecture scripts, - for which no classes are officially supported yet by \SpecialChar LyX - though. +, + nous rassemblons les classes de documents permettant d'écrire des pièces de théâtre ou des scénarios de films. + Cette catégorie est également ouverte pour d'autres scripts, + comme des scripts de cours, + pour lesquels aucune classe n'est encore reconnue par \SpecialChar LyX + cependant. \end_layout \begin_layout Subsection -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update fr.po
commit 1b0f8fae8a7acc84b445c34d0e11139d3383d4fa
Author: jpc
Date: Tue Apr 2 18:52:32 2024 +0200
Update fr.po
---
po/fr.gmo | Bin 656494 -> 656498 bytes
po/fr.po | 26 +-
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/po/fr.gmo b/po/fr.gmo
index 8f1fc37a82..0ac78123f6 100644
Binary files a/po/fr.gmo and b/po/fr.gmo differ
diff --git a/po/fr.po b/po/fr.po
index 74cce5f396..92ea86438a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -363,7 +363,7 @@ msgstr ""
"Project-Id-Version: LyX 2.4\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
"POT-Creation-Date: 2024-03-06 09:55+0100\n"
-"PO-Revision-Date: 2024-03-06 10:25+0100\n"
+"PO-Revision-Date: 2024-04-02 17:50+0200\n"
"Last-Translator: Jean-Pierre Chrétien \n"
"Language-Team: lyxfr\n"
"Language: fr\n"
@@ -3282,7 +3282,7 @@ msgstr "Langage"
#: src/frontends/qt/ui/ListingsUi.ui:343
msgid "Lan&guage[[Programming]]:"
-msgstr "Lan&gage"
+msgstr "Lan&gage :"
#: src/frontends/qt/ui/ListingsUi.ui:353
msgid "Select the programming language"
@@ -6930,7 +6930,7 @@ msgstr ", "
#: lib/citeengines/biblatex.citeengine:147
#: lib/citeengines/natbib.citeengine:126 lib/layouts/stdciteformats.inc:30
msgid ", and [[separate name of last author in citation]]"
-msgstr " et "
+msgstr ", et "
#: lib/citeengines/biblatex-natbib.citeengine:156
#: lib/citeengines/biblatex.citeengine:148
@@ -7465,7 +7465,7 @@ msgstr "Cas"
#: lib/layouts/AEA.layout:206 lib/layouts/elsart.layout:546
#: lib/layouts/theorems-without-preamble.inc:458
msgid "Case ##"
-msgstr "Cas ##."
+msgstr "Cas ##"
#: lib/layouts/AEA.layout:213 lib/layouts/theorems-without-preamble.inc:464
msgid "Case \\thecase."
@@ -14813,7 +14813,7 @@ msgstr "Akigumi"
#: lib/layouts/jlreq-common.inc:302
msgid "Akigumi (LuaLaTeX)"
-msgstr "Akigumi(LuaLaTeX) "
+msgstr "Akigumi (LuaLaTeX)"
#: lib/layouts/jlreq-common.inc:304
msgid "Char Space"
@@ -16921,7 +16921,7 @@ msgstr "Liste numérotée (niveau 2)"
#: lib/layouts/powerdot.layout:621
msgid "(\\arabic{enumii})"
-msgstr "(\\arabic{enumi})"
+msgstr "(\\arabic{enumii})"
#: lib/layouts/powerdot.layout:625 lib/layouts/stdcounters.inc:63
msgid "Numbered List (Level 3)"
@@ -16929,7 +16929,7 @@ msgstr "Liste numérotée (niveau 3)"
#: lib/layouts/powerdot.layout:627
msgid "(\\arabic{enumiii})"
-msgstr "(\\arabic{enumi})"
+msgstr "(\\arabic{enumiii})"
#: lib/layouts/powerdot.layout:631 lib/layouts/stdcounters.inc:70
msgid "Numbered List (Level 4)"
@@ -16937,7 +16937,7 @@ msgstr "Liste numérotée (niveau 4)"
#: lib/layouts/powerdot.layout:633
msgid "(\\arabic{enumiv})"
-msgstr "(\\arabic{enumi})"
+msgstr "(\\arabic{enumiv})"
#: lib/layouts/powerdot.layout:637 lib/layouts/stdcounters.inc:77
msgid "Bibliography Item"
@@ -28295,7 +28295,7 @@ msgstr "Bienvenue"
#: lib/examples/Articles:0
msgid "Writing Korean with CJK-ko"
-msgstr "Écriture du coréen avec CJK-ko "
+msgstr "Écriture du coréen avec CJK-ko"
#: lib/examples/Articles:0
msgid "Hebrew Article (KOMA-Script)"
@@ -29924,7 +29924,7 @@ msgstr "caractère spécial"
#: src/Color.cpp:305
msgid "math text"
-msgstr "Texte mathématique"
+msgstr "texte mathématique"
#: src/Color.cpp:306
msgid "math background"
@@ -30722,7 +30722,7 @@ msgstr "Exécution du processeur d'index."
#: src/LaTeX.cpp:460
msgid "Index Processor Error"
-msgstr "Erreur du processeur d'index."
+msgstr "Erreur du processeur d'index"
#: src/LaTeX.cpp:461
msgid ""
@@ -30851,7 +30851,7 @@ msgstr "&Quitter LyX"
#: src/LyX.cpp:597
msgid "No python is found"
-msgstr "python introuvable"
+msgstr "Python introuvable"
#: src/LyX.cpp:598
msgid ""
@@ -33058,7 +33058,7 @@ msgstr "%1$s (%2$s)"
#: src/frontends/qt/GuiBranch.cpp:70
msgid "master"
-msgstr "Document maître"
+msgstr "document maître"
#: src/frontends/qt/GuiBranch.h:35
msgid "Branch Settings"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Cmake build: Adapt for branch 2.4
commit 993e784a6284a3e0ee54014567629d01ad4cbf99
Author: Kornel Benko
Date: Tue Apr 2 10:46:20 2024 +0200
Cmake build: Adapt for branch 2.4
---
CMakeLists.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 38e11b8a0b..0fb6cf284a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -664,9 +664,9 @@ set(min_qt5_version "5.6")
if(LYX_USE_QT MATCHES "AUTO")
# try qt6 first
find_package(Qt6Core CONFIG QUIET)
- if (Qt6Core_Found)
+ if (Qt6Core_FOUND)
set(LYX_USE_QT "QT6" CACHE STRING "Valid qt version" FORCE)
- message(STATUS "Qt5Core_VERSION = ${Qt5Core_VERSION}")
+ message(STATUS "Qt6Core_VERSION = ${Qt6Core_VERSION}")
else()
find_package(Qt5Core CONFIG QUIET)
if(Qt5Core_FOUND)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update sk.po
commit 148001f6fe5575cb3752f11a76360d0372d74ade Author: Kornel Benko Date: Tue Apr 2 11:35:56 2024 +0200 Update sk.po --- po/sk.po | 15 +++ 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/po/sk.po b/po/sk.po index e4fac1562a..b848decde2 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-03-07 11:49+0100\n" -"PO-Revision-Date: 2024-03-07 10:52+\n" +"POT-Creation-Date: 2024-04-02 09:51+0200\n" +"PO-Revision-Date: 2024-04-02 09:29+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -21742,8 +21742,12 @@ msgid "End of Sentence|E" msgstr "Koniec vety|K" #: lib/ui/stdmenus.inc:418 -msgid "Plain Quotation Mark|Q" -msgstr "Prosté úvodzovky|P" +msgid "Plain Double Quotation Mark|Q" +msgstr "Prostá dvojitá úvodzovka|P" + +#: lib/ui/stdmenus.inc:419 +msgid "Plain Single Quotation Mark|S" +msgstr "Jednoduchá úvodzovka|J" #: lib/ui/stdmenus.inc:419 msgid "Inner Quotation Mark|n" @@ -44189,3 +44193,6 @@ msgstr "Neznámy používateľ" #~ msgid "No, &Dismiss Changes" #~ msgstr "Nie, zmeny &zahodiť" + +#~ msgid "Plain Quotation Mark|Q" +#~ msgstr "Prosté úvodzovky|P" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] de/UserGuide: update
commit 334b5391ef30967bd3ef7266fe1d33fd34905d3b Author: Juergen Spitzmueller Date: Tue Apr 2 09:32:02 2024 +0200 de/UserGuide: update --- lib/doc/de/UserGuide.lyx | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index d0d819de8c..30366aa07f 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -43830,11 +43830,11 @@ Sprache \end_layout \begin_layout Description -Einfaches +Inneres \begin_inset space ~ \end_inset -Anführungszeichen Fügt ein einfaches Anführungszeichen im Anführungszeichenstil ein, +Anführungszeichen Fügt ein inneres Anführungszeichen im Anführungszeichenstil ein, der im Dialog \family sans Dokument\SpecialChar menuseparator @@ -43842,6 +43842,15 @@ Einstellungen\SpecialChar menuseparator Sprache \family default eingestellt ist. + Meist sind dies +\begin_inset Quotes gls +\end_inset + +einfache +\begin_inset Quotes grs +\end_inset + + Anführungszeichen. \end_layout \begin_layout Description -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Marking branching
commit 63e54d91179c84965babf84df25fb66fb1f92f09 Author: Richard Kimberly Heck Date: Mon Apr 1 16:20:24 2024 -0400 Marking branching --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8c4f1bfbe1..08221b1692 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~devel],[lyx-de...@lists.lyx.org],[lyx]) AC_PRESERVE_HELP_ORDER # Use ISO format only. The frontend needs to parse this -AC_SUBST(LYX_DATE, ["2024-02-09"]) +AC_SUBST(LYX_DATE, ["2024-04-01"]) 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/2.4.1-devel] Put new citation after selected item rather than at end of list.
commit 1d7c8325f29c5da77218e37e1085ae983da356e0
Author: Richard Kimberly Heck
Date: Sat Jun 1 20:25:20 2024 -0400
Put new citation after selected item rather than at end of list.
Fixes bug #12940.
Patch from Daniel.
(cherry picked from commit 40ae8644f9f81576033ff1f8f56428946029b4f4)
---
src/frontends/qt/GuiSelectionManager.cpp | 15 ---
status.24x | 2 ++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/frontends/qt/GuiSelectionManager.cpp
b/src/frontends/qt/GuiSelectionManager.cpp
index d99cd23897..55335d08e2 100644
--- a/src/frontends/qt/GuiSelectionManager.cpp
+++ b/src/frontends/qt/GuiSelectionManager.cpp
@@ -285,17 +285,26 @@ void GuiSelectionManager::addPB_clicked()
return;
QModelIndex const idxToAdd = selIdx.first();
- int const srows = selectedModel->rowCount();
+ // Add item after selected item
+ int const currentRow = selectedLV->currentIndex().row();
+ int const srows = currentRow == -1 ? selectedModel->rowCount() :
+currentRow + 1;
QMap qm = availableModel->itemData(idxToAdd);
- insertRowToSelected(srows, qm);
+ bool const isAdded = insertRowToSelected(srows, qm);
selectionChanged(); //signal
-
+
QModelIndex const idx = selectedLV->currentIndex();
if (idx.isValid())
selectedLV->setCurrentIndex(idx);
+ // select and show last added item
+ if (isAdded) {
+ QModelIndex idx = selectedModel->index(srows, 0);
+ selectedLV->setCurrentIndex(idx);
+ }
+
updateHook();
}
diff --git a/status.24x b/status.24x
index f4ab64b448..830cf44644 100644
--- a/status.24x
+++ b/status.24x
@@ -88,6 +88,8 @@ What's new
- Allow "longest label" to be empty (bug 11934).
+- Put new citation after selected item rather than at end of list (bug 12940).
+
* INTERNALS
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] XHTML: export paragraph IDs also for list items, but not for the opening tag of the list.
commit 37a865762b805a9b7cfed783719548a0d86f47e2
Author: Thibaut Cuvelier
Date: Mon May 20 03:21:00 2024 +0200
XHTML: export paragraph IDs also for list items, but not for the opening
tag of the list.
The IDs are used to link to specific elements (for instance, the User's
guide nomenclature).
The beginning of the list ( or ) has the same magic ID as the first
item of the list.
---
src/output_xhtml.cpp | 33 -
1 file changed, 20 insertions(+), 13 deletions(-)
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index f01b0b8e62..f8ccc3733e 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -210,25 +210,32 @@ inline void closeLabelTag(XMLStream & xs, Layout const &
lay)
}
-inline void openItemTag(XMLStream & xs, Layout const & lay)
+inline void openItemTag(XMLStream & xs, Layout const & lay,
+std::string const & parlabel)
{
if (lay.htmlitemtag() != "NONE") {
- xs << xml::StartTag(lay.htmlitemtag(), lay.htmlitemattr(),
true);
+ string attrs = lay.htmlitemattr();
+ if (!parlabel.empty())
+ attrs += " id='" + parlabel + "'";
+ xs << xml::StartTag(lay.htmlitemtag(), attrs, true);
}
}
void openItemTag(XMLStream & xs, Layout const & lay,
- ParagraphParameters const & params)
+ ParagraphParameters const & params,
+ std::string const & parlabel)
{
if (lay.htmlitemtag() != "NONE") {
// FIXME Are there other things we should handle here?
string const align = alignmentToCSS(params.align());
if (align.empty()) {
- openItemTag(xs, lay);
+ openItemTag(xs, lay, parlabel);
return;
}
string attrs = lay.htmlGetAttrString() + " style='text-align: "
+ align + ";'";
+ if (!parlabel.empty())
+ attrs += " id='" + parlabel + "'";
xs << xml::StartTag(lay.htmlitemtag(), attrs);
}
}
@@ -411,7 +418,8 @@ ParagraphList::const_iterator makeEnvironment(Buffer const
& buf,
ParagraphList::const_iterator const begin = text.paragraphs().begin();
ParagraphList::const_iterator par = pbegin;
Layout const & bstyle = par->layout();
- depth_type const origdepth = pbegin->params().depth();
+ depth_type const origdepth = par->params().depth();
+ string const parId = bstyle.htmlitemtag().empty() ? par->magicLabel() :
"";
// open tag for this environment
if ((bstyle.labeltype == LABEL_ENUMERATE || bstyle.labeltype ==
LABEL_ITEMIZE)
@@ -444,12 +452,12 @@ ParagraphList::const_iterator makeEnvironment(Buffer
const & buf,
// not a valid enumdepth...
break;
}
- openParTag(xs, bstyle,
- string( isenum ? "lyxenum" : "lyxitem" ) + "
"
- + to_utf8(enumcounter),
pbegin->magicLabel());
+ const string cssClass = string(isenum ? "lyxenum" : "lyxitem")
+ " "
+ + to_utf8(enumcounter);
+ openParTag(xs, bstyle, cssClass, parId);
}
else
- openParTag(xs, bstyle, pbegin->magicLabel());
+ openParTag(xs, bstyle, parId);
xs << xml::CR();
// we will on occasion need to remember a layout from before.
@@ -491,7 +499,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const
& buf,
pos_type sep = 0;
bool const labelfirst = style.htmllabelfirst();
if (!labelfirst)
- openItemTag(xs, style, par->params());
+ openItemTag(xs, style, par->params(),
par->magicLabel());
// label output
if (style.labeltype != LABEL_NO_LABEL &&
@@ -529,7 +537,7 @@ ParagraphList::const_iterator makeEnvironment(Buffer const
& buf,
} // end label output
if (labelfirst)
- openItemTag(xs, style, par->params());
+ openItemTag(xs, style, par->params(),
par->magicLabel());
docstring deferred =
par->simpleLyXHTMLOnePar(buf, xs, runparams,
text.outerFont(distance(begin, par)),
true, true, sep);
@@ -594,8 +602,7 @@ void makeCommand(Buffer const & buf,
buf.masterBuffer()->params().
documentClass().counters().step(style.counter,
OutputUpdate);
- bool const make_parid = !runparams.for_toc && runparams.html_make_pars;
-
[LyX/2.4.1-devel] Make comment clearer.
commit c5b1ce5f37fd89711819d067a7ab7b1065577c0f
Author: Thibaut Cuvelier
Date: Sat May 18 19:38:52 2024 +0200
Make comment clearer.
---
src/insets/InsetInfo.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/insets/InsetInfo.cpp b/src/insets/InsetInfo.cpp
index 90f1620b0a..14861cd707 100644
--- a/src/insets/InsetInfo.cpp
+++ b/src/insets/InsetInfo.cpp
@@ -1563,7 +1563,7 @@ void xhtmlShortcutInfo(XMLStream & xs, const
InsetInfoParams & params) {
sequence = theTopLevelKeymap().printBindings(func,
KeySequence::ForGui);
seq_untranslated = theTopLevelKeymap().printBindings(func,
KeySequence::ForGui, true);
}
- // No other possible case.
+ // No other possible case (`return` at the beginning of the function
otherwise).
Language const * tryguilang =
languages.getFromCode(Messages::guiLanguage());
// Some info insets use the language of the GUI (if available)
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
