[LyX/master] French docs: remove unicode thin spaces
commit 07a7e847d6d4af4b19d4daa5066b192cac2bc07f Author: Scott Kostyshak Date: Sat Feb 18 16:40:50 2023 -0500 French docs: remove unicode thin spaces Consistent with 9b20b33a and cb732ef5. --- lib/doc/fr/Customization.lyx |2 +- lib/doc/fr/UserGuide.lyx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/doc/fr/Customization.lyx b/lib/doc/fr/Customization.lyx index 5e7587a..c2f78d4 100644 --- a/lib/doc/fr/Customization.lyx +++ b/lib/doc/fr/Customization.lyx @@ -327,7 +327,7 @@ Avertissement: \series default dans le document, - on utilise « graphique » en tant que raccourci de « objet graphique »: + on utilise «graphique» en tant que raccourci de «objet graphique»: graphique, diagramme, image, diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx index 8be88c7..8742d95 100644 --- a/lib/doc/fr/UserGuide.lyx +++ b/lib/doc/fr/UserGuide.lyx @@ -498,7 +498,7 @@ Avertissement: \series default dans le document, - on utilise « graphique » en tant que raccourci de « objet graphique »: + on utilise «graphique» en tant que raccourci de «objet graphique»: graphique, diagramme, image, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] fr EmbeddedObjects: fix comp with LuaTeX + babel
commit 9b20b33a3e54ee2c418a25fb7b78359c1da43b40 Author: Scott Kostyshak Date: Sat Feb 18 16:18:53 2023 -0500 fr EmbeddedObjects: fix comp with LuaTeX + babel This commit removes unicode thin space characters (unicode 2009). LuaTeX with polyglossia (the default) was compiling before, but this fixes LuaTeX with babel. XeTeX compilation (with both polyglossia and babel) still yields missing glyphs. Consistent with cb732ef5. --- lib/doc/fr/EmbeddedObjects.lyx |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/doc/fr/EmbeddedObjects.lyx b/lib/doc/fr/EmbeddedObjects.lyx index 1595539..304987f 100644 --- a/lib/doc/fr/EmbeddedObjects.lyx +++ b/lib/doc/fr/EmbeddedObjects.lyx @@ -491,7 +491,7 @@ Avertissement: \series default dans le document, - on utilise « graphique » en tant que raccourci de « objet graphique »: + on utilise «graphique» en tant que raccourci de «objet graphique»: graphique, diagramme, image, -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update sk.po
commit 0823f823db7abb4c66ce13fbb6dec060a8b0301e Author: Kornel Benko Date: Sat Feb 18 17:13:45 2023 +0100 Update sk.po --- po/sk.po | 16 ++-- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/po/sk.po b/po/sk.po index 8720ef1..15c0a02 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: 2023-02-17 15:05+0100\n" -"PO-Revision-Date: 2023-02-17 14:27+\n" +"POT-Creation-Date: 2023-02-18 16:49+0100\n" +"PO-Revision-Date: 2023-02-18 16:11+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -21578,16 +21578,12 @@ msgid "Reject All Changes|e" msgstr "Odhodiť všetky zmeny|O" #: lib/ui/stdmenus.inc:594 -msgid "Accept All Changes (incl. Master/Children/Siblings)|p" -msgstr "" -"Akceptovať všetky zmeny (vrátane pre hlavný súbor, potomky a rovnocenné " -"súbory)|r" +msgid "Accept All Changes (incl. relatives)|p" +msgstr "Akceptovať všetky zmeny (i v príslušných súboroch)|r" #: lib/ui/stdmenus.inc:595 -msgid "Reject All Changes (incl. Master/Children/Siblings)|j" -msgstr "" -"Odmietnuť všetky zmeny (vrátane pre hlavný súbor, potomky a rovnocenné " -"súbory)|m" +msgid "Reject All Changes (incl. relatives)|j" +msgstr "Odmietnuť všetky zmeny (i v príslušných súboroch)|m" #: lib/ui/stdmenus.inc:596 msgid "Show Changes in Output|S" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 2987530434105
commit da1d6d03ebdb724ca3ab7353d5bbdd017b627f84
Author: Juergen Spitzmueller
Date: Sat Feb 18 17:04:43 2023 +0100
Amend 2987530434105
This is more readable (and fixes a thinko)
---
src/BufferParams.cpp | 12 +---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index e702b18..71e4bae 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1923,10 +1923,16 @@ bool BufferParams::writeLaTeX(otexstream & os,
LaTeXFeatures & features,
// Babel (as of 2017/11/03) loads fontspec itself
// However, it does so only if a non-default font is requested
via \babelfont
// Thus load fontspec if this is not the case and we need
fontspec features
+ bool const babel_needfontspec =
+ !features.isAvailableAtLeastFrom("babel", 2017,
11, 3)
+ || (fontsRoman() == "default"
+ && fontsSans() == "default"
+ && fontsTypewriter() == "default"
+ // these need fontspec features
+ && (features.isRequired("textquotesinglep")
+ ||
features.isRequired("textquotedblp")));
if (!features.isProvided("fontspec")
- && !(features.useBabel() &&
features.isAvailableAtLeastFrom("babel", 2017, 11, 3)
- && (fontsRoman() != "default" || fontsSans() !=
"default" || fontsTypewriter() != "default")
- && !features.isRequired("textquotesinglep") &&
!features.isRequired("textquotedoublep")))
+ && (!features.useBabel() || babel_needfontspec))
os << "\\usepackage{fontspec}\n";
if (features.mustProvide("unicode-math")
&& features.isAvailable("unicode-math"))
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Address an edge case where we need to loaf fontspec also with babel
commit 2987530434105787d13fe6d6796da678dc5ee370
Author: Juergen Spitzmueller
Date: Sat Feb 18 16:12:49 2023 +0100
Address an edge case where we need to loaf fontspec also with babel
---
src/BufferParams.cpp |6 +-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 4d7550a..e702b18 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1921,8 +1921,12 @@ bool BufferParams::writeLaTeX(otexstream & os,
LaTeXFeatures & features,
if (useNonTeXFonts) {
// Babel (as of 2017/11/03) loads fontspec itself
+ // However, it does so only if a non-default font is requested
via \babelfont
+ // Thus load fontspec if this is not the case and we need
fontspec features
if (!features.isProvided("fontspec")
- && !(features.useBabel() &&
features.isAvailableAtLeastFrom("babel", 2017, 11, 3)))
+ && !(features.useBabel() &&
features.isAvailableAtLeastFrom("babel", 2017, 11, 3)
+ && (fontsRoman() != "default" || fontsSans() !=
"default" || fontsTypewriter() != "default")
+ && !features.isRequired("textquotesinglep") &&
!features.isRequired("textquotedoublep")))
os << "\\usepackage{fontspec}\n";
if (features.mustProvide("unicode-math")
&& features.isAvailable("unicode-math"))
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] CT: Shorten menu items
commit e98d9f974aea3831acdfa6db90240855d3413d14 Author: Pavel Sanda Date: Sat Feb 18 12:19:56 2023 +0100 CT: Shorten menu items --- lib/ui/stdmenus.inc |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index acbbcb4..53bb14d 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -591,8 +591,8 @@ Menuset Item "Reject Change|R" "change-reject" Item "Accept All Changes|c" "all-changes-accept" Item "Reject All Changes|e" "all-changes-reject" - Item "Accept All Changes (incl. Master/Children/Siblings)|p" "ifrelatives master-buffer-forall all-changes-accept" - Item "Reject All Changes (incl. Master/Children/Siblings)|j" "ifrelatives master-buffer-forall all-changes-reject" + Item "Accept All Changes (incl. relatives)|p" "ifrelatives master-buffer-forall all-changes-accept" + Item "Reject All Changes (incl. relatives)|j" "ifrelatives master-buffer-forall all-changes-reject" Item "Show Changes in Output|S" "changes-output" End -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * ja.po - Update from Koji
commit f83e8dd8ce41ef90829b043b140c31d155050937 Author: Pavel Sanda Date: Sat Feb 18 12:13:03 2023 +0100 * ja.po - Update from Koji po/ja.po | 568 ++ 1 files changed, 350 insertions(+), 218 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
