[LyX/2.3.x] sk.po: Remerge strings with a shortcut from master
commit 96ed0ea7081b14d73d6a3c55bf574a5777308aca Author: Kornel Benko Date: Sun Dec 17 07:18:53 2017 +0100 sk.po: Remerge strings with a shortcut from master po/sk.gmo | Bin 526332 -> 526800 bytes po/sk.po | 826 +++-- 2 files changed, 416 insertions(+), 410 deletions(-)
r41110 - www-user/trunk/images/LGT
Author: uwestoehr Date: Sun Dec 17 05:03:36 2017 New Revision: 41110 URL: http://www.lyx.org/trac/changeset/41110 Log: remove unnecessary, now also unused and even outdated images Deleted: www-user/trunk/images/LGT/101_sm.png www-user/trunk/images/LGT/102_sm.png www-user/trunk/images/LGT/103_sm.png www-user/trunk/images/LGT/104_sm.png www-user/trunk/images/LGT/105_sm.png www-user/trunk/images/LGT/39_sm.png www-user/trunk/images/LGT/42_sm.png www-user/trunk/images/LGT/43_sm.png www-user/trunk/images/LGT/44_sm.png www-user/trunk/images/LGT/46_sm.png www-user/trunk/images/LGT/47_sm.png www-user/trunk/images/LGT/48-1_sm.png www-user/trunk/images/LGT/49_sm.png www-user/trunk/images/LGT/53_sm.png www-user/trunk/images/LGT/54_sm.png www-user/trunk/images/LGT/55_sm.png www-user/trunk/images/LGT/56_sm.png www-user/trunk/images/LGT/57_sm.png www-user/trunk/images/LGT/58_sm.png www-user/trunk/images/LGT/59_sm.png www-user/trunk/images/LGT/60_sm.png www-user/trunk/images/LGT/61_sm.png www-user/trunk/images/LGT/62-1_sm.png www-user/trunk/images/LGT/62-2_sm.png www-user/trunk/images/LGT/63_sm.png www-user/trunk/images/LGT/64_sm.png www-user/trunk/images/LGT/65_sm.png www-user/trunk/images/LGT/66_sm.png www-user/trunk/images/LGT/67_sm.png www-user/trunk/images/LGT/68_sm.png www-user/trunk/images/LGT/69_sm.png www-user/trunk/images/LGT/70_sm.png www-user/trunk/images/LGT/71_sm.png www-user/trunk/images/LGT/72_sm.png www-user/trunk/images/LGT/74_sm.png www-user/trunk/images/LGT/75_sm.png www-user/trunk/images/LGT/79_sm.png www-user/trunk/images/LGT/83_sm.png www-user/trunk/images/LGT/84_sm.png www-user/trunk/images/LGT/85_sm.png www-user/trunk/images/LGT/87_sm.png www-user/trunk/images/LGT/93_sm.png www-user/trunk/images/LGT/95_sm.png www-user/trunk/images/LGT/97_sm.png
r41108 - www-user/trunk/images/about
Author: uwestoehr Date: Sun Dec 17 03:56:23 2017 New Revision: 41108 URL: http://www.lyx.org/trac/changeset/41108 Log: delete a file to be able to rename it Deleted: www-user/trunk/images/about/preview_dvi.png
r41109 - www-user/trunk/images/about
Author: uwestoehr Date: Sun Dec 17 03:56:57 2017 New Revision: 41109 URL: http://www.lyx.org/trac/changeset/41109 Log: update a screenshot Added: www-user/trunk/images/about/preview_pdf.png (contents, props changed) Added: www-user/trunk/images/about/preview_pdf.png == Binary file. No diff available.
[LyX/master] Russian splash.lyx: update from Yuriy
commit 79bdb88d35da8b86c366d811a3a0ff09103d93bb Author: Uwe Stöhr Date: Sun Dec 17 03:51:22 2017 +0100 Russian splash.lyx: update from Yuriy --- lib/examples/ru/splash.lyx |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/examples/ru/splash.lyx b/lib/examples/ru/splash.lyx index b2576da..b8be00f 100644 --- a/lib/examples/ru/splash.lyx +++ b/lib/examples/ru/splash.lyx @@ -201,8 +201,8 @@ https://www.lyx.org . Там вы сможете получить информацию о программе \SpecialChar LyX , подписаться на списки - рассылки, ознакомиться с графическими образами экрана \SpecialChar LyX -: + рассылки, совершить графический тур по ключевым возможностям \SpecialChar LyX + ( \begin_inset Flex URL status collapsed @@ -213,7 +213,7 @@ https://www.lyx.org/Walkthrough \end_inset - и многое другое. +) и многое другое. \end_layout \begin_layout Enumerate
[LyX/2.3.x] Russian splash.lyx: update from Yuriy
commit c10e3f87ac087486971eaedead42d98891596758 Author: Uwe Stöhr Date: Sun Dec 17 03:51:08 2017 +0100 Russian splash.lyx: update from Yuriy --- lib/examples/ru/splash.lyx |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/examples/ru/splash.lyx b/lib/examples/ru/splash.lyx index b2576da..b8be00f 100644 --- a/lib/examples/ru/splash.lyx +++ b/lib/examples/ru/splash.lyx @@ -201,8 +201,8 @@ https://www.lyx.org . Там вы сможете получить информацию о программе \SpecialChar LyX , подписаться на списки - рассылки, ознакомиться с графическими образами экрана \SpecialChar LyX -: + рассылки, совершить графический тур по ключевым возможностям \SpecialChar LyX + ( \begin_inset Flex URL status collapsed @@ -213,7 +213,7 @@ https://www.lyx.org/Walkthrough \end_inset - и многое другое. +) и многое другое. \end_layout \begin_layout Enumerate
[LyX/master] Russian doc files: finished review from Yuriy
commit df2cddb859f5c3e4be50e00ac072d79fdf166ad1 Author: Uwe Stöhr Date: Sun Dec 17 03:40:02 2017 +0100 Russian doc files: finished review from Yuriy lib/doc/ru/Intro.lyx| 1234 --- lib/doc/ru/Tutorial.lyx | 1196 +- 2 files changed, 1183 insertions(+), 1247 deletions(-)
[LyX/2.3.x] Russian doc files: finished review from Yuriy
commit fc23deacd9da5c9720ca61827a18f796a8622eed Author: Uwe Stöhr Date: Sun Dec 17 03:39:25 2017 +0100 Russian doc files: finished review from Yuriy lib/doc/ru/Intro.lyx| 1234 --- lib/doc/ru/Tutorial.lyx | 1196 +- 2 files changed, 1183 insertions(+), 1247 deletions(-)
[LyX/master] ru.po: port from 2.3.x for Yuriy
commit ff0bc661c980d9f05bb2230791c5331b36ade911 Author: Uwe Stöhr Date: Sun Dec 17 03:38:24 2017 +0100 ru.po: port from 2.3.x for Yuriy po/ru.po | 1436 +++--- 1 files changed, 713 insertions(+), 723 deletions(-)
[LyX/master] de.po: remerge to bring a lost string back
commit 73ea46fd0ad5b1a176c55be9e842119d4b6e25ed Author: Uwe Stöhr Date: Sun Dec 17 03:37:34 2017 +0100 de.po: remerge to bring a lost string back --- po/de.gmo | Bin 540742 -> 540818 bytes po/de.po |9 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/po/de.gmo b/po/de.gmo index 9f1864e..f6ce59f 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index af0fbba..9f0015c 100644 --- a/po/de.po +++ b/po/de.po @@ -95,7 +95,7 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2017-12-16 17:36+0100\n" +"POT-Creation-Date: 2017-12-17 02:19+0100\n" "PO-Revision-Date: 2017-12-17 02:04+0100\n" "Last-Translator: Uwe Stöhr \n" "Language-Team: German \n" @@ -30889,6 +30889,10 @@ msgstr "LyX-Tastaturtabellen (*.kmap)" msgid "Longest label width" msgstr "Breite der längsten Marke" +#: src/frontends/qt4/GuiPrintNomencl.h:40 +msgid "Nomenclature List Settings" +msgstr "Nomenklaturverzeichnis-Einstellungen" + #: src/frontends/qt4/GuiPrintindex.cpp:37 msgid "Index Settings" msgstr "Index-Einstellungen" @@ -33934,9 +33938,6 @@ msgstr "Unbekannter Benutzer" #~ msgid "Output en- and &em-dashes as ligatures" #~ msgstr "&Halbgeviert- und Geviertstriche als Ligaturen ausgeben" -#~ msgid "Nomenclature List Settings" -#~ msgstr "Nomenklaturverzeichnis-Einstellungen" - #~ msgid "&Clipping" #~ msgstr "&Ausschnitt"
[LyX/2.3.x] ru.po: remerge for Yuriy
commit acb34ac53f009eb42efeb1f7768047a7b5a43513 Author: Uwe Stöhr Date: Sun Dec 17 03:33:52 2017 +0100 ru.po: remerge for Yuriy po/ru.gmo | Bin 445472 -> 468783 bytes po/ru.po | 1436 ++--- 2 files changed, 713 insertions(+), 723 deletions(-)
[LyX/2.3.x] de.po: translate a new string
commit 41de012dcb2d5431097b79bd90b8a94657506e9c Author: Uwe Stöhr Date: Sun Dec 17 03:14:32 2017 +0100 de.po: translate a new string --- po/de.gmo | Bin 540058 -> 540058 bytes po/de.po | 12 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/po/de.gmo b/po/de.gmo index 6daa532..ed80dfd 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index 6584e3b..1dc7baa 100644 --- a/po/de.po +++ b/po/de.po @@ -95,15 +95,15 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2017-12-14 02:51+0100\n" -"PO-Revision-Date: 2017-12-14 08:07+0100\n" -"Last-Translator: Juergen Spitzmueller \n" +"POT-Creation-Date: 2017-12-17 03:06+0100\n" +"PO-Revision-Date: 2017-12-17 03:13+0100\n" +"Last-Translator: Uwe Stöhr \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: src/frontends/qt4/ui/AboutUi.ui:33 @@ -30871,6 +30871,10 @@ msgstr "LyX-Tastaturtabellen (*.kmap)" msgid "Longest label width" msgstr "Breite der längsten Marke" +#: src/frontends/qt4/GuiPrintNomencl.h:40 +msgid "Nomenclature List Settings" +msgstr "Nomenklaturverzeichnis-Einstellungen" + #: src/frontends/qt4/GuiPrintindex.cpp:37 msgid "Index Settings" msgstr "Index-Einstellungen"
[LyX/2.3.x] it.po: fix msgmerge warning
commit 0dc80440652cd195c8ee6814ad20f2fd9a812e76 Author: Uwe Stöhr Date: Sun Dec 17 03:12:18 2017 +0100 it.po: fix msgmerge warning "it.po:33740: warning: internationalized messages should not contain the '\f' escape sequence" Since this message is not used, it can be removed. --- po/it.gmo | Bin 529696 -> 529904 bytes po/it.po | 50 +- 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/po/it.gmo b/po/it.gmo index d7f42a4..882410d 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/it.po b/po/it.po index d12c2f3..f88dc9c 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: it\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2017-12-01 10:55+0100\n" +"POT-Creation-Date: 2017-12-17 03:06+0100\n" "PO-Revision-Date: 2017-11-04 17:03+0100\n" "Last-Translator: Enrico Forestieri \n" "Language-Team: italiano \n" @@ -2838,7 +2838,7 @@ msgstr "E&limina" msgid "S&elected:" msgstr "S&elezionati:" -#: src/frontends/qt4/ui/NomenclUi.ui:14 src/insets/InsetNomencl.cpp:182 +#: src/frontends/qt4/ui/NomenclUi.ui:14 src/insets/InsetNomencl.cpp:184 msgid "Nomenclature" msgstr "Nomenclatura" @@ -30658,6 +30658,11 @@ msgstr "Mappa di tastiera di LyX (*.kmap)" msgid "Longest label width" msgstr "Etichetta più lunga" +#: src/frontends/qt4/GuiPrintNomencl.h:40 +#, fuzzy +msgid "Nomenclature List Settings" +msgstr "Impostazioni nomenclatura" + #: src/frontends/qt4/GuiPrintindex.cpp:37 msgid "Index Settings" msgstr "Impostazioni indice" @@ -32181,11 +32186,11 @@ msgstr "Nome parametro sconosciuto: " msgid "Missing \\end_inset at this point: " msgstr "Manca \\end_inset in questo punto: " -#: src/insets/InsetCommandParams.cpp:459 +#: src/insets/InsetCommandParams.cpp:460 msgid "Uncodable characters" msgstr "Carattere intraducibili" -#: src/insets/InsetCommandParams.cpp:460 +#: src/insets/InsetCommandParams.cpp:461 #, c-format msgid "" "The following characters that are used in the inset %1$s are not\n" @@ -32778,19 +32783,19 @@ msgstr "Azzera pagina" msgid "Clear Double Page" msgstr "Azzera pagina doppia" -#: src/insets/InsetNomencl.cpp:80 +#: src/insets/InsetNomencl.cpp:82 msgid "Nom: " msgstr "Nom: " -#: src/insets/InsetNomencl.cpp:88 +#: src/insets/InsetNomencl.cpp:90 msgid "Nomenclature Symbol: " msgstr "Simbolo di nomenclatura: " -#: src/insets/InsetNomencl.cpp:89 +#: src/insets/InsetNomencl.cpp:91 msgid "Description: " msgstr "Descrizione: " -#: src/insets/InsetNomencl.cpp:92 +#: src/insets/InsetNomencl.cpp:94 msgid "Sorting: " msgstr "Ordinamento: " @@ -33724,35 +33729,6 @@ msgstr "Utente sconosciuto" #~ msgstr "Codice Sorgente Minted" #~ msgid "" -#~ "Format source code using the 'minted' package.\n" -#~ "This template works with minted version 2.1 or higher.\n" -#~ "The source language is specified by the 'lang' option,\n" -#~ "which must be inserted into the 'Option' field in the\n" -#~ "'LaTeX and LyX options' tab.\n" -#~ "Example options:\n" -#~ "* linenos,fontsize=\footnotesize,lang=fortran\n" -#~ "* bgcolor=yellow,baselinestretch=1.2,lang=c\n" -#~ "* frame=lines,framesep=2\fboxsep,lang=python\n" -#~ "If 'lang=xxx' is not given, 'lang=latex' is assumed by default.\n" -#~ "Make sure to use the '-shell-escape' option for the latex backend.\n" -#~ "Read the documentation of the minted package\n" -#~ "for further options and details.\n" -#~ msgstr "" -#~ "Formattazione di codice sorgente con il pacchetto 'minted'.\n" -#~ "Questo modello funziona con minted versione 2.1 o superiore.\n" -#~ "Il linguaggio del sorgente è specificato con l'opzione 'lang',\n" -#~ "che deve essere inserita nel campo 'Opzione' della scheda\n" -#~ "'Opzioni per LaTeX e LyX'.\n" -#~ "Esempi di opzioni:\n" -#~ "* linenos,fontsize=\\footnotesize,lang=fortran\n" -#~ "* bgcolor=yellow,baselinestretch=1.2,lang=c\n" -#~ "* frame=lines,framesep=2\\fboxsep,lang=python\n" -#~ "Se 'lang=xxx' non è specificato, si assume 'lang=latex' per default.\n" -#~ "Assicuratevi di usare l'opzione '-shell-escape' per il motore latex.\n" -#~ "Leggete la documentazione del pacchetto minted\n" -#~ "per ulteriori opzioni e dettagli.\n" - -#~ msgid "" #~ "An Inkscape figure.\n" #~ "This template should work flawlessly with Inkscape 0.48. \n" #~ "For Inkscape 0.91, there is a (reported) bug in the \n"
[LyX/2.3.x] Buffer.cpp: reference oasis in https link
commit 50c83973a653be92f8967961ab559b376ab2d870
Author: Uwe Stöhr
Date: Sun Dec 17 02:41:51 2017 +0100
Buffer.cpp: reference oasis in https link
---
src/Buffer.cpp |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 9ec20e0..ffe522e 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -2057,7 +2057,7 @@ void Buffer::writeDocBookSource(odocstream & os, string
const & fname,
os << from_ascii(tclass.class_header());
else if (runparams.flavor == OutputParams::XML)
os << "PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" "
- <<
"\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";;
+ <<
"\"https://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";;
else
os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
@@ -4733,7 +4733,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType
utype) const
// not updated during the updateBuffer call and
TocModel::toc_ is invalid
// (bug 5699). The same happens if the master buffer is
open in a different
// window. This test catches both possibilities.
- // See:
http://marc.info/?l=lyx-devel&m=138590578911716&w=2
+ // See:
https://marc.info/?l=lyx-devel&m=138590578911716&w=2
// There remains a problem here: If there is another
child open in yet a third
// window, that TOC is not updated. So some more
general solution is needed at
// some point.
@@ -5159,7 +5159,7 @@ int Buffer::charCount(bool with_blanks) const
Buffer::ReadStatus Buffer::reload()
{
setBusy(true);
- // c.f. bug http://www.lyx.org/trac/ticket/6587
+ // c.f. bug https://www.lyx.org/trac/ticket/6587
removeAutosaveFile();
// e.g., read-only status could have changed due to version control
d->filename.refresh();
[LyX/2.3.x] tex2lyx: support to detect https:// links
commit e73164e25dd04fd3c655ab9988f4f8e098e39937
Author: Uwe Stöhr
Date: Sun Dec 17 02:28:54 2017 +0100
tex2lyx: support to detect https:// links
- Preamble.cpp: use the occasion to backport JMarcs recent compiler warning
fixe
---
src/tex2lyx/Preamble.cpp |7 +++
src/tex2lyx/text.cpp |4 ++--
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index ea315dd..fe722f4 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -689,7 +689,6 @@ void Preamble::handle_package(Parser &p, string const &
name,
{
vector options = split_options(opts);
add_package(name, options);
- char const * const * where = 0;
if (is_known(name, known_xetex_packages)) {
xetex = true;
@@ -1016,7 +1015,7 @@ void Preamble::handle_package(Parser &p, string const &
name,
else if (name == "subfig")
; // ignore this FIXME: Use the package separator mechanism
instead
- else if ((where = is_known(name, known_languages)))
+ else if (char const * const * where = is_known(name, known_languages))
h_language = known_coded_languages[where - known_languages];
else if (name == "natbib") {
@@ -1114,9 +1113,9 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc,
string const & outfiled
// LyX only knows the following quotes languages:
// english, swedish, german, polish, french and danish
// (quotes for "japanese" and "chinese-traditional" are missing because
- // they wouldn't be useful: http://www.lyx.org/trac/ticket/6383)
+ // they wouldn't be useful: https://www.lyx.org/trac/ticket/6383)
// conversion list taken from
- // http://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage
+ // https://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage
// (quotes for kazakh and interlingua are unknown)
// danish
if (is_known(h_language, known_danish_quotes_languages))
diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 2fe40bd..5330c62 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3621,8 +3621,8 @@ void parse_text(Parser & p, ostream & os, unsigned flags,
bool outer,
type = target.substr(0, i + 1);
if (type == "mailto:"; || type == "file:")
target = target.substr(i + 1);
- // handle the case that name is equal to
target, except of "http://";
- else if (target.substr(i + 3) == name && type
== "http:")
+ // handle the case that name is equal to
target, except of "http(s)://"
+ else if (target.substr(i + 3) == name && (type
== "http:" || type == "https:"))
target = name;
}
begin_command_inset(os, "href", "href");
[LyX/master] use https:// in the first line of .lyx files
commit 6c6cf5e07136fd1b74c19ef142cf18e1f3723de7
Author: Uwe Stöhr
Date: Sun Dec 17 02:24:26 2017 +0100
use https:// in the first line of .lyx files
- also support to detect https via tex2lyx
---
lib/lyx2lyx/LyX.py |2 +-
src/Buffer.cpp | 12 ++--
src/tex2lyx/Preamble.cpp |4 ++--
src/tex2lyx/text.cpp |4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py
index c76fc58..98111d6 100644
--- a/lib/lyx2lyx/LyX.py
+++ b/lib/lyx2lyx/LyX.py
@@ -533,7 +533,7 @@ class LyX_base:
" Set the header with the version used."
initial_comment = " ".join(["#LyX %s created this file." % version__,
-"For more info see http://www.lyx.org/";])
+"For more info see https://www.lyx.org/";])
# Simple heuristic to determine the comment that always starts
# a lyx file
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 79ceb9b..294c7a1 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1610,7 +1610,7 @@ bool Buffer::write(ostream & ofs) const
// Important: Keep the version formatting in sync with lyx2lyx and
//tex2lyx (bug 7951)
ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor
- << " created this file. For more info see http://www.lyx.org/\n";
+ << " created this file. For more info see https://www.lyx.org/\n";
<< "\\lyxformat " << LYX_FORMAT << "\n"
<< "\\begin_document\n";
@@ -1794,7 +1794,7 @@ void Buffer::writeLaTeXSource(otexstream & os,
// first paragraph of the document. (Asger)
if (output_preamble && runparams.nice) {
os << "%% LyX " << lyx_version << " created this file. "
- "For more info, see http://www.lyx.org/.\n";
+ "For more info, see https://www.lyx.org/.\n";
"%% Do not edit unless you really know what "
"you are doing.\n";
}
@@ -2038,7 +2038,7 @@ void Buffer::writeDocBookSource(odocstream & os, string
const & fname,
os << from_ascii(tclass.class_header());
else if (runparams.flavor == OutputParams::XML)
os << "PUBLIC \"-//OASIS//DTD DocBook XML V4.2//EN\" "
- <<
"\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";;
+ <<
"\"https://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";;
else
os << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
@@ -2077,7 +2077,7 @@ void Buffer::writeDocBookSource(odocstream & os, string
const & fname,
os << "\n";
+ << "\n See https://www.lyx.org/ for more
information -->\n";
params().documentClass().counters().reset();
@@ -4646,7 +4646,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType
utype) const
// not updated during the updateBuffer call and
TocModel::toc_ is invalid
// (bug 5699). The same happens if the master buffer is
open in a different
// window. This test catches both possibilities.
- // See:
http://marc.info/?l=lyx-devel&m=138590578911716&w=2
+ // See:
https://marc.info/?l=lyx-devel&m=138590578911716&w=2
// There remains a problem here: If there is another
child open in yet a third
// window, that TOC is not updated. So some more
general solution is needed at
// some point.
@@ -5087,7 +5087,7 @@ int Buffer::charCount(bool with_blanks) const
Buffer::ReadStatus Buffer::reload()
{
setBusy(true);
- // c.f. bug http://www.lyx.org/trac/ticket/6587
+ // c.f. bug https://www.lyx.org/trac/ticket/6587
removeAutosaveFile();
// e.g., read-only status could have changed due to version control
d->filename.refresh();
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 2b5d706..fe722f4 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1113,9 +1113,9 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc,
string const & outfiled
// LyX only knows the following quotes languages:
// english, swedish, german, polish, french and danish
// (quotes for "japanese" and "chinese-traditional" are missing because
- // they wouldn't be useful: http://www.lyx.org/trac/ticket/6383)
+ // they wouldn't be useful: https://www.lyx.org/trac/ticket/6383)
// conversion list taken from
- // http://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage
+ // https://en.wikipedia.org/wiki/Quotation_mark,_non-English_usage
// (quotes for kazakh and interlingua are unknown)
[LyX/master] de.po: use another Project-Id
commit 70e7785000dd0e1bfcace73365e42239ef9a Author: Uwe Stöhr Date: Sun Dec 17 02:05:19 2017 +0100 de.po: use another Project-Id to make it clear that master is no longer in sync with de.po in the 2.3.x branch --- po/de.po | 15 +++ 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/po/de.po b/po/de.po index 41cbbc7..af0fbba 100644 --- a/po/de.po +++ b/po/de.po @@ -93,17 +93,17 @@ # Jürgen Spitzmüller , 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. msgid "" msgstr "" -"Project-Id-Version: LyX 2.3\n" +"Project-Id-Version: LyX 2.4git\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" "POT-Creation-Date: 2017-12-16 17:36+0100\n" -"PO-Revision-Date: 2017-12-16 17:44+0100\n" -"Last-Translator: Juergen Spitzmueller \n" +"PO-Revision-Date: 2017-12-17 02:04+0100\n" +"Last-Translator: Uwe Stöhr \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Poedit 2.0.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: src/frontends/qt4/ui/AboutUi.ui:33 @@ -1910,10 +1910,9 @@ msgid "" "By default, a line break can occur after en- and em-dashes and before em-" "dashes. Checking this box prevents that." msgstr "" -"Per Voreinstellung kann ein Zeilenumbruch nach einem Halbgeviertstrich" -" (Gedankenstrich) und vor " -"sowie nach einem Geviertstrich (langem Gedankenstrich) vorkommen. Diese" -" Option verhindert das." +"Per Voreinstellung kann ein Zeilenumbruch nach einem Halbgeviertstrich " +"(Gedankenstrich) und vor sowie nach einem Geviertstrich (langem " +"Gedankenstrich) vorkommen. Diese Option verhindert das." #: src/frontends/qt4/ui/FontUi.ui:303 msgid "Disallow l&ine breaks at dashes"
[LyX/2.3.x] GuiPrintNomencl.h: fix bug #10819 also for 2.3.x
commit 998d39fa28e1932f507440f8641ab42d3fd68abe
Author: Uwe Stöhr
Date: Sun Dec 17 02:01:49 2017 +0100
GuiPrintNomencl.h: fix bug #10819 also for 2.3.x
---
src/frontends/qt4/GuiPrintNomencl.h |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/frontends/qt4/GuiPrintNomencl.h
b/src/frontends/qt4/GuiPrintNomencl.h
index 6d5de97..54e6d96 100644
--- a/src/frontends/qt4/GuiPrintNomencl.h
+++ b/src/frontends/qt4/GuiPrintNomencl.h
@@ -37,6 +37,7 @@ private:
//@{
InsetCode insetCode() const { return NOMENCL_PRINT_CODE; }
FuncCode creationCode() const { return LFUN_INSET_INSERT; }
+ QString dialogTitle() const { return qt_("Nomenclature List Settings");
}
void paramsToDialog(Inset const *);
void paramsToDialog(InsetCommandParams const &);
docstring dialogToParams() const;
[LyX/master] sk.po: New strings + revised shortcuts for stdmenus and stdcontext
commit 2e75f4e930f00b46fbbec7d66cc01073086593a2 Author: Kornel Benko Date: Sat Dec 16 21:20:02 2017 +0100 sk.po: New strings + revised shortcuts for stdmenus and stdcontext --- po/sk.gmo | Bin 527019 -> 527462 bytes po/sk.po | 514 +++-- 2 files changed, 262 insertions(+), 252 deletions(-) diff --git a/po/sk.gmo b/po/sk.gmo index 717468a..2924d86 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index ee19ded..10e95f5 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: 2017-12-09 14:28+0100\n" -"PO-Revision-Date: 2017-12-13 18:55+\n" +"POT-Creation-Date: 2017-12-16 16:32+0100\n" +"PO-Revision-Date: 2017-12-16 20:06+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -1816,15 +1816,15 @@ msgstr "Povoliť mikr&o-typografické rozšírenia" #: src/frontends/qt4/ui/FontUi.ui:300 msgid "" -"Use font ligatures -- and --- instead of \\textendash and \\textemdash for " -"en- and em-dashes" +"By default, a line break can occur after en- and em-dashes and before em-" +"dashes. Checking this box prevents that." msgstr "" -"Použiť zliatky fontu pre '--' a '---' namiesto \\textendash a \\textemdash " -"pre en a em čiarky" +"Normálne, zalomenie prichádza za ''en'- alebo 'em'- pomlčkou a pred 'em' " +"pomlčkou. Začiarknutím políčka sa to prevencuje." #: src/frontends/qt4/ui/FontUi.ui:303 -msgid "Output en- and &em-dashes as ligatures" -msgstr "Výstup pre en a em čiarky ako zliatk&y" +msgid "Disallow l&ine breaks at dashes" +msgstr "Nepovoliť zalomenie &riadku pri pomlčkách" #: src/frontends/qt4/ui/GraphicsUi.ui:51 msgid "&Graphics" @@ -1932,7 +1932,7 @@ msgstr "Dodatočné LaTeX voľby" #: src/frontends/qt4/ui/GraphicsUi.ui:530 msgid "LaTeX &options:" -msgstr "LaTeX voľby:" +msgstr "LaTe&X voľby:" #: src/frontends/qt4/ui/GraphicsUi.ui:556 msgid "" @@ -2497,7 +2497,7 @@ msgstr "Odstup v číslovaní riadkov" #: src/frontends/qt4/ui/ListingsUi.ui:148 msgid "Font si&ze:" -msgstr "V&eľkosť písma:" +msgstr "Veľkosť pís&ma:" #: src/frontends/qt4/ui/ListingsUi.ui:169 msgid "Choose the font size for line numbers" @@ -2518,7 +2518,7 @@ msgstr "Základná veľkosť písma" #: src/frontends/qt4/ui/ListingsUi.ui:231 msgid "Font Famil&y:" -msgstr "Rodina písma:" +msgstr "Rodi&na písma:" #: src/frontends/qt4/ui/ListingsUi.ui:252 msgid "The content's base font style" @@ -2546,7 +2546,7 @@ msgstr "Zobraz medzery v reťazcoch špeciálnym symbolom" #: src/frontends/qt4/ui/ListingsUi.ui:297 msgid "Space i&n string as symbol" -msgstr "&Medzera v reťazci ako symbol" +msgstr "Medzera v re&ťazci ako symbol" #: src/frontends/qt4/ui/ListingsUi.ui:307 msgid "Tab&ulator size:" @@ -2598,7 +2598,7 @@ msgstr "Posledný riadok výpisu" #: src/frontends/qt4/ui/ListingsUi.ui:444 msgid "Ad&vanced" -msgstr "Rozšíre&ne" +msgstr "Rozšír&ené" #: src/frontends/qt4/ui/ListingsUi.ui:458 msgid "More Parameters" @@ -3980,7 +3980,7 @@ msgstr "Označiť &cudzie jazyky" #: src/frontends/qt4/ui/PrefLanguageUi.ui:217 msgid "Right-to-Left Language Support" -msgstr "Podpora Písania Sprava-Doľava" +msgstr "Podpora Písania Zprava-Doľava" #: src/frontends/qt4/ui/PrefLanguageUi.ui:237 msgid "Cursor movement:" @@ -13075,7 +13075,7 @@ msgstr "Tablá" #: lib/layouts/linguistics.module:35 msgid "Numbered Example (multiline)" -msgstr "Číslovaný príklad (viacriadkový)" +msgstr "Číslovaný príklad (viac-riadkový)" #: lib/layouts/linguistics.module:67 msgid "Numbered Examples (consecutive)" @@ -17668,115 +17668,115 @@ msgstr "ASCII" #: lib/ui/stdcontext.inc:30 lib/ui/stdmenus.inc:461 msgid "Array Environment|y" -msgstr "Pole prostredie" +msgstr "Array Prostredie|y" #: lib/ui/stdcontext.inc:31 lib/ui/stdmenus.inc:462 msgid "Cases Environment|C" -msgstr "Cases prostredie" +msgstr "Cases Prostredie|C" #: lib/ui/stdcontext.inc:32 lib/ui/stdmenus.inc:463 msgid "Aligned Environment|l" -msgstr "Aligned prostredie" +msgstr "Aligned Prostredie|l" #: lib/ui/stdcontext.inc:33 lib/ui/stdmenus.inc:464 msgid "AlignedAt Environment|v" -msgstr "AlignedAt prostredie" +msgstr "AlignedAt Prostredie|n" #: lib/ui/stdcontext.inc:34 lib/ui/stdmenus.inc:465 msgid "Gathered Environment|h" -msgstr "Gathered prostredie" +msgstr "Gathered Prostredie|h" #: lib/ui/stdcontext.inc:35 lib/ui/stdmenus.inc:466 msgid "Split Environment|S" -msgstr "Rozdeliť prostredie" +msgstr "Rozdeliť Prostredie|z" #: lib/ui/stdcontext.inc:37 lib/ui/stdmenus.inc:468 msgid "Delimiters...|r" -msgstr "Oddeľovače…" +msgstr "Oddeľovače…|O" #: lib/ui/stdcontext.inc:38 lib/ui/stdmenus.inc:469 msgid "Matrix...|x" -msgstr "Matica…" +msgstr "Matica…|M" #: lib/ui/stdcontext.inc:39 lib/ui/stdmenus.inc:470 msgid "Macro|o" -msgstr "Makro" +msgstr "Makro|k" #: lib/ui/stdcontext.inc:43 lib/ui
r41107 - www-user/trunk/images/LGT
Author: uwestoehr Date: Sat Dec 16 18:28:35 2017 New Revision: 41107 URL: http://www.lyx.org/trac/changeset/41107 Log: update LGT: next step Deleted: www-user/trunk/images/LGT/25_sm.png www-user/trunk/images/LGT/26_sm.png www-user/trunk/images/LGT/27_sm.png www-user/trunk/images/LGT/88_sm.png www-user/trunk/images/LGT/89_sm.png www-user/trunk/images/LGT/90_sm.png www-user/trunk/images/LGT/91_sm.png Modified: www-user/trunk/images/LGT/25.png www-user/trunk/images/LGT/26.png www-user/trunk/images/LGT/27.png www-user/trunk/images/LGT/88.png www-user/trunk/images/LGT/89.png www-user/trunk/images/LGT/90.png www-user/trunk/images/LGT/91.png Modified: www-user/trunk/images/LGT/25.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/LGT/26.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/LGT/27.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/LGT/88.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/LGT/89.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/LGT/90.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/LGT/91.png == Binary file (source and/or target). No diff available.
[LyX/master] de.po: update
commit 16d6289230cf2cce7ddcc05f05e63e809387a89a Author: Juergen Spitzmueller Date: Sat Dec 16 17:46:14 2017 +0100 de.po: update --- po/de.gmo | Bin 540741 -> 540742 bytes po/de.po | 399 +++-- 2 files changed, 205 insertions(+), 194 deletions(-) diff --git a/po/de.gmo b/po/de.gmo index 868e8c2..9f1864e 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index fc68a27..41cbbc7 100644 --- a/po/de.po +++ b/po/de.po @@ -95,8 +95,8 @@ msgid "" msgstr "" "Project-Id-Version: LyX 2.3\n" "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n" -"POT-Creation-Date: 2017-12-14 03:24+0100\n" -"PO-Revision-Date: 2017-12-14 08:07+0100\n" +"POT-Creation-Date: 2017-12-16 17:36+0100\n" +"PO-Revision-Date: 2017-12-16 17:44+0100\n" "Last-Translator: Juergen Spitzmueller \n" "Language-Team: German \n" "Language: de\n" @@ -639,7 +639,7 @@ msgstr "Dehnen" #: src/frontends/qt4/ui/BoxUi.ui:265 src/frontends/qt4/ui/ListingsUi.ui:103 #: src/frontends/qt4/ui/TabularUi.ui:391 src/frontends/qt4/ui/TabularUi.ui:1549 -#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiDocument.cpp:1300 +#: src/frontends/qt4/ui/WrapUi.ui:209 src/frontends/qt4/GuiDocument.cpp:1299 #: src/frontends/qt4/GuiParagraph.cpp:111 src/frontends/qt4/GuiTabular.cpp:851 msgid "Left" msgstr "Links" @@ -653,7 +653,7 @@ msgstr "Zentriert" #: src/frontends/qt4/ui/BoxUi.ui:275 src/frontends/qt4/ui/ListingsUi.ui:108 #: src/frontends/qt4/ui/TabularUi.ui:401 src/frontends/qt4/ui/TabularUi.ui:1566 -#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiDocument.cpp:1302 +#: src/frontends/qt4/ui/WrapUi.ui:214 src/frontends/qt4/GuiDocument.cpp:1301 #: src/frontends/qt4/GuiParagraph.cpp:112 src/frontends/qt4/GuiTabular.cpp:853 msgid "Right" msgstr "Rechts" @@ -808,7 +808,7 @@ msgstr "A&lle hinzufügen" #: src/Buffer.cpp:4460 src/Buffer.cpp:4524 src/LyXVC.cpp:114 src/LyXVC.cpp:304 #: src/buffer_funcs.cpp:78 src/frontends/qt4/GuiBranches.cpp:219 #: src/frontends/qt4/GuiClipboard.cpp:247 -#: src/frontends/qt4/GuiDocument.cpp:2332 src/frontends/qt4/GuiParagraph.cpp:69 +#: src/frontends/qt4/GuiDocument.cpp:2328 src/frontends/qt4/GuiParagraph.cpp:69 #: src/frontends/qt4/GuiParagraph.cpp:161 src/frontends/qt4/GuiPrefs.cpp:3328 #: src/frontends/qt4/GuiView.cpp:2452 src/frontends/qt4/GuiView.cpp:2600 #: src/frontends/qt4/GuiView.cpp:2624 src/frontends/qt4/GuiView.cpp:2638 @@ -845,20 +845,20 @@ msgstr "&Größe:" #: src/Font.cpp:184 src/frontends/qt4/GuiDocument.cpp:119 #: src/frontends/qt4/GuiDocument.cpp:742 src/frontends/qt4/GuiDocument.cpp:872 #: src/frontends/qt4/GuiDocument.cpp:877 src/frontends/qt4/GuiDocument.cpp:918 -#: src/frontends/qt4/GuiDocument.cpp:929 src/frontends/qt4/GuiDocument.cpp:1088 -#: src/frontends/qt4/GuiDocument.cpp:1193 -#: src/frontends/qt4/GuiDocument.cpp:1294 -#: src/frontends/qt4/GuiDocument.cpp:1301 -#: src/frontends/qt4/GuiDocument.cpp:2088 -#: src/frontends/qt4/GuiDocument.cpp:2166 -#: src/frontends/qt4/GuiDocument.cpp:2167 -#: src/frontends/qt4/GuiDocument.cpp:2168 -#: src/frontends/qt4/GuiDocument.cpp:2188 -#: src/frontends/qt4/GuiDocument.cpp:2195 -#: src/frontends/qt4/GuiDocument.cpp:2202 -#: src/frontends/qt4/GuiDocument.cpp:2287 -#: src/frontends/qt4/GuiDocument.cpp:2816 -#: src/frontends/qt4/GuiDocument.cpp:4206 src/frontends/qt4/GuiExternal.cpp:77 +#: src/frontends/qt4/GuiDocument.cpp:929 src/frontends/qt4/GuiDocument.cpp:1089 +#: src/frontends/qt4/GuiDocument.cpp:1194 +#: src/frontends/qt4/GuiDocument.cpp:1293 +#: src/frontends/qt4/GuiDocument.cpp:1300 +#: src/frontends/qt4/GuiDocument.cpp:2084 +#: src/frontends/qt4/GuiDocument.cpp:2162 +#: src/frontends/qt4/GuiDocument.cpp:2163 +#: src/frontends/qt4/GuiDocument.cpp:2164 +#: src/frontends/qt4/GuiDocument.cpp:2184 +#: src/frontends/qt4/GuiDocument.cpp:2191 +#: src/frontends/qt4/GuiDocument.cpp:2198 +#: src/frontends/qt4/GuiDocument.cpp:2283 +#: src/frontends/qt4/GuiDocument.cpp:2812 +#: src/frontends/qt4/GuiDocument.cpp:4202 src/frontends/qt4/GuiExternal.cpp:77 #: src/frontends/qt4/GuiGraphics.cpp:71 src/frontends/qt4/GuiIndices.cpp:58 #: src/frontends/qt4/GuiListings.cpp:154 src/frontends/qt4/GuiListings.cpp:161 #: src/frontends/qt4/GuiPrefs.cpp:2462 src/frontends/qt4/GuiPrefs.cpp:2575 @@ -991,7 +991,7 @@ msgstr "Strichstärke" #: lib/layouts/europasscv.layout:340 lib/layouts/europasscv.layout:373 #: lib/layouts/europasscv.layout:380 lib/layouts/europecv.layout:246 #: lib/layouts/europecv.layout:252 lib/layouts/moderncv.layout:467 -#: src/frontends/qt4/GuiDocument.cpp:1502 src/frontends/qt4/GuiPrefs.cpp:2417 +#: src/frontends/qt4/GuiDocument.cpp:1499 src/frontends/qt4/GuiPrefs.cpp:2417 #: src/frontends/qt4/Menus.cpp:902 msgid "Language" msgstr "Sprache" @@ -1062,9 +1062,9 @@ msgstr "Änderungen &sofort übernehmen" #: src/frontends/qt4/ui/ParagraphUi.ui:251 src/frontends/qt4/ui/PrefsUi.ui:80 #: src/frontends/qt4/ui/RefUi.ui:362 src/frontends/qt4/ui/Send
[LyX/master] Further modifications of the "Dashes and Linebreaks" section
commit ad093160d8c183f2b09d8e844047ea4b8813f079
Author: Juergen Spitzmueller
Date: Sat Dec 16 17:35:40 2017 +0100
Further modifications of the "Dashes and Linebreaks" section
---
lib/doc/UserGuide.lyx| 308 +++---
lib/doc/de/UserGuide.lyx | 235 ---
2 files changed, 395 insertions(+), 148 deletions(-)
diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 0f405f7..2a0ac1c 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -140,11 +140,12 @@ enumitem
\papercolumns 1
\papersides 2
\paperpagestyle default
-\tracking_changes false
+\tracking_changes true
\output_changes false
\html_math_output 0
\html_css_as_file 0
\html_be_strict true
+\author -712698321 "Jürgen Spitzmüller"
\end_header
\begin_body
@@ -8335,12 +8336,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
@@ -8353,6 +8356,7 @@ The following 2 lines are empty:
\end_layout
\begin_layout Verbatim
+
Almost everything is allowed in Verbatim:"%&$§#~'`
\backslash
}][{|
@@ -8376,6 +8380,7 @@ Verbatim
\end_layout
\begin_layout Verbatim*
+
This is Verbatim*.
\end_layout
@@ -16563,7 +16568,7 @@ literal "false"
\end_layout
\begin_layout Subsection
-Dashes and line breaks
+Dashes and Line Breaks
\begin_inset CommandInset label
LatexCommand label
name "subsec:Dashes-and-line-breaks"
@@ -16574,8 +16579,13 @@ name "subsec:Dashes-and-line-breaks"
\end_layout
\begin_layout Standard
-Whether line breaks around dashes are allowed depends on the use case and
- locale:
+Whether line breaks
+\change_deleted -712698321 1513438804
+around
+\change_inserted -712698321 1513438805
+at
+\change_unchanged
+ dashes are allowed depends on the use case and locale:
\end_layout
\begin_layout Itemize
@@ -16595,9 +16605,20 @@ In French and Spanish, dashes around parenthetical
statements are treated
\end_layout
\begin_layout Standard
+
+\change_deleted -712698321 1513437551
In \SpecialChar LyX
-, line breaks after en-dashes and em-dashes are only allowed (without
- manual intervention), if the option
+,
+\change_inserted -712698321 1513437622
+The dashes that are output by \SpecialChar LyX
+ to \SpecialChar LaTeX
+ by default generally allow for
+\change_unchanged
+line breaks after en-dashes and em-dashes
+\change_inserted -712698321 1513437597
+as well as linebreaks before em-dashes.
+\change_deleted -712698321 1513438851
+are only allowed (without manual intervention), if the option
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
@@ -16636,6 +16657,8 @@ In this case, the dashes are output as
\end_inset
+\change_unchanged
+
\end_layout
\begin_layout Standard
@@ -16643,12 +1,22 @@ Please note:
\end_layout
\begin_layout Enumerate
+
+\change_deleted -712698321 1513437637
This results in optional line breaks after
\emph on
all
\emph default
en- and em-dashes.
- Unwanted line breaks must be prevented by wrapping in a makebox
+
+\change_unchanged
+Unwanted line breaks
+\change_deleted -712698321 1513437645
+must
+\change_inserted -712698321 1513437646
+can
+\change_unchanged
+ be prevented by wrapping in a makebox
\begin_inset Foot
status collapsed
@@ -16784,6 +16817,8 @@ An incorrect line break is easily overlooked because
\end_deeper
\begin_layout Enumerate
+
+\change_deleted -712698321 1513437701
The setting is ignored for documents using non-\SpecialChar TeX
fonts.
\begin_inset Foot
@@ -16814,9 +16849,13 @@ XeTeXdashbreakstate=0
\end_inset
+\change_unchanged
+
\end_layout
\begin_layout Enumerate
+
+\change_deleted -712698321 1513437705
Em dashes in
\family typewriter
typewriter
@@ -16830,22 +16869,63 @@ typewriter
---
\family default
in the output.
+\change_unchanged
+
\end_layout
\begin_layout Enumerate
-Hyphenation is suppressed in words adjacent to hyphens and ligature dashes.
+
+\change_inserted -712698321 1513437950
+The default dashes output to \SpecialChar LaTeX
+ disable
+\change_deleted -712698321 1513437951
+H
+\change_inserted -712698321 1513437954
+h
+\change_unchanged
+yphenation
+\change_deleted -712698321 1513437961
+is suppressed
+\change_unchanged
+in words adjacent to hyphens and ligature dashes.
\end_layout
\begin_layout Standard
-If the option
+If
+\change_inserted -712698321 1513438154
+you want to globally disable line breaks at dashes, you can select
+\change_unchanged
+the option
\family sans
Document\SpecialChar menuseparator
Settings\SpecialChar menuseparator
Fonts\SpecialChar menuseparator
+
+\change_inserted -712698321 1513438180
+Disallow line breaks at dashes
+\family default
+.
+ In this case optional line breaks at individual
+\family sans
+ dashes
+\change_deleted -712698321 1513438124
Output en- and em-dashes as ligatures
\family default
- h
r41106 - in www-user/trunk/images/about: . WebDe WebEs WebFr WebHu WebJa
Author: uwestoehr Date: Sat Dec 16 16:26:01 2017 New Revision: 41106 URL: http://www.lyx.org/trac/changeset/41106 Log: upload more localized screenshots Added: www-user/trunk/images/about/WebDe/citation_dialog-de.png (contents, props changed) www-user/trunk/images/about/WebEs/citation_dialog-es.png (contents, props changed) www-user/trunk/images/about/WebFr/citation_dialog-fr.png (contents, props changed) www-user/trunk/images/about/WebHu/citation_dialog-hu.png (contents, props changed) www-user/trunk/images/about/WebJa/citation_dialog-ja.png (contents, props changed) Modified: www-user/trunk/images/about/citation_dialog.png Added: www-user/trunk/images/about/WebDe/citation_dialog-de.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebEs/citation_dialog-es.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebFr/citation_dialog-fr.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebHu/citation_dialog-hu.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebJa/citation_dialog-ja.png == Binary file. No diff available. Modified: www-user/trunk/images/about/citation_dialog.png == Binary file (source and/or target). No diff available.
[LyX/master] Consistent output of breakable/non-breakable dashes on all TeX engines.
commit d56a5447f30688286c1fe19f3b51225f4b586b3e
Author: Juergen Spitzmueller
Date: Sat Dec 16 16:11:25 2017 +0100
Consistent output of breakable/non-breakable dashes on all TeX engines.
Fixes: #10839
---
src/LaTeXFeatures.cpp |3 +++
src/Paragraph.cpp | 26 +-
src/frontends/qt4/GuiDocument.cpp |5 ++---
src/frontends/qt4/ui/FontUi.ui|4 ++--
4 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 3f9eb67..d4b0018 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -1318,6 +1318,9 @@ TexString LaTeXFeatures::getMacros() const
macros << getPreambleSnippets();
}
+ if (mustProvide("xetexdashbreakstate"))
+ macros << "\\XeTeXdashbreakstate 0" << '\n';
+
if (mustProvide("papersize")) {
if (runparams_.flavor == OutputParams::LATEX
|| runparams_.flavor == OutputParams::DVILUATEX)
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 80bfe3d..a6c72c3 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1289,7 +1289,10 @@ void Paragraph::Private::latexSpecialChar(otexstream &
os,
case 0x2013:
case 0x2014:
- if (bparams.use_dash_ligatures && !bparams.useNonTeXFonts) {
+ // XeTeX's dash behaviour is determined via a global setting
+ if (bparams.use_dash_ligatures
+ && owner_->getFontSettings(bparams, i).fontInfo().family()
!= TYPEWRITER_FAMILY
+ && (!bparams.useNonTeXFonts || runparams.flavor !=
OutputParams::XETEX)) {
if (c == 0x2013) {
// en-dash
os << "--";
@@ -1417,6 +1420,14 @@ bool Paragraph::Private::latexSpecialT3(char_type const
c, otexstream & os,
os << "\\textvertline" << termcmd;
column += 14;
return true;
+ case 0x2013:
+ os << "\\textendash" << termcmd;
+ column += 12;
+ return true;
+ case 0x2014:
+ os << "\\textemdash" << termcmd;
+ column += 12;
+ return true;
default:
return false;
}
@@ -1425,11 +1436,11 @@ bool Paragraph::Private::latexSpecialT3(char_type const
c, otexstream & os,
void Paragraph::Private::validate(LaTeXFeatures & features) const
{
+ Buffer const & buf = inset_owner_->buffer();
+ BufferParams const & bp = features.runparams().is_child
+ ? buf.masterParams() : buf.params();
if (layout_->inpreamble && inset_owner_) {
bool const is_command = layout_->latextype == LATEX_COMMAND;
- Buffer const & buf = inset_owner_->buffer();
- BufferParams const & bp = features.runparams().is_child
- ? buf.masterParams() : buf.params();
Font f;
// Using a string stream here circumvents the encoding
// switching machinery of odocstream. Therefore the
@@ -1509,7 +1520,6 @@ void Paragraph::Private::validate(LaTeXFeatures &
features) const
}
// then the contents
- BufferParams const bp = features.buffer().masterParams();
for (pos_type i = 0; i < int(text_.size()) ; ++i) {
char_type c = text_[i];
if (c == 0x0022) {
@@ -1519,6 +1529,12 @@ void Paragraph::Private::validate(LaTeXFeatures &
features) const
|| ((&owner_->getFontSettings(bp,
i))->language()->internalFontEncoding()))
features.require("textquotedbl");
}
+ if (!bp.use_dash_ligatures
+ && (c == 0x2013 || c == 0x2014)
+ && bp.useNonTeXFonts
+ && features.runparams().flavor == OutputParams::XETEX)
+ // XeTeX's dash behaviour is determined via a global
setting
+ features.require("xetexdashbreakstate");
BufferEncodings::validate(c, features);
}
}
diff --git a/src/frontends/qt4/GuiDocument.cpp
b/src/frontends/qt4/GuiDocument.cpp
index b607231..53cee98 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -2074,7 +2074,6 @@ void GuiDocument::updateFontOptions()
fontModule->fontsRomanCO->currentIndex()).toString();
fontModule->fontScCB->setEnabled(providesSC(font));
fontModule->fontOsfCB->setEnabled(providesOSF(font));
- fontModule->dashesCB->setEnabled(tex_fonts);
updateMathFonts(font);
}
@@ -3210,7 +3209,7 @@ void GuiDocument::applyView()
fromqstr(fontModule->cjkFontLE->text());
bp_.use_microtype = fontModule->microtypeCB->isChecked();
- bp_.use_dash_ligatures = fontModule->dashes
r41105 - in www-user/trunk/images/about: WebDe WebEs WebFr WebHu WebJa
Author: uwestoehr Date: Sat Dec 16 16:09:10 2017 New Revision: 41105 URL: http://www.lyx.org/trac/changeset/41105 Log: upload more localized screenshots Added: www-user/trunk/images/about/WebDe/preferences-de.png (contents, props changed) www-user/trunk/images/about/WebDe/spellchecker-de.png (contents, props changed) www-user/trunk/images/about/WebEs/preferences-es.png (contents, props changed) www-user/trunk/images/about/WebEs/spellchecker-es.png (contents, props changed) www-user/trunk/images/about/WebFr/preferences-fr.png (contents, props changed) www-user/trunk/images/about/WebFr/spellchecker-fr.png (contents, props changed) www-user/trunk/images/about/WebHu/preferences-hu.png (contents, props changed) www-user/trunk/images/about/WebHu/spellchecker-hu.png (contents, props changed) www-user/trunk/images/about/WebJa/preferences-ja.png (contents, props changed) www-user/trunk/images/about/WebJa/spellchecker-ja.png (contents, props changed) Added: www-user/trunk/images/about/WebDe/preferences-de.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebDe/spellchecker-de.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebEs/preferences-es.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebEs/spellchecker-es.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebFr/preferences-fr.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebFr/spellchecker-fr.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebHu/preferences-hu.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebHu/spellchecker-hu.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebJa/preferences-ja.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebJa/spellchecker-ja.png == Binary file. No diff available.
[LyX/master] Fix #10871 compiler warnings.
commit 4c093a50c2aaebad1459991b90b625a8c00a69e8
Author: Richard Heck
Date: Sat Dec 16 09:58:52 2017 -0500
Fix #10871 compiler warnings.
---
src/frontends/qt4/GuiExternal.cpp |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/frontends/qt4/GuiExternal.cpp
b/src/frontends/qt4/GuiExternal.cpp
index f994aaf..8215f07 100644
--- a/src/frontends/qt4/GuiExternal.cpp
+++ b/src/frontends/qt4/GuiExternal.cpp
@@ -626,9 +626,9 @@ void GuiExternal::applyView()
}
-bool GuiExternal::initialiseParams(string const & data)
+bool GuiExternal::initialiseParams(string const & sdata)
{
- InsetExternal::string2params(data, buffer(), params_);
+ InsetExternal::string2params(sdata, buffer(), params_);
return true;
}
[LyX/master] Fix #10869 compiler warnings.
commit e869ec4bc9c417b872bb2ccc240fcb167e86f615
Author: Richard Heck
Date: Sat Dec 16 09:55:25 2017 -0500
Fix #10869 compiler warnings.
---
src/frontends/qt4/GuiDocument.cpp | 39 +---
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/src/frontends/qt4/GuiDocument.cpp
b/src/frontends/qt4/GuiDocument.cpp
index 3e4fa06..b607231 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -494,7 +494,7 @@ void PreambleModule::update(BufferParams const & params,
BufferId id)
preamble_coords_[current_id_] = make_pair(0, 0);
else {
// Restore saved coords.
- QTextCursor cur = preambleTE->textCursor();
+ cur = preambleTE->textCursor();
cur.setPosition(it->second.first);
preambleTE->setTextCursor(cur);
preambleTE->verticalScrollBar()->setValue(it->second.second);
@@ -1078,9 +1078,10 @@ GuiDocument::GuiDocument(GuiView & lv)
QStringList encodinglist;
Encodings::const_iterator it = encodings.begin();
Encodings::const_iterator const end = encodings.end();
- for (; it != end; ++it)
- if (!it->unsafe())
- encodinglist.append(qt_(it->guiName()));
+ for (auto const & encvar : encodings) {
+ if (!encvar.unsafe())
+ encodinglist.append(qt_(encvar.guiName()));
+ }
encodinglist.sort();
langModule->encodingCO->addItems(encodinglist);
@@ -1191,9 +1192,8 @@ GuiDocument::GuiDocument(GuiView & lv)
// NOTE: we do not provide "custom" here for security reasons!
biblioModule->bibtexCO->clear();
biblioModule->bibtexCO->addItem(qt_("Default"), QString("default"));
- for (set::const_iterator it = lyxrc.bibtex_alternatives.begin();
-it != lyxrc.bibtex_alternatives.end(); ++it) {
- QString const command = toqstr(*it).left(toqstr(*it).indexOf("
"));
+ for (auto const & alts : lyxrc.bibtex_alternatives) {
+ QString const command =
toqstr(alts).left(toqstr(alts).indexOf(" "));
biblioModule->bibtexCO->addItem(command, command);
}
@@ -1213,11 +1213,10 @@ GuiDocument::GuiDocument(GuiView & lv)
setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(),
QHeaderView::ResizeToContents);
map const & packages = BufferParams::auto_packages();
mathsModule->packagesTW->setRowCount(packages.size());
- int i = 0;
- for (map::const_iterator it = packages.begin();
-it != packages.end(); ++it) {
- docstring const package = from_ascii(it->first);
- QString autoTooltip = qt_(it->second);
+ int packnum = 0;
+ for (auto const & pkgvar : packages) {
+ docstring const package = from_ascii(pkgvar.first);
+ QString autoTooltip = qt_(pkgvar.second);
QString alwaysTooltip;
if (package == "amsmath")
alwaysTooltip =
@@ -1245,10 +1244,10 @@ GuiDocument::GuiDocument(GuiView & lv)
alwaysRB->setToolTip(alwaysTooltip);
neverRB->setToolTip(neverTooltip);
QTableWidgetItem * pack = new QTableWidgetItem(toqstr(package));
- mathsModule->packagesTW->setItem(i, 0, pack);
- mathsModule->packagesTW->setCellWidget(i, 1, autoRB);
- mathsModule->packagesTW->setCellWidget(i, 2, alwaysRB);
- mathsModule->packagesTW->setCellWidget(i, 3, neverRB);
+ mathsModule->packagesTW->setItem(packnum, 0, pack);
+ mathsModule->packagesTW->setCellWidget(packnum, 1, autoRB);
+ mathsModule->packagesTW->setCellWidget(packnum, 2, alwaysRB);
+ mathsModule->packagesTW->setCellWidget(packnum, 3, neverRB);
//center the radio buttons
autoRB->setStyleSheet("margin-left:50%; margin-right:50%;");
alwaysRB->setStyleSheet("margin-left:50%; margin-right:50%;");
@@ -1260,7 +1259,7 @@ GuiDocument::GuiDocument(GuiView & lv)
this, SLOT(change_adaptor()));
connect(neverRB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
- ++i;
+ ++packnum;
}
connect(mathsModule->allPackagesAutoPB, SIGNAL(clicked()),
this, SLOT(allPackagesAuto()));
@@ -1345,10 +1344,8 @@ GuiDocument::GuiDocument(GuiView & lv)
vector classList = bcl.classList();
sort(classList.begin(), classList.end(), less_textclass_avail_desc());
- vector::const_iterator cit = classList.begin();
- vector::const_iterator cen = classList.end();
- for (int i = 0; cit != cen; ++cit, ++i) {
- LayoutFile const & tc = bcl[*cit];
+ for (auto const & cvar : classList) {
+
[LyX/master] Fix #10867 compiler warnings.
commit fb93733feea65bd0b31d5f0458f9a74fc02d827e
Author: Richard Heck
Date: Sat Dec 16 09:45:38 2017 -0500
Fix #10867 compiler warnings.
---
src/frontends/qt4/GuiBibtex.cpp | 32
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/frontends/qt4/GuiBibtex.cpp b/src/frontends/qt4/GuiBibtex.cpp
index 4b4dd7e..d3c728a 100644
--- a/src/frontends/qt4/GuiBibtex.cpp
+++ b/src/frontends/qt4/GuiBibtex.cpp
@@ -452,33 +452,33 @@ QString GuiBibtex::browseBst(QString const & in_name)
const
QStringList GuiBibtex::bibStyles() const
{
- QStringList data = texFileList("bstFiles.lst");
+ QStringList sdata = texFileList("bstFiles.lst");
// test whether we have a valid list, otherwise run rescan
- if (data.isEmpty()) {
+ if (sdata.isEmpty()) {
rescanBibStyles();
- data = texFileList("bstFiles.lst");
+ sdata = texFileList("bstFiles.lst");
}
- for (int i = 0; i != data.size(); ++i)
- data[i] = onlyFileName(data[i]);
+ for (int i = 0; i != sdata.size(); ++i)
+ sdata[i] = onlyFileName(sdata[i]);
// sort on filename only (no path)
- data.sort();
- return data;
+ sdata.sort();
+ return sdata;
}
QStringList GuiBibtex::bibFiles() const
{
- QStringList data = texFileList("bibFiles.lst");
+ QStringList sdata = texFileList("bibFiles.lst");
// test whether we have a valid list, otherwise run rescan
- if (data.isEmpty()) {
+ if (sdata.isEmpty()) {
rescanBibStyles();
- data = texFileList("bibFiles.lst");
+ sdata = texFileList("bibFiles.lst");
}
- for (int i = 0; i != data.size(); ++i)
- data[i] = onlyFileName(data[i]);
+ for (int i = 0; i != sdata.size(); ++i)
+ sdata[i] = onlyFileName(sdata[i]);
// sort on filename only (no path)
- data.sort();
- return data;
+ sdata.sort();
+ return sdata;
}
@@ -539,9 +539,9 @@ QString GuiBibtex::styleFile() const
}
-bool GuiBibtex::initialiseParams(std::string const & data)
+bool GuiBibtex::initialiseParams(std::string const & sdata)
{
- InsetCommand::string2params(data, params_);
+ InsetCommand::string2params(sdata, params_);
return true;
}
r41104 - in www-user/trunk/images/about: . WebDe WebEs WebFr WebHu WebJa
Author: uwestoehr Date: Sat Dec 16 15:31:37 2017 New Revision: 41104 URL: http://www.lyx.org/trac/changeset/41104 Log: update some more screenshots and add localizes screenshots -also remove unnecessary files Added: www-user/trunk/images/about/WebDe/ www-user/trunk/images/about/WebDe/edit_menu-de.png (contents, props changed) www-user/trunk/images/about/WebDe/insert_menu-de.png (contents, props changed) www-user/trunk/images/about/WebDe/main_window-de.png (contents, props changed) www-user/trunk/images/about/WebEs/ www-user/trunk/images/about/WebEs/edit_menu-es.png (contents, props changed) www-user/trunk/images/about/WebEs/insert_menu-es.png (contents, props changed) www-user/trunk/images/about/WebEs/main_window-es.png (contents, props changed) www-user/trunk/images/about/WebFr/ www-user/trunk/images/about/WebFr/edit_menu-fr.png (contents, props changed) www-user/trunk/images/about/WebFr/insert_menu-fr.png (contents, props changed) www-user/trunk/images/about/WebFr/main_window-fr.png (contents, props changed) www-user/trunk/images/about/WebHu/ www-user/trunk/images/about/WebHu/edit_menu-hu.png (contents, props changed) www-user/trunk/images/about/WebHu/insert_menu-hu.png (contents, props changed) www-user/trunk/images/about/WebHu/main_window-hu.png (contents, props changed) www-user/trunk/images/about/WebJa/ www-user/trunk/images/about/WebJa/edit_menu-ja.png (contents, props changed) www-user/trunk/images/about/WebJa/insert_menu-ja.png (contents, props changed) www-user/trunk/images/about/WebJa/main_window-ja.png (contents, props changed) Deleted: www-user/trunk/images/about/aqua_sm.png www-user/trunk/images/about/citation_dialog_sm.png www-user/trunk/images/about/edit_menu_sm.png www-user/trunk/images/about/fullscreen_sm.png www-user/trunk/images/about/insert_menu_sm.png www-user/trunk/images/about/main_window_sm.png www-user/trunk/images/about/math_panel_sm.png www-user/trunk/images/about/preferences_sm.png www-user/trunk/images/about/preview_dvi_sm.png www-user/trunk/images/about/spellchecker_sm.png www-user/trunk/images/about/table_of_contents_sm.png Modified: www-user/trunk/images/about/edit_menu.png www-user/trunk/images/about/insert_menu.png www-user/trunk/images/about/main_window.png Added: www-user/trunk/images/about/WebDe/edit_menu-de.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebDe/insert_menu-de.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebDe/main_window-de.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebEs/edit_menu-es.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebEs/insert_menu-es.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebEs/main_window-es.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebFr/edit_menu-fr.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebFr/insert_menu-fr.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebFr/main_window-fr.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebHu/edit_menu-hu.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebHu/insert_menu-hu.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebHu/main_window-hu.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebJa/edit_menu-ja.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebJa/insert_menu-ja.png == Binary file. No diff available. Added: www-user/trunk/images/about/WebJa/main_window-ja.png == Binary file. No diff available. Modified: www-user/trunk/images/about/edit_men
[LyX/master] Properly fix #10863 compiler warnings.
commit fab87917eab29ee0ac97808cc1f2292989a5156a
Author: Richard Heck
Date: Sat Dec 16 09:30:12 2017 -0500
Properly fix #10863 compiler warnings.
Also change a few variable names, so as not to use "it" with
range-based for loops.
---
src/BufferParams.cpp |4 ++--
src/insets/InsetCitation.cpp |4 ++--
src/mathed/InsetMathHull.cpp |4 ++--
src/mathed/MathParser.cpp|4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 711f52f..8cb0c2c 100644
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2674,8 +2674,8 @@ OutputParams::FLAVOR BufferParams::getOutputFlavor(string
const & format) const
if (find(backs.begin(), backs.end(), dformat) == backs.end()) {
// Get shortest path to format
Graph::EdgePath path;
- for (auto const & bit : backs) {
- Graph::EdgePath p =
theConverters().getPath(bit, dformat);
+ for (auto const & bvar : backs) {
+ Graph::EdgePath p =
theConverters().getPath(bvar, dformat);
if (!p.empty() && (path.empty() || p.size() <
path.size())) {
path = p;
}
diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp
index 236dda2..167fc24 100644
--- a/src/insets/InsetCitation.cpp
+++ b/src/insets/InsetCitation.cpp
@@ -253,8 +253,8 @@ docstring InsetCitation::toolTip(BufferView const & bv,
int, int) const
docstring tip;
tip += "";
int count = 0;
- for (docstring const & kit : keys) {
- docstring const key_info = bi.getInfo(kit, buffer(), ci);
+ for (docstring const & kvar : keys) {
+ docstring const key_info = bi.getInfo(kvar, buffer(), ci);
// limit to reasonable size.
if (count > 9 && keys.size() > 11) {
tip.push_back(0x2026);// HORIZONTAL ELLIPSIS
diff --git a/src/mathed/InsetMathHull.cpp b/src/mathed/InsetMathHull.cpp
index 724c115..06368ac 100644
--- a/src/mathed/InsetMathHull.cpp
+++ b/src/mathed/InsetMathHull.cpp
@@ -824,8 +824,8 @@ void InsetMathHull::preparePreview(DocIterator const & pos,
usedMacros(cell(idx), pos, macros, defs);
docstring macro_preamble;
- for (auto const & defit : defs)
- macro_preamble.append(defit);
+ for (auto const & defvar : defs)
+ macro_preamble.append(defvar);
// set the font series and size for this snippet
DocIterator dit = pos.getInnerText();
diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index 35062ca..aaf8b22 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -745,7 +745,7 @@ docstring Parser::parse_verbatim_option()
docstring res;
if (nextToken().character() == '[') {
Token t = getToken();
- for (Token t = getToken(); t.character() != ']' && good(); t =
getToken()) {
+ for (t = getToken(); t.character() != ']' && good(); t =
getToken()) {
if (t.cat() == catBegin) {
putback();
res += '{' + parse_verbatim_item() + '}';
@@ -763,7 +763,7 @@ docstring Parser::parse_verbatim_item()
docstring res;
if (nextToken().cat() == catBegin) {
Token t = getToken();
- for (Token t = getToken(); t.cat() != catEnd && good(); t =
getToken()) {
+ for (t = getToken(); t.cat() != catEnd && good(); t =
getToken()) {
if (t.cat() == catBegin) {
putback();
res += '{' + parse_verbatim_item() + '}';
[LyX/master] Revert "Fix #10863 compiler warnings."
commit 0a87aa02474ef15adb18d82043b9f32726c9cc8a
Author: Richard Heck
Date: Sat Dec 16 09:22:41 2017 -0500
Revert "Fix #10863 compiler warnings."
This reverts commit b684ec39eaaf7d5b0270bf8109b8e281fa8c5d9f.
---
src/mathed/MathParser.cpp | 12 +++-
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/mathed/MathParser.cpp b/src/mathed/MathParser.cpp
index c914a6a..35062ca 100644
--- a/src/mathed/MathParser.cpp
+++ b/src/mathed/MathParser.cpp
@@ -744,6 +744,7 @@ docstring Parser::parse_verbatim_option()
skipSpaces();
docstring res;
if (nextToken().character() == '[') {
+ Token t = getToken();
for (Token t = getToken(); t.character() != ']' && good(); t =
getToken()) {
if (t.cat() == catBegin) {
putback();
@@ -761,6 +762,7 @@ docstring Parser::parse_verbatim_item()
skipSpaces();
docstring res;
if (nextToken().cat() == catBegin) {
+ Token t = getToken();
for (Token t = getToken(); t.cat() != catEnd && good(); t =
getToken()) {
if (t.cat() == catBegin) {
putback();
@@ -1035,10 +1037,10 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned
flags,
else if (t.cat() == catComment) {
docstring s;
while (good()) {
- Token const & tt = getToken();
- if (tt.cat() == catNewline)
+ Token const & t = getToken();
+ if (t.cat() == catNewline)
break;
- s += tt.asInput();
+ s += t.asInput();
}
cell->push_back(MathAtom(new InsetMathComment(buf, s)));
skipSpaces();
@@ -1772,7 +1774,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
docstring s;
int num_tokens = 0;
while (true) {
- Token const & tt = getToken();
+ Token const & t = getToken();
++num_tokens;
if (!good()) {
s.clear();
@@ -1780,7 +1782,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
putback();
break;
}
- s += tt.character();
+ s += t.character();
if (isValidLength(to_utf8(s)))
break;
}
r41103 - www-user/trunk/images/about
Author: uwestoehr Date: Sat Dec 16 14:29:41 2017 New Revision: 41103 URL: http://www.lyx.org/trac/changeset/41103 Log: update some more screenshots Modified: www-user/trunk/images/about/citation_dialog.png www-user/trunk/images/about/preferences.png www-user/trunk/images/about/spellchecker.png Modified: www-user/trunk/images/about/citation_dialog.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/about/preferences.png == Binary file (source and/or target). No diff available. Modified: www-user/trunk/images/about/spellchecker.png == Binary file (source and/or target). No diff available.
[LyX/2.3.x] splash.lyx: link https://www.lyx.org/Walkthrough
commit b32e719f825d3e70a3baccf8aebebf9bbce2ac6a Author: Uwe Stöhr Date: Sat Dec 16 14:25:34 2017 +0100 splash.lyx: link https://www.lyx.org/Walkthrough It is a good idea from Yuriy to link it, especially for the languages where we don't have other docs than the splash file. --- lib/examples/ca/splash.lyx| 19 +-- lib/examples/cs/splash.lyx| 20 +--- lib/examples/da/splash.lyx| 15 +-- lib/examples/de/splash.lyx| 13 - lib/examples/el/splash.lyx| 21 - lib/examples/es/splash.lyx| 21 - lib/examples/eu/splash.lyx| 25 ++--- lib/examples/fa/splash.lyx| 14 -- lib/examples/fr/splash.lyx| 19 +-- lib/examples/gl/splash.lyx| 15 +-- lib/examples/hu/splash.lyx| 23 +-- lib/examples/id/splash.lyx| 16 +--- lib/examples/it/splash.lyx| 11 +++ lib/examples/ja/splash.lyx| 13 - lib/examples/ko/splash.lyx| 15 +-- lib/examples/nb/splash.lyx| 15 +-- lib/examples/nl/splash.lyx| 15 +-- lib/examples/pl/splash.lyx| 13 - lib/examples/pt_BR/splash.lyx | 13 - lib/examples/pt_PT/splash.lyx | 11 +++ lib/examples/ro/splash.lyx| 13 - lib/examples/ru/splash.lyx| 13 - lib/examples/sk/splash.lyx| 15 +-- lib/examples/sl/splash.lyx| 15 +-- lib/examples/splash.lyx | 15 +-- lib/examples/sr/splash.lyx| 15 +-- lib/examples/sv/splash.lyx| 17 ++--- lib/examples/uk/splash.lyx| 13 - 28 files changed, 384 insertions(+), 59 deletions(-) diff --git a/lib/examples/ca/splash.lyx b/lib/examples/ca/splash.lyx index ddfd05f..e726741 100644 --- a/lib/examples/ca/splash.lyx +++ b/lib/examples/ca/splash.lyx @@ -222,7 +222,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/ +https://www.lyx.org \end_layout \end_inset @@ -231,11 +231,18 @@ https://www.lyx.org/ Obtingueu informació sobre el \SpecialChar LyX , subscriviu-vos a les llistes de correu de \SpecialChar LyX -, passegeu-vos pel -\emph on -\SpecialChar LyX - Graphical Tour -\emph default +, passegeu-vos pel \SpecialChar LyX + Graphical Tour: +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/Walkthrough +\end_layout + +\end_inset + , i molt més. \end_layout diff --git a/lib/examples/cs/splash.lyx b/lib/examples/cs/splash.lyx index 2401d99..17d1a5c 100644 --- a/lib/examples/cs/splash.lyx +++ b/lib/examples/cs/splash.lyx @@ -200,7 +200,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/ +https://www.lyx.org \end_layout \end_inset @@ -208,8 +208,22 @@ https://www.lyx.org/ . Můžete zde najít další informace, přihlásit se do konference, udělat si grafickou výpravu do \SpecialChar LyX -u (Graphical Tour) a najít spousty rad a triků v rámci - wiki. +u (Graphical Tour): +\begin_inset Newline newline +\end_inset + + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/Walkthrough +\end_layout + +\end_inset + + a najít spousty rad a triků v rámci wiki. \end_layout \end_body diff --git a/lib/examples/da/splash.lyx b/lib/examples/da/splash.lyx index c6fffa0..2395ae4 100644 --- a/lib/examples/da/splash.lyx +++ b/lib/examples/da/splash.lyx @@ -210,7 +210,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/ +https://www.lyx.org \end_layout \end_inset @@ -218,7 +218,18 @@ https://www.lyx.org/ \SpecialChar endofsentence Find oplysninger om \SpecialChar LyX , abonnér på \SpecialChar LyX -'s postlister, tag en grafisk rundtur +'s postlister, tag en grafisk rundtur: + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/Walkthrough +\end_layout + +\end_inset + m.m\SpecialChar endofsentence \end_layout diff --git a/lib/examples/de/splash.lyx b/lib/examples/de/splash.lyx index a86d8bc..35dc483 100644 --- a/lib/examples/de/splash.lyx +++ b/lib/examples/de/splash.lyx @@ -207,7 +207,18 @@ https://www.lyx.org/WebDe.Home Dort bekommen Sie aktuelle Informationen zu \SpecialChar LyX , können Mailing-Listen abonnieren, sich einen grafischen Rundgang durch \SpecialChar LyX - ansehen und vieles mehr. + ansehen: +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/WebDe.Walkthrough +\end_layout + +\end_inset + + und vieles mehr. \end_layout \begin_layout Enumerate diff --git a/lib/examples/el/splash.lyx b/lib/examples/el/splash.lyx index 54b9749..5254561 100644 --- a/lib/examples/el/splash.lyx +++ b/lib/examples/el/splash.lyx @@ -194,21 +194,40 @@ View \begin_layout Enumerate Η ιστοσελίδα
[LyX/master] splash.lyx: link https://www.lyx.org/Walkthrough
commit 1f23d65f8f6bf6b24690698160b5f6f2a55a2d8b Author: Uwe Stöhr Date: Sat Dec 16 14:24:17 2017 +0100 splash.lyx: link https://www.lyx.org/Walkthrough It is a good idea from Yuriy to link it, especially for the languages where we don't have other docs than the splash file. --- lib/examples/ca/splash.lyx| 19 +-- lib/examples/cs/splash.lyx| 20 +--- lib/examples/da/splash.lyx| 15 +-- lib/examples/de/splash.lyx| 13 - lib/examples/el/splash.lyx| 21 - lib/examples/es/splash.lyx| 21 - lib/examples/eu/splash.lyx| 25 ++--- lib/examples/fa/splash.lyx| 14 -- lib/examples/fr/splash.lyx| 19 +-- lib/examples/gl/splash.lyx| 15 +-- lib/examples/hu/splash.lyx| 23 +-- lib/examples/id/splash.lyx| 16 +--- lib/examples/it/splash.lyx| 11 +++ lib/examples/ja/splash.lyx| 13 - lib/examples/ko/splash.lyx| 15 +-- lib/examples/nb/splash.lyx| 15 +-- lib/examples/nl/splash.lyx| 15 +-- lib/examples/pl/splash.lyx| 13 - lib/examples/pt_BR/splash.lyx | 13 - lib/examples/pt_PT/splash.lyx | 11 +++ lib/examples/ro/splash.lyx| 13 - lib/examples/ru/splash.lyx| 13 - lib/examples/sk/splash.lyx| 15 +-- lib/examples/sl/splash.lyx| 15 +-- lib/examples/splash.lyx | 15 +-- lib/examples/sr/splash.lyx| 15 +-- lib/examples/sv/splash.lyx| 17 ++--- lib/examples/uk/splash.lyx| 13 - 28 files changed, 384 insertions(+), 59 deletions(-) diff --git a/lib/examples/ca/splash.lyx b/lib/examples/ca/splash.lyx index ddfd05f..e726741 100644 --- a/lib/examples/ca/splash.lyx +++ b/lib/examples/ca/splash.lyx @@ -222,7 +222,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/ +https://www.lyx.org \end_layout \end_inset @@ -231,11 +231,18 @@ https://www.lyx.org/ Obtingueu informació sobre el \SpecialChar LyX , subscriviu-vos a les llistes de correu de \SpecialChar LyX -, passegeu-vos pel -\emph on -\SpecialChar LyX - Graphical Tour -\emph default +, passegeu-vos pel \SpecialChar LyX + Graphical Tour: +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/Walkthrough +\end_layout + +\end_inset + , i molt més. \end_layout diff --git a/lib/examples/cs/splash.lyx b/lib/examples/cs/splash.lyx index 2401d99..17d1a5c 100644 --- a/lib/examples/cs/splash.lyx +++ b/lib/examples/cs/splash.lyx @@ -200,7 +200,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/ +https://www.lyx.org \end_layout \end_inset @@ -208,8 +208,22 @@ https://www.lyx.org/ . Můžete zde najít další informace, přihlásit se do konference, udělat si grafickou výpravu do \SpecialChar LyX -u (Graphical Tour) a najít spousty rad a triků v rámci - wiki. +u (Graphical Tour): +\begin_inset Newline newline +\end_inset + + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/Walkthrough +\end_layout + +\end_inset + + a najít spousty rad a triků v rámci wiki. \end_layout \end_body diff --git a/lib/examples/da/splash.lyx b/lib/examples/da/splash.lyx index c6fffa0..2395ae4 100644 --- a/lib/examples/da/splash.lyx +++ b/lib/examples/da/splash.lyx @@ -210,7 +210,7 @@ status collapsed \begin_layout Plain Layout -https://www.lyx.org/ +https://www.lyx.org \end_layout \end_inset @@ -218,7 +218,18 @@ https://www.lyx.org/ \SpecialChar endofsentence Find oplysninger om \SpecialChar LyX , abonnér på \SpecialChar LyX -'s postlister, tag en grafisk rundtur +'s postlister, tag en grafisk rundtur: + +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/Walkthrough +\end_layout + +\end_inset + m.m\SpecialChar endofsentence \end_layout diff --git a/lib/examples/de/splash.lyx b/lib/examples/de/splash.lyx index a86d8bc..35dc483 100644 --- a/lib/examples/de/splash.lyx +++ b/lib/examples/de/splash.lyx @@ -207,7 +207,18 @@ https://www.lyx.org/WebDe.Home Dort bekommen Sie aktuelle Informationen zu \SpecialChar LyX , können Mailing-Listen abonnieren, sich einen grafischen Rundgang durch \SpecialChar LyX - ansehen und vieles mehr. + ansehen: +\begin_inset Flex URL +status collapsed + +\begin_layout Plain Layout + +https://www.lyx.org/WebDe.Walkthrough +\end_layout + +\end_inset + + und vieles mehr. \end_layout \begin_layout Enumerate diff --git a/lib/examples/el/splash.lyx b/lib/examples/el/splash.lyx index 54b9749..5254561 100644 --- a/lib/examples/el/splash.lyx +++ b/lib/examples/el/splash.lyx @@ -194,21 +194,40 @@ View \begin_layout Enumerate Η ιστοσελίδα
[LyX/master] gzstream.cpp: whitespace fix
commit 5ebff51e99b0bfc8237caf4bf009d9fe4bcfe4d3
Author: Uwe Stöhr
Date: Sat Dec 16 13:09:39 2017 +0100
gzstream.cpp: whitespace fix
---
src/support/gzstream.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/support/gzstream.cpp b/src/support/gzstream.cpp
index 22e7c07..dfad995 100644
--- a/src/support/gzstream.cpp
+++ b/src/support/gzstream.cpp
@@ -121,7 +121,7 @@ int gzstreambuf::overflow( int c) { // used for output
buffer only
if ( ! ( mode & ios::out) || ! opened)
return EOF;
if (c != EOF) {
- *pptr() = (char) c;
+*pptr() = (char) c;
pbump(1);
}
if ( flush_buffer() == EOF)
