[LyX/master] Fix Python escaping of unicode string
commit 713fd70e8fdca800e74e256979e2a86ab522d099 Author: Scott Kostyshak Date: Tue Dec 26 02:03:06 2017 -0500 Fix Python escaping of unicode string When removing "r" from "ur", it is needed to add extra backslashes. See: https://www.mail-archive.com/search?l=mid&q=2024193.iXIh6cq6L3%40myth Thanks to José. This commit amends b7983478 (and thus 586d16a4). --- lib/lyx2lyx/lyx_2_3.py |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/lyx2lyx/lyx_2_3.py b/lib/lyx2lyx/lyx_2_3.py index d0481ae..140f57f 100644 --- a/lib/lyx2lyx/lyx_2_3.py +++ b/lib/lyx2lyx/lyx_2_3.py @@ -1875,7 +1875,7 @@ def convert_dashligatures(document): flags=re.UNICODE): has_literal_dashes = True # ligature dash followed by word or no-break space on next line: -if re.search(u"(\\twohyphens|\\threehyphens)", line, +if re.search(u"(twohyphens|threehyphens)", line, flags=re.UNICODE) and re.match(u"[\w\u00A0]", document.body[i+1], flags=re.UNICODE): has_ligature_dashes = True
[LyX/master] Fix crash after cancellation code.
commit 61b1a20185498e92593b17a8bb38034dea7925fc
Author: Richard Heck
Date: Sun Dec 24 11:17:50 2017 -0500
Fix crash after cancellation code.
I thought we didn't use clones when exporting from the command line.
We probably shouldn't.
---
src/support/Systemcall.cpp |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 93166b5..fe8c23f 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -403,7 +403,7 @@ void SystemcallPrivate::startProcess(QString const & cmd,
string const & path,
bool SystemcallPrivate::waitAndCheck()
{
Sleep::millisec(100);
- if (theApp()->cancel_export) {
+ if (theApp() && theApp()->cancel_export) {
// is there a better place to reset this?
process_->kill();
state = Killed;
[LyX/2.3.x] Update sk.po
commit e13281a14d3c06bb841172aa3205363588269bb4 Author: Kornel Benko Date: Mon Dec 25 14:50:47 2017 +0100 Update sk.po --- po/sk.gmo | Bin 526825 -> 526868 bytes po/sk.po | 60 ++-- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/po/sk.gmo b/po/sk.gmo index c541504..cc8d45d 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sk.po b/po/sk.po index 995391e..4a37d39 100644 --- a/po/sk.po +++ b/po/sk.po @@ -8,8 +8,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-17 19:29+0100\n" -"PO-Revision-Date: 2017-12-21 05:06+\n" +"POT-Creation-Date: 2017-12-25 14:40+0100\n" +"PO-Revision-Date: 2017-12-25 13:49+\n" "Last-Translator: Kornel Benko \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -1207,7 +1207,7 @@ msgstr "Nový &Dokument" #: src/frontends/qt4/ui/CompareUi.ui:112 msgid "Ol&d Document" -msgstr "&Bývalí Dokument" +msgstr "Bý&valí Dokument" #: src/frontends/qt4/ui/CompareUi.ui:178 msgid "" @@ -2134,7 +2134,7 @@ msgstr "Názov súboru pre zaradenie" #: src/frontends/qt4/ui/IncludeUi.ui:282 msgid "&Include Type:" -msgstr "Spôsob za&hrnutia:" +msgstr "Spôsob Za&hrnutia:" #: src/frontends/qt4/ui/IncludeUi.ui:293 src/insets/InsetInclude.cpp:390 msgid "Include" @@ -2307,7 +2307,7 @@ msgstr "" #: src/frontends/qt4/ui/LaTeXUi.ui:84 msgid "Cus&tom:" -msgstr "Vlas&tné:" +msgstr "&Vlastné:" #: src/frontends/qt4/ui/LaTeXUi.ui:100 msgid "&Graphics driver:" @@ -3040,7 +3040,7 @@ msgstr "" #: src/frontends/qt4/ui/PDFSupportUi.ui:169 msgid "Automatically fi&ll header" -msgstr "A&utomaticky vyplniť hlavičku" +msgstr "Automat&icky vyplniť hlavičku" #: src/frontends/qt4/ui/PDFSupportUi.ui:176 msgid "Enable fullscreen PDF presentation" @@ -3168,7 +3168,7 @@ msgstr "&Najdlhšie návestie" #: src/frontends/qt4/ui/ParagraphUi.ui:93 msgid "Line &spacing" -msgstr "&Rozstup riadkov" +msgstr "Rozst&up riadkov" #: src/frontends/qt4/ui/ParagraphUi.ui:121 src/Text.cpp:1939 #: src/frontends/qt4/GuiDocument.cpp:749 @@ -8961,7 +8961,7 @@ msgstr "PrispôsobiťBitmap" #: lib/layouts/powerdot.layout:332 lib/layouts/stdlists.inc:33 #: lib/layouts/stdlists.inc:62 lib/layouts/theorems-case.inc:53 msgid "Custom Item|s" -msgstr "Vlastná Položka" +msgstr "Vlastná Položka|V" #: lib/layouts/apa.layout:375 lib/layouts/apa.layout:400 #: lib/layouts/apa6.layout:476 lib/layouts/apa6.layout:501 @@ -9089,7 +9089,7 @@ msgstr "Prezentácie" #: lib/layouts/beamer.layout:1158 lib/layouts/beamer.layout:1185 #: lib/layouts/beamer.layout:1345 msgid "Overlay Specifications|v" -msgstr "Špecifikácie Prekrytia" +msgstr "Špecifikácie Prekrytia|P" #: lib/layouts/beamer.layout:87 lib/layouts/beamer.layout:123 #: lib/layouts/beamer.layout:165 @@ -9128,7 +9128,7 @@ msgstr "Mini šablóna pre túto listinu (viď enumitem manuál)" #: lib/layouts/beamer.layout:171 msgid "Longest label|s" -msgstr "Najdlhšie návestie" +msgstr "Najdlhšie návestie|v" #: lib/layouts/beamer.layout:172 msgid "The longest label in this list (to determine the indendation width)" @@ -9163,7 +9163,7 @@ msgstr "Mód" #: lib/layouts/beamer.layout:356 lib/layouts/beamer.layout:385 #: lib/layouts/beamer.layout:417 msgid "Mode Specification|S" -msgstr "Špecifikácie módu" +msgstr "Špecifikácie Módu|u" #: lib/layouts/beamer.layout:210 lib/layouts/beamer.layout:264 #: lib/layouts/beamer.layout:296 lib/layouts/beamer.layout:325 @@ -9330,7 +9330,7 @@ msgstr "Špecifikovať voľby prekrytia (viď beamer manuál)" #: lib/layouts/beamer.layout:580 msgid "Short Frame Title|S" -msgstr "Krátky Titul Rámu" +msgstr "Krátky Titul Rámu|K" #: lib/layouts/beamer.layout:581 msgid "A short form of the frame title used in some themes" @@ -9488,7 +9488,7 @@ msgstr "Blok:" #: lib/layouts/beamer.layout:871 msgid "Action Specification|S" -msgstr "Špecifikácie akcie" +msgstr "Špecifikácie Akcie|A" #: lib/layouts/beamer.layout:878 msgid "Block Title" @@ -9530,7 +9530,7 @@ msgstr "Titul (prostý rám)" #: lib/layouts/beamer.layout:960 msgid "Short Subtitle|S" -msgstr "Krátky Podtitul" +msgstr "Krátky Podtitul|K" #: lib/layouts/beamer.layout:961 msgid "Short subtitle which appears in the sidebar/header" @@ -9542,7 +9542,7 @@ msgstr "Skratka autora ktorá sa zjaví na boku/hlavičke" #: lib/layouts/beamer.layout:1007 msgid "Short Institute|S" -msgstr "Krátky Inštitút" +msgstr "Krátky Inštitút|K" #: lib/layouts/beamer.layout:1008 msgid "Short institute which appears in the sidebar/header" @@ -9554,7 +9554,7 @@ msgstr "Znak Inštitútu" #: lib/layouts/beamer.layout:1051 msgid "Short Date|S" -msgstr "Krátky Dátum" +msgstr "Krátky Dátum|K" #: lib/layouts/beamer.layout:1052 msgid "Short date which appears in the sidebar/header" @@ -9593,7 +9593,7 @@ msgstr "Korolár." #: lib/layouts/beamer.layout:1505 lib/layouts/beamer.layout:1525 #: lib/layouts/beamer.
[LyX/master] Update sk.po
commit ffd1e932e2c6ed544ae44899cac75a5eb9f71983
Author: Kornel Benko
Date: Mon Dec 25 14:42:34 2017 +0100
Update sk.po
---
po/sk.gmo | Bin 528262 -> 528686 bytes
po/sk.po | 38 ++
2 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/po/sk.gmo b/po/sk.gmo
index c3f6d3c..04655c9 100644
Binary files a/po/sk.gmo and b/po/sk.gmo differ
diff --git a/po/sk.po b/po/sk.po
index e87926e..637eb27 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-24 06:24+0100\n"
-"PO-Revision-Date: 2017-12-24 12:18+\n"
+"POT-Creation-Date: 2017-12-24 19:48+0100\n"
+"PO-Revision-Date: 2017-12-25 13:07+\n"
"Last-Translator: Kornel Benko \n"
"Language-Team: Slovak \n"
"Language: sk\n"
@@ -18177,7 +18177,7 @@ msgstr "Znížiť Úroveň Sekcie|í"
#: lib/ui/stdcontext.inc:350
msgid "Move Section Down|D"
-msgstr "Presunúť Sekciu Nadol|r"
+msgstr "Presunúť Sekciu Nadol|N"
#: lib/ui/stdcontext.inc:351 lib/ui/stdcontext.inc:650
msgid "Move Section Up|U"
@@ -26598,6 +26598,25 @@ msgstr ", Bunka: "
msgid ", Position: "
msgstr ", Pozícia: "
+#: src/CutAndPaste.cpp:185
+#, c-format
+msgid ""
+"The character \"%1$s\" is uncodable in this verbatim context and thus has "
+"not been pasted."
+msgstr "Nekódovateľný znak \"%1$s\" v tomto doslovnom kontexte bol vynechaný."
+
+#: src/CutAndPaste.cpp:189
+#, c-format
+msgid ""
+"The characters \"%1$s\" are uncodable in this verbatim context and thus have "
+"not been pasted."
+msgstr ""
+"Nekódovateľné znaky \"%1$s\" v tomto doslovnom kontexte boli vynechané."
+
+#: src/CutAndPaste.cpp:232
+msgid "Uncodable content"
+msgstr "Nekódovateľný obsah"
+
#: src/CutAndPaste.cpp:370
#, c-format
msgid ""
@@ -27856,9 +27875,9 @@ msgid "You cannot type two spaces this way. Please read
the Tutorial."
msgstr ""
"Nemôžte takýmto spôsobom vložiť dve medzery. Prečítajte si, prosím, Príručku."
-#: src/Text.cpp:944
-msgid "Character is uncodable in verbatim paragraphs."
-msgstr "Znak je v doslovných(verbatim) odstavcoch nekódovateľný."
+#: src/Text.cpp:941
+msgid "Character is uncodable in this verbatim context."
+msgstr "Znak je v tomto doslovnom(verbatim) kontexte nekódovateľný."
#: src/Text.cpp:1907
msgid "[Change Tracking] "
@@ -31657,7 +31676,7 @@ msgstr "Vybrať z osobného slovníka|r"
#: src/frontends/qt4/Menus.cpp:901
msgid "Language|L"
-msgstr "Jazyk"
+msgstr "Jazyk|J"
#: src/frontends/qt4/Menus.cpp:903
msgid "More Languages ...|M"
@@ -31665,7 +31684,7 @@ msgstr "Viac Jazykov …|V"
#: src/frontends/qt4/Menus.cpp:973 src/frontends/qt4/Menus.cpp:974
msgid "Hidden|H"
-msgstr "Skryté"
+msgstr "Skryté|y"
#: src/frontends/qt4/Menus.cpp:978
msgid ""
@@ -35634,6 +35653,9 @@ msgstr "Neznámy používateľ"
#~ "[[{%inštitúcia%[[, %inštitúcia%]]}]]}]]}{%rok%[[ (%rok%)]]}{%strany%[[, "
#~ "%strany%]]}."
+#~ msgid "Character is uncodable in verbatim paragraphs."
+#~ msgstr "Znak je v doslovných(verbatim) odstavcoch nekódovateľný."
+
#~ msgid ""
#~ "By default, a line break can occur after en- and em-dashes and before em-"
#~ "dashes. Checking this box prevents that."
[LyX/master] de.po: update
commit 1db77c488ca02100fe04b4b5f93248121e659f27 Author: Juergen Spitzmueller Date: Mon Dec 25 12:35:43 2017 +0100 de.po: update po/de.gmo | Bin 540739 -> 542552 bytes po/de.po | 3236 +++-- 2 files changed, 1663 insertions(+), 1573 deletions(-)
[LyX/master] Improve error msg
commit 69f41b54b8616058ef5a9ad63d7a10225b3e4176
Author: Juergen Spitzmueller
Date: Mon Dec 25 12:22:45 2017 +0100
Improve error msg
---
src/Buffer.cpp | 24 +---
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 294c7a1..9442f23 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1706,13 +1706,23 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
docstring const failed(1, e.failed_char);
ostringstream oss;
oss << "0x" << hex << e.failed_char << dec;
- docstring msg = bformat(_("Could not find LaTeX command for
character '%1$s'"
- " (code point %2$s)"),
- failed, from_utf8(oss.str()));
- errorList.push_back(ErrorItem(msg, _("Some characters of your
document are probably not "
- "representable in the chosen encoding.\n"
- "Changing the document encoding to utf8 could
help."),
- {e.par_id, e.pos}, {e.par_id,
e.pos + 1}));
+ if (getParFromID(e.par_id).paragraph().layout().pass_thru) {
+ docstring msg = bformat(_("Uncodable character '%1$s'"
+ " (code point %2$s)"),
+ failed, from_utf8(oss.str()));
+ errorList.push_back(ErrorItem(msg, _("Some characters
of your document are not "
+ "representable in specific verbatim
contexts.\n"
+ "Changing the document encoding to utf8
could help."),
+ {e.par_id, e.pos},
{e.par_id, e.pos + 1}));
+ } else {
+ docstring msg = bformat(_("Could not find LaTeX command
for character '%1$s'"
+ " (code point %2$s)"),
+ failed, from_utf8(oss.str()));
+ errorList.push_back(ErrorItem(msg, _("Some characters
of your document are probably not "
+ "representable in the chosen
encoding.\n"
+ "Changing the document encoding to utf8
could help."),
+ {e.par_id, e.pos},
{e.par_id, e.pos + 1}));
+ }
failed_export = true;
}
catch (iconv_codecvt_facet_exception const & e) {
