[LyX/master] Dissolve some shortcut conflicts in the wake of f3a4602c4c1ec
commit 728175f9acdd8b67249d5403d99319557201f80c Author: Juergen Spitzmueller Date: Wed Apr 3 08:28:00 2024 +0200 Dissolve some shortcut conflicts in the wake of f3a4602c4c1ec --- lib/ui/stdcontext.inc | 10 +- src/frontends/qt/Menus.cpp | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 90a4cda1aa..dc49f44c77 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -237,7 +237,7 @@ Menuset Item "Greyed Out|y" "inset-modify note Note Greyedout" Separator Item "Open All Notes|A" "inset-forall Note inset-toggle open" - Item "Close All Notes|o" "inset-forall Note inset-toggle close" + Item "Close All Notes|l" "inset-forall Note inset-toggle close" End # @@ -378,7 +378,7 @@ Menuset Item "Paste" "paste" Submenu "Paste Recent|e" "edit_pasterecent" Separator - OptItem "Split Inset|t" "inset-split" + OptItem "Split Inset|i" "inset-split" Separator Item "Jump Back to Saved Bookmark|B" "bookmark-goto 0" OptItem "Forward Search|F" "forward-search" @@ -399,7 +399,7 @@ Menuset OptItem "Reject Change|j" "change-reject" Separator Submenu "Text Properties|x" "edit_textprops" - OptSubmenu "Custom Text Styles|S" "edit_textstyles" + OptSubmenu "Custom Text Styles|y" "edit_textstyles" Item "Paragraph Settings...|P" "layout-paragraph" OptItem "Unify Graphics Groups|U" "graphics-unify" LanguageSelector @@ -648,9 +648,9 @@ Menuset End Menu "context-edit-index" - OptItem "Insert Subentry|b" "indexmacro-insert subentry" + OptItem "Insert Subentry|n" "indexmacro-insert subentry" OptItem "Insert Sortkey|k" "indexmacro-insert sortkey" - OptItem "Insert See Reference|e" "indexmacro-insert see" + OptItem "Insert See Reference|c" "indexmacro-insert see" OptItem "Insert See also Reference|a" "indexmacro-insert seealso" End diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp index 6c4b08cf48..4a09a1b4a7 100644 --- a/src/frontends/qt/Menus.cpp +++ b/src/frontends/qt/Menus.cpp @@ -888,9 +888,9 @@ void MenuDefinition::expandSpellingSuggestions(BufferView const * bv) docstring const arg = wl.word() + " " + from_ascii(wl.lang()->lang()); add(MenuItem(MenuItem::Command, qt_("Add to personal dictionary|r"), FuncRequest(LFUN_SPELLING_ADD, arg))); - add(MenuItem(MenuItem::Command, qt_("Ignore this occurrence|g"), + add(MenuItem(MenuItem::Command, qt_("Ignore this occurrence|o"), FuncRequest(LFUN_FONT_NO_SPELLCHECK, arg))); - add(MenuItem(MenuItem::Command, qt_("Ignore all for this session|l"), + add(MenuItem(MenuItem::Command, qt_("Ignore all for this session|t"), FuncRequest(LFUN_SPELLING_IGNORE, arg))); add(MenuItem(MenuItem::Command, qt_("Ignore all in this document|u"), FuncRequest(LFUN_SPELLING_ADD_LOCAL, arg))); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Update German User Guide
commit ad95503c0b8e9100674361d990bca2d810daf9c9 Author: Juergen Spitzmueller Date: Wed Apr 3 07:40:56 2024 +0200 Update German User Guide --- lib/doc/de/UserGuide.lyx | 28 1 file changed, 28 insertions(+) diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 30366aa07f..a5d30012e9 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -43818,6 +43818,10 @@ Nicht-typographisches \begin_inset space ~ \end_inset +doppeltes +\begin_inset space ~ +\end_inset + Anführungszeichen Fügt dieses Anführungszeichen ein: ", unabhängig vom Anführungszeichen-Stil der im Dialog @@ -43829,6 +43833,30 @@ Sprache eingestellt ist. \end_layout +\begin_layout Description +Nicht-typographisches +\begin_inset space ~ +\end_inset + +einfaches +\begin_inset space ~ +\end_inset + +Anführungszeichen Fügt dieses Anführungszeichen ein: + +\begin_inset Quotes qls +\end_inset + +, + unabhängig vom Anführungszeichen-Stil der im Dialog +\family sans +Dokument\SpecialChar menuseparator +Einstellungen\SpecialChar menuseparator +Sprache +\family default + eingestellt ist. +\end_layout + \begin_layout Description Inneres \begin_inset space ~ -- 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 1424c518abaaab3fa579d6c41842774a73a20f9f 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/master] Update German User Guide
commit a55ede6a7462affbdf860caa6bc54777f6ad3aa5 Author: Juergen Spitzmueller Date: Wed Apr 3 07:35:59 2024 +0200 Update German User Guide --- lib/doc/de/UserGuide.lyx | 34 +- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx index 30366aa07f..368fae244e 100644 --- a/lib/doc/de/UserGuide.lyx +++ b/lib/doc/de/UserGuide.lyx @@ -1,4 +1,4 @@ -#LyX 2.4 created this file. For more info see https://www.lyx.org/ +#LyX 2.5 created this file. For more info see https://www.lyx.org/ \lyxformat 620 \begin_document \begin_header @@ -9302,10 +9302,12 @@ Unformatiert \end_layout \begin_layout Verbatim + Dies ist Unformatiert. \end_layout \begin_layout Verbatim + Die folgenden 2 Zeilen sind leer: \end_layout @@ -9318,6 +9320,7 @@ Die folgenden 2 Zeilen sind leer: \end_layout \begin_layout Verbatim + Fast alles ist in Unformatiert erlaubt:"%&$§#~'` \backslash }][{| @@ -9343,6 +9346,7 @@ Unformatiert \end_layout \begin_layout Verbatim* + Dies ist Unformatiert*. \end_layout @@ -43818,6 +43822,10 @@ Nicht-typographisches \begin_inset space ~ \end_inset +doppeltes +\begin_inset space ~ +\end_inset + Anführungszeichen Fügt dieses Anführungszeichen ein: ", unabhängig vom Anführungszeichen-Stil der im Dialog @@ -43829,6 +43837,30 @@ Sprache eingestellt ist. \end_layout +\begin_layout Description +Nicht-typographisches +\begin_inset space ~ +\end_inset + +einfaches +\begin_inset space ~ +\end_inset + +Anführungszeichen Fügt dieses Anführungszeichen ein: + +\begin_inset Quotes qls +\end_inset + +, + unabhängig vom Anführungszeichen-Stil der im Dialog +\family sans +Dokument\SpecialChar menuseparator +Einstellungen\SpecialChar menuseparator +Sprache +\family default + eingestellt ist. +\end_layout + \begin_layout Description Inneres \begin_inset space ~ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Merge branch 'master' of git.lyx.org:lyx
commit 77b680546d08e4cf5cefac2feca30155d52ad183 Merge: 655cdfbb7b 34dbdad957 Author: Juergen Spitzmueller Date: Wed Apr 3 07:26:11 2024 +0200 Merge branch 'master' of git.lyx.org:lyx .gitignore| 2 +- lib/doc/UserGuide.lyx | 87 -- po/fr.gmo | Bin 656494 -> 656498 bytes po/fr.po | 26 +++ src/LyXAction.cpp | 4 ++- 5 files changed, 101 insertions(+), 18 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] de.po
commit 655cdfbb7b8d72efbc5eca64a24b31898bfe Author: Juergen Spitzmueller Date: Tue Apr 2 16:26:00 2024 +0200 de.po --- po/de.po | 214 +++ 1 file changed, 107 insertions(+), 107 deletions(-) diff --git a/po/de.po b/po/de.po index b2575ee8b9..1bcd38fdd5 100644 --- a/po/de.po +++ b/po/de.po @@ -95,8 +95,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2024-04-02 08:21+0200\n" -"PO-Revision-Date: 2024-04-02 08:23+0200\n" +"POT-Creation-Date: 2024-04-02 16:21+0200\n" +"PO-Revision-Date: 2024-04-02 16:25+0200\n" "Last-Translator: Juergen Spitzmueller \n" "Language-Team: German \n" "Language: de\n" @@ -1112,7 +1112,7 @@ msgstr "S&prache:" #: lib/layouts/europasscv.layout:483 lib/layouts/europecv.layout:322 #: lib/layouts/europecv.layout:328 lib/layouts/moderncv.layout:581 #: src/frontends/qt/GuiDocument.cpp:1831 src/frontends/qt/GuiPrefs.cpp:2324 -#: src/frontends/qt/Menus.cpp:936 +#: src/frontends/qt/Menus.cpp:955 msgid "Language" msgstr "Sprache" @@ -1741,25 +1741,25 @@ msgid "Case &sensitive" msgstr "&Groß-/Kleinschreibung beachten" #: src/frontends/qt/ui/FindAndReplaceUi.ui:205 -#: src/frontends/qt/FindAndReplace.cpp:716 +#: src/frontends/qt/FindAndReplace.cpp:719 msgid "Find next occurrence (Enter, backwards: Shift+Enter)" msgstr "" "Suche nächsten Treffer (Eingabetaste; rückwärts: Umschalt+Eingabetaste)" #: src/frontends/qt/ui/FindAndReplaceUi.ui:208 -#: src/frontends/qt/ui/SearchUi.ui:190 src/frontends/qt/FindAndReplace.cpp:715 +#: src/frontends/qt/ui/SearchUi.ui:190 src/frontends/qt/FindAndReplace.cpp:718 msgid "Find &>" msgstr "Suchen &>" #: src/frontends/qt/ui/FindAndReplaceUi.ui:221 -#: src/frontends/qt/FindAndReplace.cpp:718 +#: src/frontends/qt/FindAndReplace.cpp:721 msgid "Replace and find next occurrence (Enter, backwards: Shift+Enter)" msgstr "" "Ersetze und suche nächsten Treffer (Eingabetaste; rückwärts: " "Umschalt+Eingabetaste)" #: src/frontends/qt/ui/FindAndReplaceUi.ui:224 -#: src/frontends/qt/FindAndReplace.cpp:717 +#: src/frontends/qt/FindAndReplace.cpp:720 msgid "Rep&lace >" msgstr "Erse&tzen >" @@ -5568,7 +5568,7 @@ msgstr "Ohne Hyperlink " msgid "Find previous occurrence (Shift+Enter)" msgstr "Vorhergehender Treffer (Umschalt+Eingabe)" -#: src/frontends/qt/ui/SearchUi.ui:55 src/frontends/qt/FindAndReplace.cpp:710 +#: src/frontends/qt/ui/SearchUi.ui:55 src/frontends/qt/FindAndReplace.cpp:713 msgid "&< Find" msgstr "&< Suchen" @@ -7617,8 +7617,8 @@ msgstr "Zusammenfassung" msgid "Summary ##" msgstr "Zusammenfassung ##" -#: lib/layouts/AEA.layout:356 src/frontends/qt/Menus.cpp:1804 -#: src/frontends/qt/Menus.cpp:1819 +#: lib/layouts/AEA.layout:356 src/frontends/qt/Menus.cpp:1823 +#: src/frontends/qt/Menus.cpp:1838 msgid "Caption" msgstr "Legende" @@ -20646,7 +20646,7 @@ msgid "Comment|m" msgstr "Kommentar|K" #: lib/ui/stdcontext.inc:237 lib/ui/stdmenus.inc:548 -msgid "Greyed Out|G" +msgid "Greyed Out|y" msgstr "Grauschrift|G" #: lib/ui/stdcontext.inc:239 @@ -20654,7 +20654,7 @@ msgid "Open All Notes|A" msgstr "Alle Notizen öffnen|f" #: lib/ui/stdcontext.inc:240 -msgid "Close All Notes|l" +msgid "Close All Notes|o" msgstr "Alle Notizen schließen|c" #: lib/ui/stdcontext.inc:248 lib/ui/stdmenus.inc:558 @@ -20910,7 +20910,7 @@ msgid "Forward Search|F" msgstr "Vorwärtssuche|V" #: lib/ui/stdcontext.inc:386 lib/ui/stdmenus.inc:120 -msgid "Move Paragraph Up|o" +msgid "Move Paragraph Up|h" msgstr "Absatz nach oben verschieben|o" #: lib/ui/stdcontext.inc:387 lib/ui/stdmenus.inc:121 @@ -27892,10 +27892,6 @@ msgstr "Gnuplot" msgid "External Material" msgstr "Externes Material" -#: lib/examples/Articles:0 -msgid "XY-Figure" -msgstr "XY-Figure" - #: lib/examples/Articles:0 msgid "Feynman Diagrams" msgstr "Feynman-Diagramme" @@ -27904,6 +27900,10 @@ msgstr "Feynman-Diagramme" msgid "Instant Preview" msgstr "Eingebettete Vorschau" +#: lib/examples/Articles:0 +msgid "Itemize Bullets" +msgstr "Auflistungszeichen" + #: lib/examples/Articles:0 msgid "Minted File Listing" msgstr "Minted-Programmlistings (Dateien)" @@ -27913,8 +27913,8 @@ msgid "Minted Listings" msgstr "Minted-Programmlistings" #: lib/examples/Articles:0 -msgid "Itemize Bullets" -msgstr "Auflistungszeichen" +msgid "XY-Figure" +msgstr "XY-Figure" #: lib/examples/Articles:0 msgid "XY-Pic" @@ -27956,6 +27956,10 @@ msgstr "Serienbrief 2" msgid "Serial Letter 3" msgstr "Serienbrief 3" +#: lib/examples/Articles:0 +msgid "Noweb Listerrors" +msgstr "Noweb-Fehlerbericht" + #: lib/examples/Articles:0 msgid "Hazard and Precautionary Statements" msgstr "H- und P-Sätze" @@ -27972,14 +27976,14 @@ msgstr "Mehrsprachige Legenden" msgid "Noweb2LyX" msgstr "Noweb2LyX" -#: lib/examples/Articles:0 -msgid "Noweb Listerrors" -msgstr "Noweb-Fehlerbericht" - #: lib/examples/Articles:0 src/frontends/qt/Gu
[LyX/master] Ignore all build* directories
commit 34dbdad9573f09e6c1b47b9990b8700a7b832093 Author: Richard Kimberly Heck Date: Tue Apr 2 22:03:53 2024 -0400 Ignore all build* directories (cherry picked from commit 368f10571aab8b6796218a1ac70b98a940e45722) --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5b86db561a..3667bd0a0a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ stamp-h1 *.old *.bak *.patch -build/ +build*/ CMakeLists.txt.user .dirstamp /src/tex2lyx/test/*.lyx.tex -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Docs for menu change
commit b8a988fa135fe0e01a0ddaf2e527cf6dc17c7642 Author: Richard Kimberly Heck Date: Tue Apr 2 22:02:55 2024 -0400 Docs for menu change (cherry picked from commit c8534081c9d40b7331ac73513a758ffc51bc423e) --- lib/doc/UserGuide.lyx | 87 +-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index d32f5960e3..1e6d3489fb 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -148,7 +148,7 @@ logicalmkup \papersides 2 \paperpagestyle default \tablestyle default -\tracking_changes false +\tracking_changes true \output_changes false \change_bars false \postpone_fragile_content false @@ -157,6 +157,7 @@ logicalmkup \html_be_strict true \docbook_table_output 0 \docbook_mathml_prefix 1 +\author -584632292 "Richard Kimberly Heck" \end_header \begin_body @@ -9642,12 +9643,14 @@ Verbatim \end_layout \begin_layout Verbatim + This is Verbatim. \end_layout \begin_layout Verbatim \noindent \align block + The following 2 lines are empty: \end_layout @@ -9660,6 +9663,7 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim + Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -9683,6 +9687,7 @@ Verbatim \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -44599,11 +44604,35 @@ nolink "false" \end_layout \begin_layout Description + +\change_inserted -584632292 1712109674 +Plain +\begin_inset space ~ +\end_inset + +Double +\begin_inset space ~ +\end_inset + + +\change_deleted -584632292 1712109675 Ordinary \begin_inset space ~ \end_inset -Quote Inserts this quote: + +\change_unchanged +Quot +\change_inserted -584632292 1712109680 +ation +\begin_inset space ~ +\end_inset + +Mark +\change_deleted -584632292 1712109681 +e +\change_unchanged + Inserts this quote: ", no matter what quote style you selected in the \family sans @@ -44615,11 +44644,63 @@ Language \end_layout \begin_layout Description + +\change_inserted -584632292 1712109701 +Plain +\begin_inset space ~ +\end_inset + +Single +\begin_inset space ~ +\end_inset + +Quotation +\begin_inset space ~ +\end_inset + +Mark Inserts this quote: + +\begin_inset Quotes qls +\end_inset + +, + no matter what quote style you have selected. +\end_layout + +\begin_layout Description + +\change_deleted -584632292 1712109722 Single +\change_inserted -584632292 1712109720 +Inner +\change_unchanged + +\begin_inset space ~ +\end_inset + +Quot +\change_inserted -584632292 1712109726 +ation \begin_inset space ~ \end_inset -Quote Inserts a single quote in the quotation marks style selected in the +Mark +\change_deleted -584632292 1712109727 +e +\change_unchanged + Inserts a +\change_inserted -584632292 1712109731 +n inner +\change_unchanged + +\change_deleted -584632292 1712109733 +single +\change_unchanged +quote +\change_inserted -584632292 1712109738 +(usually a single quote) +\change_unchanged +in the quotation marks style selected in the \family sans Document\SpecialChar menuseparator Settings\SpecialChar menuseparator -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Ignore all build* directories
commit 368f10571aab8b6796218a1ac70b98a940e45722 Author: Richard Kimberly Heck Date: Tue Apr 2 22:03:53 2024 -0400 Ignore all build* directories --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5b86db561a..3667bd0a0a 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ stamp-h1 *.old *.bak *.patch -build/ +build*/ CMakeLists.txt.user .dirstamp /src/tex2lyx/test/*.lyx.tex -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Docs for menu change
commit c8534081c9d40b7331ac73513a758ffc51bc423e Author: Richard Kimberly Heck Date: Tue Apr 2 22:02:55 2024 -0400 Docs for menu change --- lib/doc/UserGuide.lyx | 87 +-- 1 file changed, 84 insertions(+), 3 deletions(-) diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index d32f5960e3..1e6d3489fb 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide.lyx @@ -148,7 +148,7 @@ logicalmkup \papersides 2 \paperpagestyle default \tablestyle default -\tracking_changes false +\tracking_changes true \output_changes false \change_bars false \postpone_fragile_content false @@ -157,6 +157,7 @@ logicalmkup \html_be_strict true \docbook_table_output 0 \docbook_mathml_prefix 1 +\author -584632292 "Richard Kimberly Heck" \end_header \begin_body @@ -9642,12 +9643,14 @@ Verbatim \end_layout \begin_layout Verbatim + This is Verbatim. \end_layout \begin_layout Verbatim \noindent \align block + The following 2 lines are empty: \end_layout @@ -9660,6 +9663,7 @@ The following 2 lines are empty: \end_layout \begin_layout Verbatim + Almost everything is allowed in Verbatim:"%&$§#~'` \backslash }][{| @@ -9683,6 +9687,7 @@ Verbatim \end_layout \begin_layout Verbatim* + This is Verbatim*. \end_layout @@ -44599,11 +44604,35 @@ nolink "false" \end_layout \begin_layout Description + +\change_inserted -584632292 1712109674 +Plain +\begin_inset space ~ +\end_inset + +Double +\begin_inset space ~ +\end_inset + + +\change_deleted -584632292 1712109675 Ordinary \begin_inset space ~ \end_inset -Quote Inserts this quote: + +\change_unchanged +Quot +\change_inserted -584632292 1712109680 +ation +\begin_inset space ~ +\end_inset + +Mark +\change_deleted -584632292 1712109681 +e +\change_unchanged + Inserts this quote: ", no matter what quote style you selected in the \family sans @@ -44615,11 +44644,63 @@ Language \end_layout \begin_layout Description + +\change_inserted -584632292 1712109701 +Plain +\begin_inset space ~ +\end_inset + +Single +\begin_inset space ~ +\end_inset + +Quotation +\begin_inset space ~ +\end_inset + +Mark Inserts this quote: + +\begin_inset Quotes qls +\end_inset + +, + no matter what quote style you have selected. +\end_layout + +\begin_layout Description + +\change_deleted -584632292 1712109722 Single +\change_inserted -584632292 1712109720 +Inner +\change_unchanged + +\begin_inset space ~ +\end_inset + +Quot +\change_inserted -584632292 1712109726 +ation \begin_inset space ~ \end_inset -Quote Inserts a single quote in the quotation marks style selected in the +Mark +\change_deleted -584632292 1712109727 +e +\change_unchanged + Inserts a +\change_inserted -584632292 1712109731 +n inner +\change_unchanged + +\change_deleted -584632292 1712109733 +single +\change_unchanged +quote +\change_inserted -584632292 1712109738 +(usually a single quote) +\change_unchanged +in the quotation marks style selected in the \family sans Document\SpecialChar menuseparator Settings\SpecialChar menuseparator -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.x] 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/master] Update fr.po
commit 3923c3abf4206c170876f509a08899b3b7c6c1f5 Author: jpc Date: Tue Apr 2 18:56:26 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.x] 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.x] 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.x] 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/master] Update doc info for quote-insert
commit f37486968782d4ada66ca85290a39fd3fd366dc8 Author: Richard Kimberly Heck Date: Tue Apr 2 12:46:36 2024 -0400 Update doc info for quote-insert --- src/LyXAction.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp index 19f12038a8..b6bb52152c 100644 --- a/src/LyXAction.cpp +++ b/src/LyXAction.cpp @@ -3470,7 +3470,9 @@ void LyXAction::init() * \li Params: : 'inner' for (i.e., secondary, usually single) quotes, otherwise * outer (i.e., primary, usually double) quotes will be used.\n * : 'opening' for opening quotes, 'closing' for closing quotes, - * otherwise the side will be guessed from the context.\n + * otherwise the side will be guessed from the context. Use 'auto' + * to force this default. (You will need to give this argument if + * you also want to give
[LyX/master] Smarter menu length calculation
commit f3a4602c4c1eca9bc79e7ba0b58395b79eafe9db Author: Juergen Spitzmueller Date: Tue Apr 2 14:41:54 2024 +0200 Smarter menu length calculation It is possible I have missed some shortcut conflicts, so please report if you find any. --- lib/ui/stdcontext.inc | 6 +++--- lib/ui/stdmenus.inc| 4 ++-- src/frontends/qt/Menus.cpp | 43 +-- 3 files changed, 38 insertions(+), 15 deletions(-) diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc index 6d4fc75703..90a4cda1aa 100644 --- a/lib/ui/stdcontext.inc +++ b/lib/ui/stdcontext.inc @@ -234,10 +234,10 @@ Menuset Menu "context-note" Item "LyX Note|N" "inset-modify note Note Note" Item "Comment|m" "inset-modify note Note Comment" - Item "Greyed Out|G" "inset-modify note Note Greyedout" + Item "Greyed Out|y" "inset-modify note Note Greyedout" Separator Item "Open All Notes|A" "inset-forall Note inset-toggle open" - Item "Close All Notes|l" "inset-forall Note inset-toggle close" + Item "Close All Notes|o" "inset-forall Note inset-toggle close" End # @@ -383,7 +383,7 @@ Menuset Item "Jump Back to Saved Bookmark|B" "bookmark-goto 0" OptItem "Forward Search|F" "forward-search" Separator - Item "Move Paragraph Up|o" "paragraph-move-up" + Item "Move Paragraph Up|h" "paragraph-move-up" Item "Move Paragraph Down|v" "paragraph-move-down" Separator EnvironmentSeparatorsContext diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 7d7750cc03..14c927dc06 100644 --- a/lib/ui/stdmenus.inc +++ b/lib/ui/stdmenus.inc @@ -117,7 +117,7 @@ Menuset Item "Find & Replace (Quick)...|F" "dialog-show findreplace" Item "Find & Replace (Advanced)..." "dialog-show findreplaceadv" Separator - Item "Move Paragraph Up|o" "paragraph-move-up" + Item "Move Paragraph Up|h" "paragraph-move-up" Item "Move Paragraph Down|v" "paragraph-move-down" Separator Item "Paragraph Settings...|P" "layout-paragraph" @@ -545,7 +545,7 @@ Menuset Menu "insert_note" Item "LyX Note|N" "note-insert Note" Item "Comment|C" "note-insert Comment" - Item "Greyed Out|G" "note-insert Greyedout" + Item "Greyed Out|y" "note-insert Greyedout" End Menu "insert_branches" diff --git a/src/frontends/qt/Menus.cpp b/src/frontends/qt/Menus.cpp index a3fc5a7ce1..6c4b08cf48 100644 --- a/src/frontends/qt/Menus.cpp +++ b/src/frontends/qt/Menus.cpp @@ -342,6 +342,8 @@ public: const; /// bool hasFunc(FuncRequest const &) const; + /// The real size of the menu considering hidden entries + int realSize() const; /// Add the menu item unconditionally void add(MenuItem const & item) { items_.push_back(item); } /// Checks the associated FuncRequest status before adding the @@ -727,6 +729,23 @@ bool MenuDefinition::hasFunc(FuncRequest const & func) const } +int MenuDefinition::realSize() const +{ + int res = 0; + for (auto const & it : *this) { + if (it.kind() == MenuItem::Submenu) + ++res; + else if (it.kind() == MenuItem::Command) { + FuncStatus status = lyx::getStatus(*it.func()); + // count only items that are actually displayed + if (!status.unknown() && (status.enabled() || !it.optional())) + ++res; + } + } + return res; +} + + void MenuDefinition::catSub(docstring const & name) { add(MenuItem(MenuItem::Submenu, @@ -867,13 +886,13 @@ void MenuDefinition::expandSpellingSuggestions(BufferView const * bv) if (i > 0) add(MenuItem(MenuItem::Separator)); docstring const arg = wl.word() + " " + from_ascii(wl.lang()->lang()); - add(MenuItem(MenuItem::Command, qt_("Add to personal dictionary|n"), + add(MenuItem(MenuItem::Command, qt_("Add to personal dictionary|r"), FuncRequest(LFUN_SPELLING_ADD, arg))); add(MenuItem(MenuItem::Command, qt_("Ignore this occurrence|g"), FuncRequest(LFUN_FONT_NO_SPELLCHECK, arg))); - add(MenuItem(MenuItem::Command, qt_("Ignore all for this session|I"), + add(MenuItem(MenuItem::Command, qt_("Ignore all for this session|l"),
[LyX/master] Translation of French Additional.lyx: chapter 3 completed
commit 8850b68792cf5c86dd5f73d39cff3e4e69886afd 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] Cmake build: Adapt for branch 2.4
commit 85c8cf6dcdef39cf4c739a6fe70643fa46ba3839 Author: Kornel Benko Date: Tue Apr 2 10:46:20 2024 +0200 Cmake build: Adapt for branch 2.4 (cherry picked from commit b8b9e8ec1402341229aade4b4a975b54c3ef80c9) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86226dc8e8..f473ee4bc5 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] cmake build with qt6 (macos) did not include "plugins"
commit 00d59c17cdb1232e845d3776d0d392a14ab3c167 Author: P. De Visschere Date: Sun Dec 31 15:30:12 2023 +0100 cmake build with qt6 (macos) did not include "plugins" (cherry picked from commit 4d02fb7ad7a846bebfd8ba5fd37a5453482e768d) --- development/cmake/post_install/CMakeLists.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/development/cmake/post_install/CMakeLists.txt b/development/cmake/post_install/CMakeLists.txt index f39bb5a763..56c552e4d0 100644 --- a/development/cmake/post_install/CMakeLists.txt +++ b/development/cmake/post_install/CMakeLists.txt @@ -48,6 +48,11 @@ if(LYX_BUNDLE) install_qt_plugin("${QtScope}::QCocoaIntegrationPlugin") endif() +if (APPLE AND LYX_USE_QT MATCHES "QT6") + # With QT6, just copy all the plugins + file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/*") + install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime) +endif() # Install code does the following: # - Creates the qt.conf file # - install the platform specific plugins (with Qt5) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Cmake build: Handle deprecated cmake versions
commit 0485574f76868a40cdee768b66af42cd114c2f02 Author: Kornel Benko Date: Sun Dec 31 15:18:11 2023 +0100 Cmake build: Handle deprecated cmake versions The warning says: CMake Deprecation Warning at .../CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 will be removed from a future version of CMake. Spotted by Scott Kostyshak (cherry picked from commit 8d79860ea76da4d9c0b87fce86526da15b686ab9) --- 3rdparty/dtl/CMakeLists.txt| 2 +- 3rdparty/hunspell/CMakeLists.txt | 2 +- 3rdparty/libiconv/CMakeLists.txt | 2 +- 3rdparty/mythes/CMakeLists.txt | 2 +- 3rdparty/zlib/CMakeLists.txt | 2 +- CMakeLists.txt | 4 ++-- development/Win32/vld/cmake/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3rdparty/dtl/CMakeLists.txt b/3rdparty/dtl/CMakeLists.txt index f757b26b17..20df178997 100644 --- a/3rdparty/dtl/CMakeLists.txt +++ b/3rdparty/dtl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/hunspell/CMakeLists.txt b/3rdparty/hunspell/CMakeLists.txt index 389524b0d8..00b36491b1 100644 --- a/3rdparty/hunspell/CMakeLists.txt +++ b/3rdparty/hunspell/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt index 12d5446a12..cb921d071d 100644 --- a/3rdparty/libiconv/CMakeLists.txt +++ b/3rdparty/libiconv/CMakeLists.txt @@ -5,7 +5,7 @@ # Please note that the package source code is licensed under its own license. project ( libiconv C ) -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/mythes/CMakeLists.txt b/3rdparty/mythes/CMakeLists.txt index 869bee7c93..251d4ffc93 100644 --- a/3rdparty/mythes/CMakeLists.txt +++ b/3rdparty/mythes/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt index e81e43af1c..0b539a58b0 100644 --- a/3rdparty/zlib/CMakeLists.txt +++ b/3rdparty/zlib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38e11b8a0b..86226dc8e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ # Licence details can be found in the file COPYING. # # Copyright (c) 2006-2011 Peter Kümmel, -# Copyright (c) 2008-2020 Kornel Benko, +# Copyright (c) 2008-2024 Kornel Benko, -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.5.0) set(LYX_PROJECT LyX) # Instruct cmake to not use gnu extensions, diff --git a/development/Win32/vld/cmake/CMakeLists.txt b/development/Win32/vld/cmake/CMakeLists.txt index b197151895..5ccbe1572c 100644 --- a/development/Win32/vld/cmake/CMakeLists.txt +++ b/development/Win32/vld/cmake/CMakeLists.txt @@ -22,7 +22,7 @@ #// # -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 3.5.0) project(vld) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] FindAdv: no paragraph indentation for more space in the search string
commit f957964e9bc19c1f589787f6100b5e3430b20b35 Author: Daniel Ramoeller Date: Sun Dec 31 14:36:01 2023 +0100 FindAdv: no paragraph indentation for more space in the search string See #11555 (cherry picked from commit 638c04dd6aab3e16063a03183e25491f83780b68) --- src/frontends/qt/FindAndReplace.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/frontends/qt/FindAndReplace.cpp b/src/frontends/qt/FindAndReplace.cpp index 8c8ad115bd..b53c520974 100644 --- a/src/frontends/qt/FindAndReplace.cpp +++ b/src/frontends/qt/FindAndReplace.cpp @@ -630,6 +630,9 @@ void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */) copy_params(*bv, find_work_area_->bufferView()); copy_params(*bv, replace_work_area_->bufferView()); } + // no paragraph indentation for more space + find_work_area_->bufferView().buffer().params().setParIndent(Length(0, Length::IN)); + replace_work_area_->bufferView().buffer().params().setParIndent(Length(0, Length::IN)); find_work_area_->installEventFilter(this); replace_work_area_->installEventFilter(this); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] FindAdv: Handle neg-spaces like normal space if searching without format
commit 32a680e4fe1246f150f095fbc7e1397329932f67 Author: Kornel Benko Date: Sun Dec 31 14:27:40 2023 +0100 FindAdv: Handle neg-spaces like normal space if searching without format (cherry picked from commit 07cacef398d6d748e30d70fa6f06821e82ac4e4e) --- src/insets/InsetSpace.cpp | 7 ++- src/insets/InsetSpace.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp index 53fda518da..8ad6f7f5e0 100644 --- a/src/insets/InsetSpace.cpp +++ b/src/insets/InsetSpace.cpp @@ -773,7 +773,12 @@ int InsetSpace::plaintext(odocstringstream & os, case InsetSpaceParams::NEGTHIN: case InsetSpaceParams::NEGMEDIUM: case InsetSpaceParams::NEGTHICK: - return 0; + if (rp.find_effective()) { + os << ' '; + return 1; + } + else + return 0; default: os << ' '; return 1; diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h index 04edaed2c4..ceca1cfa06 100644 --- a/src/insets/InsetSpace.h +++ b/src/insets/InsetSpace.h @@ -136,7 +136,7 @@ public: /// void validate(LaTeXFeatures & features) const override; /// - bool findUsesToString() const override { return true; } + bool findUsesToString() const override { return false; } /// void toString(odocstream &) const override; /// -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.4.1-devel] Rename hasToString() to findUsesToString()
commit 1edbf565e4ec9903edd7baf26909bd85ad1a7651 Author: Kornel Benko Date: Sun Dec 31 14:09:17 2023 +0100 Rename hasToString() to findUsesToString() There are special cases where the toString() exist, but still plaintext() is not to be used by find. (cherry picked from commit 8de81e8dc1cf344a9a245868aaff2c31dd0c9ce4) --- src/Paragraph.cpp | 2 +- src/insets/Inset.h| 2 +- src/insets/InsetBranch.h | 2 +- src/insets/InsetCitation.h| 2 +- src/insets/InsetCounter.h | 2 +- src/insets/InsetHyperlink.h | 2 +- src/insets/InsetIPAMacro.h| 2 +- src/insets/InsetQuotes.h | 2 +- src/insets/InsetRef.h | 2 +- src/insets/InsetSpace.h | 2 +- src/insets/InsetSpecialChar.h | 2 +- src/insets/InsetText.h| 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 49713a8b9a..4282defa4a 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -4425,7 +4425,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options, const Out else if (c == META_INSET && (options & AS_STR_INSETS)) { if (c == META_INSET && (options & AS_STR_PLAINTEXT)) { LASSERT(runparams != nullptr, return docstring()); - if (runparams->find_effective() && getInset(i)->hasToString()) + if (runparams->find_effective() && getInset(i)->findUsesToString()) getInset(i)->toString(os); else getInset(i)->plaintext(os, *runparams); diff --git a/src/insets/Inset.h b/src/insets/Inset.h index d2b407675b..2fa3e26234 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -350,7 +350,7 @@ public: virtual docstring xhtml(XMLStream &, OutputParams const &) const; /// - virtual bool hasToString() const { return false; } + virtual bool findUsesToString() const { return false; } /// Writes a string representation of the inset to the odocstream. /// This one should be called when you want the whole contents of /// the inset. diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h index e2b2958f18..5098e70afb 100644 --- a/src/insets/InsetBranch.h +++ b/src/insets/InsetBranch.h @@ -80,7 +80,7 @@ private: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h index 56ad45a9b6..b1b27e0291 100644 --- a/src/insets/InsetCitation.h +++ b/src/insets/InsetCitation.h @@ -62,7 +62,7 @@ public: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetCounter.h b/src/insets/InsetCounter.h index eb6338dde2..65a38ab325 100644 --- a/src/insets/InsetCounter.h +++ b/src/insets/InsetCounter.h @@ -43,7 +43,7 @@ public: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h index 59615b0d5b..36bd249902 100644 --- a/src/insets/InsetHyperlink.h +++ b/src/insets/InsetHyperlink.h @@ -34,7 +34,7 @@ public: /// bool isInToc() const override { return true; } /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetIPAMacro.h b/src/insets/InsetIPAMacro.h index 5855da9e95..dc1977f977 100644 --- a/src/insets/InsetIPAMacro.h +++ b/src/insets/InsetIPAMacro.h @@ -154,7 +154,7 @@ public: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetQuotes.h b/src/insets/InsetQuotes.h index 5e6cb3c4aa..2eeb5fa866 100644 --- a/src/insets/InsetQuotes.h +++ b/src/insets/InsetQuotes.h @@ -157,7 +157,7 @@ public: docstring xhtml(XMLStream &, OutputParams const &) const override; ///
[LyX/2.4.1-devel] Update sk.po
commit 4cb805a9c8f7bee496130fc3f3625af68bc2f02f 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/master] Update sk.po
commit 6ad572a3a2cb6937a2e4eef78eada2495523d2a4 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.x] 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/master] Cmake build: Adapt for branch 2.4
commit b8b9e8ec1402341229aade4b4a975b54c3ef80c9 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 86226dc8e8..f473ee4bc5 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/master] de/UserGuide: update
commit 0b8e8eb1740f6db4f81772fd39dff8f80243dd5d 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.x] 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/master] FindAdv: no paragraph indentation for more space in the search string
commit 638c04dd6aab3e16063a03183e25491f83780b68 Author: Daniel Ramoeller Date: Sun Dec 31 14:36:01 2023 +0100 FindAdv: no paragraph indentation for more space in the search string See #11555 --- src/frontends/qt/FindAndReplace.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/frontends/qt/FindAndReplace.cpp b/src/frontends/qt/FindAndReplace.cpp index 8c8ad115bd..b53c520974 100644 --- a/src/frontends/qt/FindAndReplace.cpp +++ b/src/frontends/qt/FindAndReplace.cpp @@ -630,6 +630,9 @@ void FindAndReplaceWidget::showEvent(QShowEvent * /* ev */) copy_params(*bv, find_work_area_->bufferView()); copy_params(*bv, replace_work_area_->bufferView()); } + // no paragraph indentation for more space + find_work_area_->bufferView().buffer().params().setParIndent(Length(0, Length::IN)); + replace_work_area_->bufferView().buffer().params().setParIndent(Length(0, Length::IN)); find_work_area_->installEventFilter(this); replace_work_area_->installEventFilter(this); -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] cmake build with qt6 (macos) did not include "plugins"
commit 4d02fb7ad7a846bebfd8ba5fd37a5453482e768d Author: P. De Visschere Date: Sun Dec 31 15:30:12 2023 +0100 cmake build with qt6 (macos) did not include "plugins" --- development/cmake/post_install/CMakeLists.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/development/cmake/post_install/CMakeLists.txt b/development/cmake/post_install/CMakeLists.txt index f39bb5a763..56c552e4d0 100644 --- a/development/cmake/post_install/CMakeLists.txt +++ b/development/cmake/post_install/CMakeLists.txt @@ -48,6 +48,11 @@ if(LYX_BUNDLE) install_qt_plugin("${QtScope}::QCocoaIntegrationPlugin") endif() +if (APPLE AND LYX_USE_QT MATCHES "QT6") + # With QT6, just copy all the plugins + file(GLOB QT_PLUGIN_DIRECTORIES "${QT_PLUGINS_DIR}/*") + install(DIRECTORY ${QT_PLUGIN_DIRECTORIES} DESTINATION "${qtplugin_dest_dir}/plugins/" COMPONENT Runtime) +endif() # Install code does the following: # - Creates the qt.conf file # - install the platform specific plugins (with Qt5) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Cmake build: Handle deprecated cmake versions
commit 8d79860ea76da4d9c0b87fce86526da15b686ab9 Author: Kornel Benko Date: Sun Dec 31 15:18:11 2023 +0100 Cmake build: Handle deprecated cmake versions The warning says: CMake Deprecation Warning at .../CMakeLists.txt:1 (cmake_minimum_required): Compatibility with CMake < 3.5 will be removed from a future version of CMake. Spotted by Scott Kostyshak --- 3rdparty/dtl/CMakeLists.txt| 2 +- 3rdparty/hunspell/CMakeLists.txt | 2 +- 3rdparty/libiconv/CMakeLists.txt | 2 +- 3rdparty/mythes/CMakeLists.txt | 2 +- 3rdparty/zlib/CMakeLists.txt | 2 +- CMakeLists.txt | 4 ++-- development/Win32/vld/cmake/CMakeLists.txt | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/3rdparty/dtl/CMakeLists.txt b/3rdparty/dtl/CMakeLists.txt index f757b26b17..20df178997 100644 --- a/3rdparty/dtl/CMakeLists.txt +++ b/3rdparty/dtl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/hunspell/CMakeLists.txt b/3rdparty/hunspell/CMakeLists.txt index 389524b0d8..00b36491b1 100644 --- a/3rdparty/hunspell/CMakeLists.txt +++ b/3rdparty/hunspell/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/libiconv/CMakeLists.txt b/3rdparty/libiconv/CMakeLists.txt index 12d5446a12..cb921d071d 100644 --- a/3rdparty/libiconv/CMakeLists.txt +++ b/3rdparty/libiconv/CMakeLists.txt @@ -5,7 +5,7 @@ # Please note that the package source code is licensed under its own license. project ( libiconv C ) -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/mythes/CMakeLists.txt b/3rdparty/mythes/CMakeLists.txt index 869bee7c93..251d4ffc93 100644 --- a/3rdparty/mythes/CMakeLists.txt +++ b/3rdparty/mythes/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/3rdparty/zlib/CMakeLists.txt b/3rdparty/zlib/CMakeLists.txt index e81e43af1c..0b539a58b0 100644 --- a/3rdparty/zlib/CMakeLists.txt +++ b/3rdparty/zlib/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1) +cmake_minimum_required(VERSION 3.5.0) set(LYX_IPO_SUPPORTED FALSE) if (POLICY CMP0069) diff --git a/CMakeLists.txt b/CMakeLists.txt index 38e11b8a0b..86226dc8e8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,9 +2,9 @@ # Licence details can be found in the file COPYING. # # Copyright (c) 2006-2011 Peter Kümmel, -# Copyright (c) 2008-2020 Kornel Benko, +# Copyright (c) 2008-2024 Kornel Benko, -cmake_minimum_required(VERSION 3.1.0) +cmake_minimum_required(VERSION 3.5.0) set(LYX_PROJECT LyX) # Instruct cmake to not use gnu extensions, diff --git a/development/Win32/vld/cmake/CMakeLists.txt b/development/Win32/vld/cmake/CMakeLists.txt index b197151895..5ccbe1572c 100644 --- a/development/Win32/vld/cmake/CMakeLists.txt +++ b/development/Win32/vld/cmake/CMakeLists.txt @@ -22,7 +22,7 @@ #// # -cmake_minimum_required(VERSION 2.6.4) +cmake_minimum_required(VERSION 3.5.0) project(vld) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Rename hasToString() to findUsesToString()
commit 8de81e8dc1cf344a9a245868aaff2c31dd0c9ce4 Author: Kornel Benko Date: Sun Dec 31 14:09:17 2023 +0100 Rename hasToString() to findUsesToString() There are special cases where the toString() exist, but still plaintext() is not to be used by find. --- src/Paragraph.cpp | 2 +- src/insets/Inset.h| 2 +- src/insets/InsetBranch.h | 2 +- src/insets/InsetCitation.h| 2 +- src/insets/InsetCounter.h | 2 +- src/insets/InsetHyperlink.h | 2 +- src/insets/InsetIPAMacro.h| 2 +- src/insets/InsetQuotes.h | 2 +- src/insets/InsetRef.h | 2 +- src/insets/InsetSpace.h | 2 +- src/insets/InsetSpecialChar.h | 2 +- src/insets/InsetText.h| 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp index 49713a8b9a..4282defa4a 100644 --- a/src/Paragraph.cpp +++ b/src/Paragraph.cpp @@ -4425,7 +4425,7 @@ docstring Paragraph::asString(pos_type beg, pos_type end, int options, const Out else if (c == META_INSET && (options & AS_STR_INSETS)) { if (c == META_INSET && (options & AS_STR_PLAINTEXT)) { LASSERT(runparams != nullptr, return docstring()); - if (runparams->find_effective() && getInset(i)->hasToString()) + if (runparams->find_effective() && getInset(i)->findUsesToString()) getInset(i)->toString(os); else getInset(i)->plaintext(os, *runparams); diff --git a/src/insets/Inset.h b/src/insets/Inset.h index d2b407675b..2fa3e26234 100644 --- a/src/insets/Inset.h +++ b/src/insets/Inset.h @@ -350,7 +350,7 @@ public: virtual docstring xhtml(XMLStream &, OutputParams const &) const; /// - virtual bool hasToString() const { return false; } + virtual bool findUsesToString() const { return false; } /// Writes a string representation of the inset to the odocstream. /// This one should be called when you want the whole contents of /// the inset. diff --git a/src/insets/InsetBranch.h b/src/insets/InsetBranch.h index e2b2958f18..5098e70afb 100644 --- a/src/insets/InsetBranch.h +++ b/src/insets/InsetBranch.h @@ -80,7 +80,7 @@ private: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetCitation.h b/src/insets/InsetCitation.h index 56ad45a9b6..b1b27e0291 100644 --- a/src/insets/InsetCitation.h +++ b/src/insets/InsetCitation.h @@ -62,7 +62,7 @@ public: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetCounter.h b/src/insets/InsetCounter.h index eb6338dde2..65a38ab325 100644 --- a/src/insets/InsetCounter.h +++ b/src/insets/InsetCounter.h @@ -43,7 +43,7 @@ public: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetHyperlink.h b/src/insets/InsetHyperlink.h index 59615b0d5b..36bd249902 100644 --- a/src/insets/InsetHyperlink.h +++ b/src/insets/InsetHyperlink.h @@ -34,7 +34,7 @@ public: /// bool isInToc() const override { return true; } /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetIPAMacro.h b/src/insets/InsetIPAMacro.h index 5855da9e95..dc1977f977 100644 --- a/src/insets/InsetIPAMacro.h +++ b/src/insets/InsetIPAMacro.h @@ -154,7 +154,7 @@ public: /// docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findUsesToString() const override { return true; } /// void toString(odocstream &) const override; /// diff --git a/src/insets/InsetQuotes.h b/src/insets/InsetQuotes.h index 5e6cb3c4aa..2eeb5fa866 100644 --- a/src/insets/InsetQuotes.h +++ b/src/insets/InsetQuotes.h @@ -157,7 +157,7 @@ public: docstring xhtml(XMLStream &, OutputParams const &) const override; /// - bool hasToString() const override { return true; } + bool findU
[LyX/master] FindAdv: Handle neg-spaces like normal space if searching without format
commit 07cacef398d6d748e30d70fa6f06821e82ac4e4e Author: Kornel Benko Date: Sun Dec 31 14:27:40 2023 +0100 FindAdv: Handle neg-spaces like normal space if searching without format --- src/insets/InsetSpace.cpp | 7 ++- src/insets/InsetSpace.h | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/insets/InsetSpace.cpp b/src/insets/InsetSpace.cpp index 53fda518da..8ad6f7f5e0 100644 --- a/src/insets/InsetSpace.cpp +++ b/src/insets/InsetSpace.cpp @@ -773,7 +773,12 @@ int InsetSpace::plaintext(odocstringstream & os, case InsetSpaceParams::NEGTHIN: case InsetSpaceParams::NEGMEDIUM: case InsetSpaceParams::NEGTHICK: - return 0; + if (rp.find_effective()) { + os << ' '; + return 1; + } + else + return 0; default: os << ' '; return 1; diff --git a/src/insets/InsetSpace.h b/src/insets/InsetSpace.h index 04edaed2c4..ceca1cfa06 100644 --- a/src/insets/InsetSpace.h +++ b/src/insets/InsetSpace.h @@ -136,7 +136,7 @@ public: /// void validate(LaTeXFeatures & features) const override; /// - bool findUsesToString() const override { return true; } + bool findUsesToString() const override { return false; } /// void toString(odocstream &) const override; /// -- 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 b4a93a493c17ebde04a5759dd16d3d12a63f9adf Author: Juergen Spitzmueller Date: Tue Apr 2 09:15:03 2024 +0200 de.po po/de.po | 1054 +++--- 1 file changed, 529 insertions(+), 525 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs