[LyX/master] Revert da8b5de97 because of MSVC 2017.
commit 8af747c9d9f4d5f496313256e044e8a5b99147f4
Author: Pavel Sanda
Date: Sat Oct 24 12:06:17 2020 +0200
Revert da8b5de97 because of MSVC 2017.
In GCC `min` is defined via including .
---
src/DocIterator.h |1 +
src/Paragraph.cpp |1 -
src/frontends/qt/FindAndReplace.cpp |2 --
src/frontends/qt/GuiBox.cpp |2 --
src/frontends/qt/GuiCharacter.cpp |2 --
src/frontends/qt/GuiDocument.cpp|1 -
src/frontends/qt/GuiRef.cpp |2 --
src/xml.cpp |1 -
8 files changed, 1 insertions(+), 11 deletions(-)
diff --git a/src/DocIterator.h b/src/DocIterator.h
index a3786c4..35b 100644
--- a/src/DocIterator.h
+++ b/src/DocIterator.h
@@ -15,6 +15,7 @@
#include "CursorSlice.h"
#include
+#include // std::min in MSVC 2017
namespace lyx {
diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 98e0514..6578e2a 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -61,7 +61,6 @@
#include "support/lstrings.h"
#include "support/textutils.h"
-#include
#include
#include
#include
diff --git a/src/frontends/qt/FindAndReplace.cpp
b/src/frontends/qt/FindAndReplace.cpp
index 4d14bcf..af2 100644
--- a/src/frontends/qt/FindAndReplace.cpp
+++ b/src/frontends/qt/FindAndReplace.cpp
@@ -44,8 +44,6 @@
#include
#include
-#include
-
using namespace std;
using namespace lyx::support;
diff --git a/src/frontends/qt/GuiBox.cpp b/src/frontends/qt/GuiBox.cpp
index a722ed3..298009d 100644
--- a/src/frontends/qt/GuiBox.cpp
+++ b/src/frontends/qt/GuiBox.cpp
@@ -32,8 +32,6 @@
#include
#include
-#include
-
#ifdef IN
#undef IN
#endif
diff --git a/src/frontends/qt/GuiCharacter.cpp
b/src/frontends/qt/GuiCharacter.cpp
index 96e8d73..cfa481c 100644
--- a/src/frontends/qt/GuiCharacter.cpp
+++ b/src/frontends/qt/GuiCharacter.cpp
@@ -40,8 +40,6 @@
#include
#include
-#include
-
using namespace std;
namespace lyx {
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index d691cc7..7e1ec24 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -82,7 +82,6 @@
#include
#include
-#include
#include
#include
diff --git a/src/frontends/qt/GuiRef.cpp b/src/frontends/qt/GuiRef.cpp
index b0aaba6..83be347 100644
--- a/src/frontends/qt/GuiRef.cpp
+++ b/src/frontends/qt/GuiRef.cpp
@@ -40,8 +40,6 @@
#include
#include
-#include
-
using namespace std;
using namespace lyx::support;
diff --git a/src/xml.cpp b/src/xml.cpp
index e50e559..dda39a4 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -28,7 +28,6 @@
#include "support/lstrings.h"
#include "support/textutils.h"
-#include
#include
#include
#include
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Checking po-files (shortcut handling)
commit 12557b094ce1a6376cf77003a443592af235f2a7
Author: Kornel Benko
Date: Sat Oct 24 14:05:19 2020 +0200
Checking po-files (shortcut handling)
1.) Allow ' ' as a menu shortcut (corrected for missing/unexpected spaces
at message end)
2.) Adapt for utf-8 shortcuts (corrected chacking for missing/unexpected
shortcuts)
---
po/pocheck.pl | 19 +++
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/po/pocheck.pl b/po/pocheck.pl
index 391245a..db59aa0 100755
--- a/po/pocheck.pl
+++ b/po/pocheck.pl
@@ -168,8 +168,11 @@ foreach my $pofilename ( @ARGV ) {
}
if ($check_spaces) {
- # Check space at the end of a message
- if ( ( $msgid =~ m/ *?(\|.*)?$/ ) != ( $msgstr =~ m/ *?(\|.*)?$/ ) ) {
+ # Check space at the end of a message (if not a shortcut)
+ my ($msgid1, $msgstr1);
+ ($msgid1 = $msgid) =~ s/\|.$//;
+ ($msgstr1 = $msgstr) =~ s/\|.$//;# TODO: Shortcut may be utf-8
char
+ if (($msgid1 =~ / $/) != ($msgstr1 =~ / $/)) {
print "Line $linenum: Missing or unexpected space:\n '$msgid' =>
'$msgstr'\n"
unless $only_total;
++$bad{"Bad spaces"};
@@ -188,8 +191,16 @@ foreach my $pofilename ( @ARGV ) {
}
if ($check_menu) {
- # Check for "|..." shortcuts
- if ( ( $msgid =~ m/\|[^ ]/ ) != ( $msgstr =~ m/\|[^ ]/ ) ) {
+ # Check for "|..." shortcuts (space shortcut allowed)
+ # Shortcut is either 1 char (ascii in msgid) or utf8 char (in msgstr)
+ my ($s1, $s2) = (0,0);
+ $s1 = 1 if ($msgid =~ /\|([^\|])$/);
+ if ($msgstr =~ /\|([^\|]+)$/) {
+ my $chars = $1;
+ my $u = decode('utf-8', $chars);
+ $s2 = 1 if (length($u) == 1);
+ }
+ if($s1 != $s2) {
print "Line $linenum: Missing or unexpected menu shortcut:\n '$msgid'
=> '$msgstr'\n"
unless $only_total;
++$bad{"Bad menu shortcuts"};
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Fix isSpace for docstring
commit 69f838bbf3e5c1cd0eb1a64dfbf8de469dc10d97
Author: Yuriy Skalko
Date: Sat Oct 24 11:03:36 2020 +0300
Fix isSpace for docstring
---
src/insets/InsetBibtex.cpp |2 +-
src/xml.cpp|2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/insets/InsetBibtex.cpp b/src/insets/InsetBibtex.cpp
index bee485e..f606444 100644
--- a/src/insets/InsetBibtex.cpp
+++ b/src/insets/InsetBibtex.cpp
@@ -1276,7 +1276,7 @@ void InsetBibtex::docbook(XMLStream & xs, OutputParams
const &) const
xs << xml::StartTag("keywordset") << xml::CR();
for (auto & kw: keywords) {
kw.erase(kw.begin(),
std::find_if(kw.begin(), kw.end(),
-
[](int c) {return !std::isspace(c);}));
+
[](char_type c) {return !lyx::isSpace(c);}));
xs << xml::StartTag("keyword");
xs << kw;
xs << xml::EndTag("keyword");
diff --git a/src/xml.cpp b/src/xml.cpp
index dda39a4..f96a19c 100644
--- a/src/xml.cpp
+++ b/src/xml.cpp
@@ -143,7 +143,7 @@ docstring CompTag::writeTag() const
// automatically.
docstring attributes = escapeString(attr_,
XMLStream::ESCAPE_NONE);
attributes.erase(attributes.begin(),
std::find_if(attributes.begin(), attributes.end(),
- [](int c) {return
!std::isspace(c);}));
+ [](char_type c)
{return !isSpace(c);}));
if (!attributes.empty()) {
output += ' ' + attributes;
}
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Amend 12557b09: Checking po-files (shortcut handling)
commit 47146ab8a3f73dca7e158fb3a2fc0195e7684dc8
Author: Kornel Benko
Date: Sat Oct 24 18:40:15 2020 +0200
Amend 12557b09: Checking po-files (shortcut handling)
---
po/pocheck.pl | 17 -
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/po/pocheck.pl b/po/pocheck.pl
index db59aa0..fcc5dc1 100755
--- a/po/pocheck.pl
+++ b/po/pocheck.pl
@@ -169,9 +169,16 @@ foreach my $pofilename ( @ARGV ) {
if ($check_spaces) {
# Check space at the end of a message (if not a shortcut)
- my ($msgid1, $msgstr1);
- ($msgid1 = $msgid) =~ s/\|.$//;
- ($msgstr1 = $msgstr) =~ s/\|.$//;# TODO: Shortcut may be utf-8
char
+ my ($msgid1, $msgstr1) = ($msgid, $msgstr);
+ $msgid1 =~ s/\|.$//;
+ if ($msgstr =~ /^(.*)\|(.+)$/) {
+ my ($msg, $shortcut) = ($1, $2);
+ # Check for unicode char
+ my $u = decode('utf-8', $shortcut);
+ if (length($u) == 1) {
+ $msgstr1 = $msg;
+ }
+ }
if (($msgid1 =~ / $/) != ($msgstr1 =~ / $/)) {
print "Line $linenum: Missing or unexpected space:\n '$msgid' =>
'$msgstr'\n"
unless $only_total;
@@ -194,8 +201,8 @@ foreach my $pofilename ( @ARGV ) {
# Check for "|..." shortcuts (space shortcut allowed)
# Shortcut is either 1 char (ascii in msgid) or utf8 char (in msgstr)
my ($s1, $s2) = (0,0);
- $s1 = 1 if ($msgid =~ /\|([^\|])$/);
- if ($msgstr =~ /\|([^\|]+)$/) {
+ $s1 = 1 if ($msgid =~ /\|(.)$/);
+ if ($msgstr =~ /.*\|(.+)$/) {
my $chars = $1;
my $u = decode('utf-8', $chars);
$s2 = 1 if (length($u) == 1);
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update it.po
commit 6bf0578e6e3b08ee9570ffd8bb2230d5dfd19dd6 Author: Enrico Forestieri Date: Sat Oct 24 18:42:15 2020 +0200 Update it.po po/it.gmo | Bin 597571 -> 598256 bytes po/it.po | 4032 +++-- 2 files changed, 2030 insertions(+), 2002 deletions(-) -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/2.3.x] Update it.po
commit d3d00723f0ff57d00312835a7b0b724a38851558
Author: Enrico Forestieri
Date: Sat Oct 24 19:14:24 2020 +0200
Update it.po
---
po/it.gmo | Bin 537660 -> 537655 bytes
po/it.po | 45 -
2 files changed, 24 insertions(+), 21 deletions(-)
diff --git a/po/it.gmo b/po/it.gmo
index 03437a7..5c0e97c 100644
Binary files a/po/it.gmo and b/po/it.gmo differ
diff --git a/po/it.po b/po/it.po
index ff88306..fb68f3d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: it\n"
"Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2020-09-18 11:05-0400\n"
-"PO-Revision-Date: 2020-09-18 23:46+0200\n"
+"POT-Creation-Date: 2020-10-24 18:55+0200\n"
+"PO-Revision-Date: 2020-10-24 19:13+0200\n"
"Last-Translator: Enrico Forestieri \n"
"Language-Team: italiano \n"
"Language: it\n"
@@ -2174,7 +2174,7 @@ msgstr "Listato di programma"
#: src/frontends/qt4/ui/IncludeUi.ui:369
msgid "Edit the file"
-msgstr "Edita il file"
+msgstr "Modifica il file"
#: src/frontends/qt4/ui/IncludeUi.ui:372
#: src/frontends/qt4/ui/LocalLayoutUi.ui:74
@@ -3713,15 +3713,15 @@ msgstr "Ra&ggruppa gli ambienti secondo le loro
categorie"
#: src/frontends/qt4/ui/PrefEditUi.ui:122
msgid "Edit Math Macros inline with a box around"
-msgstr "Edita macro in linea con cornice"
+msgstr "Modifica macro in linea con cornice"
#: src/frontends/qt4/ui/PrefEditUi.ui:127
msgid "Edit Math Macros inline with the name in the status bar"
-msgstr "Edita macro in linea con nome nella barra di stato"
+msgstr "Modifica macro in linea con nome nella barra di stato"
#: src/frontends/qt4/ui/PrefEditUi.ui:132
msgid "Edit Math Macros with a parameter list (like in LyX < 1.6)"
-msgstr "Edita macro con lista di parametri (come in LyX < 1.6)"
+msgstr "Modifica macro con lista di parametri (come in LyX < 1.6)"
#: src/frontends/qt4/ui/PrefEditUi.ui:156
msgid "Fullscreen"
@@ -4744,7 +4744,7 @@ msgstr "&Invia il file esportato al comando:"
#: src/frontends/qt4/ui/ShortcutUi.ui:13
msgid "Edit shortcut"
-msgstr "Edita scorciatoia"
+msgstr "Modifica scorciatoia"
#: src/frontends/qt4/ui/ShortcutUi.ui:77
msgid "Enter LyX function or command sequence"
@@ -15468,8 +15468,8 @@ msgid "\\Roman{part}"
msgstr "\\Roman{part}"
#: lib/layouts/stdcounters.inc:10
-msgid "Part \\Roman{part}"
-msgstr "Parte \\Roman{part}"
+msgid "Part ##"
+msgstr "Parte ##"
#: lib/layouts/stdcounters.inc:14
msgid "Chapter ##"
@@ -25438,12 +25438,12 @@ msgstr "Errore nella visualizzazione del file di
output."
#: src/Buffer.cpp:3370 src/frontends/qt4/GuiView.cpp:2329
#: src/frontends/qt4/Validator.cpp:222 src/insets/ExternalSupport.cpp:386
-#: src/insets/InsetGraphics.cpp:692 src/insets/InsetInclude.cpp:565
+#: src/insets/InsetGraphics.cpp:699 src/insets/InsetInclude.cpp:565
msgid "Invalid filename"
msgstr "Nome file non valido"
#: src/Buffer.cpp:3371 src/insets/ExternalSupport.cpp:387
-#: src/insets/InsetGraphics.cpp:693 src/insets/InsetInclude.cpp:566
+#: src/insets/InsetGraphics.cpp:700 src/insets/InsetInclude.cpp:566
msgid ""
"The following filename will cause troubles when running the exported file "
"through LaTeX: "
@@ -25452,12 +25452,12 @@ msgstr ""
"esportato: "
#: src/Buffer.cpp:3376 src/insets/ExternalSupport.cpp:392
-#: src/insets/InsetGraphics.cpp:700 src/insets/InsetInclude.cpp:570
+#: src/insets/InsetGraphics.cpp:707 src/insets/InsetInclude.cpp:570
msgid "Problematic filename for DVI"
msgstr "Nome file problematico per DVI"
#: src/Buffer.cpp:3377 src/insets/ExternalSupport.cpp:393
-#: src/insets/InsetGraphics.cpp:701 src/insets/InsetInclude.cpp:571
+#: src/insets/InsetGraphics.cpp:708 src/insets/InsetInclude.cpp:571
msgid ""
"The following filename can cause troubles when running the exported file "
"through LaTeX and opening the resulting DVI: "
@@ -25797,7 +25797,7 @@ msgstr "Classe del documento non disponibile"
#: src/BufferParams.cpp:1742 src/BufferParams.cpp:2208 src/Encoding.cpp:246
#: src/Paragraph.cpp:2766 src/frontends/qt4/LaTeXHighlighter.cpp:122
#: src/insets/InsetCommandParams.cpp:503 src/insets/InsetCommandParams.cpp:511
-#: src/insets/InsetGraphics.cpp:887 src/insets/InsetGraphics.cpp:895
+#: src/insets/InsetGraphics.cpp:894 src/insets/InsetGraphics.cpp:902
#: src/insets/InsetListings.cpp:259 src/insets/InsetListings.cpp:267
#: src/insets/InsetListings.cpp:290 src/mathed/MathExtern.cpp:1440
#: src/mathed/MathExtern.cpp:1518
@@ -25806,8 +25806,8 @@ msgstr "Avviso di LyX: "
#: src/BufferParams.cpp:1743 src/BufferParams.cpp:2209 src/Encoding.cpp:247
#: src/Paragraph.cpp:2767 src/insets/InsetCommandParams.cpp:504
-#: src/insets/InsetCommandParams.cpp:512 src/insets/InsetGraphics.cpp:888
-#: src/insets/InsetGraphics.cpp:896 src/insets/InsetListings.cpp:260
+#: src/insets/InsetCommandParams.cpp:512 src/insets/InsetGraphics.cpp:895
+#: src/insets/InsetGraphics.cpp:903 src/insets/InsetListings.cpp:260
#: src/insets/I
[LyX/master] Replace QFontMetrics::width() by horizontalAdvance() in Qt>=5.11
commit 21422dd6527754d8b7876a6e11b686cd726321ed
Author: Jean-Marc Lasgouttes
Date: Sat Oct 24 19:29:34 2020 +0200
Replace QFontMetrics::width() by horizontalAdvance() in Qt>=5.11
The method horizontalAdvance() replaces width() starting with Qt 5.11.
To handle this, all direct calls to QFontMetrics::width() are replaced
by calls to GuiFontMetrics::width(), and the code for
GuiFontMetrics::width(QChar) uses horizontalAdvance on newer Qt
versions.
---
src/frontends/qt/GuiFontExample.cpp |9 +
src/frontends/qt/GuiFontMetrics.cpp |7 +++
src/frontends/qt/GuiView.cpp|5 +++--
src/frontends/qt/PanelStack.cpp |4 ++--
4 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/src/frontends/qt/GuiFontExample.cpp
b/src/frontends/qt/GuiFontExample.cpp
index cb27b5f..8a4ca13 100644
--- a/src/frontends/qt/GuiFontExample.cpp
+++ b/src/frontends/qt/GuiFontExample.cpp
@@ -11,6 +11,7 @@
#include
#include "GuiFontExample.h"
+#include "GuiFontMetrics.h"
#include
#include
@@ -28,20 +29,20 @@ void GuiFontExample::set(QFont const & font, QString const
& text)
QSize GuiFontExample::sizeHint() const
{
- QFontMetrics m(font_);
- return QSize(m.width(text_) + 10, m.ascent() + m.descent() + 6);
+ lyx::frontend::GuiFontMetrics m(font_);
+ return QSize(m.width(text_) + 10, m.maxHeight() + 6);
}
void GuiFontExample::paintEvent(QPaintEvent *)
{
QPainter p;
- QFontMetrics m(font_);
+ lyx::frontend::GuiFontMetrics m(font_);
p.begin(this);
p.setFont(font_);
p.drawRect(0, 0, width() - 1, height() - 1);
- p.drawText(5, 3 + m.ascent(), text_);
+ p.drawText(5, 3 + m.maxAscent(), text_);
p.end();
}
diff --git a/src/frontends/qt/GuiFontMetrics.cpp
b/src/frontends/qt/GuiFontMetrics.cpp
index 83c9f65..dffa827 100644
--- a/src/frontends/qt/GuiFontMetrics.cpp
+++ b/src/frontends/qt/GuiFontMetrics.cpp
@@ -627,10 +627,17 @@ int GuiFontMetrics::width(char_type c) const
if (value != outOfLimitMetric)
return value;
+#if QT_VERSION >= 0x050b00
+ if (is_utf16(c))
+ value = metrics_.horizontalAdvance(ucs4_to_qchar(c));
+ else
+ value = metrics_.horizontalAdvance(toqstr(docstring(1, c)));
+#else
if (is_utf16(c))
value = metrics_.width(ucs4_to_qchar(c));
else
value = metrics_.width(toqstr(docstring(1, c)));
+#endif
width_cache_.insert(c, value);
diff --git a/src/frontends/qt/GuiView.cpp b/src/frontends/qt/GuiView.cpp
index 4dca7bf..907f151 100644
--- a/src/frontends/qt/GuiView.cpp
+++ b/src/frontends/qt/GuiView.cpp
@@ -21,6 +21,7 @@
#include "GuiApplication.h"
#include "GuiClickableLabel.h"
#include "GuiCompleter.h"
+#include "GuiFontMetrics.h"
#include "GuiKeySymbol.h"
#include "GuiToc.h"
#include "GuiToolbar.h"
@@ -199,12 +200,12 @@ public:
// Check how long the logo gets with the current font
// and adapt if the font is running wider than what
// we assume
- QFontMetrics fm(font);
+ GuiFontMetrics fm(font);
// Split the title into lines to measure the longest line
// in the current l7n.
QStringList titlesegs = htext.split('\n');
int wline = 0;
- int hline = fm.height();
+ int hline = fm.maxHeight();
QStringList::const_iterator sit;
for (sit = titlesegs.constBegin(); sit != titlesegs.constEnd();
++sit) {
if (fm.width(*sit) > wline)
diff --git a/src/frontends/qt/PanelStack.cpp b/src/frontends/qt/PanelStack.cpp
index 2614284..22eab2a 100644
--- a/src/frontends/qt/PanelStack.cpp
+++ b/src/frontends/qt/PanelStack.cpp
@@ -13,6 +13,7 @@
#include "PanelStack.h"
#include "GuiApplication.h"
+#include "GuiFontMetrics.h"
#include "qt_helpers.h"
#include "FancyLineEdit.h"
@@ -23,7 +24,6 @@
#include
#include
#include
-#include
#include
#include
#include
@@ -120,7 +120,7 @@ void PanelStack::addCategory(QString const & name, QString
const & parent)
panel_map_[name] = item;
- QFontMetrics fm(list_->font());
+ GuiFontMetrics fm(list_->font());
// calculate the real size the current item needs in the listview
int itemsize = fm.width(qt_(name)) + 10 + list_->indentation() * depth;
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] ctests: add test from #9043 which is fixedinmaster
commit f2622e1488a8d2b85f7ee754348bacff8c0bba6c Author: Scott Kostyshak Date: Sat Oct 24 15:54:03 2020 -0400 ctests: add test from #9043 which is fixedinmaster This file succeeds on master, but not in 2.3.0 or 2.3.x (I have not checked which commit fixed it). --- .../lyxbugs-resolved/9043-comparison-result.lyx| 92 1 files changed, 92 insertions(+), 0 deletions(-) diff --git a/autotests/export/latex/lyxbugs-resolved/9043-comparison-result.lyx b/autotests/export/latex/lyxbugs-resolved/9043-comparison-result.lyx new file mode 100644 index 000..c96c3fe --- /dev/null +++ b/autotests/export/latex/lyxbugs-resolved/9043-comparison-result.lyx @@ -0,0 +1,92 @@ +#LyX 2.1 created this file. For more info see http://www.lyx.org/ +\lyxformat 474 +\begin_document +\begin_header +\textclass article +\use_default_options true +\maintain_unincluded_children false +\language english +\language_package default +\inputencoding auto +\fontencoding global +\font_roman default +\font_sans default +\font_typewriter default +\font_math auto +\font_default_family default +\use_non_tex_fonts false +\font_sc false +\font_osf false +\font_sf_scale 100 +\font_tt_scale 100 +\graphics default +\default_output_format default +\output_sync 0 +\bibtex_command default +\index_command default +\paperfontsize default +\spacing single +\use_hyperref false +\papersize default +\use_geometry false +\use_package amsmath 1 +\use_package amssymb 1 +\use_package cancel 1 +\use_package esint 1 +\use_package mathdots 1 +\use_package mathtools 1 +\use_package mhchem 1 +\use_package stackrel 1 +\use_package stmaryrd 1 +\use_package undertilde 1 +\cite_engine basic +\cite_engine_type default +\biblio_style plain +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\justification true +\use_refstyle 1 +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\quotes_language english +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes true +\output_changes true +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\author 1470551561 "Koji Yokota" +\end_header + +\begin_body + +\begin_layout Standard +text +\change_deleted 1470551561 1395456779 + +\lang ngerman +German +\begin_inset space ~ +\end_inset + + +\change_inserted 1470551561 1395456779 + +\lang english +English +\change_unchanged +text +\end_layout + +\end_body +\end_document -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update GMO files
commit acb2ca7b4c577229e8dc5db91790fb82aaf747a4 Author: Richard Kimberly Heck Date: Sat Oct 24 23:05:33 2020 -0400 Update GMO files --- po/ar.gmo| Bin 447069 -> 440125 bytes po/bg.gmo| Bin 342731 -> 336422 bytes po/cs.gmo| Bin 512007 -> 500411 bytes po/de.gmo| Bin 609776 -> 610863 bytes po/el.gmo| Bin 393630 -> 383181 bytes po/es.gmo| Bin 457608 -> 446138 bytes po/eu.gmo| Bin 512594 -> 501130 bytes po/fi.gmo| Bin 303989 -> 297828 bytes po/fr.gmo| Bin 586659 -> 573965 bytes po/he.gmo| Bin 244783 -> 241014 bytes po/hu.gmo| Bin 310295 -> 302769 bytes po/ia.gmo| Bin 480987 -> 577792 bytes po/id.gmo| Bin 329378 -> 321110 bytes po/it.gmo| Bin 598256 -> 598215 bytes po/ja.gmo| Bin 535491 -> 523480 bytes po/nb.gmo| Bin 419063 -> 410358 bytes po/nl.gmo| Bin 572442 -> 559987 bytes po/nn.gmo| Bin 334657 -> 326568 bytes po/pl.gmo| Bin 332788 -> 324761 bytes po/pt_BR.gmo | Bin 516870 -> 505208 bytes po/pt_PT.gmo | Bin 409521 -> 400141 bytes po/sk.gmo| Bin 579117 -> 596982 bytes po/sv.gmo| Bin 498283 -> 487030 bytes po/tr.gmo| Bin 212310 -> 207475 bytes po/uk.gmo| Bin 648654 -> 634480 bytes po/zh_CN.gmo | Bin 453135 -> 464863 bytes po/zh_TW.gmo | Bin 389665 -> 380761 bytes 27 files changed, 0 insertions(+), 0 deletions(-) diff --git a/po/ar.gmo b/po/ar.gmo index 0d58425..0c371a2 100644 Binary files a/po/ar.gmo and b/po/ar.gmo differ diff --git a/po/bg.gmo b/po/bg.gmo index c349fa1..96cd84b 100644 Binary files a/po/bg.gmo and b/po/bg.gmo differ diff --git a/po/cs.gmo b/po/cs.gmo index 89dfba4..70c74af 100644 Binary files a/po/cs.gmo and b/po/cs.gmo differ diff --git a/po/de.gmo b/po/de.gmo index 82e992f..0e1453c 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/el.gmo b/po/el.gmo index 55ca6a9..ff15da4 100644 Binary files a/po/el.gmo and b/po/el.gmo differ diff --git a/po/es.gmo b/po/es.gmo index 9ca4370..f8d1348 100644 Binary files a/po/es.gmo and b/po/es.gmo differ diff --git a/po/eu.gmo b/po/eu.gmo index a153bbf..96d2879 100644 Binary files a/po/eu.gmo and b/po/eu.gmo differ diff --git a/po/fi.gmo b/po/fi.gmo index 178a964..faca070 100644 Binary files a/po/fi.gmo and b/po/fi.gmo differ diff --git a/po/fr.gmo b/po/fr.gmo index 6457b33..973946f 100644 Binary files a/po/fr.gmo and b/po/fr.gmo differ diff --git a/po/he.gmo b/po/he.gmo index db3e8c6..1fe9671 100644 Binary files a/po/he.gmo and b/po/he.gmo differ diff --git a/po/hu.gmo b/po/hu.gmo index 0c981de..37401b1 100644 Binary files a/po/hu.gmo and b/po/hu.gmo differ diff --git a/po/ia.gmo b/po/ia.gmo index e00b4b8..1fc0761 100644 Binary files a/po/ia.gmo and b/po/ia.gmo differ diff --git a/po/id.gmo b/po/id.gmo index 3b236c5..0a2b2b1 100644 Binary files a/po/id.gmo and b/po/id.gmo differ diff --git a/po/it.gmo b/po/it.gmo index 12740b1..e06dd2a 100644 Binary files a/po/it.gmo and b/po/it.gmo differ diff --git a/po/ja.gmo b/po/ja.gmo index 928a7bc..17295bc 100644 Binary files a/po/ja.gmo and b/po/ja.gmo differ diff --git a/po/nb.gmo b/po/nb.gmo index 5cecbbc..9fbf523 100644 Binary files a/po/nb.gmo and b/po/nb.gmo differ diff --git a/po/nl.gmo b/po/nl.gmo index ddafd3e..7edaf73 100644 Binary files a/po/nl.gmo and b/po/nl.gmo differ diff --git a/po/nn.gmo b/po/nn.gmo index e8f955e..44b6194 100644 Binary files a/po/nn.gmo and b/po/nn.gmo differ diff --git a/po/pl.gmo b/po/pl.gmo index 928db56..497462c 100644 Binary files a/po/pl.gmo and b/po/pl.gmo differ diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo index 4a2ac79..36160a4 100644 Binary files a/po/pt_BR.gmo and b/po/pt_BR.gmo differ diff --git a/po/pt_PT.gmo b/po/pt_PT.gmo index 1ed9f4c..b4e4f62 100644 Binary files a/po/pt_PT.gmo and b/po/pt_PT.gmo differ diff --git a/po/sk.gmo b/po/sk.gmo index 3c34f2a..fa59c84 100644 Binary files a/po/sk.gmo and b/po/sk.gmo differ diff --git a/po/sv.gmo b/po/sv.gmo index 1ebe277..05fe0f4 100644 Binary files a/po/sv.gmo and b/po/sv.gmo differ diff --git a/po/tr.gmo b/po/tr.gmo index c03f6ff..3e1bc2d 100644 Binary files a/po/tr.gmo and b/po/tr.gmo differ diff --git a/po/uk.gmo b/po/uk.gmo index a9138bc..bba02f6 100644 Binary files a/po/uk.gmo and b/po/uk.gmo differ diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo index 156b931..69674f1 100644 Binary files a/po/zh_CN.gmo and b/po/zh_CN.gmo differ diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo index 17eb11a..cfd2e0e 100644 Binary files a/po/zh_TW.gmo and b/po/zh_TW.gmo differ -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] typo
commit 904d960d6a11e50f099d89e496ed9ad7090b4784 Author: Richard Kimberly Heck Date: Sat Oct 24 23:24:28 2020 -0400 typo --- development/tools/lyx-build |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/development/tools/lyx-build b/development/tools/lyx-build index 1c61b2f..5465ffc 100755 --- a/development/tools/lyx-build +++ b/development/tools/lyx-build @@ -2,7 +2,7 @@ # This script builds a maintainance LyX distribution according to # the procedure outlined at: # http://wiki.lyx.org/Devel/ReleaseProcedure -# It also includes several other tests, to make sure the packages +# It also includes several other tests, to make sure the package # works as it should. #DEBUG=echo; -- lyx-cvs mailing list lyx-cvs@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-cvs
[LyX/master] Update lyx-build script
commit c4620152ce239b3c5d56fef79e7c77ed20bce2fe
Author: Richard Kimberly Heck
Date: Sat Oct 24 23:23:56 2020 -0400
Update lyx-build script
---
development/tools/lyx-build |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/development/tools/lyx-build b/development/tools/lyx-build
index 853f0b9..1c61b2f 100755
--- a/development/tools/lyx-build
+++ b/development/tools/lyx-build
@@ -49,7 +49,8 @@ shift $(($OPTIND - 1));
# Determine LyX version
cd $SRCDIR/
-VERSION=$(head configure.ac | grep AC_INIT | perl -e 'while (<>)
{m/AC_INIT\(LyX,([^,]+)/; print $1;}');
+VERSION=$(head configure.ac | grep AC_INIT | \
+ perl -e 'while (<>) {m/AC_INIT\(\[LyX\],\[([^,]+)\]/; print $1;}');
# Development release?
DEVEL_RELEASE="";
@@ -61,7 +62,7 @@ if [ "$VERSION" != "$PKG_VERSION" ]; then
CURHASH=$(git rev-parse HEAD);
# Eight chars should be enough
CURHASH=${CURHASH:0:8};
- # New version is e.g. 2.3.4-12649348
+ # New version is e.g. 2.3.4dev-12649348
PKG_VERSION="$VERSION-$CURHASH";
PATCH="";
fi
@@ -81,7 +82,7 @@ $DEBUG cd "$BASE/lyx-build/";
echo "Building distribution...";
$DEBUG "$BASE/lyx-export/configure" --enable-build-type=rel --enable-qt5
-if ! $DEBUG make lyxdist; then
+if ! $DEBUG make dist; then
echo "Couldn't make distribution!";
exit 1;
fi
--
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs
