gmane.editors.lyx.cvs

[LyX master] Typo

Kornel Benko — 2013-05-21T11:26:37

The branch, master, has been updated.

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

commit 82bca55a1f1d1e13da86e6d335ea4c1859fcc79b
Author: Kornel Benko <kornel< at >lyx.org>
Date:   Tue May 21 13:26:26 2013 +0200

    Typo

diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index a510a3f..cbe0b50 100755
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
< at >< at > -391,7 +391,7 < at >< at > while not failed:
         time.sleep(0.5)
         if not lyx_exists():
             print "LyX instance not found because of crash or assert !\n"
-            failed = true
+            failed = True
         else:
             print "Terminating lyx instance: " + str(lyx_pid) + "\n"
             intr_system("kill -9 " + str(lyx_pid), True);

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

Summary of changes:
 development/autotests/keytest.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive

Re: [LyX master] Add autotests for #8684

Kornel Benko — 2013-05-21T08:40:35

Am Dienstag, 21. Mai 2013 um 00:52:53, schrieb Scott Kostyshak <skostysh< at >lyx.org>

It passes here if called the first time (because of lyx configuring
shows too early, thus not yet accepting key strokes?)

#ctest -R 8684
Test project /usr/BUILD/BuildLyxGit
    Start 139: autotests/bug-8684
1/1 Test #139: autotests/bug-8684 ...............   Passed   62.10 sec

100% tests passed, 0 tests failed out of 1


#ctest -R 8684
Test project /usr/BUILD/BuildLyxGit
    Start 139: autotests/bug-8684
1/1 Test #139: autotests/bug-8684 ...............***Failed   10.28 sec

0% tests passed, 1 tests failed out of 1

Total Test time (real) =  10.50 sec

Kornel

[LyX master] RJournal.layout: remove unneeded code

Scott Kostyshak — 2013-05-21T05:31:50

The branch, master, has been updated.

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

commit 32a5a06db5ac4f5cb21f59c47fa906ed81d09d9a
Author: Scott Kostyshak <skostysh< at >lyx.org>
Date:   Tue May 21 01:28:26 2013 -0400

    RJournal.layout: remove unneeded code
    
    Part of this code was moved to the template in a previous commit
    and part was removed because it is no longer needed.
    
    Patch by Yihui Xie.

diff --git a/lib/layouts/RJournal.layout b/lib/layouts/RJournal.layout
index f7cca92..19e49b6 100644
--- a/lib/layouts/RJournal.layout
+++ b/lib/layouts/RJournal.layout
< at >< at > -18,13 +18,6 < at >< at > AddToPreamble
 \bibliographystyle{abbrvnat}
 \usepackage{booktabs}
 
-% use Schunk, Sinput and Soutput environments defined by RJournal
-<<include=FALSE>>=
-render_sweave()
-set_header(highlight = '')
-knit_hooks$set(document = hook_rjournal)
-< at >
-
 \fancyhf{}
 \fancyhead[LO,RE]{\textsc{Contributed Article}}
 \fancyhead[RO,LE]{\thepage}

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

[LyX master] Header cleanup cont.

Pavel Sanda — 2013-05-21T01:47:27

The branch, master, has been updated.

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

commit 707b099102aba7aab8180389bd14382bb2ca9849
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Mon May 20 18:47:16 2013 -0700

    Header cleanup cont.

diff --git a/src/frontends/qt4/GuiGraphics.h b/src/frontends/qt4/GuiGraphics.h
index 67a4cbe..7d32ce2 100644
--- a/src/frontends/qt4/GuiGraphics.h
+++ b/src/frontends/qt4/GuiGraphics.h
< at >< at > -20,8 +20,6 < at >< at >
 
 #include "insets/InsetGraphicsParams.h"
 
-#include "support/docstring.h"
-
 #include <vector>
 
 class QString;
diff --git a/src/frontends/qt4/GuiKeySymbol.h b/src/frontends/qt4/GuiKeySymbol.h
index d113f50..d178185 100644
--- a/src/frontends/qt4/GuiKeySymbol.h
+++ b/src/frontends/qt4/GuiKeySymbol.h
< at >< at > -13,8 +13,6 < at >< at >
 #ifndef GUIKEYSYM_H
 #define GUIKEYSYM_H
 
