[LyX/2.1.1-staging] UserGuide.lyx: update appendix C (lyX preferences)

2014-03-23 Thread Uwe Stöhr
commit 0ab252e162e6b480d2b0ea357f52f8af527d806c Author: Uwe Stöhr Date: Mon Mar 24 01:10:53 2014 +0100 UserGuide.lyx: update appendix C (lyX preferences) the only missing thing is the feature of the default length unit in the Language settings diff --git a/lib/doc/UserGuide.lyx b

[LyX/2.0.x] Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion.

2014-03-23 Thread Richard Heck
commit 2c88e6ab2f61e1b73cda66e93ccd59c0d9c0af64 Author: Juergen Spitzmueller Date: Sun Mar 23 13:31:21 2014 +0100 Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion. Fixes: #7437(cherry picked from commit afd89

[LyX/2.1.1-staging] Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion.

2014-03-23 Thread Richard Heck
commit 31b601346eb01a21fc5bcacf34fa55c15046fdfb Author: Juergen Spitzmueller Date: Sun Mar 23 13:31:21 2014 +0100 Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion. Fixes: #7437(cherry picked from commit afd89

[LyX/2.1.1-staging] UserGuide.lyx: update appendix B for LyX 2.1.0

2014-03-23 Thread Uwe Stöhr
commit 9bffd31bee263dcea884eeb804baf23f66a6afc7 Author: Uwe Stöhr Date: Sun Mar 23 20:57:06 2014 +0100 UserGuide.lyx: update appendix B for LyX 2.1.0 diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx index df7d77a..4e2d8e8 100644 --- a/lib/doc/UserGuide.lyx +++ b/lib/doc/UserGuide

[LyX/master] lyx2lyx: Set conversion table for LyX 2.1

2014-03-23 Thread Vincent van Ravesteijn
commit 6eba310ef7c568b6382a1469ca063bf69b1eda35 Author: Vincent van Ravesteijn Date: Sun Mar 23 13:26:28 2014 +0100 lyx2lyx: Set conversion table for LyX 2.1 diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 17445ad..f29995e 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py

[LyX/master] Update MacOSX Readme to latest fileformat

2014-03-23 Thread Vincent van Ravesteijn
commit ae25fa5fe0e8ce55a2016c5c3021eaa7a37f3cd7 Author: Vincent van Ravesteijn Date: Sun Mar 23 17:44:07 2014 +0100 Update MacOSX Readme to latest fileformat diff --git a/development/MacOSX/ReadMe/Leame.lyx b/development/MacOSX/ReadMe/Leame.lyx index 9d1958a..ee88085 100644 --- a/developm

[LyX/master] lyx2lyx: Set last minor version of the 2.0.x series

2014-03-23 Thread Vincent van Ravesteijn
commit 84827c8705bb5e1b16276dc337f18ccacedbeff2 Author: Vincent van Ravesteijn Date: Sun Mar 23 13:30:21 2014 +0100 lyx2lyx: Set last minor version of the 2.0.x series diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index f29995e..7b534fe 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2

[LyX/master] lyx2lyx: Fix conversion table for LyX 2.0

2014-03-23 Thread Vincent van Ravesteijn
commit 5d15807954bd6850342d5218765cf4aa59f3ee32 Author: Vincent van Ravesteijn Date: Sun Mar 23 13:25:09 2014 +0100 lyx2lyx: Fix conversion table for LyX 2.0 diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 7e02761..17445ad 100644 --- a/lib/lyx2lyx/LyX.py +++ b/lib/lyx2lyx/LyX.py

[LyX/master] Update templates to latest fileformat

2014-03-23 Thread Vincent van Ravesteijn
commit 9f5739e23784ecb407b13f45fe0a33deb92c4bf2 Author: Vincent van Ravesteijn Date: Sun Mar 23 17:32:50 2014 +0100 Update templates to latest fileformat diff --git a/lib/templates/ACM-SIGS.lyx b/lib/templates/ACM-SIGS.lyx index a3933b5..bb51cb0 100644 --- a/lib/templates/ACM-SIGS.lyx +++

