gmane.editors.lyx.cvs

[LyX master] lyx2lyx/lyx_2_1.py: remove 2 warnings I accidentally just committed

Uwe Stöhr — 2012-05-26T17:02:38

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 5463389ec9af49224b56f0c34c6c401a97a22c86
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Sat May 26 19:02:32 2012 +0200

    lyx2lyx/lyx_2_1.py: remove 2 warnings I accidentally just committed

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 84bf2bc..395f011 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
< at >< at > -364,11 +364,9 < at >< at > def revert_use_packages(document):
         i = find_re(document.header, regexp, j)
         if i != -1:
             value = get_value(document.header, "\\use_package %s" % p, i).split()[1]
-            document.warning(str(value))
             del document.header[i]
             j = i
             document.header.insert(j, "\\use_%s %s"  % (p, value))
-            document.warning(str(value))
         j = j + 1
 
 

-----------------------------------------------------------------------

Summary of changes:
 lib/lyx2lyx/lyx_2_1.py

[LyX master] lyx2lyx/lyx_2_1.py: fix #8172

Uwe Stöhr — 2012-05-26T17:00:09

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 7b680058756b4d80e741faa4bdafe894bc06360d
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Sat May 26 19:00:03 2012 +0200

    lyx2lyx/lyx_2_1.py: fix #8172

diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index bbd9b3c..84bf2bc 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
< at >< at > -347,27 +347,28 < at >< at > def convert_use_packages(document):
     "use_xxx yyy => use_package xxx yyy"
     packages = ["amsmath", "esint", "mathdots", "mhchem", "undertilde"]
     for p in packages:
-        i = find_token(document.header, "\\use_%s" % p , 0)
+        i = find_token(document.header, "\\use_%s" % p, 0)
         if i != -1:
-            value = get_value(document.header, "\\use_%s" % p , i)
+            value = get_value(document.header, "\\use_%s" % p, i)
             document.header[i] = "\\use_package %s %s" % (p, value)
 
 
 def revert_use_packages(document):
     "use_packa

[LyX master] add missing IPA glyph

Juergen Spitzmueller — 2012-05-26T14:51:46

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 25556fe4d92872904f4e380aefb1b1c8a1896887
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 26 16:51:37 2012 +0200

    add missing IPA glyph

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index b92a823..f06f10a 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
< at >< at > -177,7 +177,7 < at >< at >
 0x0124 "\\^{H}"                   "" "mathalpha" "\\hat{H}" # LATIN CAPITAL LETTER H WITH CIRCUMFLEX
 0x0125 "\\^{h}"                   "" "mathalpha" "\\hat{h}" # LATIN SMALL LETTER H WITH CIRCUMFLEX
 #0x0126 ""                         "" "" "" "" # LATIN CAPITAL LETTER H WITH STROKE
-#0x0127 ""                         "" "" "" "" # LATIN SMALL LETTER H WITH STROKE
+0x0127 "\\textcrh"                "tipa" "force" # LATIN SMALL LETTER H WITH STROKE
 0x0128 "\\~{I}"                   "" "mathalpha" "\\tilde{I}" # LATIN CAPITAL LETTER I WITH TILDE
 0x0129 "\\~{\\i}"                 "" "matha

[LyX master] Fix macro termination in IPA inset if next character uses a TIPA shortcut