-#include "frontends/KeySymbol.h"
-
 class QKeyEvent;
 
 namespace lyx {
diff --git a/src/frontends/qt4/GuiParagraph.h b/src/frontends/qt4/GuiParagraph.h
index 201d9a0..aee410f 100644
--- a/s

[LyX master] UserGuide.lyx: port recent changes to master

Uwe Stöhr — 2013-05-20T23:45:30

The branch, master, has been updated.

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

commit 0dd01cfce8ec0d7224ce85e4821154d2d8956845
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Tue May 21 01:45:19 2013 +0200

    UserGuide.lyx: port recent changes to master

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index dc0cdd7..2252682 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -10302,8 +10302,8 < at >< at > Width of the different horizontal spaces.
 \begin_inset Tabular

 <lyxtabular version="3" rows="8" columns="2">

 <features rotate="0" tabularvalignment="middle">

-<column alignment="center" valignment="top" width="0">

-<column alignment="center" valignment="top" width="0">

+<column alignment="center" valignment="top">

+<column alignment="center" valignment="top">

 <row>

 <cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">

 \begin_inset Text

< at >< at > -15338,9 +15338,9 < at >< at > em dash
 \begin_inset Tabular

[LyX 2.0.x] UserGuide.lyx: next revision step

Uwe Stöhr — 2013-05-20T23:43:32

The branch, 2.0.x, has been updated.

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

commit 807e34674072986d8e770f3e9de29e0b930f75a9
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Tue May 21 01:43:07 2013 +0200

    UserGuide.lyx: next revision step
    
    - chapter A
    (now only chapter B needs to be done and the revision is done)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index ad993c0..b0c34be 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -21941,13 +21941,6 < at >< at > Minipages
 \end_inset

 

 

-\begin_inset CommandInset label

-LatexCommand label

-name "sec:Minipages"

-

-\end_inset

-

-

 \end_layout

 

 \begin_layout Standard

< at >< at > -26049,8 +26042,8 < at >< at > Outline
 Document\SpecialChar \menuseparator

 Outline

 \family default

- that is described in sec.

-\begin_inset space \thinspace{}

+ that is described in section

+\begin_inset space ~

 \end_inset

 

 

< at >< at > -35441,9 +35434,23 < at >< at > Here you can insert the following characters:
 \end_lay

[LyX master] Add autotests for #8684

Scott Kostyshak — 2013-05-20T22:52:53

The branch, master, has been updated.

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

commit 060bac3401f7a6cc3911285ff36f0b7280af1459
Author: Scott Kostyshak <skostysh< at >lyx.org>
Date:   Mon May 20 18:50:56 2013 -0400

    Add autotests for #8684
    
    (these should currently fail)

diff --git a/development/autotests/bug-8684-in.txt b/development/autotests/bug-8684-in.txt
new file mode 100644
index 0000000..c351b00
--- /dev/null
+++ b/development/autotests/bug-8684-in.txt
< at >< at > -0,0 +1,10 < at >< at >
+Lang en_US.utf8
+TestBegin ../bug-8684.lyx > lyx-log.txt 2>&1
+KK: \Ax
+KK: command-sequence change-next; change-reject; change-next\[Return]
+TestEnd
+
+TestBegin ../bug-8684.lyx > lyx-log.txt 2>&1
+KK: \Ax
+KK: command-sequence char-forward; change-next\[Return]
+TestEnd
diff --git a/development/autotests/bug-8684.lyx b/development/autotests/bug-8684.lyx
new file mode 100644
index 0000000..64f758f
--- /dev/null
+++ b/development/autotests/bug-8684.lyx
< at >< at > -0,0 +1,108 < at >< at >
+#LyX 2.0 created this fi

[LyX 2.0.x] UserGuide.lyx: next revision step

Uwe Stöhr — 2013-05-20T15:53:15

The branch, 2.0.x, has been updated.

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

commit edcdab9e2d8ff70e8515e9aad9e6dbb558974570
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Mon May 20 17:53:06 2013 +0200

    UserGuide.lyx: next revision step

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index f0b967e..ad993c0 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -34752,34 +34752,93 < at >< at > e., hunt for errors in the program) or to see what is going on in the background
 

 \begin_layout Subsection

 View

+\begin_inset space ~

+\end_inset

+

+[<output format>]

 \end_layout

 

 \begin_layout Standard

 This menu entry generates the output in the format you have specified as