Re: [LyX/2.2-staging] ja.po: update by Koji

2014-03-23 Thread Vincent van Ravesteijn
Uwe Stöhr schreef op 23-3-2014 15:11: commit de5c90baa021f89b94fbe1dea836334d59d242e6 Author: Uwe Stöhr Date: Sun Mar 23 15:11:33 2014 +0100 ja.po: update by Koji I guess you want those translations also in LyX 2.1 ? Vincent

[LyX/2.2-staging] stdmenus.inc: add move rows/columns feature to Edit menu

2014-03-23 Thread Uwe Stöhr
commit 5286dbe548e188512aad1030fd1e7495533d4332 Author: Uwe Stöhr Date: Sun Mar 23 15:30:13 2014 +0100 stdmenus.inc: add move rows/columns feature to Edit menu fixes bug #9047 diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 2da0b7c..32ed83e 100644 --- a/lib/ui/stdmenu

[LyX/2.1.1-staging] stdmenus.inc: add move rows/columns feature to Edit menu

2014-03-23 Thread Uwe Stöhr
commit 71c625dd1f883ad7e9af1da80b32d031f7ed2c4b Author: Uwe Stöhr Date: Sun Mar 23 15:25:59 2014 +0100 stdmenus.inc: add move rows/columns feature to Edit menu fixes bug #9047 diff --git a/lib/ui/stdmenus.inc b/lib/ui/stdmenus.inc index 2da0b7c..32ed83e 100644 --- a/lib/ui/stdmenu

[LyX/2.2-staging] PrefCompletionUi.ui: port commit 1a137950

2014-03-23 Thread Uwe Stöhr
commit 085b0e6fd1ad316793ad8f4f96cf69a17c667d2d Author: Uwe Stöhr Date: Sun Mar 23 14:49:57 2014 +0100 PrefCompletionUi.ui: port commit 1a137950 diff --git a/src/frontends/qt4/ui/PrefCompletionUi.ui b/src/frontends/qt4/ui/PrefCompletionUi.ui index 010b308..45faee4 100644 --- a/src/fronten

[LyX/2.2-staging] Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion.

2014-03-23 Thread Juergen Spitzmueller
commit afd897029917a083fbeb84cccd4e6cb0a21db7ed Author: Juergen Spitzmueller Date: Sun Mar 23 13:31:21 2014 +0100 Do not allow the manual insertion of a directory (without filename) into the import dialog and thus prevent an assertion. Fixes: #7437 diff --git a/src/frontends/qt4/

[LyX/2.1.1-staging] Fix problem with python and change of PATH

2014-03-23 Thread Benjamin Piwowarski
commit 06938acc0a27b3ac17ddb1c038d18fe3dd19a702 Author: Benjamin Piwowarski Date: Fri Mar 14 11:48:40 2014 +0100 Fix problem with python and change of PATH - waits that lyxrc has been read before finding python - when the PATH changes, resets the value - updated status.21x

[LyX/2.0.x] Updated status for commit 0fc6cfcdcb78e537b183767474bcdea094fd9f0d

2014-03-23 Thread Benjamin Piwowarski
commit 9fef2346d69f2262081e62c6597bb042e2f3bb3a Author: Benjamin Piwowarski Date: Sun Mar 23 12:02:26 2014 +0100 Updated status for commit 0fc6cfcdcb78e537b183767474bcdea094fd9f0d diff --git a/status.20x b/status.20x index b80e9b9..52dab75 100644 --- a/status.20x +++ b/status.20x @@ -131,6

[LyX/2.1.1-staging] style

2014-03-23 Thread Juergen Spitzmueller
commit 41d1d25772bb268c6b4ab421310707791b427e8e Author: Juergen Spitzmueller Date: Sat Mar 22 12:22:41 2014 +0100 style diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 25ebde3..ae3b640 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -2501,7 +2501,7 @@ void BufferView