Juergen Spitzmueller — 2012-05-26T14:36:55

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 6ddcfb87e4b3c4e21c4ea6b84b4162d2d7c537e8
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 26 16:36:24 2012 +0200

    Fix macro termination in IPA inset if next character uses a TIPA shortcut

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8b09952..afcf5ac 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
< at >< at > -1275,8 +1275,15 < at >< at > void Paragraph::Private::latexSpecialChar(otexstream & os,
 string script;
 pair<docstring, bool> latex = encoding.latexChar(c);
 docstring nextlatex;
-if (next != '\0' && next != META_INSET)
+bool nexttipas = false;
+string nexttipashortcut;
+if (next != '\0' && next != META_INSET) {
 nextlatex = encoding.latexChar(next).first;
+if (runparams.inIPA) {
+nexttipashortcut = Encodings::TIPAShortcut(next);
+nexttipas = !nexttipashortcut.empty();
+}
+}
 bool tipas = false;
 if (runparams.inIPA) {
 string co

[LyX 2.0.x] Update it.po

Enrico Forestieri — 2012-05-26T11:15:24

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 3c4af4e0e407668e4c47f4ee2f8cc6be0edaa5f5
Author: Enrico Forestieri <forenr< at >lyx.org>
Date:   Sat May 26 13:14:45 2012 +0200

    Update it.po

diff --git a/po/it.po b/po/it.po
index 931aee6..e8131f6 100644
--- a/po/it.po
+++ b/po/it.po
< at >< at > -7,7 +7,7 < at >< at > msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
 "POT-Creation-Date: 2012-05-25 15:37-0400\n"
-"PO-Revision-Date: 2012-05-20 23:08+0100\n"
+"PO-Revision-Date: 2012-05-26 13:04+0100\n"
 "Last-Translator: Enrico Forestieri <forenr< at >lyx.org>\n"
 "Language-Team: italiano <it< at >li.org>\n"
 "Language: it\n"
< at >< at > -30,35 +30,45 < at >< at > msgstr "2.0.x"
 msgid "Credits"
 msgstr "Ringraziamenti"
 
-#: src/frontends/qt4/ui/AboutUi.ui:80 lib/layouts/apa.layout:199
+#: src/frontends/qt4/ui/AboutUi.ui:80
+#: lib/layouts/apa.layout:199
 #: lib/layouts/agu_stdtitle.inc:81
 msgid "Copyright"
 msgstr "Copyright"
 
-#: src/frontends/qt4

[LyX 2.0.x] * sk.po

Kornel Benko — 2012-05-26T08:39:10

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 4dc065c1ff819bdea67024dd9e347d027f6b7fed
Author: Kornel Benko <kornel< at >lyx.org>
Date:   Sat May 26 10:38:53 2012 +0200

    * sk.po

diff --git a/po/sk.po b/po/sk.po
index 24ea444..51d5bbb 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -8,7 +8,7 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-05-25 15:37-0400\n"
+"POT-Creation-Date: 2012-05-24 17:27+0200\n"
 "PO-Revision-Date: 2012-04-08 11:27+0100\n"
 "Last-Translator: Kornel Benko <kornel< at >lyx.org>\n"
 "Language-Team: Slovak <lyx-docs< at >lists.lyx.org>\n"
< at >< at > -12255,9 +12255,8 < at >< at > msgid "Apply Last Text Style|A"
 msgstr "PouÅ¾iÅ¥ poslednÃ½ Å¡tÃ½l textu"
 
 #: lib/ui/stdcontext.inc:314
-#, fuzzy
 msgid "Text Style|x"
-msgstr "Å tÃ½l textu"
+msgstr "Å tÃ½l Textu"
 
 #: lib/ui/stdcontext.inc:315 lib/ui/stdmenus.inc:119
 msgid "Paragraph Settings...|P"
< at >< at > -

[LyX master] compile fix

Pavel Sanda — 2012-05-26T08:16:39

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 1b1f9d05d9d30760882c1f7ff14106196166c98c
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Sat May 26 10:16:20 2012 +0200

    compile fix

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 362f062..b0dd01e 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
< at >< at > -66,6 +66,7 < at >< at >
 #include <QPalette>
 #include <QPixmapCache>
 #include <QScrollBar>
+#include <QStylePainter>
 #include <QTimer>
 #include <QToolButton>
 #include <QToolTip>

-----------------------------------------------------------------------

Summary of changes:
 src/frontends/qt4/GuiWorkArea.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive

[LyX 2.0.x] Remerge strings.

Richard Heck — 2012-05-25T19:39:35

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit c8388c88390e6106ee842d1554e38ed2e5a012cd
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Fri May 25 15:39:24 2012 -0400

    Remerge strings.

diff --git a/po/ar.po b/po/ar.po
index 0ad9b96..9488d09 100644
--- a/po/ar.po
+++ b/po/ar.po
< at >< at > -7,7 +7,7 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX 1.6.0\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-04-12 07:51-0400\n"
+"POT-Creation-Date: 2012-05-25 15:37-0400\n"
 "PO-Revision-Date: 2010-03-21 22:45+0200\n"
 "Last-Translator: Mohamed Magdy <theblackdragon_100< at >hotmail.com>\n"
 "Language-Team: LyX team <theblackdragon_100< at >hotmail.com>\n"
< at >< at > -47,7 +47,7 < at >< at > msgstr "ØÙÙÙ Ø§ÙÙØ´Ø±"
 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66
 #: src/frontends/qt4/ui/TexinfoUi.ui:58
 #: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/WrapUi.ui:173
-#: src/frontends

r40921 - www-user/trunk/farm/cookbook/LyX

2012-05-25T19:39:41

Author: rgheck
Date: Fri May 25 21:39:40 2012
New Revision: 40921
URL: http://www.lyx.org/trac/changeset/40921

Log:
* i18n.inc: update stats

Modified:
   www-user/trunk/farm/cookbook/LyX/i18n.inc

Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc
==============================================================================
--- www-user/trunk/farm/cookbook/LyX/i18n.incThu Apr 12 13:56:12 2012(r40920)
+++ www-user/trunk/farm/cookbook/LyX/i18n.incFri May 25 21:39:40 2012(r40921)
< at >< at > -7,96 +7,96 < at >< at >
 // The data itself
 $podata = array (
 array ( 'langcode' => 'ar', "date" => "2010-03-21",
-"msg_tr" => 3264, "msg_fu" => 829, "msg_nt" => 1138,
+"msg_tr" => 3264, "msg_fu" => 839, "msg_nt" => 1139,
 "translator" => "Mohamed Magdy", "email" => "theblackdragon_100 () hotmail ! com"),
 array ( 'langcode' => 'ca', "date" => "2008-07-28",
-"msg_tr" => 3001, "msg_fu" => 1285, "msg_nt" => 945,
+"msg_tr" => 3001, "msg_fu" => 1295, "msg_nt" => 946,
 "translator" => "joan", "email" => "joan () montane ! cat"),
-array

[LyX master] Fix painting of hidden tabbar on gtk

Vincent van Ravesteijn — 2012-05-25T17:19:43

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 655a4f5515f02c057dc47abd7bdfbd4059ff494c
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Fri May 25 19:05:38 2012 +0200

    Fix painting of hidden tabbar on gtk
    
    When there is a single document open, the tabbar gets hidden. The only and selected tab is still visible though as a break in the line delining the tabwidget. To fix this we paint the tabwidget ourselves and remove the presence of the hidden tab.

diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 5eca896..362f062 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
< at >< at > -1555,6 +1555,25 < at >< at > TabWorkArea::TabWorkArea(QWidget * parent)
 }
 
 
+void TabWorkArea::paintEvent(QPaintEvent * event)
+{
+if (tabBar()->isVisible()) {
+QTabWidget::paintEvent(event);
+} else {
+// Prevent the selected tab to influence the 
+// painting of the frame of the

[LyX master] Fix bug #8170: Crash when client disconnects unexpectedly

Vincent van Ravesteijn — 2012-05-24T11:58:27

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 4c3a97d96e478dd54ee2a10205fc2520c33c6fda
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Thu May 24 13:55:41 2012 +0200

    Fix bug #8170: Crash when client disconnects unexpectedly
    
    When the socket does not exist anymore, we should not try to access it. In
    trying to do so, std::map will create a new shared_ptr but this pointer
    doesn't point at anything. To prevent this, we explicitly check whether
    the socket is available.

diff --git a/src/ServerSocket.cpp b/src/ServerSocket.cpp
index 7b9d6df..4c34212 100644
--- a/src/ServerSocket.cpp
+++ b/src/ServerSocket.cpp
< at >< at > -125,8 +125,10 < at >< at > void ServerSocket::serverCallback()
 // if the connection has been closed
 void ServerSocket::dataCallback(int fd)
 {
-shared_ptr<LyXDataSocket> client = clients[fd];
-
+map<int, shared_ptr<LyXDataSocket> >::const_iterator it = clients.find(fd);
+if (it == clients.end())
+return;
+

[LyX 2.0.x] Backport typos to branch

Pavel Sanda — 2012-05-23T20:20:13

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 5f6f5091ab35536e0a2920a3b3416d238d17b0f4
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 23 22:19:44 2012 +0200

    Backport typos to branch

diff --git a/lib/doc/cs/Tutorial.lyx b/lib/doc/cs/Tutorial.lyx
index 0b04bc3..85bc638 100644
--- a/lib/doc/cs/Tutorial.lyx
+++ b/lib/doc/cs/Tutorial.lyx
< at >< at > -127,7 +127,7 < at >< at > VÃtejte v LyXu!
 \end_layout
 
 \begin_layout Standard
-Tento soubor je urÄen vÅ¡em, kteÅÃ dopusud neslyÅ¡eli o LaTeXu Äi jej dobÅe
+Tento soubor je urÄen vÅ¡em, kteÅÃ doposud neslyÅ¡eli o LaTeXu Äi jej dobÅe
  neznajÃ.
  Ale teÄ nenÃ tÅeba panikaÅit - pro pouÅ¾ÃvÃ¡nÃ LyXu se nemusÃte uÄit LaTeX.
  To je, konec koncÅ¯, celÃ½ vtip LyXu: vytvoÅit WYSIWYM rozhranÃ pro LaTeX.
< at >< at > -2172,7 +2172,7 < at >< at > Zkusme tedy napsat seznam dÅ¯vodÅ¯, proÄ je LyX lepÅ¡Ã neÅ¾ jinÃ© textovÃ© pro
 \begin_l

[LyX master] * cs/Tutorial.lyx typos

Pavel Sanda — 2012-05-23T20:00:55

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 3476a6f1d4bc3a8e3a69efc29d9c8e1cbb862b9f
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 23 21:58:42 2012 +0200

    * cs/Tutorial.lyx typos

diff --git a/lib/doc/cs/Tutorial.lyx b/lib/doc/cs/Tutorial.lyx
index 0b04bc3..2efb0a1 100644
--- a/lib/doc/cs/Tutorial.lyx
+++ b/lib/doc/cs/Tutorial.lyx
< at >< at > -1,5 +1,5 < at >< at >
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 431
 \begin_document
 \begin_header
 \textclass book
< at >< at > -70,15 +70,21 < at >< at >
 \pdf_quoted_options "linkcolor=black, citecolor=black, urlcolor=blue, filecolor=blue,pdfpagelayout=OneColumn, pdfnewwindow=true, pdfstartview=XYZ, plainpages=false"
 \papersize default
 \use_geometry false
-\use_amsmath 0
-\use_esint 0
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package esint 0
+\use_package m

[LyX 2.0.x] de.po: update

Juergen Spitzmueller — 2012-05-23T18:12:01

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit ec24a453c5c8b4195d80d4488648791578013248
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Wed May 23 20:11:40 2012 +0200

    de.po: update

diff --git a/po/de.po b/po/de.po
index 7f97e19..4798442 100644
--- a/po/de.po
+++ b/po/de.po
< at >< at > -95,8 +95,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.0\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-05-19 13:19+0200\n"
-"PO-Revision-Date: 2012-05-19 13:29+0200\n"
+"POT-Creation-Date: 2012-05-23 20:07+0200\n"
+"PO-Revision-Date: 2012-05-23 20:09+0200\n"
 "Last-Translator: JÃ¼rgen SpitzmÃ¼ller <spitz< at >lyx.org>\n"
 "Language-Team: German <lyx-docs< at >lists.lyx.org>\n"
 "Language: de\n"
< at >< at > -12408,8 +12408,8 < at >< at > msgstr "Ãnderung ablehnen|b"
 msgid "Apply Last Text Style|A"
 msgstr "Zuletzt verwendeten Textstil verwenden|x"
 
-#: lib/ui/stdcontext.inc:314 lib/ui/stdmenus.inc:117
-msgid "Text Style|S"
+#: lib/ui/s

[LyX 2.0.x] Fix bug #8166: Crash on clicking away from empty last paragraph

Vincent van Ravesteijn — 2012-05-23T15:52:53

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit dacab5cf7be53e474452ebb9880ae4338b22fdfb
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 23 08:02:40 2012 +0200

    Fix bug #8166: Crash on clicking away from empty last paragraph
    
    We always have to call 'notifyCursorLeaves', but we only have to make sure
    that we call the 'fixIfBroken()' functions first.
    (cherry picked from commit d20cb73b874a30b82fe01d3b8f385ef066fafedf)

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index b0d3135..dda765e 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
< at >< at > -2171,8 +2171,8 < at >< at > void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
 // Notify left insets
 if (cur != old) {
-bool badcursor = old.fixIfBroken() | cur.fixIfBroken()
-| notifyCursorLeavesOrEnters(old, cur);
+bool badcursor = old.fixIfBroken() | cur.fixIfBroken();
+badcursor |= notifyCursorLeavesOrEnters(old, cur);
 if (badcursor)

[LyX master] Trac browse SVN -> GIT

Pavel Sanda — 2012-05-23T15:39:13

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 1a45c99a7df170e53fb09598f27d9d4ffac99819
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Wed May 23 17:35:08 2012 +0200

    Trac browse SVN -> GIT

diff --git a/README.localization b/README.localization
index d933d01..bcef8a7 100644
--- a/README.localization
+++ b/README.localization
< at >< at > -115,7 +115,7 < at >< at > files run make update-po.
 
 Send your edited xx.po file to po-updates< at >lyx.org.
 
-Also you can check http://www.lyx.org/trac/browser/lyx-devel/trunk to track
+Also you can check http://www.lyx.org/trac/browser/lyxgit/?rev=master to track
 changes or watch updates.
 
 
diff --git a/lib/doc/Additional.lyx b/lib/doc/Additional.lyx
index 4b8d1a8..f1a0954 100644
--- a/lib/doc/Additional.lyx
+++ b/lib/doc/Additional.lyx
< at >< at > -4522,7 +4522,7 < at >< at > development/HTML.notes
 \begin_inset CommandInset href
 LatexCommand href
 name "accessed online"
-target "http://www.lyx.org/trac/browser/lyx-devel/trunk/develo

[LyX master] Style.

Richard Heck — 2012-05-23T12:53:27

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 9d983562fe5876189a0da4208ee1bd40e0c90f7a
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Wed May 23 08:53:14 2012 -0400

    Style.

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index f6c6a93..ca63632 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
< at >< at > -2026,8 +2026,9 < at >< at > static bool import(GuiView * lv, FileName const & filename,
 string loader_format;
 vector<string> loaders = theConverters().loaders();
 if (find(loaders.begin(), loaders.end(), format) == loaders.end()) {
-for (vector<string>::const_iterator it = loaders.begin();
- it != loaders.end(); ++it) {
+vector<string>::const_iterator it = loaders.begin();
+vector<string>::const_iterator en = loaders.end();
+for (; it != en; ++it) {
 if (!theConverters().isReachable(format, *it))
 continue;
 

---------------------------------------------------------------

[LyX master] Fix bug #8166: Crash on clicking away from empty last paragraph

Vincent van Ravesteijn — 2012-05-23T06:07:18

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit d20cb73b874a30b82fe01d3b8f385ef066fafedf
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 23 08:02:40 2012 +0200

    Fix bug #8166: Crash on clicking away from empty last paragraph
    
    This reverts the previous fix in [0a33374c/lyxgit] and fixes it
    differently.
    
    We always have to call 'notifyCursorLeaves', but we only have to make sure
    that we call the 'fixIfBroken()' functions first.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 1017cea..9b6c6b3 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
< at >< at > -2201,8 +2201,8 < at >< at > void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
 // Notify left insets
 if (cur != old) {
-bool badcursor = old.fixIfBroken() || cur.fixIfBroken()
-|| notifyCursorLeavesOrEnters(old, cur);
+bool badcursor = old.fixIfBroken() | cur.fixIfBroken();
+badcursor |= notifyCursorLeavesOrEnters(old, cur);

[LyX master] Fix bug #8166: Crash on clicking away from empty paragraph

Vincent van Ravesteijn — 2012-05-22T23:34:09

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit 0a33374c0d8125e27666fe513506fb6069df453c
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Wed May 23 01:31:43 2012 +0200

    Fix bug #8166: Crash on clicking away from empty paragraph
    
    We rely on the 'or' operator to prevent us from calling
    'notifyCursorLeaves' if one of the two cursors is broken. This doesn't
    work when using the '|' operator. The compiler 'optimizes' the code in
    such a way that we always call notifyCursorLeaves anyway. Using the '||'
    operator fixes this.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index a30c0f0..1017cea 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
< at >< at > -2201,8 +2201,8 < at >< at > void BufferView::mouseEventDispatch(FuncRequest const & cmd0)
 
 // Notify left insets
 if (cur != old) {
-bool badcursor = old.fixIfBroken() | cur.fixIfBroken()
-| notifyCursorLeavesOrEnters(old, cur);
+bool badcursor = old.fixIfBr

[LyX 2.0.x] stdcontext.inc: fix 2 shortcut clashes (bug #8023)

Uwe Stöhr — 2012-05-22T22:47:52

The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit a96e49ef62c9547d631797f896d34de54cdd9bc4
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Wed May 23 00:47:48 2012 +0200

    stdcontext.inc: fix 2 shortcut clashes (bug #8023)

diff --git a/lib/ui/stdcontext.inc b/lib/ui/stdcontext.inc
index a8cf62e..a1d402e 100644
--- a/lib/ui/stdcontext.inc
+++ b/lib/ui/stdcontext.inc
< at >< at > -311,7 +311,7 < at >< at > Menuset
 OptItem "Reject Change|j" "change-reject"
 Separator
 Item "Apply Last Text Style|A" "textstyle-apply"
-Submenu "Text Style|S" "edit_textstyles"
+Submenu "Text Style|x" "edit_textstyles"
 Item "Paragraph Settings...|P" "layout-paragraph"
 LanguageSelector
 Separator
< at >< at > -593,7 +593,7 < at >< at > Menuset
 #
 Menu "context-ert"
 # repeat 1 is added as a work-around to not indicate this action as toggable
-Item "Wrap by Preview|P" "command-sequence repeat 1;inset-toggle;char-forward;char-backward;char-forward-select;preview-insert;char-bac

[LyX master] Tentative fix to #8159: Undo doesn't restore environment depth correctly

Jean-Marc Lasgouttes — 2012-05-22T20:33:12

The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit e3854bb59b98ee4f7514cf2ca5585cb6be949186
Author: Jean-Marc Lasgouttes <lasgouttes< at >lyx.org>
Date:   Mon May 21 00:11:23 2012 +0200

    Tentative fix to #8159: Undo doesn't restore environment depth correctly
    
    The undo range is extended to encompass all the paragraph after the end that
    are a non-zero depth. The reason is that these paragraphs may see their depth
    reduced if the last paragraph sees its depth reduced.
    
    Note that there is a memory cost, since we store paragraphs than may not be
    modified in practice. This may matter for some pathological files (people
    putting all their document at depth 1 for a weird reason?)
    
    I tried to be careful, but this can introduce new bugs. Please test.

diff --git a/src/Undo.cpp b/src/Undo.cpp
index 28438c1..a80c01c 100644
--- a/src/Undo.cpp
+++ b/src/Undo.cpp
< at >< at > -23,6 +23,7 < at >< at >
 #include "DocIterator.h"
 #include "P