- default output format either in the preferences (see sec.

-\begin_inset space \thinspace{}

+ default output format for the document (menu 

+\family sans

+Document\SpecialChar \menuseparator

+Settings\SpecialChar \menuseparator

+Output\SpecialChar \menuseparator

+Default

[LyX master] Update tex2lyx test cases to format 471

Vincent van Ravesteijn — 2013-05-20T12:41:20

The branch, master, has been updated.

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

commit b701eea8c869b7dbbda9bbdb68491441b1906e37
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Mon May 20 14:37:33 2013 +0200

    Update tex2lyx test cases to format 471

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 014de53..b497c30 100644
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
< at >< at > -1,5 +1,5 < at >< at >
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 470
+\lyxformat 471
 \begin_document
 \begin_header
 \textclass article
< at >< at > -51,7 +51,7 < at >< at >
 \use_package stmaryrd 0
 \use_package undertilde 0
 \cite_engine basic
-\cite_engine_type numerical
+\cite_engine_type default
 \biblio_style plain
 \use_bibtopic false
 \use_indices false
diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index 35fdfe4..a475919 100644
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
< at >< at > -1,5 +1,5 < at >< at >
 #LyX fi

[LyX master] Force encoding switch when switching from/to CJK, even if we use a customized encoding (#8558)

Juergen Spitzmueller — 2013-05-20T11:40:44

The branch, master, has been updated.

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

commit a8a2bd463c1ae7a14f1273604186131ff3798777
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Mon May 20 13:40:40 2013 +0200

    Force encoding switch when switching from/to CJK, even if we use a customized encoding (#8558)

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 0b45b5a..4883d1b 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
< at >< at > -1196,8 +1196,12 < at >< at > pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 {
 Encoding const & oldEnc = *runparams.encoding;
 bool moving_arg = runparams.moving_arg;
-if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
-|| moving_arg))
+// If we switch from/to CJK, we need to switch anyway, despite custom inputenc
+bool const from_to_cjk = 
+(oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
+|| (oldEnc.package() != Encoding::CJK && newEnc.package(

[LyX master] revert parts of 53002538 which set wrong local_font

Juergen Spitzmueller — 2013-05-20T10:31:50

The branch, master, has been updated.

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

commit a78bed06eb3d9ee0b5644944450bad4fbcfd0474
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Mon May 20 12:31:46 2013 +0200

    revert parts of 53002538 which set wrong local_font

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 697a3b5..0b45b5a 100644
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
< at >< at > -573,7 +573,6 < at >< at > void TeXOnePar(Buffer const & buf,
 
 if (style.pass_thru) {
 Font const outerfont = text.outerFont(pit);
-runparams.local_font = &par.getFirstFontSettings(bparams);
 parStartCommand(par, os, runparams, style);
 
 par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
< at >< at > -810,7 +809,6 < at >< at > void TeXOnePar(Buffer const & buf,
 }
 }
 
-runparams.local_font = &par.getFirstFontSettings(bparams);
 parStartCommand(par, os, runparams, style);
 Font const outerfont = text.outerFont(pit);
 
< at >< at > -891,7 +889,7 < at >< at > void TeXOnePar(Buffer const &

[LyX master] Handle secondary babel languages when main language is CJK

Juergen Spitzmueller — 2013-05-20T09:07:54

The branch, master, has been updated.

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

commit b65d5f201287ab09628007333f5c399835cbd624
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Mon May 20 11:07:47 2013 +0200

    Handle secondary babel languages when main language is CJK

diff --git a/src/Font.cpp b/src/Font.cpp
index c29156d..d00cbf2 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
< at >< at > -707,7 +707,8 < at >< at > void Font::validate(LaTeXFeatures & features) const
 // FIXME: Do something for background and soul package?
 
 if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
-     || (features.useBabel() && lang_->babel() != doc_language->babel()))
+     || (features.useBabel() && lang_->babel() != doc_language->babel())
+     || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
     && lang_ != ignore_language
     && lang_ != latex_language)
 {

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

[LyX master] installer: update dictionary for Norwegian

Uwe Stöhr — 2013-05-20T01:18:14

The branch, master, has been updated.

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

commit eb314aa5be3cca6d9e6565ee6aeca34b843516b7
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Mon May 20 03:18:11 2013 +0200

    installer: update dictionary for Norwegian

diff --git a/development/Win32/packaging/installer/ChangeLog.txt b/development/Win32/packaging/installer/ChangeLog.txt
index 3a02b67..bdb76f7 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
< at >< at > -1,4 +1,8 < at >< at >
-ï»¿Changelog for LyX-206-2:
+ï»¿Changelog for LyX-206-3:
+- updated spell-checker dictionaries for Norwegian(Bokmal)
+
+
+Changelog for LyX-206-2:
 - fix bug that View/Export a file as HTML did not work.
 - enable to use multiple indexes also with 64bit-MiKTeX
 - updated to Python 2.7.5 
diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh
index 5427092..97e9eb3 100644
--

[LyX master] UserGuide.lyx: next revision step

Uwe Stöhr — 2013-05-20T01:16:58

The branch, master, has been updated.

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

commit 03259396b9b4c1df751681da9466b5fe5ce145ad
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Mon May 20 03:16:44 2013 +0200

    UserGuide.lyx: next revision step
    
    - sec. A.1 - A.2 and a few others

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 27cebac..dc0cdd7 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -1,5 +1,5 < at >< at >
 #LyX 2.1 created this file. For more info see http://www.lyx.org/

-\lyxformat 469

+\lyxformat 471

 \begin_document

 \begin_header

 \textclass scrbook

< at >< at > -107,7 +107,7 < at >< at > enumitem
 \use_package stmaryrd 0

 \use_package undertilde 0

 \cite_engine basic

-\cite_engine_type numerical

+\cite_engine_type default

 \biblio_style plain

 \use_bibtopic false

 \use_indices false

< at >< at > -138,12 +138,11 < at >< at > enumitem
 \papercolumns 1

 \papersides 2

 \paperpagestyle default

-\tracking_changes true

+\tracking_changes false

 \output_chan

[LyX 2.0.x] UserGuide.lyx: next revision step

Uwe Stöhr — 2013-05-20T01:13:47

The branch, 2.0.x, has been updated.

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

commit dd964ac38afa0bf607e64e4c528af4675772660e
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Mon May 20 03:13:32 2013 +0200

    UserGuide.lyx: next revision step
    
    - sec. A.1 - A.2 and a few others

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index b3378d4..f0b967e 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
< at >< at > -33655,7 +33655,7 < at >< at > Plain
 \begin_inset space ~

 \end_inset

 

-Text

+text

 \family default

 , line breaks in the text will start a new paragraph; when using the menu

  entry 

< at >< at > -33664,7 +33664,11 < at >< at > Plain
 \begin_inset space ~

 \end_inset

 

-Text, Join

+Text,

+\begin_inset space ~

+\end_inset

+

+Join

 \begin_inset space ~

 \end_inset

 

< at >< at > -33736,7 +33740,7 < at >< at > yX format of the special LyX
 \begin_inset Newline newline

 \end_inset

 

- Since LyX 1.5.0 CJK support as been fully integrated into LyX.

+ Since LyX 1.5.0 CJK suppo

[LyX master] Header cleanup cont.

Pavel Sanda — 2013-05-20T01:08:56

The branch, master, has been updated.

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

commit 4c0ef382009943bca43caf691614be81d513a135
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Sun May 19 18:07:53 2013 -0700

    Header cleanup cont.

diff --git a/src/ServerSocket.h b/src/ServerSocket.h
index 2b2ddd1..7364250 100644
--- a/src/ServerSocket.h
+++ b/src/ServerSocket.h
< at >< at > -15,7 +15,6 < at >< at >
 #define LYXSERVERSOCKET_H
 
 #include "support/FileName.h"
-#include "support/socktools.h"
 
 #include "support/shared_ptr.h"
 
diff --git a/src/TextClass.h b/src/TextClass.h
index e4c2461..faacfa0 100644
--- a/src/TextClass.h
+++ b/src/TextClass.h
< at >< at > -11,7 +11,6 < at >< at >
 #define TEXTCLASS_H
 
 #include "Citation.h"
-#include "ColorCode.h"
 #include "Counters.h"
 #include "DocumentClassPtr.h"
 #include "FloatList.h"
diff --git a/src/frontends/Clipboard.h b/src/frontends/Clipboard.h
index 282ac1d..980c6bc 100644
--- a/src/frontends/Clipboard.h
+++ b/src/frontends/Clipboard.h
< at >< at > -16,7 +16,6 < at >< at >
 
 #include "Cu

[LyX master] Fix zombie toolbars (bug 8520)

Vincent van Ravesteijn — 2013-05-19T20:22:53

The branch, master, has been updated.

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

commit c8d685c665587fe24b57b61189e25c3b8b8c15ca
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Sun May 19 22:04:29 2013 +0200

    Fix zombie toolbars (bug 8520)
    
    If there is a new toolbar, it will not be restored by Qt and we need to
    initialize it ourselves. However, it is not so easy to find out which
    toolbars are restored by Qt and which are not. For this, the setVisible
    function of GuiToolbar is 'misused'. If the visibility is set, the toolbar
    must have been restored by Qt and we should leave it alone.

diff --git a/src/frontends/qt4/GuiToolbar.cpp b/src/frontends/qt4/GuiToolbar.cpp
index b459c60..507e847 100644
--- a/src/frontends/qt4/GuiToolbar.cpp
+++ b/src/frontends/qt4/GuiToolbar.cpp
< at >< at > -53,7 +53,8 < at >< at > namespace frontend {
 
 GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
 : QToolBar(toqstr(tbinfo.gui_name), &owner), visibility_(0),
-  ow

[LyX master] Fix bug 7673 by reverting changes to BufferView::checkDepm

Vincent van Ravesteijn — 2013-05-19T20:22:43

The branch, master, has been updated.

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

commit 97405fa6235c9ed6c8b40c651bd21b69955a88e4
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Sun May 19 14:42:27 2013 +0200

    Fix bug 7673 by reverting changes to BufferView::checkDepm
    
    This reverts commit 210a4406 and a part of 5577e877.

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index daa05a6..d26f949 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
< at >< at > -2400,9 +2400,12 < at >< at > bool BufferView::checkDepm(Cursor & cur, Cursor & old)
 return false;
 
 d->cursor_ = cur;
+
+// we would rather not do this here, but it needs to be done before 
+ // the changed() signal is sent.
+buffer_.updateBuffer();
 
-cur.forceBufferUpdate();
-cur.screenUpdateFlags(Update::Force);
+buffer_.changed(true);
 return true;
 }
 
diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 7f8edc2..3ad16f4 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
< at >< at > -2048,12 +2048,8 < at >< at > bool Cursor:

[LyX master] installer: really fix splitindex support this time

Uwe Stöhr — 2013-05-19T16:46:24

The branch, master, has been updated.

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

commit 1c362cc773dcbea697fa964f078b879ef8838a97
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Sun May 19 18:46:14 2013 +0200

    installer: really fix splitindex support this time
    
    - for splitindex the installer has to install Perl to MiKTeX but 64bit MiKTeX works with Perl using a different folder structure than 32bit MiKTeX

diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh b/development/Win32/packaging/installer/include/LaTeX.nsh
index 0078460..7883313 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
< at >< at > -289,7 +289,9 < at >< at > Function ConfigureMiKTeX
      MessageBox MB_OK|MB_ICONINFORMATION "$(MultipleIndexesNotAvailable)"
     ${endif}
    ${else}
-    ${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
+    # ${FileExists} is disabled for now to repair existing LyX installations using 64bit MiK

[LyX master] Increase the uniqueness of the temp directories

Vincent van Ravesteijn — 2013-05-19T12:10:08

The branch, master, has been updated.

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

commit 762c4eca5734b4d504ab28308a10d725a4790d5c
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Sun May 19 14:07:14 2013 +0200

    Increase the uniqueness of the temp directories
    
    Now, the temporary directories are composed of the PID + 8 random
    characters. This used to be the PID + 2 random characters.
    
    See also 327f7ed90dbcaad92511b962a8d1d14b46ef552a.

diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp
index fa8cdac..f048930 100644
--- a/src/support/FileName.cpp
+++ b/src/support/FileName.cpp
< at >< at > -443,7 +443,7 < at >< at > static string createTempFile(QString const & mask)
 //        same file again. To make this safe the QTemporaryFile object
 //        needs to be kept for the whole life time of the temp file name.
 //        This can be achieved by using the TempFile class.
-QTemporaryFile qt_tmp(mask);
+QTemporaryFile qt_tmp(mask + ".XXXXXXXXXXXX");
 if (qt

[LyX master] Disallow to insert an inset without a font

Vincent van Ravesteijn — 2013-05-19T11:19:10

The branch, master, has been updated.

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

commit 30f518707009150cbe6ef13d717d535b61f584df
Author: Vincent van Ravesteijn <vfr< at >lyx.org>
Date:   Sun May 19 12:39:01 2013 +0200

    Disallow to insert an inset without a font
    
    Doing so could lead to an assertion in Paragraph::fontSpan.

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 0777a78..7fd271c 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
< at >< at > -767,7 +767,7 < at >< at > void Paragraph::Private::insertChar(pos_type pos, char_type c,
 
 
 bool Paragraph::insertInset(pos_type pos, Inset * inset,
-   Change const & change)
+   Font const & font, Change const & change)
 {
 LASSERT(inset, return false);
 LASSERT(pos >= 0 && pos <= size(), return false);
< at >< at > -785,6 +785,7 < at >< at > bool Paragraph::insertInset(pos_type pos, Inset * inset,
 
 // Some insets require run of spell checker
 requestSpellCheck(pos);
+setFont(pos, font);
 return true;
 }
 
< at >< at > -1782,16 +1783,6 < at >< at > voi