[LyX/2.0.x] style

2014-03-23 Thread Juergen Spitzmueller
commit 6979ec68182cc9ab34386c6a5403619e0b343033 Author: Juergen Spitzmueller Date: Sat Mar 22 12:22:41 2014 +0100 style diff --git a/src/BufferView.cpp b/src/BufferView.cpp index cb2214c..58d1446 100644 --- a/src/BufferView.cpp +++ b/src/BufferView.cpp @@ -2463,7 +2463,7 @@ void BufferView

[LyX/2.1.1-staging] Fix assertion when ChkTeX hit math.

2014-03-23 Thread Juergen Spitzmueller
commit b59ef6bee01bcbd5a96350fdc9ee993aa516dcfb Author: Juergen Spitzmueller Date: Sat Mar 22 12:09:18 2014 +0100 Fix assertion when ChkTeX hit math. The problem here was that we used texted-only methods (via paragraph()), which triggered the assertion as soon as we were inside ma

[LyX/2.0.x] Fix assertion when ChkTeX hit math.

2014-03-23 Thread Juergen Spitzmueller
commit 0cad43a114ba0a1a46ec51c725e51de59048d049 Author: Juergen Spitzmueller Date: Sat Mar 22 12:09:18 2014 +0100 Fix assertion when ChkTeX hit math. The problem here was that we used texted-only methods (via paragraph()), which triggered the assertion as soon as we were inside ma

[LyX/2.1.1-staging] \lyxdeleted uses an ulem command.

2014-03-23 Thread Juergen Spitzmueller
commit d6242bb5c4764adf6a23298489facd7479aef74f Author: Juergen Spitzmueller Date: Sat Mar 22 12:27:46 2014 +0100 \lyxdeleted uses an ulem command. Therefore we need to put \cite and \ref into \mboxes, as in our native ulem commands. Fixes: #8806. diff --git a/src/Change

[LyX/2.1.1-staging] ulem commands can be nested.

2014-03-23 Thread Juergen Spitzmueller
commit fb3c63449db5b1d06bc00e8558ac690d4d3167b4 Author: Juergen Spitzmueller Date: Sat Mar 22 12:25:25 2014 +0100 ulem commands can be nested. diff --git a/src/Font.cpp b/src/Font.cpp index a155ec5..7e8b3f4 100644 --- a/src/Font.cpp +++ b/src/Font.cpp @@ -418,22 +418,22 @@ int Font::latexW

[LyX/2.1.1-staging] Do not crash when entering math in ct mode with merge dialog open.

2014-03-23 Thread Juergen Spitzmueller
commit 696b9e713c5702db56f0b26d570902ce1ca7f40d Author: Juergen Spitzmueller Date: Sun Mar 23 09:52:32 2014 +0100 Do not crash when entering math in ct mode with merge dialog open. Fixes: #7685. diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 7555f78..1398a11 100644 ---

[LyX/2.1.1-staging] Fix selection drawing after mouse-double/triple in mathed

2014-03-23 Thread Juergen Spitzmueller
commit a7e80e5f3bd465e1769b0be258029224c6407cd2 Author: Juergen Spitzmueller Date: Fri Mar 21 10:20:12 2014 +0100 Fix selection drawing after mouse-double/triple in mathed Fixes: #8829 diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index c110e12..c3edfaa

[LyX/2.0.x] Do not crash when entering math in ct mode with merge dialog open.

2014-03-23 Thread Juergen Spitzmueller
commit aceb9d9f29c9432c636a667978a0b9b7083ebe8d Author: Juergen Spitzmueller Date: Sun Mar 23 09:52:32 2014 +0100 Do not crash when entering math in ct mode with merge dialog open. Fixes: #7685. diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 4ca03d5..e4ca245 100644 ---

[LyX/2.0.x] Fix selection drawing after mouse-double/triple in mathed

