[LyX/master] * cs.po
commit 44e85604d42e936e8c6df131ddace55db3c3f585 Author: Pavel Sanda Date: Fri Aug 25 22:04:39 2023 +0200 * cs.po --- po/cs.po | 10 -- 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/cs.po b/po/cs.po index e37c8e9..d1e0fe6 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Lyx 2.4\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2023-08-25 22:02+0200\n" +"POT-Creation-Date: 2023-08-25 21:52+0200\n" "PO-Revision-Date: 2023-07-27 01:09-0800\n" "Last-Translator: Pavel Sanda \n" "Language-Team: Czech \n" @@ -2634,12 +2634,11 @@ msgstr "Ví:" msgid "" "Attempt to display formatted cross-references as they would appear in the " "output, e.g., as \"Theorem 1\" rather than just as the label." -msgstr "" +msgstr "Pokusí se zobrazit formátovaný křížový odkaz tak, jak se objeví na výstupu, např. \"Věta 1\" namísto pouhé značky." #: src/frontends/qt/ui/LaTeXUi.ui:214 -#, fuzzy msgid "Format cross-references in work area" -msgstr "Vložit křížový odkaz" +msgstr "Formátovat křížové odkazy v editačním okně" #: src/frontends/qt/ui/LanguageUi.ui:39 msgid " style:" @@ -14938,7 +14937,6 @@ msgid "List of Tableaux" msgstr "Seznam tabel" #: lib/layouts/linguistics.module:608 -#, fuzzy msgid "Tableau ##" msgstr "Tablo ##" @@ -38277,7 +38275,7 @@ msgstr "Soubory použité LyX-em" #: src/support/debug.cpp:63 msgid "Workarea events" -msgstr "Události na pracovní ploše" +msgstr "Události v editačním okně" #: src/support/debug.cpp:64 msgid "Clipboard handling" -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Remerge cs.po
commit 28d20a64736acf7b41a920b8b85b84f59d179f80 Author: Pavel Sanda Date: Fri Aug 25 22:02:44 2023 +0200 Remerge cs.po po/cs.po | 1188 +++--- 1 files changed, 599 insertions(+), 589 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Polish formatted reference patch, and add documentation.
commit 344dc1f822613da393ba6a2c07b7248839235303
Author: Richard Kimberly Heck
Date: Fri Aug 25 15:23:43 2023 -0400
Polish formatted reference patch, and add documentation.
---
lib/doc/UserGuide.lyx | 34 ++
src/frontends/qt/ui/LaTeXUi.ui |9 ++---
2 files changed, 40 insertions(+), 3 deletions(-)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index c0d6819..73e94b5 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -118,6 +118,7 @@ logicalmkup
\suppress_date false
\justification true
\use_refstyle 1
+\use_formatted_ref 0
\use_minted 0
\use_lineno 0
\notefontcolor #ff
@@ -10224,12 +10225,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
@@ -10242,6 +10245,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -10265,6 +10269,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -33789,6 +33794,35 @@ Capitalized
refstyle
\series default
package.
+\change_inserted -584632292 1692991077
+
+\begin_inset Newline newline
+\end_inset
+
+If you activate the option
+\begin_inset Quotes eld
+\end_inset
+
+Format cross-references in work area
+\begin_inset Quotes erd
+\end_inset
+
+,
+ \SpecialChar LyX
+ will attempt to display the formatted reference as it would appear in output,
+ e.g.,
+ as
+\begin_inset Quotes eld
+\end_inset
+
+Theorem 1
+\begin_inset Quotes erd
+\end_inset
+
+,
+ rather than just displaying the label.
+\change_unchanged
+
\end_layout
\begin_layout Description
diff --git a/src/frontends/qt/ui/LaTeXUi.ui b/src/frontends/qt/ui/LaTeXUi.ui
index 61d376f..444cb00 100644
--- a/src/frontends/qt/ui/LaTeXUi.ui
+++ b/src/frontends/qt/ui/LaTeXUi.ui
@@ -6,8 +6,8 @@
0
0
-332
-442
+446
+431
@@ -207,8 +207,11 @@
+
+ Attempt to display formatted cross-references as they would
appear in the output, e.g., as Theorem 1 rather than just as the
label.
+
- Indicate cross-reference output in the work area
+ Format cross-references in work area
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] * Intro.lyx from Dan.
commit 877582721d47bdb7969145c456aeee4a79ad7efe Author: Pavel Sanda Date: Fri Aug 25 20:55:21 2023 +0200 * Intro.lyx from Dan. --- lib/doc/Intro.lyx | 598 ++-- 1 files changed, 575 insertions(+), 23 deletions(-) diff --git a/lib/doc/Intro.lyx b/lib/doc/Intro.lyx index dcbb737..e5b2141 100644 --- a/lib/doc/Intro.lyx +++ b/lib/doc/Intro.lyx @@ -1,5 +1,5 @@ #LyX 2.4 created this file. For more info see https://www.lyx.org/ -\lyxformat 614 +\lyxformat 618 \begin_document \begin_header \save_transient_properties true @@ -88,6 +88,7 @@ \suppress_date false \justification true \use_refstyle 0 +\use_formatted_ref 0 \use_minted 0 \use_lineno 0 \index Index @@ -115,7 +116,9 @@ \html_be_strict false \docbook_table_output 0 \docbook_mathml_prefix 1 +\author -1463541724 "Daniel" d3v...@tutanota.com \author -584632292 "Richard Kimberly Heck" +\author 5863208 "ab" \end_header \begin_body @@ -203,7 +206,11 @@ What is \SpecialChar LyX articles in refereed scientific journals, scripts for plays and movies, business proposals, - presentations \SpecialChar ldots + presentations +\change_deleted -1463541724 1692922495 + +\change_unchanged +\SpecialChar ldots \end_layout @@ -322,11 +329,20 @@ Suppose you are writing a report. \begin_inset Quotes eld \end_inset -Introduction\SpecialChar endofsentence +Introduction +\change_deleted -1463541724 1692922782 +\SpecialChar endofsentence + +\change_unchanged \begin_inset Quotes erd \end_inset + +\change_inserted -1463541724 1692922792 +\SpecialChar endofsentence + +\change_unchanged So, you go into whatever menu it is in your word processor that changes font sizes and decide on a new font size. Then you turn on bold face. @@ -455,10 +471,19 @@ how \begin_inset Quotes eld \end_inset -What You See Is What You Get, +What You See Is What You Get +\change_deleted -1463541724 1692922450 +, +\change_unchanged + \begin_inset Quotes erd \end_inset + +\change_inserted -1463541724 1692923936 +, + +\change_unchanged the \SpecialChar LyX model is \begin_inset Quotes eld @@ -473,13 +498,24 @@ Mean \end_inset or +\change_deleted -1463541724 1692923839 + \begin_inset Quotes eld \end_inset -WYSIWYM. + +\change_unchanged +WYSIWYM +\change_deleted -1463541724 1692923836 +. \begin_inset Quotes erd \end_inset + +\change_inserted -1463541724 1692923925 +. + +\change_unchanged It's a powerful idea that greatly simplifies the mechanics of writing documents. This is also why \SpecialChar LyX isn't so good for creating posters and flyers. @@ -690,7 +726,11 @@ What is \SpecialChar LaTeX \begin_layout Standard \SpecialChar LaTeX - is a document preparation system designed by Leslie Lamport in 1985. + is a document preparation system designed by +\noun on +Leslie Lamport +\noun default + in 1985. \begin_inset Foot status collapsed @@ -714,7 +754,11 @@ User's Guide It was built up from a typesetting language called \SpecialChar TeX , - created by Donald Knuth in 1984. + created by +\shape smallcaps +Donald Knuth +\shape default + in 1984. \SpecialChar TeX takes a sequence of typesetting commands, written in a script in an ASCII file, @@ -727,11 +771,31 @@ tricks \begin_inset Quotes erd \end_inset - of the printing trade were modeled by Knuth as computer algorithms and incorporated into \SpecialChar TeX + of the printing trade were modeled by +\shape smallcaps +Knuth +\shape default + as computer algorithms and incorporated into \SpecialChar TeX , hence its excellent printed appearance. What comes directly out of \SpecialChar TeX - is the portable document format + is the +\change_inserted -1463541724 1692922633 + +\begin_inset Quotes eld +\end_inset + + +\change_unchanged +portable document format +\change_inserted -1463541724 1692922640 + +\begin_inset Quotes erd +\end_inset + + +\change_unchanged + \emph on pdf \emph default @@ -748,7 +812,11 @@ device independent dvi \emph default . - The dvi format is often used for previews and can later be converted to other formats like PostScript. + The +\family typewriter +dvi +\family default + format is often used for previews and can later be converted to other formats like PostScript. \end_layout @@ -757,8 +825,16 @@ dvi isn't only a typesetting engine; it also allows you to define macros. Most people who use \SpecialChar TeX - are actually using a macro package which Knuth created to hide a lot of the typesetting details. - This is where Leslie Lamport enters our story. + are actually using a macro package which +\noun on +Knuth +\noun default + created to hide a lot of the typesetting details. + This is where +\noun on +Leslie Lamport +\noun default + enters our story. He wanted a macro package that was more user- and less typesetter-oriented, with a set of commands that consistently typeset things like sections, tables or math formulas in a uniform, @@ -932,7
[LyX/master] Revert UI fix for two digit numbers. It actually does not work.
commit 2e32e2c1239fcb966f9eefc7926edf602b2ad9d8 Author: Pavel Sanda Date: Fri Aug 25 18:52:27 2023 +0200 Revert UI fix for two digit numbers. It actually does not work. https://www.mail-archive.com/lyx-devel@lists.lyx.org/msg220179.html --- src/frontends/qt/ui/PrefUi.ui |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/frontends/qt/ui/PrefUi.ui b/src/frontends/qt/ui/PrefUi.ui index dceee5c..d7551cb 100644 --- a/src/frontends/qt/ui/PrefUi.ui +++ b/src/frontends/qt/ui/PrefUi.ui @@ -164,7 +164,7 @@ - 99 + 9 -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix layouttranslation ES notes
commit 0171f132a7c1dcee4cfc723dc6e0ffb7a8e4fe1a
Author: Pavel Sanda
Date: Fri Aug 25 18:53:53 2023 +0200
Fix layouttranslation ES notes
https://www.mail-archive.com/lyx-docs@lists.lyx.org/msg10124.html
---
lib/layouttranslations|2 +-
lib/layouttranslations.review |1 -
po/es.po |2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/layouttranslations b/lib/layouttranslations
index 8530d75..8f9ebca 100644
--- a/lib/layouttranslations
+++ b/lib/layouttranslations
@@ -419,7 +419,7 @@ Translation es
"Nomenclature[[output]]" "Nomenclatura"
"Notation" "Notación"
"Note" "Nota"
- "Notes[[Endnotes]]" "Notes"
+ "Notes[[Endnotes]]" "Notas"
"Problem" "Problema"
"Proof" "Demostración"
"Property" "Propiedad"
diff --git a/lib/layouttranslations.review b/lib/layouttranslations.review
index b739940..edb837d 100644
--- a/lib/layouttranslations.review
+++ b/lib/layouttranslations.review
@@ -40,7 +40,6 @@ Note that the localized enotez package has the following
translations that proba
Croatian: Bilje\v{s}ke
French: Remarques
Hungarian: Megjegyz\'{e}sek
-Spanish: Notas
Turkish: Notlar
new strings (not yet committed) for:
diff --git a/po/es.po b/po/es.po
index 29b25d5..5fab444 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12360,7 +12360,7 @@ msgstr "nota final"
#: lib/layouts/foottoend.module:20 lib/layouts/foottoend.module:23
#: lib/layouts/memoir.layout:326 lib/layouts/memoir.layout:329
msgid "Notes[[Endnotes]]"
-msgstr "Notes"
+msgstr "Notas"
#: lib/layouts/enotez.module:2
#, fuzzy
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] cat.py: fix Python deprecation warning
commit dee5eec15f6e9c36e7fe858c0bb9d44da051418f Author: Scott Kostyshak Date: Thu Mar 19 18:22:16 2020 -0400 cat.py: fix Python deprecation warning This commit fixes the following warning: DeprecationWarning: 'U' mode is deprecated Removing 'U' has no effect with Python 3 [1]: There is an additional mode character permitted, 'U', which no longer has any effect, and is considered deprecated. It previously enabled universal newlines in text mode, which became the default behaviour in Python 3.0. [1] https://docs.python.org/3/library/functions.html?highlight=open#open (cherry picked from commit 9715d3504c6a74f9a498e2d9232956255110225d) --- development/cmake/po/cat.py | 14 +++--- 1 files changed, 11 insertions(+), 3 deletions(-) diff --git a/development/cmake/po/cat.py b/development/cmake/po/cat.py index 7a1ee26..fd676cc 100644 --- a/development/cmake/po/cat.py +++ b/development/cmake/po/cat.py @@ -29,9 +29,17 @@ if outfile: out = open(outfile, "wb") for f in args: - # accept both windows and unix line endings, since it can happen that we - # are on unix, but the file has been written on windows or vice versa. - fil = open(f, "rU") + if sys.version_info[0] < 3: + # accept both windows and unix line endings, since it can + # happen that we are on unix, but the file has been written on + # windows or vice versa. + mode = "rU" + else: + # The default behavior of Python 3 is to enable universal + # newlines in text mode. Adding "U" gives a deprecation + # warning. + mode = "r" + fil = open(f, mode) for l in fil: # this does always write unix line endings since the file has # been opened in binary mode. This is needed since both gettext -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] endl needs ostream header here.
commit 6b4c7c5e9107716353f8c3315fe93abfc0a27c1a Author: Pavel Sanda Date: Tue Jan 14 21:59:05 2020 +0100 endl needs ostream header here. (cherry picked from commit 8c4d6bbba68d0913ae4a7ec3beefea0e9ff4d8ea) --- src/boost.cpp |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/boost.cpp b/src/boost.cpp index ce1fb27..646d4e4 100644 --- a/src/boost.cpp +++ b/src/boost.cpp @@ -18,6 +18,7 @@ #include #include +#include using namespace std; using lyx::lyxerr; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Do not use superscript display for now.
commit 7c62a6b3c5855418d2a129b9ff2014aa94afd461
Author: Jean-Marc Lasgouttes
Date: Fri Aug 25 11:50:14 2023 -0400
Do not use superscript display for now.
There are font issues on some platforms.
---
lib/layouts/stdcounters.inc |1 -
lib/layouts/stdinsets.inc |4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/lib/layouts/stdcounters.inc b/lib/layouts/stdcounters.inc
index 662706f..dbebe25 100644
--- a/lib/layouts/stdcounters.inc
+++ b/lib/layouts/stdcounters.inc
@@ -88,7 +88,6 @@ End
Counter footnote
GuiName Footnote
- LabelString "\superarabic{footnote}"
PrettyFormat "Footnote \arabic{footnote}"
End
diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 3caa5b3..865b5ec 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -49,7 +49,7 @@ InsetLayout Marginal
End
InsetLayout Foot
- LabelString ""
+ LabelString Foot
LatexType Command
LatexName footnote
Counter footnote
@@ -59,7 +59,7 @@ InsetLayout Foot
EndFont
LabelFont
Color footlabel
- SizeNormal
+ SizeSmall
EndFont
MultiPar true
RefPrefix fn
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
