[LyX/master] Update covington support in linguistics module (file format change)
commit 2841a1c06315edb7dd3a264746c093ee4c1a7c9f Author: Juergen Spitzmueller Date: Thu Jul 20 15:09:47 2023 +0200 Update covington support in linguistics module (file format change) --- development/FORMAT |9 + lib/layouts/linguistics.module | 60 +- lib/lyx2lyx/lyx_2_4.py | 521 +++- src/version.h |4 +- 4 files changed, 586 insertions(+), 8 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 48ee924..11acdfc 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -7,6 +7,15 @@ changes happened in particular if possible. A good example would be --- +2023-07-20 Jürgen Spitzmüller + * Format incremented to 617: Update covington support in linguistics module: + - Support enviroment option of example and examples + - Support angular item argument of examples and subexamples (this shifts item + argument structure) + - Support new optional arguments of \digloss and \trigloss (this shifts argument + structure) + - Support \expreamble and \subexpreamble macros + 2022-12-25 Richard Kimberly Heck * Format incremented to 614: New "Other" type for hyperlinks diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module index 8bfb213..4c04255 100644 --- a/lib/layouts/linguistics.module +++ b/lib/layouts/linguistics.module @@ -81,6 +81,12 @@ Style Numbered_Example_(multiline) Color textlabel1 EndFont Requires covington + Argument 1 + LabelString "Example options" + MenuString"Examples options|s" + Tooltip "Add examples options here" + PassThru 1 + EndArgument Category Linguistics DocBookWrapperTag informalexample DocBookWrapperAttrrole='numbered' @@ -108,6 +114,12 @@ Style Numbered_Examples_(consecutive) EndFont EndArgument Argument item:1 + LabelString "Judgment|J" + Tooltip "Grammaticality judgment marker" + LeftDelim < + RightDelim> + EndArgument + Argument item:2 LabelString "Custom Numbering|s" Tooltip "Customize the numeration" EndArgument @@ -135,6 +147,21 @@ Style Subexample HTMLClass SubExample End +InsetLayout Flex:Example_Preamble + LyXType custom + Decorationclassic + LatexType command + LatexName expreamble + LabelString "Ex. Preamble" + ResetsFonttrue +End + +InsetLayout Flex:Subexample_Preamble + CopyStyle Flex:Example_Preamble + LatexName subexpreamble + LabelString "Subex. Preamble" +End + # # Interlinear Glosses @@ -164,6 +191,11 @@ InsetLayout Flex:Interlinear_Gloss_(2_Lines) Tooltip "Add digloss options here" EndArgument Argument post:1 + LabelString "Sentence Comment" + MenuString"Sentence Comment" + Tooltip "Add an optional sentence comment here" + EndArgument + Argument post:2 Decorationconglomerate LabelString "Interlinear Gloss" MenuString"Interlinear Gloss" @@ -173,7 +205,12 @@ InsetLayout Flex:Interlinear_Gloss_(2_Lines) FreeSpacing true InsertOnNewline true EndArgument - Argument post:2 + Argument post:3 + LabelString "Gloss Comment" + MenuString"Gloss Comment" + Tooltip "Add an optional gloss comment here" + EndArgument + Argument post:4 Decorationconglomerate LabelString "Translation" MenuString"Gloss Translation" @@ -210,6 +247,11 @@ InsetLayout Flex:Interlinear_Gloss_(3_Lines) Tooltip "Add trigloss options here" EndArgument Argument post:1 + LabelString "Sentence Comment" + MenuString"Sentence Comment" + Tooltip "Add an optional sentence comment here" + EndArgument + Argument post:2 Decorationconglomerate LabelString "Interlinear Gloss (1)" MenuString"Interlinear Gloss (Line 1)|1" @@ -219,17 +261,27 @@ InsetLayout Flex:Interlinear_Gloss_(3_Lines) FreeSpacing true InsertOnNewline true EndArgument - Argument post:2 + Argument post:3 + LabelString "Gloss Comment (1)" + MenuString"Gloss Comment (Line 1)" + Tooltip "Add an optional gloss comment
[LyX/master] Add missing FORMAT entries
commit 9d0cc94288f4ff9d6754cc6355562e474a87003d Author: Juergen Spitzmueller Date: Thu Jul 20 15:19:42 2023 +0200 Add missing FORMAT entries 616 could be a bit more verbose. Enrico? Riki? --- development/FORMAT |7 +++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 11acdfc..b60e294 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -16,6 +16,13 @@ changes happened in particular if possible. A good example would be structure) - Support \expreamble and \subexpreamble macros +2023-06-11 Enrico Forestieri + * Format incremented to 616: Do not output LaTeX for a macro if the LaTeX part is empty + +2023-04-02 Jürgen Spitzmüller + * Format incremented to 615: Unifiy spelling of "acknowledgment" styles + (using US spelling throughout) + 2022-12-25 Richard Kimberly Heck * Format incremented to 614: New "Other" type for hyperlinks -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update tex2lyx tests
commit 0e0c2c6120e8aa792c4d88c80dc31068bdb8abb0 Author: Juergen Spitzmueller Date: Thu Jul 20 15:22:47 2023 +0200 Update tex2lyx tests --- src/tex2lyx/test/CJK.lyx.lyx |2 +- src/tex2lyx/test/CJKutf8.lyx.lyx |2 +- src/tex2lyx/test/DummyDocument.lyx.lyx |2 +- src/tex2lyx/test/Dummy~Document.lyx.lyx|2 +- src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx |2 +- src/tex2lyx/test/algo2e.lyx.lyx|2 +- src/tex2lyx/test/beamer.lyx.lyx|2 +- .../test/box-color-size-space-align.lyx.lyx|2 +- src/tex2lyx/test/listpreamble.lyx.lyx |2 +- src/tex2lyx/test/tabular-x-test.lyx.lyx|2 +- src/tex2lyx/test/test-insets-basic.lyx.lyx |2 +- src/tex2lyx/test/test-insets.lyx.lyx |2 +- src/tex2lyx/test/test-memoir.lyx.lyx |2 +- src/tex2lyx/test/test-minted.lyx.lyx |2 +- src/tex2lyx/test/test-modules.lyx.lyx |2 +- src/tex2lyx/test/test-refstyle-theorems.lyx.lyx|2 +- src/tex2lyx/test/test-scr.lyx.lyx |2 +- src/tex2lyx/test/test-structure.lyx.lyx|2 +- src/tex2lyx/test/test.lyx.lyx |2 +- src/tex2lyx/test/verbatim.lyx.lyx |2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx index 12fc913..95dcfae 100644 --- a/src/tex2lyx/test/CJK.lyx.lyx +++ b/src/tex2lyx/test/CJK.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx index 0e0155d..6db7fab 100644 --- a/src/tex2lyx/test/CJKutf8.lyx.lyx +++ b/src/tex2lyx/test/CJKutf8.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx index c335ab5..77defb5 100644 --- a/src/tex2lyx/test/DummyDocument.lyx.lyx +++ b/src/tex2lyx/test/DummyDocument.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx index 9110eb4..bbaa513 100644 --- a/src/tex2lyx/test/Dummy~Document.lyx.lyx +++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx index 65a7384..471fc52 100644 --- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx +++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index abd1e0d..9748d9c 100644 --- a/src/tex2lyx/test/algo2e.lyx.lyx +++ b/src/tex2lyx/test/algo2e.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/beamer.lyx.lyx b/src/tex2lyx/test/beamer.lyx.lyx index 312e500..cdd6aa1 100644 --- a/src/tex2lyx/test/beamer.lyx.lyx +++ b/src/tex2lyx/test/beamer.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx index b51e65e..8fdde19 100644 --- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx +++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/listpreamble.lyx.lyx b/src/tex2lyx/test/listpreamble.lyx.lyx index e3c62fb..cf8a361 100644 --- a/src/tex2lyx/test/listpreamble.lyx.lyx +++ b/src/tex2lyx/test/listpreamble.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true diff --git a/src/tex2lyx/test/tabular-x-test.lyx.lyx b/src/tex2lyx/test/tabular-x-test.lyx.lyx index e8c6795..db81aab 100644 --- a/src/tex2lyx/test/tabular-x-test.lyx.lyx +++ b/src/tex2lyx/test/tabular-x-test.lyx.lyx @@ -1,5 +1,5 @@ #LyX file created by tex2lyx 2.4 -\lyxformat 616 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true
[LyX/master] FindAdv: Handle negthinspace, negmedspace and negthickspace also in regexes
commit 11f44c00e0e69cbfc347d0ef9107e3900a4f0276
Author: Kornel Benko
Date: Thu Jul 20 12:28:35 2023 +0200
FindAdv: Handle negthinspace, negmedspace and negthickspace also in regexes
---
src/lyxfind.cpp | 11 +++
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/lyxfind.cpp b/src/lyxfind.cpp
index 13159b5..42efd67 100644
--- a/src/lyxfind.cpp
+++ b/src/lyxfind.cpp
@@ -947,6 +947,9 @@ string correctRegex(string t, bool withformat)
}
else if (sub.str(4) == "mathcircumflex")
replace = "^";
+ else if ((sub.str(4) == "negthinspace") || (sub.str(4)
== "negmedspace") || (sub.str(4) == "negthickspace")) {
+ replace = accents[sub.str(4)+"{}"];
+ }
else if (backslashed) {
backslashed = false;
if (withformat) {
@@ -1996,11 +1999,11 @@ static void buildAccentsMap()
accents["guillemotleft"] = "«";
accents["hairspace"] = getutf8(0xf);// select from free
unicode plane 15
accents["thinspace"] = getutf8(0xf0002);// and used _only_ by
findadv
- accents["negthinspace"] = getutf8(0xf0003);// to omit backslashed
latex macros
+ accents["negthinspace{}"]= getutf8(0xf0003);// to omit backslashed
latex macros
accents["medspace"] = getutf8(0xf0004);// See
https://en.wikipedia.org/wiki/Private_Use_Areas
- accents["negmedspace"] = getutf8(0xf0005);
+ accents["negmedspace{}"] = getutf8(0xf0005);
accents["thickspace"]= getutf8(0xf0006);
- accents["negthickspace"] = getutf8(0xf0007);
+ accents["negthickspace{}"]= getutf8(0xf0007);
accents["lyx"] = getutf8(0xf0010);// Used logos
accents["LyX"] = getutf8(0xf0010);
accents["tex"] = getutf8(0xf0011);
@@ -2090,7 +2093,7 @@ void Intervall::removeAccents()
if (accents.empty())
buildAccentsMap();
static regex const accre("("
-"([\\S]|[A-Za-z]+)\\{[^\\{\\}]+\\}"
+"([\\S]|[A-Za-z]+)\\{[^\\{\\}]*\\}"
"|([\\S]|[A-Za-z]+)\\{[ij](math)?\\}"
"|("
"(backslash
([lL]y[xX]|[tT]e[xX]|[lL]a[tT]e[xX]e?|lyxarrow))"
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Forgot these
commit a91d1ebe820fe7ace78ec83ae159b6597e6be96c Author: Juergen Spitzmueller Date: Thu Jul 20 16:26:17 2023 +0200 Forgot these --- development/FORMAT |2 +- lib/layouts/linguistics.module | 13 + lib/lyx2lyx/lyx_2_4.py |2 ++ 3 files changed, 16 insertions(+), 1 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index 2b0d293..56cd436 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -14,7 +14,7 @@ changes happened in particular if possible. A good example would be argument structure) - Support new optional arguments of \digloss and \trigloss (this shifts argument structure) - - Support \expreamble and \subexpreamble macros + - Support \expreamble, \subexpreamble \expostamble, \subexpostamble macros 2023-06-11 Enrico Forestieri * Format incremented to 616: Do not output LaTeX for a macro if the LaTeX part is empty diff --git a/lib/layouts/linguistics.module b/lib/layouts/linguistics.module index 4c04255..a5379da 100644 --- a/lib/layouts/linguistics.module +++ b/lib/layouts/linguistics.module @@ -163,6 +163,19 @@ InsetLayout Flex:Subexample_Preamble End +InsetLayout Flex:Example_Postamble + CopyStyle Flex:Example_Preamble + LatexName expostamble + LabelString "Ex. Postamble" +End + +InsetLayout Flex:Subexample_Postamble + CopyStyle Flex:Example_Preamble + LatexName subexpostamble + LabelString "Subex. Postamble" +End + + # # Interlinear Glosses # diff --git a/lib/lyx2lyx/lyx_2_4.py b/lib/lyx2lyx/lyx_2_4.py index dd092e9..33bf92c 100644 --- a/lib/lyx2lyx/lyx_2_4.py +++ b/lib/lyx2lyx/lyx_2_4.py @@ -5520,6 +5520,8 @@ def revert_expreambles(document): revert_flex_inset(document.body, "Example Preamble", "\\expreamble") revert_flex_inset(document.body, "Subexample Preamble", "\\subexpreamble") +revert_flex_inset(document.body, "Example Postamble", "\\expostamble") +revert_flex_inset(document.body, "Subexample Postamble", "\\subexpostamble") ## -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update linguistics manual
commit 37b39eb0cfcf47e771979e4566e098663d3eeba1 Author: Juergen Spitzmueller Date: Thu Jul 20 16:45:43 2023 +0200 Update linguistics manual --- lib/examples/Modules/Linguistics.lyx| 190 --- lib/examples/de/Modules/Linguistics.lyx | 158 -- 2 files changed, 274 insertions(+), 74 deletions(-) diff --git a/lib/examples/Modules/Linguistics.lyx b/lib/examples/Modules/Linguistics.lyx index 32f2079..676ce01 100644 --- a/lib/examples/Modules/Linguistics.lyx +++ b/lib/examples/Modules/Linguistics.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 614 +\lyxformat 617 \begin_document \begin_header \save_transient_properties true @@ -266,8 +266,8 @@ glosses \change_unchanged . -\change_inserted -712698321 1561204748 - Note that at least version 2.3 of the covington package is required to use all features. +\change_inserted -712698321 1689860042 + Note that at least version 2.11 of the covington package is required to use all features. \change_unchanged \end_layout @@ -620,25 +620,35 @@ nolink "false" \end_layout \begin_layout Standard + +\change_deleted -712698321 1689862356 If you want to modify the numbering of an individual example, you can use \family sans Insert\SpecialChar menuseparator Custom Numbering -\change_deleted -712698321 1561204890 - -\change_unchanged - \family default . +\change_unchanged -\change_inserted -712698321 1561205104 - For global adjustments, - -\emph on -covington -\emph default - provides means for customization. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1689861656 +All example variants can be customized in many details via optional arguments. + These can be inserted via +\family sans +Insert\SpecialChar menuseparator +Examples options +\family default + or +\family sans +Insert\SpecialChar menuseparator +Subexamples options +\family default +, + respectively. Please refer to the \emph on covington @@ -652,28 +662,101 @@ literal "false" \end_inset for details. -\change_unchanged - \end_layout \begin_layout Standard -\change_inserted -712698321 1561205365 -As of version 2.3, - +\change_inserted -712698321 1689862358 +For global adjustments, + these options can be passed to the +\family typewriter + +\backslash +setexampleoptions +\family default + macro (please use \SpecialChar TeX + mode for this purpose). + Again, + please refer to the \emph on covington \emph default -'s subexamples features optional arguments (to insert text between the main number and the first sub-example). - These can be inserted via + manual +\begin_inset CommandInset citation +LatexCommand cite +key "covington" +literal "false" + +\end_inset + + for details. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1689862465 +In the case of consecutive examples and subexamples, + there are some more extra insets available: +\end_layout + +\begin_layout Itemize + +\change_inserted -712698321 1689862485 +To modify the numbering of an individual example, + you can use \family sans Insert\SpecialChar menuseparator -Subexamples options +Custom Numbering \family default . - Please, - again, - refer to the +\end_layout + +\begin_layout Itemize + +\change_inserted -712698321 1689862558 +To add judgment markers (such as * or ?) to example sentences, + use +\family sans +Insert\SpecialChar menuseparator +Judgment +\family default +. +\end_layout + +\begin_layout Itemize + +\change_inserted -712698321 1689863425 +To add text that precedes an example sentence (but is not part of the presented data), + use +\family sans +Insert\SpecialChar menuseparator +Custom Inset\SpecialChar menuseparator +Example Preamble +\family default + or +\family sans +Subexample Preamble. +\end_layout + +\begin_layout Itemize + +\change_inserted -712698321 1689863466 +To add text that follows an example sentence (but is not part of the presented data), + use +\family sans +Insert\SpecialChar menuseparator +Custom Inset\SpecialChar menuseparator +Example Postamble +\family default + or +\family sans +Subexample Postamble. +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1689862769 +Please consult the \emph on covington \emph default @@ -685,7 +768,7 @@ literal "false" \end_inset - for details. + for details on all these features. \change_unchanged \end_layout @@ -859,9 +942,36 @@ in the right order \change_unchanged . -\change_inserted -712698321 1559636755 - Finally, - you can also insert gloss options via +\change_inserted -712698321 1689863632 + +\end_layout + +\begin_layout Standard + +\change_inserted -712698321 1689863920 +Optionally, + you can also insert comments to the example sentence or each of the gloss lines via +\family sans +Insert\SpecialChar menuseparator +Sentence Comment +\family default + (for the example sentence) or +\family sans +Insert\SpecialChar
[LyX/master] Update sk.po
commit 3ebc7cc706274ba23469527a5958e4bb48e70a5d
Author: Kornel Benko
Date: Thu Jul 20 18:36:26 2023 +0200
Update sk.po
---
po/sk.po | 106 +-
1 files changed, 98 insertions(+), 8 deletions(-)
diff --git a/po/sk.po b/po/sk.po
index 2838b20..58efa36 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-06-17 10:35+0200\n"
-"PO-Revision-Date: 2023-06-17 08:39+\n"
+"POT-Creation-Date: 2023-07-20 17:30+0200\n"
+"PO-Revision-Date: 2023-07-20 16:33+\n"
"Last-Translator: Kornel Benko \n"
"Language-Team: Slovak \n"
"Language: sk\n"
@@ -14351,10 +14351,30 @@ msgstr "\\theexamplei (\\alph{subexampleiv})"
msgid "Numbered Example (multiline)"
msgstr "Číslovaný príklad (viac-riadkový)"
+#: lib/layouts/linguistics.module:85
+msgid "Example options"
+msgstr "Príkladné voľby"
+
+#: lib/layouts/linguistics.module:86
+msgid "Examples options|s"
+msgstr "Voľby pre príklady|y"
+
+#: lib/layouts/linguistics.module:87
+msgid "Add examples options here"
+msgstr "Pridajte sem voľby pre príklady"
+
#: lib/layouts/linguistics.module:93
msgid "Numbered Examples (consecutive)"
msgstr "Číslované príklady (postupne)"
+#: lib/layouts/linguistics.module:117
+msgid "Judgment|J"
+msgstr "Úsudok|D"
+
+#: lib/layouts/linguistics.module:118
+msgid "Grammaticality judgment marker"
+msgstr "Marker pre gramatikalizujúcy úsudok"
+
#: lib/layouts/linguistics.module:111
msgid "Custom Numbering|s"
msgstr "Vlastné číslovanie|é"
@@ -14363,17 +14383,49 @@ msgstr "Vlastné číslovanie|é"
msgid "Customize the numeration"
msgstr "Prispôsobiť číslovanie"
-#: lib/layouts/linguistics.module:130
+#: lib/layouts/linguistics.module:142
msgid "Subexamples options"
-msgstr "Podpríkladné voľby"
+msgstr "Pod-príkladné voľby"
-#: lib/layouts/linguistics.module:131
+#: lib/layouts/linguistics.module:143
msgid "Subexamples options|s"
-msgstr "Podpríkladné voľby|n"
+msgstr "Pod-príkladné voľby|n"
-#: lib/layouts/linguistics.module:132
+#: lib/layouts/linguistics.module:144
msgid "Add subexamples options here"
-msgstr "Pridajte sem voľby pre podpríklad"
+msgstr "Pridajte sem voľby pre pod-príklad"
+
+#: lib/layouts/linguistics.module:150
+msgid "Example Preamble"
+msgstr "Príkladná preambula"
+
+#: lib/layouts/linguistics.module:155
+msgid "Ex. Preamble"
+msgstr "Pr. preambula"
+
+#: lib/layouts/linguistics.module:159
+msgid "Subexample Preamble"
+msgstr "Pod-príkladná preambula"
+
+#: lib/layouts/linguistics.module:162
+msgid "Subex. Preamble"
+msgstr "Podpr. preambula"
+
+#: lib/layouts/linguistics.module:166
+msgid "Example Postamble"
+msgstr "Príkladný záver"
+
+#: lib/layouts/linguistics.module:169
+msgid "Ex. Postamble"
+msgstr "Pr. záver"
+
+#: lib/layouts/linguistics.module:172
+msgid "Subexample Postamble"
+msgstr "Pod-príkladný záver"
+
+#: lib/layouts/linguistics.module:175
+msgid "Subex. Postamble"
+msgstr "Podpr. záver"
#: lib/layouts/linguistics.module:144
msgid "Interlinear Gloss (2 Lines)"
@@ -14396,6 +14448,15 @@ msgstr "Voľby glosy|s"
msgid "Add digloss options here"
msgstr "Pridajte sem voľby pre digloss"
+#: lib/layouts/linguistics.module:207 lib/layouts/linguistics.module:208
+#: lib/layouts/linguistics.module:263 lib/layouts/linguistics.module:264
+msgid "Sentence Comment"
+msgstr "Komentár na vetu"
+
+#: lib/layouts/linguistics.module:209 lib/layouts/linguistics.module:265
+msgid "Add an optional sentence comment here"
+msgstr "Pridajte sem nepovinný komentár glosovej vety"
+
# Med
#: lib/layouts/linguistics.module:168 lib/layouts/linguistics.module:169
msgid "Interlinear Gloss"
@@ -14405,6 +14466,15 @@ msgstr "Medziriadková glosa"
msgid "Add the inter-linear gloss here"
msgstr "Vložte sem medzi-riadkovú glosu"
+#: lib/layouts/linguistics.module:222 lib/layouts/linguistics.module:223
+msgid "Gloss Comment"
+msgstr "Komentár na glosu"
+
+#: lib/layouts/linguistics.module:224 lib/layouts/linguistics.module:280
+#: lib/layouts/linguistics.module:295
+msgid "Add an optional gloss comment here"
+msgstr "Pridajte sem nepovinný komentár glosy"
+
#: lib/layouts/linguistics.module:178 lib/layouts/linguistics.module:234
msgid "Translation"
msgstr "Preklad"
@@ -14441,6 +14511,14 @@ msgstr "Medziriadková glosa (riadok 1)|1"
msgid "Add the first inter-linear gloss line here"
msgstr "Vložte sem prvý riadok medzi-riadkovej glosy"
+#: lib/layouts/linguistics.module:278
+msgid "Gloss Comment (1)"
+msgstr "Komentár na glosu (1)"
+
+#: lib/layouts/linguistics.module:279
+msgid "Gloss Comment (Line 1)"
+msgstr "Komentár na glosu (riadok 1)"
+
#: lib/layouts/linguistics.module:224
msgid "Interlinear Gloss (2)"
msgstr "Medziriadková glosa (2)"
@@ -14449,6 +14527,18 @@ msgstr "Medziriadková glosa (2)"
msgid "Interlinear Gloss (Line 2)|2"
msgstr "Medziriadková glosa (riadok 2)|2"
+#:
[LyX/master] de.po
commit 9a35ba1aa07f5ef1f1916364051d6ee4c363cb0d Author: Juergen Spitzmueller Date: Thu Jul 20 15:31:36 2023 +0200 de.po po/de.gmo | Bin 645476 -> 646776 bytes po/de.po | 872 + 2 files changed, 473 insertions(+), 399 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] FORMAT: more details on 616
commit 573b4be7bc4dac611e97a84235a76415672f21d7 Author: Scott Kostyshak Date: Thu Jul 20 10:11:53 2023 -0400 FORMAT: more details on 616 --- development/FORMAT |2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/development/FORMAT b/development/FORMAT index b60e294..2b0d293 100644 --- a/development/FORMAT +++ b/development/FORMAT @@ -18,6 +18,8 @@ changes happened in particular if possible. A good example would be 2023-06-11 Enrico Forestieri * Format incremented to 616: Do not output LaTeX for a macro if the LaTeX part is empty + - This allows the user to define the LyX display for LaTeX commands + that are already defined (e.g., in user preamble or a package). 2023-04-02 Jürgen Spitzmüller * Format incremented to 615: Unifiy spelling of "acknowledgment" styles -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Improve format specification for 616.
commit 9eec50464fa194e7468e9e233b94cb27cf2efe8e
Author: Richard Kimberly Heck
Date: Thu Jul 20 13:20:48 2023 -0400
Improve format specification for 616.
---
development/FORMAT |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/development/FORMAT b/development/FORMAT
index 56cd436..8adbb25 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -20,6 +20,9 @@ changes happened in particular if possible. A good example
would be
* Format incremented to 616: Do not output LaTeX for a macro if the
LaTeX part is empty
- This allows the user to define the LyX display for LaTeX commands
that are already defined (e.g., in user preamble or a package).
+ - No substantive change to file format. Format change just in case
someone defined a
+ math macro with an empty LaTeX field. In that case, lyx2lyx adds {}
to the LaTeX
+ part on conversion and removes the macro altogether on reversion.
2023-04-02 Jürgen Spitzmüller
* Format incremented to 615: Unifiy spelling of "acknowledgment" styles
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Send some debug info to ACTION
commit f31bf0df1dec6e815fe28872b1cfeaf608e4ffb0
Author: Jean-Marc Lasgouttes
Date: Thu Jul 20 23:39:15 2023 +0200
Send some debug info to ACTION
---
src/Cursor.cpp |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 7afefcf..98b2b15 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -795,7 +795,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
disp_.dispatched(true);
disp_.screenUpdate(Update::FitCursor | Update::Force);
FuncRequest tmpcmd = cmd;
- LYXERR(Debug::DEBUG, "Cursor::dispatch: (AtPoint) cmd: "
+ LYXERR(Debug::ACTION, "Cursor::dispatch: (AtPoint) cmd: "
<< cmd0 << endl << *this);
nextInset()->dispatch(*this, tmpcmd);
if (disp_.dispatched()) {
@@ -807,7 +807,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
// store some values to be used inside of the handlers
beforeDispatchCursor_ = *this;
for (; depth(); pop(), boundary(false)) {
- LYXERR(Debug::DEBUG, "Cursor::dispatch: cmd: "
+ LYXERR(Debug::ACTION, "Cursor::dispatch: cmd: "
<< cmd0 << endl << *this);
// In any of these cases, the cursor is invalid, and we should
@@ -829,7 +829,7 @@ void Cursor::dispatch(FuncRequest const & cmd0)
// it completely to get a 'bomb early' behaviour in case this
// object will be used again.
if (!disp_.dispatched()) {
- LYXERR(Debug::DEBUG, "RESTORING OLD CURSOR!");
+ LYXERR(Debug::ACTION, "RESTORING OLD CURSOR!");
// We might have invalidated the cursor when removing an empty
// paragraph while the cursor could not be moved out the inset
// while we initially thought we could. This might happen when
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
