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 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 -Quote Inserts a single quote in the quotation marks style selected in the +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 + +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 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-devel@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" 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