2014-03-23 Thread Juergen Spitzmueller
commit 1c35155810ebfb0a11848101eede1dedea44fc29 Author: Juergen Spitzmueller Date: Fri Mar 21 10:20:12 2014 +0100 Fix selection drawing after mouse-double/triple in mathed Fixes: #8829 diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp index 22d6334..1e555ce

[LyX/2.0.x] InsetListings: Rewrite C-ism in C++ and fix terminator bug.

2014-03-23 Thread Juergen Spitzmueller
commit e6af49a9f57028474e95f6ae162e93995d20f28e Author: Juergen Spitzmueller Date: Sat Mar 22 12:02:21 2014 +0100 InsetListings: Rewrite C-ism in C++ and fix terminator bug. The rewriting is completely done by JMarc. The terminator bug fix has been added to that by me. Fi

[LyX/2.1.1-staging] InsetListings: Rewrite C-ism in C++ and fix terminator bug.

2014-03-23 Thread Juergen Spitzmueller
commit a84d6e80ec45f667a6149c19de3437aa646a7bae Author: Juergen Spitzmueller Date: Sat Mar 22 12:02:21 2014 +0100 InsetListings: Rewrite C-ism in C++ and fix terminator bug. The rewriting is completely done by JMarc. The terminator bug fix has been added to that by me. Fi

[LyX/2.0.x] Fix section-select when issued from outliner

2014-03-23 Thread Juergen Spitzmueller
commit a62cfc602411edca6c4ce48579119fa2eaba16eb Author: Juergen Spitzmueller Date: Fri Mar 21 10:21:18 2014 +0100 Fix section-select when issued from outliner Fixes: #8936 diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index bfdc9f0..da9f0dd 100644

[LyX/2.0.x] Focus on buffer after section select in Outliner

2014-03-23 Thread Juergen Spitzmueller
commit c56fc4c5f4302321da17b8dac1f85ce5798a7027 Author: Scott Kostyshak Date: Fri Mar 21 19:34:46 2014 -0400 Focus on buffer after section select in Outliner diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index da9f0dd..3528c61 100644 --- a/src/frontends/qt4

[LyX/2.1.1-staging] Focus on buffer after section select in Outliner

2014-03-23 Thread Juergen Spitzmueller
commit 10927a410c9730ffa3af0151a182c402b0eab380 Author: Scott Kostyshak Date: Fri Mar 21 19:34:46 2014 -0400 Focus on buffer after section select in Outliner diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index 2069035..83ac1bf 100644 --- a/src/frontends/qt4

[LyX/2.1.1-staging] Fix section-select when issued from outliner

2014-03-23 Thread Juergen Spitzmueller
commit 1c71fb6e468f70b7a991022c8d8e1b1e729fb4d0 Author: Juergen Spitzmueller Date: Fri Mar 21 10:21:18 2014 +0100 Fix section-select when issued from outliner Fixes: #8936 diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp index 3619e6c..2069035 100644

[LyX/2.2-staging] Do not crash when entering math in ct mode with merge dialog open.

2014-03-23 Thread Juergen Spitzmueller
commit c1ae9506f25144f4b3b0ef769c24e70633076691 Author: Juergen Spitzmueller Date: Sun Mar 23 09:52:32 2014 +0100 Do not crash when entering math in ct mode with merge dialog open. Fixes: #7685. diff --git a/src/BufferView.cpp b/src/BufferView.cpp index 2d3df5f..392f380 100644 ---

[LyX/2.2-staging] Fix corrupted PrefCompletionUI.ui

2014-03-23 Thread Juergen Spitzmueller
commit 81795f9b4b1f4cb6bc8ecc42befa699e7d4c76c3 Author: Juergen Spitzmueller Date: Sun Mar 23 09:50:39 2014 +0100 Fix corrupted PrefCompletionUI.ui diff --git a/src/frontends/qt4/ui/PrefCompletionUi.ui b/src/frontends/qt4/ui/PrefCompletionUi.ui index 0cb8751..010b308 100644 --- a/src/fron