[LyX/master] Prevent the most important case of bug #9012

[Georg Baum]

commit 1b675d3a62c6bf14fe3a4b3933b913a28fde9a4a
Author: Georg Baum b...@lyx.org
Date:   Sun Mar 9 10:30:20 2014 +0100

Prevent the most important case of bug #9012

Currently you can easily create an uncompilable document if you insert
non-ASCII characters in a pass-through paragraph (e.g. ERT inset or verbatim
style). This commit prevents entering these characters directly, but of
course they can still be inserted via tricks, e.g. changing a standard
paragraph to verbatim. A complete fix would handle this case as well,
and also change the fixed latin1 encoding of latex_language to a dynamic 
one,
so that a verbatim paragraph can contain any character that is encodable in
the encoding of its environment.

diff --git a/src/Text.cpp b/src/Text.cpp
index 70805df..c4cac88 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -30,6 +30,7 @@
 #include Cursor.h
 #include CutAndPaste.h
 #include DispatchResult.h
+#include Encoding.h
 #include ErrorList.h
 #include FuncRequest.h
 #include factory.h
@@ -1004,6 +1005,16 @@ void Text::insertChar(Cursor  cur, char_type c)
}
}
 
+   // Prevent to insert uncodable characters in verbatim and ERT
+   // (workaround for bug 9012)
+   if (cur.paragraph().isPassThru()  cur.current_font.language()) {
+   Encoding const * e = cur.current_font.language()-encoding();
+   if (!e-encodable(c)) {
+   cur.message(_(Character is uncodable in verbatim 
paragraphs.));
+   return;
+   }
+   }
+
par.insertChar(cur.pos(), c, cur.current_font,
cur.buffer()-params().trackChanges);
cur.checkBufferStructure();

[LyX/master] de.po: update

[Juergen Spitzmueller]

commit 28a1fdfa4642726e3409a439e8913d53c3f90c0f
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Mar 9 10:43:51 2014 +0100

de.po: update

diff --git a/po/de.gmo b/po/de.gmo
index fbd7f1a..308b7d9 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 6eab40c..db35b5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr 
 Project-Id-Version: LyX 2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-09 10:36+0100\n
-PO-Revision-Date: 2014-02-26 08:42+0100\n
+PO-Revision-Date: 2014-03-09 10:43+0100\n
 Last-Translator: Jürgen Spitzmüller spitzmuel...@ds.uzh.ch\n
 Language-Team: German kde-i18n...@kde.org\n
 Language: de\n
@@ -1013,12 +1013,11 @@ msgstr Der Bereich, auf den die Suche sich erstreckt
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:206
 msgid Scope
-msgstr 
+msgstr Bereich
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:218
-#, fuzzy
 msgid Current document
-msgstr Aktuelles Dokument
+msgstr Aktuelles Dokument
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:237
 msgid 
@@ -1028,7 +1027,7 @@ msgstr Alle Dokumente, die zum selben Hauptdokument wie 
das aktuelle gehören
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:240
 msgid Master document
-msgstr Hauptdokument
+msgstr Hauptdokument
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:250
 msgid All open documents
@@ -1039,9 +1038,8 @@ msgid Open documents
 msgstr Geöffnete Dokumente
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:263
-#, fuzzy
 msgid All manuals
-msgstr Alle LyX-Handbücher
+msgstr Alle LyX-Handbücher
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:281
 msgid 
@@ -1052,7 +1050,6 @@ msgstr 
 die den ausgewählten Text- und Absatzstil verwenden.
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:284
-#, fuzzy
 msgid Ignore format
 msgstr Ignoriere Format
 
@@ -1073,7 +1070,6 @@ msgid Expand macros
 msgstr Makros ausklappen
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:314
-#, fuzzy
 msgid Search only in maths
 msgstr Nur im Mathe-Umfeld
 
@@ -24653,7 +24649,7 @@ msgstr 
 
 #: src/Text.cpp:1013
 msgid Character is uncodable in verbatim paragraphs.
-msgstr 
+msgstr Das Zeichen ist in unformatierten Absätzen nicht kodierbar.
 
 #: src/Text.cpp:1850
 msgid [Change Tracking] 

[LyX/master] Disable unicode math symbol replacement.

[Georg Baum]

commit 23752e6114aab1d88b60fa59620d4100eeb94e9b
Author: Georg Baum b...@lyx.org
Date:   Sun Mar 9 10:56:05 2014 +0100

Disable unicode math symbol replacement.

This seems to work only in some cases, so better display the symbol in ERT.

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 961e70e..274acd9 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -120,6 +120,8 @@ bool canBeDisplayed(char_type c)
 
 bool isUnicodeSymbolAvailable(docstring const  name, char_type  c)
 {
+   // this is too fragile, e.g. prodes W instead of capital omega on OS X
+#if 0
docstring cmd(from_ascii(\\) + name);
bool is_combining;
bool termination;
@@ -133,6 +135,7 @@ bool isUnicodeSymbolAvailable(docstring const  name, 
char_type  c)
is_combining, termination);
}
return c != 0  !is_combining;
+#endif
 }
 
 

[LyX/master] correct author data

[Juergen Spitzmueller]

commit 7303f0caad297d4aacc3e83f43ec0565496f6dd8
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Mar 9 11:17:14 2014 +0100

correct author data

diff --git a/po/de.po b/po/de.po
index db35b5e..7b6d7ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,9 +96,9 @@ msgstr 
 Project-Id-Version: LyX 2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
 POT-Creation-Date: 2014-03-09 10:36+0100\n
-PO-Revision-Date: 2014-03-09 10:43+0100\n
-Last-Translator: Jürgen Spitzmüller spitzmuel...@ds.uzh.ch\n
-Language-Team: German kde-i18n...@kde.org\n
+PO-Revision-Date: 2014-03-09 11:16+0100\n
+Last-Translator: Jürgen Spitzmüller sp...@lyx.org\n
+Language-Team: German lyx-de...@lists.lyx.org\n
 Language: de\n
 MIME-Version: 1.0\n
 Content-Type: text/plain; charset=UTF-8\n

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

[spitz]

Author: spitz
Date: Sun Mar  9 11:22:43 2014
New Revision: 40988
URL: http://www.lyx.org/trac/changeset/40988

Log:
update trunk stats

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

Modified: www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc
==
--- www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc Sat Feb  1 20:00:44 
2014(r40987)
+++ www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc Sun Mar  9 11:22:43 
2014(r40988)
@@ -7,96 +7,96 @@
 // The data itself
 $podata = array (
 array ( 'langcode' = 'ar', date = 2014-01-10,
-msg_tr = 4874, msg_fu = 430, msg_nt = 1156,
+msg_tr = 4867, msg_fu = 440, msg_nt = 1154,
 translator = Hatim Alahmadi, email = Dr ! hatim () hotmail ! com),
 array ( 'langcode' = 'ca', date = 2008-07-28,
-msg_tr = 2938, msg_fu = 1976, msg_nt = 1546,
+msg_tr = 2938, msg_fu = 1978, msg_nt = 1545,
 translator = joan, email = joan () montane ! cat),
 array ( 'langcode' = 'cs', date = 2013-06-15,
-msg_tr = 5757, msg_fu = 331, msg_nt = 372,
+msg_tr = 5771, msg_fu = 327, msg_nt = 363,
 translator = Pavel Sanda, email = sanda () lyx ! org),
 array ( 'langcode' = 'da', date = 2011-04-20,
-msg_tr = 3692, msg_fu = 1637, msg_nt = 1131,
+msg_tr = 3688, msg_fu = 1644, msg_nt = 1129,
 translator = Jesper Stemann Andersen, email = jesper () sait ! dk),
-array ( 'langcode' = 'de', date = 2014-01-27,
-msg_tr = 6460, msg_fu = 0, msg_nt = 0,
+array ( 'langcode' = 'de', date = 2014-03-09,
+msg_tr = 6461, msg_fu = 0, msg_nt = 0,
 translator = J#252;rgen Spitzm#252;ller, email = spitz () lyx ! 
org),
 array ( 'langcode' = 'el', date = 2010-07-07,
-msg_tr = 3192, msg_fu = 962, msg_nt = 2306,
+msg_tr = 3187, msg_fu = 968, msg_nt = 2306,
 translator = #927;#948;#965;#963;#963;#941;#945;#962; 
#916;#945;#947;#954;#955;#942;#962;, email = o2d () freemail ! gr),
 array ( 'langcode' = 'es', date = 2013-06-21,
-msg_tr = 6405, msg_fu = 42, msg_nt = 13,
+msg_tr = 6394, msg_fu = 52, msg_nt = 15,
 translator = Ignacio Garc#237;a, email = ignacio ! gmorales () gmail 
! com),
 array ( 'langcode' = 'eu', date = 2012-06-21,
-msg_tr = 5206, msg_fu = 685, msg_nt = 569,
+msg_tr = 5197, msg_fu = 694, msg_nt = 570,
 translator = I#241;aki Larra#241;aga Murgoitio, email = dooteo () 
zundan ! com),
 array ( 'langcode' = 'fi', date = 2007-07-14,
-msg_tr = 2901, msg_fu = 2254, msg_nt = 1305,
+msg_tr = 2913, msg_fu = 2248, msg_nt = 1300,
 translator = Martin Vermeer, email = martin ! vermeer () tkk ! fi),
-array ( 'langcode' = 'fr', date = 2013-11-30,
-msg_tr = 6456, msg_fu = 3, msg_nt = 1,
+array ( 'langcode' = 'fr', date = 2014-01-23,
+msg_tr = 6444, msg_fu = 14, msg_nt = 3,
 translator = Jean-Pierre Chr#233;tien, email = jeanpierre ! chretien 
() free ! fr),
 array ( 'langcode' = 'gl', date = 2007-07-11,
-msg_tr = 3052, msg_fu = 2190, msg_nt = 1218,
+msg_tr = 3052, msg_fu = 2194, msg_nt = 1215,
 translator = Ramon Flores, email = fa2ramon () usc ! es),
 array ( 'langcode' = 'he', date = 2013-10-26,
-msg_tr = 3226, msg_fu = 1683, msg_nt = 1551,
+msg_tr = 3222, msg_fu = 1690, msg_nt = 1549,
 translator = Gilad Orr, email = giladorr () gmail ! com),
 array ( 'langcode' = 'hu', date = 2011-04-26,
-msg_tr = 4486, msg_fu = 1165, msg_nt = 809,
+msg_tr = 4483, msg_fu = 1172, msg_nt = 806,
 translator = Sz#337;ke S#225;ndor, email = alex () lyx ! hu),
 array ( 'langcode' = 'ia', date = 2013-09-03,
-msg_tr = 6298, msg_fu = 43, msg_nt = 119,
+msg_tr = 6287, msg_fu = 53, msg_nt = 121,
 translator = G.Sora, email = g ! sora () tiscali ! it),
 array ( 'langcode' = 'id', date = 2012-02-01,
-msg_tr = 5103, msg_fu = 768, msg_nt = 589,
+msg_tr = 5097, msg_fu = 775, msg_nt = 589,
 translator = Waluyo Adi Siswanto, email = was ! uthm () gmail ! com),
-array ( 'langcode' = 'it', date = 2013-11-24,
-msg_tr = 6454, msg_fu = 5, msg_nt = 1,
+array ( 'langcode' = 'it', date = 2014-03-09,
+msg_tr = 6460, msg_fu = 0, msg_nt = 1,
 translator = Enrico Forestieri, email = forenr () lyx ! org),
 array ( 'langcode' = 'ja', date = 2013-08-30,
-msg_tr = 6447, msg_fu = 11, msg_nt = 2,
+msg_tr = 6436, msg_fu = 21, msg_nt = 4,
 translator = Koji Yokota, email = yokota () res ! otaru-uc ! ac ! 
jp),
 array ( 'langcode' = 'nb', date = 2013-11-06,
-msg_tr = 6216, msg_fu = 120, msg_nt = 124,
+msg_tr = 6206, msg_fu = 130, msg_nt = 125,
 translator = Helge Hafting, email = helge ! hafting () aitel ! hist ! 
no),
 array ( 'langcode' = 'nl', date = 2011-12-08,
-msg_tr = 2778, msg_fu = 964, msg_nt = 2718,
+msg_tr = 2778, msg_fu = 970, msg_nt = 2713,
 translator = Timo Kluck, email = tkluck () infty ! nl),
 array ( 'langcode' = 'nn', date = 2013-05-01,
-msg_tr = 5159, msg_fu = 717, msg_nt = 584,
+msg_tr = 5153, msg_fu = 724, msg_nt = 584,
 translator = Ingar Pareliussen, email = ),
 array ( 'langcode' = 'pl', date = 2012-11-03,
-msg_tr = 4525, msg_fu = 1155, msg_nt = 780,
+msg_tr = 4521, msg_fu = 1162, msg_nt = 778,
 translator = Micha#322; Fita, email = michal ! fita () 

[LyX/master] Add Korean Splash, provided by Dal Ho Park

[Juergen Spitzmueller]

commit 2c2b5e48418794966ac5a0bd8463a21bcf10f987
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Mar 9 12:46:56 2014 +0100

Add Korean Splash, provided by Dal Ho Park

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 29f7631..d0127a6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -181,6 +181,10 @@ dist_jaexamples_DATA = \
examples/ja/xyfigure.png \
examples/ja/xypic.lyx
 
+koexamplesdir = $(pkgdatadir)/examples/ko
+dist_koexamples_DATA = \
+   examples/ko/splash.lyx
+
 nlexamplesdir = $(pkgdatadir)/examples/nl
 dist_nlexamples_DATA = \
examples/nl/opsommingstekens.lyx \
diff --git a/lib/examples/ko/splash.lyx b/lib/examples/ko/splash.lyx
new file mode 100644
index 000..445794f
--- /dev/null
+++ b/lib/examples/ko/splash.lyx
@@ -0,0 +1,185 @@
+#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 false
+\maintain_unincluded_children false
+\language korean
+\language_package default
+\inputencoding utf8
+\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 0
+\use_package amssymb 0
+\use_package cancel 0
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\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 0
+\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 false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Title
+LyX에 오신 것을 환영합니다!
+\end_layout
+
+\begin_layout Section*
+LyX 사용시 알아야되는 가장 중요한 것들
+\end_layout
+
+\begin_layout Enumerate
+LyX는 훌륭한 문서를 동반합니다 - 사용하세요! 문서에 대한 간략한 소개를 제공하는
+\family sans
+ 도움말\SpecialChar \menuseparator
+소개
+\family default
+ 메뉴에서 시작하세요.
+ 그 다음
+\family sans
+ 도움말\SpecialChar \menuseparator
+자습서
+\family default
+를 통해 LyX 사용법을 익히세요.
+ 
+\end_layout
+
+\begin_layout Enumerate
+우리는 LyX를 
+\begin_inset Quotes eld
+\end_inset
+
+문서 처리기
+\begin_inset Quotes erd
+\end_inset
+
+라고 부릅니다.
+ 설계상 문서 작성을 쉽게 만든다는 측면에서 일반 워드 프로세서와는 다릅니다.
+ 차이점은 아주 적으니 겁부터 먹진 마세요.
+ 문서를 보면 확실해질 것입니다.
+\end_layout
+
+\begin_layout Enumerate
+LyX의 출력물은 아주 훌륭합니다! 메뉴에서 
+\family sans
+보기\SpecialChar \menuseparator
+
+\begin_inset space ~
+\end_inset
+
+[PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)]로 보기
+\family default
+를 선택하거나 툴바에서 
+\begin_inset Info
+type  icon
+arg   buffer-view
+\end_inset
+
+ 버튼을 선택해서 직접 보세요.
+\end_layout
+
+\begin_layout Enumerate
+그렇습니다, LyX는 (거의) 모든 LaTeX 기능들을 흉내낼 수 있습니다.
+ 그리고 또한 LyX는 LaTeX 파일들을 가져올 수 있습니다.
+ LaTeX 사용 경험이 있는 사용자들은 나머지 
+\emph on
+자습서
+\emph default
+를 생략하고, 
+\begin_inset Quotes eld
+\end_inset
+
+LaTeX 사용자를 위한 LyX
+\begin_inset Quotes erd
+\end_inset
+
+ 장을 읽어주세요.
+ (해당되지 않는 모든 사람들: 걱정 마시압, LyX 사용을 위해 LaTeX를 꼭 알아야할 필요는 없습니다.) 
+\end_layout
+
+\begin_layout Enumerate
+LyX는 영어 이외의 언어를 읽고 쓰는 사람들을 위한 많은 기능을 가지고 있습니다.
+ 덧붙여, 키바인딩, 툴바, 다른 많은 특성들이 설정 변경 가능합니다.
+ 자세한 것은
+\family sans
+ 도움말(Help)\SpecialChar \menuseparator
+Customization
+\family default
+을 보세요.
+\end_layout
+
+\begin_layout Enumerate
+LyX 홈페이지는
+\family typewriter
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.lyx.org/
+\end_layout
+
+\end_inset
+
+
+\family default
+입니다.
+ LyX에 대한 정보를 얻고, LyX 메일링 리스트에 가입하고, LyX 그림으로 배우기(Graphical Tour) 등 많은 것을 할 수 
있습니다.
+\end_layout
+
+\end_body
+\end_document

[LyX/master] Update credits and add Dal Ho Park.

[Juergen Spitzmueller]

commit cefbd644f3f8c6baa92613c7de40e1ea06a5305d
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Mar 9 12:53:47 2014 +0100

Update credits and add Dal Ho Park.

diff --git a/lib/CREDITS b/lib/CREDITS
index 6a0444d..98339e0 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -1,3 +1,6 @@
+@bRamanathan Vishnampet
+@iE-mail: rvishnampet () gmail ! com
+   Support for g++ on 4.8 Mac
 @bRonen Abravanel
 @iE-mail: ronena () gmail ! com
Support for feyn diagrams
@@ -193,9 +196,15 @@
 @bClaus Hentschel
 @iE-mail: claus.hentschel () mbau ! fh-hannover ! de
Win32 port of LyX 1.1.x
+@bJosh Hieronymous
+@iE-mail: josh.p.hieronymus () gmail ! com
+   XHTML and ePub Improvements (GSOC Student)
 @bClaus Hindsgaul
 @iE-mail: claus_h () image ! dk
Danish translation
+@bMartin Hoffmann
+@iE-mail: hoffimar () gmail ! com
+   Dialog usability fix
 @bBernard Hurley
 @iE-mail: bernard () fong-hurley ! org ! uk
Fixes to literate programming support
@@ -321,6 +330,9 @@
 @bGünter Milde
 @iE-mail: milde () users ! berlios ! de
Unicode and layout file fixes
+@bDustin J. Mitchell
+@iE-mail: dustin () v ! igoro ! us
+   Fix for csv2lyx
 @bJoan Montané
 @iE-mail: jmontane () gmail ! com
Catalan translations of menus
@@ -348,12 +360,18 @@
 @bCarl Ollivier-Gooch
 @iE-mail: cfog () mech ! ubc ! ca
Support for two-column figure (figure*) and table (table*) environments.  
Fixed minibuffer entry of floats.
+@bGilad Orr
+@iE-mail: giladorr () gmail ! com
+   Hebrew translation.
 @bPanayotis PAP Papasotiriou
 @iE-mail: papasot () upatras ! gr
Support for kluwer and ijmpd document classes
 @bAndrey V. Panov
 @iE-mail: panov () canopus ! iacp ! dvo ! ru
Russian translation of the user interface
+@bDal Ho Park
+@iE-mail: airdalho () gmail ! com
+   Korean translation
 @bBo Peng
 @iE-mail: ben.bob () gmail ! com
Conversion of all shell scripts to Python, shortcuts dialog, session, 
view-source, auto-view, embedding features and scons build system.
@@ -366,6 +384,9 @@
 @bZvezdan Petkovic
 @iE-mail: zpetkovic () acm ! org
Better support for serbian and serbocroatian
+@bPrannoy Pilligundla
+@iE-mail: prannoy.bits () gmail ! com
+   Full screen statusbar toggling
 @bGeoffroy Piroux
 @iE-mail: piroux () fyma ! ucl ! ac ! be
Mathematica backend for mathed
@@ -432,6 +453,9 @@
 @bPaul A. Rubin
 @iE-mail: rubin () msu ! edu
Major rework of the AMS classes
+@bGuy Rutenberg
+@iE-mail: guyrutenberg () gmail ! com
+   System call fixes
 @bRan Rutenberg
 @iE-mail: ran.rutenberg () gmail ! com
Hebrew translation
@@ -567,6 +591,9 @@
 @bRuss Woodroofe
 @iE-mail: paranoia () math ! cornell ! edu
question layout environment
+@bMingyi Wu
+@iE-mail: mingi.eo97g () g2 ! nctu ! edu ! tw
+   Chinese (traditional) translations
 @bYihui Xie
 @iE-mail: xie () yihui ! name
Bugfixing, Chinese translation, Sweave support
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 72a8bf2..a43a8ed 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -1307,6 +1307,14 @@ contributors = [
  24 December 2007,
  uRussian translation of the user interface),
 
+ contributor(u'Dal Ho Park',
+ airdalho () gmail ! com,
+ GPL,
+ splash.lyx translation (Korean),
+ m=139436383128181,
+ 9 March 2014,
+ uKorean translation),
+
  contributor(u'Bo Peng',
  ben.bob () gmail ! com,
  GPL,

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

[spitz]

Author: spitz
Date: Sun Mar  9 12:56:54 2014
New Revision: 40989
URL: http://www.lyx.org/trac/changeset/40989

Log:
Update credits

Modified:
   www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
   www-user/trunk/farm/cookbook/LyX/credits.inc

Modified: www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
==
--- www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
11:22:43 2014(r40988)
+++ www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
12:56:54 2014(r40989)
@@ -43,6 +43,12 @@
 
 dl;
 
+$output=$output.blanket_contrib(Ramanathan Vishnampet,
+rvishnampet () gmail ! com,
+Re: [Patch] -fobjc-exceptions for compiling linkback sources with g++ 
on Mac,
+,
+17 February 2014);
+
 $output=$output.blanket_contrib(Ronen Abravanel,
 ronena () gmail ! com,
 Re: Patch: Diagram inset,
@@ -409,12 +415,24 @@
 m=124190107613441,
 9 May 2009);
 
+$output=$output.blanket_contrib(Josh Hieronymous,
+josh.p.hieronymus () gmail ! com,
+licensing my contributions to LyX,
+m=137426932127289,
+19 July 2013);
+
 $output=$output.blanket_contrib(Claus Hindsgaul,
 claus_h () image ! dk,
 Re: The LyX licence,
 m=110908607416324,
 22 February 2005);
 
+$output=$output.blanket_contrib(Martin Hoffmann,
+hoffimar () gmail ! com,
+Re: #8703: 'new shortcut' box closes if no shortcut,
+m=138105799411067,
+6 October 2013);
+
 $output=$output.blanket_contrib(Bernard Hurley,
 bernard () fong-hurley ! org ! uk,
 Re: The LyX licence --- a gentle nudge,
@@ -637,6 +655,12 @@
 m=122398147620761,
 14 October 2008);
 
+$output=$output.blanket_contrib(Dustin J. Mitchell,
+dustin () v ! igoro ! us,
+Fwd: Your patch for LyX,
+m=139255709609015,
+16 February 2014);
+
 $output=$output.blanket_contrib(Joan Montané,
 jmontane () gmail ! com,
 Re: LyX translation updates needed,
@@ -679,6 +703,12 @@
 m=111220662413921,
 30 March 2005);
 
+$output=$output.blanket_contrib(Gilad Orr,
+giladorr () gmail ! com,
+Internationalization-Hebrew,
+m=138314500901798,
+28 October 2013);
+
 $output=$output.blanket_contrib(Panayotis quot;PAPquot; Papasotiriou,
 papasot () upatras ! gr,
 Re: The LyX licence,
@@ -691,6 +721,12 @@
 m=119853644302866,
 24 December 2007);
 
+$output=$output.blanket_contrib(Dal Ho Park,
+airdalho () gmail ! com,
+splash.lyx translation (Korean),
+m=139436383128181,
+9 March 2014);
+
 $output=$output.blanket_contrib(Bo Peng,
 ben.bob () gmail ! com,
 Re: Python version of configure script (preview version),
@@ -709,6 +745,12 @@
 m=111276877900892,
 6 April 2005);
 
+$output=$output.blanket_contrib(Prannoy Pilligundla,
+prannoy.bits () gmail ! com,
+Contribution license,
+m=139332446711707,
+25 February 2014);
+
 $output=$output.blanket_contrib(Benjamin Piwowarski,
 benjamin ! piwowarski () lip6 ! fr,
 GPL statement,
@@ -829,6 +871,12 @@
 m=119072721929143,
 25 September 2007);
 
+$output=$output.blanket_contrib(Guy Rutenberg,
+guyrutenberg () gmail ! com,
+Re: [PATCH] Strange Behaivor: xdg-open left as zombie,
+m=137365070116624,
+12 July 2013);
+
 $output=$output.blanket_contrib(Ran Rutenberg,
 ran.rutenberg () gmail ! com,
 The New Hebrew Translation of the Introduction,
@@ -1057,6 +1105,12 @@
 m=123091448326090,
 1 January 2009);
 
+$output=$output.blanket_contrib(Mingyi Wu,
+mingi.eo97g () g2 ! nctu ! edu ! tw,
+newcomer,
+m=139389779502232,
+3 March 2014);
+
 $output=$output.blanket_contrib(Yihui Xie,
 xie () yihui ! name,
 GPL Statement,

Modified: www-user/trunk/farm/cookbook/LyX/credits.inc
==
--- www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 11:22:43 
2014(r40988)
+++ www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 12:56:54 
2014(r40989)
@@ -40,6 +40,10 @@
 
 dl;
 
+$output=$output.credits_contrib(Ramanathan Vishnampet,
+rvishnampet () gmail ! com,
+Support for g++ on 4.8 Mac);
+
 $output=$output.credits_contrib(Ronen Abravanel,
 ronena () gmail ! com,
 Support for feyn diagrams);
@@ -316,10 +320,18 @@
 claus.hentschel () mbau ! fh-hannover ! de,
 Win32 port of LyX 1.1.x);
 
+$output=$output.credits_contrib(Josh Hieronymous,
+josh.p.hieronymus () gmail ! com,
+XHTML and ePub Improvements (GSOC Student));
+
 $output=$output.credits_contrib(Claus Hindsgaul,
 

[LyX/master] Re-sort credits.

[Juergen Spitzmueller]

commit 030d75187c03934f4e7f4f363251ad4620063d3d
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Mar 9 13:07:30 2014 +0100

Re-sort credits.

diff --git a/lib/CREDITS b/lib/CREDITS
index 98339e0..f61e57b 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -1,6 +1,3 @@
-@bRamanathan Vishnampet
-@iE-mail: rvishnampet () gmail ! com
-   Support for g++ on 4.8 Mac
 @bRonen Abravanel
 @iE-mail: ronena () gmail ! com
Support for feyn diagrams
@@ -561,6 +558,9 @@
 @bPauli Virtanen
 @iE-mail: pauli.virtanen () hut ! fi
Finnish localization of the interface
+@bRamanathan Vishnampet
+@iE-mail: rvishnampet () gmail ! com
+   Support for g++ on 4.8 Mac
 @bHerbert Voß
 @iE-mail: herbert.voss () alumni ! tu-berlin ! de
The one who answers all questions on lyx-users mailing list and maintains 
www.lyx.org/help/ Big insetgraphics and bibliography cleanups
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index a43a8ed..0c7e59a 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -315,14 +315,6 @@ def main(argv, contributors):
 # Store the raw data.
 contributors = [
 
- contributor(uRamanathan Vishnampet,
- rvishnampet () gmail ! com,
- GPL,
- Re: [Patch] -fobjc-exceptions for compiling linkback sources 
with g++ on Mac,
- ,
- 17 February 2014,
- uSupport for g++ on 4.8 Mac),
-
  contributor(uRonen Abravanel,
  ronena () gmail ! com,
  GPL,
@@ -1819,6 +1811,14 @@ contributors = [
  23 February 2005,
  uFinnish localization of the interface),
 
+ contributor(uRamanathan Vishnampet,
+ rvishnampet () gmail ! com,
+ GPL,
+ Re: [Patch] -fobjc-exceptions for compiling linkback sources 
with g++ on Mac,
+ ,
+ 17 February 2014,
+ uSupport for g++ on 4.8 Mac),
+
  contributor(uHerbert Voß,
  herbert.voss () alumni ! tu-berlin ! de,
  GPL,

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

[spitz]

Author: spitz
Date: Sun Mar  9 13:08:45 2014
New Revision: 40990
URL: http://www.lyx.org/trac/changeset/40990

Log:
Re-sort credits

Modified:
   www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
   www-user/trunk/farm/cookbook/LyX/credits.inc

Modified: www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
==
--- www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
12:56:54 2014(r40989)
+++ www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
13:08:45 2014(r40990)
@@ -43,12 +43,6 @@
 
 dl;
 
-$output=$output.blanket_contrib(Ramanathan Vishnampet,
-rvishnampet () gmail ! com,
-Re: [Patch] -fobjc-exceptions for compiling linkback sources with g++ 
on Mac,
-,
-17 February 2014);
-
 $output=$output.blanket_contrib(Ronen Abravanel,
 ronena () gmail ! com,
 Re: Patch: Diagram inset,
@@ -1063,6 +1057,12 @@
 m=110918662408397,
 23 February 2005);
 
+$output=$output.blanket_contrib(Ramanathan Vishnampet,
+rvishnampet () gmail ! com,
+Re: [Patch] -fobjc-exceptions for compiling linkback sources with g++ 
on Mac,
+,
+17 February 2014);
+
 $output=$output.blanket_contrib(Herbert Voß,
 herbert.voss () alumni ! tu-berlin ! de,
 Fwd: Re: The LyX licence,

Modified: www-user/trunk/farm/cookbook/LyX/credits.inc
==
--- www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 12:56:54 
2014(r40989)
+++ www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 13:08:45 
2014(r40990)
@@ -40,10 +40,6 @@
 
 dl;
 
-$output=$output.credits_contrib(Ramanathan Vishnampet,
-rvishnampet () gmail ! com,
-Support for g++ on 4.8 Mac);
-
 $output=$output.credits_contrib(Ronen Abravanel,
 ronena () gmail ! com,
 Support for feyn diagrams);
@@ -839,6 +835,10 @@
 pauli.virtanen () hut ! fi,
 Finnish localization of the interface);
 
+$output=$output.credits_contrib(Ramanathan Vishnampet,
+rvishnampet () gmail ! com,
+Support for g++ on 4.8 Mac);
+
 $output=$output.credits_contrib(Herbert Voß,
 herbert.voss () alumni ! tu-berlin ! de,
 The one who answers all questions on lyx-users mailing list

[LyX/master] Prevent LyX from freezing in additional common cases where it would try to show dialogs or ask for user input while doing advanced find and replace. In many of these cases we should simpl

[Tommaso Cucinotta]

commit eef602cc9ebad680028f2ff61c23afcb2a0609ca
Author: Tommaso Cucinotta tomm...@lyx.org
Date:   Sun Mar 9 15:40:13 2014 +

Prevent LyX from freezing in additional common cases where it would
try to show dialogs or ask for user input while doing advanced find
and replace. In many of these cases we should simply find a way for
avoiding lyx to show a dialog, however an extra info/warning dialog
is better than the GUI freezing and having to kill the process.

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 0113389..4e9a8e4 100644
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -161,6 +161,11 @@ void doWarning(docstring const  title0, docstring const  
message,
return;
}
 
+   /// Long operation in progress prevents user from Ok-ing the error 
dialog
+   bool long_op = theApp()-longOperationStarted();
+   if (long_op)
+   theApp()-stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp-setOverrideCursor(Qt::ArrowCursor);
 
@@ -176,6 +181,9 @@ void doWarning(docstring const  title0, docstring const  
message,
}
 
qApp-restoreOverrideCursor();
+
+   if (long_op)
+   theApp()-startLongOperation();
 }
 
 void warning(docstring const  title0, docstring const  message,
@@ -250,6 +258,11 @@ void doInformation(docstring const  title0, docstring 
const  message)
return;
}
 
+   /// Long operation in progress prevents user from Ok-ing the error 
dialog
+   bool long_op = theApp()-longOperationStarted();
+   if (long_op)
+   theApp()-stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp-setOverrideCursor(Qt::ArrowCursor);
 
@@ -258,6 +271,9 @@ void doInformation(docstring const  title0, docstring 
const  message)
toqstr(message));
 
qApp-restoreOverrideCursor();
+
+   if (long_op)
+   theApp()-startLongOperation();
 }
 
 void information(docstring const  title0, docstring const  message)
@@ -286,6 +302,11 @@ bool doAskForText(docstring  response, docstring const  
msg,
 
docstring const title = bformat(_(LyX: %1$s), msg);
 
+   /// Long operation in progress prevents user from Ok-ing the error 
dialog
+   bool long_op = theApp()-longOperationStarted();
+   if (long_op)
+   theApp()-stopLongOperation();
+
bool ok;
QString text = QInputDialog::getText(qApp-focusWidget(),
toqstr(title),
@@ -293,6 +314,9 @@ bool doAskForText(docstring  response, docstring const  
msg,
QLineEdit::Normal,
toqstr(dflt), ok);
 
+   if (long_op)
+   theApp()-startLongOperation();
+
if (ok) {
response = qstring_to_ucs4(text);
return true;

[LyX/master] installer: update package list for LyX 2.1

[Uwe Stöhr]

commit fc3d1bcbb48883236cc017011e15425f6f5e9848
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun Mar 9 18:16:20 2014 +0100

installer: update package list for LyX 2.1

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 7e8d909..166ba62 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,11 +3,18 @@ l3packages
 mptopdf
 bezos
 algorithms
+algorithm2e
+apacite
+apalike
 arabi
+authordate
+babel
 bibtopic
+bidi
 booktabs
 braille
 breakurl
+cancel
 cjk
 covington
 csquotes
@@ -16,19 +23,28 @@ endnotes
 enumitem
 esint
 eso-pic
-greek-inputenc
+fontspec
 fancybox
 fancyhdr
+filehook
+float
 framed
+geometry
+greek-inputenc
+harvard
+hyperref
 hyphenat
+iftex
 jurabib
 lettrine
 listings
 lithuanian
+luainputenc
 genmisc
 mhchem
 mongolian-babel
 miktex-hyph-mongolian
+multirow
 natbib
 units
 nomencl
@@ -49,21 +65,25 @@ thailatex
 turkmen
 ulem
 undertilde
+unicode-math
 units
 url
 vntex
 wrapfig
 xargs
 xcolor
+xetex-def
+xkeyval
 arydshln
+binhex
 braket
 cancel
 caption
 colortbl
 diagbox
 etoolbox
+eurosym
 fp
-iftex
 koma-script
 makecmds
 marginnote
@@ -71,19 +91,35 @@ picinpar
 pict2e
 sidecap
 was
-xetex-def
 charter
+courier
+garamondx
+helvet
 mathpazo
+utopia
+ae
 bera
+cbgreek
 ccfonts
 cmbright
+concmath
+concrete
+ecc
 eco
+eulervm
 feyn
+fontaxes
 fourier
 lh
+lmodern
+lm-math
 luxi
+mdput
+mslapa
+stmaryrd
 symbol
 tipa
+txfonts
 wasy
 zhmetrics
 ascii
@@ -109,7 +145,6 @@ ctex
 dinbrief
 dtk
 elsarticle
-elsevier
 endfloat
 epsf
 europecv
@@ -155,4 +190,5 @@ type1cm
 ucs
 upquote
 xecjk
-xifthen
\ No newline at end of file
+xifthen
+pdfcrop
\ No newline at end of file

[LyX/master] MSVC compile fix

[Georg Baum]

commit a6f4aa2d181ee24fc913e573d971b5556f78fd71
Author: Georg Baum b...@lyx.org
Date:   Sun Mar 9 18:18:17 2014 +0100

MSVC compile fix

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 274acd9..24e35c9 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -135,6 +135,8 @@ bool isUnicodeSymbolAvailable(docstring const  name, 
char_type  c)
is_combining, termination);
}
return c != 0  !is_combining;
+#else
+   return false;
 #endif
 }
 

[LyX/master] installer: cleaner support for splitindex and pdfcrop

[Uwe Stöhr]

commit ea05826908abe2bab72575cae55fb7a7eb33584c
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun Mar 9 18:19:58 2014 +0100

installer: cleaner support for splitindex and pdfcrop

- it turned out that the hack to install a stripped-down Perl directly to 
MiKTEX is not only error-prone, requires admin permission but that it is also 
not safe because MiKTeX changes the folder structure from time to time. With 
the new solution Perl is installed directly for LyX like we do for ImageMagick, 
Python etc.
- for pdfcrop support there is a bug in pdfcriop that the requirement is 
hardcoded to Ghostscript 32bit - I contacted the pdfcrop author to fix this

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index fc21866..48b8e4a 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,6 +1,10 @@
 Changelog for LyX-207-3:
 - fix serious bug that LyX could directly be installed to c:\programs
   the uninstaller would then delete the whole c:\programs folder
+- install a stripped-down version of Perl to be able to use LyX's feature
+  to have several indexe also when LyX is installed without admin privileges
+- updated to Qt 4.8.5
+- updated to Perl 5.18
 
 
 Changelog for LyX-207-2:
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh 
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 70d50a8..1b4cf98 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -14,7 +14,7 @@ Handling of LaTeX distributions
 #
 # - ConfigureMiKTeX
 #   (installs the LaTeX class files that are delivered with LyX,
-#a Perl interpreter for splitindex
+#a Perl interpreter for splitindex and pdfcrop
 #and enable MiKTeX's automatic package installation)
 #
 # - ConfigureTeXLive
@@ -240,7 +240,7 @@ FunctionEnd
 
 Function ConfigureMiKTeX
  # installs the LaTeX class files that are delivered with LyX,
- # a Perl interpreter for splitindex
+ # a Perl interpreter for splitindex and pdfcrop
  # and enable MiKTeX's automatic package installation
  
  # install LyX's LaTeX class and style files and a Perl interpreter
@@ -276,59 +276,10 @@ Function ConfigureMiKTeX
   SetOutPath $PathLaTeXLocal\tex\generic\babel
   File ${FILES_DVIPOST_PKG}\magyar.ldf
   
-  # only install a Perl interpreter if it is not already installed
-  # this is only possible if MikTeX _and_ LyX is installed with the same 
privileges
-  ${if} ${RunningX64}
-   SetRegView 32 # FIXME: recheck this if the 64bit version of MiKTeX is out 
of beta state 
-  ${endif}
-  ReadRegStr $0 HKCU 
Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX $MiKTeXVersion 
DisplayVersion
-  ${if} $MultiUser.Privileges != Admin
-  ${andif} $MultiUser.Privileges != Power
-   ${if} $0 == 
-${ifnot} ${FileExists} $PathLaTeX\perl.exe
- MessageBox MB_OK|MB_ICONINFORMATION $(MultipleIndexesNotAvailable) /SD 
IDOK
-${endif}
-   ${else}
-# ${FileExists} is disabled for now to repair existing LyX installations 
using 64bit MiKTeX
-# re-enable this for LyX 2.1.1
-#${ifnot} ${FileExists} $PathLaTeX\perl.exe 
- ${if} $Is64bit == true
-  StrCpy $3 $PathLaTeX -15 # delete \miktex\bin\x64
- ${else}
-  StrCpy $3 $PathLaTeX -11 # delete \miktex\bin
- ${endif}
- SetOutPath $3
- File /r ${FILES_MIKTEX}
- # move the files to the correct location for 64bit
- # on 32bit MiKTeX the lib folder has to be parallel to the bin folder
- # while on 64bit MiKTeX the lib folder has to be inside the bin folder
- ${if} $Is64bit == true
-  CopyFiles /SILENT /FILESONLY $3\miktex\bin\*.* $PathLaTeX
-  CreateDirectory $3\miktex\bin\x64\lib
-  CopyFiles /SILENT $3\miktex\lib\*.* $3\miktex\bin\x64\lib
-  RMDir /r $3\miktex\lib
-  RMDir /r $3\miktex\bin\lib # to clean up existing installations; can 
be removed for LyX 2.1.1
-  Delete $3\miktex\bin\*.*
- ${endif}
-#${endif}
-   ${endif}
-  ${else} # if admin or power user
-   # ${FileExists} is disabled for now to repair existing LyX installations 
using 64bit MiKTeX
-   # re-enable this for LyX 2.1.1
-   #${ifnot} ${FileExists} $PathLaTeX\perl.exe
-SetOutPath $PathLaTeXLocal
-File /r ${FILES_MIKTEX}
-# move the files to the correct location for 64bit
-${if} $Is64bit == true
- CopyFiles /SILENT /FILESONLY $PathLaTeXLocal\miktex\bin\*.* $PathLaTeX
- CreateDirectory $PathLaTeXLocal\miktex\bin\x64\lib
- CopyFiles /SILENT $PathLaTeXLocal\miktex\lib\*.* 
$PathLaTeXLocal\miktex\bin\x64\lib
- RMDir /r $PathLaTeXLocal\miktex\lib
- RMDir /r $PathLaTeXLocal\miktex\bin\lib # to clean up existing 
installations; can be removed for LyX 2.1.1
- Delete $PathLaTeXLocal\miktex\bin\*.*
-${endif}
-   #${endif}
-  ${endif}
+  # install a Perl interpreter for splitindex and pdfcrop
+  SetOutPath 

[LyX/master] Merge branch 'master' of git.lyx.org:lyx

[Uwe Stöhr]

commit 4f716cb0f8f350a1481dbdee12dbd558e0180a9b
Merge: ea05826 a6f4aa2
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun Mar 9 18:20:55 2014 +0100

Merge branch 'master' of git.lyx.org:lyx

[LyX/master] Arrgh, fix warning

[Georg Baum]

commit c9a49d2145c60c71768d7df1a615f7e4e043e703
Author: Georg Baum b...@lyx.org
Date:   Sun Mar 9 18:48:50 2014 +0100

Arrgh, fix warning

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 24e35c9..d198998 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -118,7 +118,7 @@ bool canBeDisplayed(char_type c)
 }
 
 
-bool isUnicodeSymbolAvailable(docstring const  name, char_type  c)
+bool isUnicodeSymbolAvailable(docstring const  /*name*/, char_type  /*c*/)
 {
// this is too fragile, e.g. prodes W instead of capital omega on OS X
 #if 0

[LyX/master] UserGuide.lyx: remove a now obsolete info

[Uwe Stöhr]

commit 27fc428d43c851e9bb332a5c60ddac1cc98d22bf
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun Mar 9 19:22:11 2014 +0100

UserGuide.lyx: remove a now obsolete info

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index e4694cd..d48c38c 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8025,11 +8025,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 Because of these properties 
 \family sans
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 10a7ec0..1d77dc9 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8469,11 +8469,6 @@ Hyperlinks, Boxen, Fußnoten, (Rand)notizen, Formeln, 
Zitate, Stichworte,
 bungen und TeX-Code enthalten
 \end_layout
 
-\begin_layout Itemize
-der folgenden Zeichen enthalten (würde zu LaTeX-Fehlern führen): µ ; ´ ;
- ³ ; ²
-\end_layout
-
 \begin_layout Standard
 Aufgrund dieser Eigenschaften funktioniert 
 \family sans
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index c1d995d..9730988 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8320,13 +8320,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-
-\lang english
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 
 \lang english
@@ -8339,14 +8332,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8359,7 +8350,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in verbatim:%$§#~'`
 \backslash
 }][{|
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 660954c..b610702 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -8487,13 +8487,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-
-\lang english
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 
 \lang english
@@ -8506,14 +8499,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8526,7 +8517,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in verbatim:%$§#~'`
 \backslash
 }][{|
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index fa25ef5..d67a6ca 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -6992,13 +6992,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-
-\lang english
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 
 \lang english
@@ -7011,14 +7004,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -7031,7 +7022,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in verbatim:%$§#~'`
 \backslash
 }][{|

[LyX/master] add the background image to distribution tarball

[Stephan Witt]

commit dff79377f43928f3505770e13a018bc2ea48e9e8
Author: Stephan Witt sw...@lyx.org
Date:   Sun Mar 9 19:49:31 2014 +0100

add the background image to distribution tarball

diff --git a/development/MacOSX/Makefile.am b/development/MacOSX/Makefile.am
index ad67e8d..579c928 100644
--- a/development/MacOSX/Makefile.am
+++ b/development/MacOSX/Makefile.am
@@ -10,7 +10,7 @@ nodist_bundle_DATA = Info.plist
 
 dist_bin_SCRIPTS = lyxeditor
 
-dist_pkgdata_DATA = COPYING LyXapp.icns LyX.icns LyX.sdef
+dist_pkgdata_DATA = COPYING LyXapp.icns LyX.icns LyX.sdef dmg-background.png
 nodist_pkgdata_DATA = lyxrc.dist
 
 

[LyX/master] UserGuide.lyx: describe new output format PDF (cropped)

[Uwe Stöhr]

commit dcde635d87ecf840f81a1ccf912936353ead039f
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun Mar 9 21:40:01 2014 +0100

UserGuide.lyx: describe new output format PDF (cropped)

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index d48c38c..2e47bbf 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -15510,6 +15510,24 @@ PDF
 \begin_inset space ~
 \end_inset
 
+(cropped) This is the same as 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ but the result is a PDF with cropped page margins.
+ This is for example useful if you want to use LyX to generate good-looking
+ formulas to use them in other programs like for presentations.
+\end_layout
+
+\begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
 (dvipdfm) This uses the program 
 \family typewriter
 dvipdfm
@@ -34485,6 +34503,18 @@ Note:
 \end_layout
 
 \begin_layout Description
+EPS
+\begin_inset space ~
+\end_inset
+
+(cropped) the same as 
+\family sans
+PostScript
+\family default
+ but with cropped page margins.
+\end_layout
+
+\begin_layout Description
 Graphviz
 \begin_inset space ~
 \end_inset
@@ -34719,13 +34749,35 @@ yX
 \begin_inset space ~
 \end_inset
 
-Archive
+z.y.x LyX-Document in a format readable by the LyX versions z.y.x (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+LyX
 \begin_inset space ~
 \end_inset
 
-(zip|tar.gz) creates a zip-archive or a tar.gz-archive file (depending upon
- your system) that contains your document and all files that are necessary
- to compile it (images, child documents, BibTeX files, etc.)
+2.1.x; 
+\begin_inset Quotes eld
+\end_inset
+
+z
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+y
+\begin_inset Quotes erd
+\end_inset
+
+ represent the version number)
 \end_layout
 
 \begin_layout Description
@@ -34748,23 +34800,13 @@ yX
 \begin_inset space ~
 \end_inset
 
-z.y.x LyX-Document in a format readable by the LyX versions z.y.x (
-\begin_inset Quotes eld
-\end_inset
-
-z
-\begin_inset Quotes erd
-\end_inset
-
- and 
-\begin_inset Quotes eld
-\end_inset
-
-y
-\begin_inset Quotes erd
+Archive
+\begin_inset space ~
 \end_inset
 
- represent the version number)
+(zip|tar.gz) creates a zip-archive or a tar.gz-archive file (depending upon
+ your system) that contains your document and all files that are necessary
+ to compile it (images, child documents, BibTeX files, etc.)
 \end_layout
 
 \begin_layout Description
@@ -34803,6 +34845,22 @@ LibreOffice, OpenOffice, KOffice, Abiword
 \end_layout
 
 \begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
+(cropped) the same as 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ but with cropped page margins.
+\end_layout
+
+\begin_layout Description
 
 \family sans
 PDF
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 1d77dc9..a226dca 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8479,10 +8479,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 Dies ist Verbatim.
 \end_layout
 
 \begin_layout Verbatim
+
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8495,6 +8497,7 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
+
 Fast alles ist in Verbatim erlaubt:%$§#~'`
 \backslash
 }][{|
@@ -16206,6 +16209,34 @@ PDF
 \begin_inset space ~
 \end_inset
 
+(beschnitten) Dies ist dasselbe wie 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ aber das Ergebnis ist ein PDF mit beschnittenen Seitenrändern.
+ Das ist z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ nützlich wenn man LyX dazu benutzt, um gutaussehende Formeln zu erstellen,
+ die man in anderen Programmen z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ für Präsentationen verwenden kann.
+\end_layout
+
+\begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
 (dvipdfm) Diese verwendet das Programm 
 \family typewriter
 dvipdfm
@@ -35042,6 +35073,18 @@ Achtung:
 \end_layout
 
 \begin_layout Description
+EPS
+\begin_inset space ~
+\end_inset
+
+(beschnitten) wie 
+\family sans
+PostScript
+\family default
+ aber mit beschnittenen Seitenrändern.
+\end_layout
+
+\begin_layout Description
 Graphviz
 \begin_inset space ~
 \end_inset
@@ -35332,6 +35375,22 @@ PDF
 \begin_inset space ~
 \end_inset
 
+(beschnitten) wie 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ aber mit beschnittenen Seitenrändern.
+\end_layout
+
+\begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
 (dvipdfm) PDF-Format unter Verwendung des Programms 
 \family typewriter
 dvipdfm
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 9730988..114d00f 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8332,12 +8332,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is verbatim.
 \end_layout
 
 

[LyX/master] Prevent the most important case of bug #9012

[Georg Baum]

commit 1b675d3a62c6bf14fe3a4b3933b913a28fde9a4a
Author: Georg Baum 
Date:   Sun Mar 9 10:30:20 2014 +0100

Prevent the most important case of bug #9012

Currently you can easily create an uncompilable document if you insert
non-ASCII characters in a pass-through paragraph (e.g. ERT inset or verbatim
style). This commit prevents entering these characters directly, but of
course they can still be inserted via tricks, e.g. changing a standard
paragraph to verbatim. A complete fix would handle this case as well,
and also change the fixed latin1 encoding of latex_language to a dynamic 
one,
so that a verbatim paragraph can contain any character that is encodable in
the encoding of its environment.

diff --git a/src/Text.cpp b/src/Text.cpp
index 70805df..c4cac88 100644
--- a/src/Text.cpp
+++ b/src/Text.cpp
@@ -30,6 +30,7 @@
 #include "Cursor.h"
 #include "CutAndPaste.h"
 #include "DispatchResult.h"
+#include "Encoding.h"
 #include "ErrorList.h"
 #include "FuncRequest.h"
 #include "factory.h"
@@ -1004,6 +1005,16 @@ void Text::insertChar(Cursor & cur, char_type c)
}
}
 
+   // Prevent to insert uncodable characters in verbatim and ERT
+   // (workaround for bug 9012)
+   if (cur.paragraph().isPassThru() && cur.current_font.language()) {
+   Encoding const * e = cur.current_font.language()->encoding();
+   if (!e->encodable(c)) {
+   cur.message(_("Character is uncodable in verbatim 
paragraphs."));
+   return;
+   }
+   }
+
par.insertChar(cur.pos(), c, cur.current_font,
cur.buffer()->params().trackChanges);
cur.checkBufferStructure();

[LyX/master] de.po: update

[Juergen Spitzmueller]

commit 28a1fdfa4642726e3409a439e8913d53c3f90c0f
Author: Juergen Spitzmueller 
Date:   Sun Mar 9 10:43:51 2014 +0100

de.po: update

diff --git a/po/de.gmo b/po/de.gmo
index fbd7f1a..308b7d9 100644
Binary files a/po/de.gmo and b/po/de.gmo differ
diff --git a/po/de.po b/po/de.po
index 6eab40c..db35b5e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,7 +96,7 @@ msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2014-03-09 10:36+0100\n"
-"PO-Revision-Date: 2014-02-26 08:42+0100\n"
+"PO-Revision-Date: 2014-03-09 10:43+0100\n"
 "Last-Translator: Jürgen Spitzmüller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -1013,12 +1013,11 @@ msgstr "Der Bereich, auf den die Suche sich erstreckt"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:206
 msgid "Scope"
-msgstr ""
+msgstr "Bereich"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:218
-#, fuzzy
 msgid "C document"
-msgstr "Aktuelles "
+msgstr "Aktuelles Dok"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:237
 msgid ""
@@ -1028,7 +1027,7 @@ msgstr "Alle Dokumente, die zum selben Hauptdokument wie 
das aktuelle gehören"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:240
 msgid " document"
-msgstr ""
+msgstr "Hau"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:250
 msgid "All open documents"
@@ -1039,9 +1038,8 @@ msgid " documents"
 msgstr "öffnete Dokumente"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:263
-#, fuzzy
 msgid " manuals"
-msgstr "Alle LyX-Handb&ücher"
+msgstr " LyX-Handbücher"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:281
 msgid ""
@@ -1052,7 +1050,6 @@ msgstr ""
 "die den ausgewählten Text- und Absatzstil verwenden."
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:284
-#, fuzzy
 msgid "I format"
 msgstr "Ignoriere For"
 
@@ -1073,7 +1070,6 @@ msgid " macros"
 msgstr " ausklappen"
 
 #: src/frontends/qt4/ui/FindAndReplaceUi.ui:314
-#, fuzzy
 msgid "Search on in maths"
 msgstr "Nur im Ma"
 
@@ -24653,7 +24649,7 @@ msgstr ""
 
 #: src/Text.cpp:1013
 msgid "Character is uncodable in verbatim paragraphs."
-msgstr ""
+msgstr "Das Zeichen ist in unformatierten Absätzen nicht kodierbar."
 
 #: src/Text.cpp:1850
 msgid "[Change Tracking] "

[LyX/master] Disable unicode math symbol replacement.

[Georg Baum]

commit 23752e6114aab1d88b60fa59620d4100eeb94e9b
Author: Georg Baum 
Date:   Sun Mar 9 10:56:05 2014 +0100

Disable unicode math symbol replacement.

This seems to work only in some cases, so better display the symbol in ERT.

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 961e70e..274acd9 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -120,6 +120,8 @@ bool canBeDisplayed(char_type c)
 
 bool isUnicodeSymbolAvailable(docstring const & name, char_type & c)
 {
+   // this is too fragile, e.g. prodes W instead of capital omega on OS X
+#if 0
docstring cmd(from_ascii("\\") + name);
bool is_combining;
bool termination;
@@ -133,6 +135,7 @@ bool isUnicodeSymbolAvailable(docstring const & name, 
char_type & c)
is_combining, termination);
}
return c != 0 && !is_combining;
+#endif
 }
 
 

[LyX/master] correct author data

[Juergen Spitzmueller]

commit 7303f0caad297d4aacc3e83f43ec0565496f6dd8
Author: Juergen Spitzmueller 
Date:   Sun Mar 9 11:17:14 2014 +0100

correct author data

diff --git a/po/de.po b/po/de.po
index db35b5e..7b6d7ab 100644
--- a/po/de.po
+++ b/po/de.po
@@ -96,9 +96,9 @@ msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 "POT-Creation-Date: 2014-03-09 10:36+0100\n"
-"PO-Revision-Date: 2014-03-09 10:43+0100\n"
-"Last-Translator: Jürgen Spitzmüller \n"
-"Language-Team: German \n"
+"PO-Revision-Date: 2014-03-09 11:16+0100\n"
+"Last-Translator: Jürgen Spitzmüller \n"
+"Language-Team: German \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

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

[spitz]

Author: spitz
Date: Sun Mar  9 11:22:43 2014
New Revision: 40988
URL: http://www.lyx.org/trac/changeset/40988

Log:
update trunk stats

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

Modified: www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc
==
--- www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc Sat Feb  1 20:00:44 
2014(r40987)
+++ www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc Sun Mar  9 11:22:43 
2014(r40988)
@@ -7,96 +7,96 @@
 // The data itself
 $podata = array (
 array ( 'langcode' => 'ar', "date" => "2014-01-10",
-"msg_tr" => 4874, "msg_fu" => 430, "msg_nt" => 1156,
+"msg_tr" => 4867, "msg_fu" => 440, "msg_nt" => 1154,
 "translator" => "Hatim Alahmadi", "email" => "Dr ! hatim () hotmail ! com"),
 array ( 'langcode' => 'ca', "date" => "2008-07-28",
-"msg_tr" => 2938, "msg_fu" => 1976, "msg_nt" => 1546,
+"msg_tr" => 2938, "msg_fu" => 1978, "msg_nt" => 1545,
 "translator" => "joan", "email" => "joan () montane ! cat"),
 array ( 'langcode' => 'cs', "date" => "2013-06-15",
-"msg_tr" => 5757, "msg_fu" => 331, "msg_nt" => 372,
+"msg_tr" => 5771, "msg_fu" => 327, "msg_nt" => 363,
 "translator" => "Pavel Sanda", "email" => "sanda () lyx ! org"),
 array ( 'langcode' => 'da', "date" => "2011-04-20",
-"msg_tr" => 3692, "msg_fu" => 1637, "msg_nt" => 1131,
+"msg_tr" => 3688, "msg_fu" => 1644, "msg_nt" => 1129,
 "translator" => "Jesper Stemann Andersen", "email" => "jesper () sait ! dk"),
-array ( 'langcode' => 'de', "date" => "2014-01-27",
-"msg_tr" => 6460, "msg_fu" => 0, "msg_nt" => 0,
+array ( 'langcode' => 'de', "date" => "2014-03-09",
+"msg_tr" => 6461, "msg_fu" => 0, "msg_nt" => 0,
 "translator" => "Jrgen Spitzmller", "email" => "spitz () lyx ! 
org"),
 array ( 'langcode' => 'el', "date" => "2010-07-07",
-"msg_tr" => 3192, "msg_fu" => 962, "msg_nt" => 2306,
+"msg_tr" => 3187, "msg_fu" => 968, "msg_nt" => 2306,
 "translator" => " 
", "email" => "o2d () freemail ! gr"),
 array ( 'langcode' => 'es', "date" => "2013-06-21",
-"msg_tr" => 6405, "msg_fu" => 42, "msg_nt" => 13,
+"msg_tr" => 6394, "msg_fu" => 52, "msg_nt" => 15,
 "translator" => "Ignacio Garca", "email" => "ignacio ! gmorales () gmail 
! com"),
 array ( 'langcode' => 'eu', "date" => "2012-06-21",
-"msg_tr" => 5206, "msg_fu" => 685, "msg_nt" => 569,
+"msg_tr" => 5197, "msg_fu" => 694, "msg_nt" => 570,
 "translator" => "Iaki Larraaga Murgoitio", "email" => "dooteo () 
zundan ! com"),
 array ( 'langcode' => 'fi', "date" => "2007-07-14",
-"msg_tr" => 2901, "msg_fu" => 2254, "msg_nt" => 1305,
+"msg_tr" => 2913, "msg_fu" => 2248, "msg_nt" => 1300,
 "translator" => "Martin Vermeer", "email" => "martin ! vermeer () tkk ! fi"),
-array ( 'langcode' => 'fr', "date" => "2013-11-30",
-"msg_tr" => 6456, "msg_fu" => 3, "msg_nt" => 1,
+array ( 'langcode' => 'fr', "date" => "2014-01-23",
+"msg_tr" => 6444, "msg_fu" => 14, "msg_nt" => 3,
 "translator" => "Jean-Pierre Chrtien", "email" => "jeanpierre ! chretien 
() free ! fr"),
 array ( 'langcode' => 'gl', "date" => "2007-07-11",
-"msg_tr" => 3052, "msg_fu" => 2190, "msg_nt" => 1218,
+"msg_tr" => 3052, "msg_fu" => 2194, "msg_nt" => 1215,
 "translator" => "Ramon Flores", "email" => "fa2ramon () usc ! es"),
 array ( 'langcode' => 'he', "date" => "2013-10-26",
-"msg_tr" => 3226, "msg_fu" => 1683, "msg_nt" => 1551,
+"msg_tr" => 3222, "msg_fu" => 1690, "msg_nt" => 1549,
 "translator" => "Gilad Orr", "email" => "giladorr () gmail ! com"),
 array ( 'langcode' => 'hu', "date" => "2011-04-26",
-"msg_tr" => 4486, "msg_fu" => 1165, "msg_nt" => 809,
+"msg_tr" => 4483, "msg_fu" => 1172, "msg_nt" => 806,
 "translator" => "Szke Sndor", "email" => "alex () lyx ! hu"),
 array ( 'langcode' => 'ia', "date" => "2013-09-03",
-"msg_tr" => 6298, "msg_fu" => 43, "msg_nt" => 119,
+"msg_tr" => 6287, "msg_fu" => 53, "msg_nt" => 121,
 "translator" => "G.Sora", "email" => "g ! sora () tiscali ! it"),
 array ( 'langcode' => 'id', "date" => "2012-02-01",
-"msg_tr" => 5103, "msg_fu" => 768, "msg_nt" => 589,
+"msg_tr" => 5097, "msg_fu" => 775, "msg_nt" => 589,
 "translator" => "Waluyo Adi Siswanto", "email" => "was ! uthm () gmail ! com"),
-array ( 'langcode' => 'it', "date" => "2013-11-24",
-"msg_tr" => 6454, "msg_fu" => 5, "msg_nt" => 1,
+array ( 'langcode' => 'it', "date" => "2014-03-09",
+"msg_tr" => 6460, "msg_fu" => 0, "msg_nt" => 1,
 "translator" => "Enrico Forestieri", "email" => "forenr () lyx ! org"),
 array ( 'langcode' => 'ja', "date" => "2013-08-30",
-"msg_tr" => 6447, "msg_fu" => 11, "msg_nt" => 2,
+"msg_tr" => 6436, "msg_fu" => 21, "msg_nt" => 4,
 "translator" => "Koji Yokota", "email" => "yokota () res ! otaru-uc ! ac ! 
jp"),
 array ( 'langcode' => 'nb', "date" => "2013-11-06",
-"msg_tr" => 6216, "msg_fu" => 120, "msg_nt" => 124,
+"msg_tr" => 6206, "msg_fu" => 130, "msg_nt" => 125,
 "translator" => "Helge Hafting", "email" => "helge ! hafting () aitel ! hist ! 
no"),
 array ( 'langcode' => 'nl', "date" => "2011-12-08",

[LyX/master] Add Korean Splash, provided by Dal Ho Park

[Juergen Spitzmueller]

commit 2c2b5e48418794966ac5a0bd8463a21bcf10f987
Author: Juergen Spitzmueller 
Date:   Sun Mar 9 12:46:56 2014 +0100

Add Korean Splash, provided by Dal Ho Park

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 29f7631..d0127a6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -181,6 +181,10 @@ dist_jaexamples_DATA = \
examples/ja/xyfigure.png \
examples/ja/xypic.lyx
 
+koexamplesdir = $(pkgdatadir)/examples/ko
+dist_koexamples_DATA = \
+   examples/ko/splash.lyx
+
 nlexamplesdir = $(pkgdatadir)/examples/nl
 dist_nlexamples_DATA = \
examples/nl/opsommingstekens.lyx \
diff --git a/lib/examples/ko/splash.lyx b/lib/examples/ko/splash.lyx
new file mode 100644
index 000..445794f
--- /dev/null
+++ b/lib/examples/ko/splash.lyx
@@ -0,0 +1,185 @@
+#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 false
+\maintain_unincluded_children false
+\language korean
+\language_package default
+\inputencoding utf8
+\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 0
+\use_package amssymb 0
+\use_package cancel 0
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package stackrel 0
+\use_package stmaryrd 0
+\use_package undertilde 0
+\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 0
+\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 false
+\output_changes false
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
+\end_header
+
+\begin_body
+
+\begin_layout Title
+LyX에 오신 것을 환영합니다!
+\end_layout
+
+\begin_layout Section*
+LyX 사용시 알아야되는 가장 중요한 것들
+\end_layout
+
+\begin_layout Enumerate
+LyX는 훌륭한 문서를 동반합니다 - 사용하세요! 문서에 대한 간략한 소개를 제공하는
+\family sans
+ 도움말\SpecialChar \menuseparator
+소개
+\family default
+ 메뉴에서 시작하세요.
+ 그 다음
+\family sans
+ 도움말\SpecialChar \menuseparator
+자습서
+\family default
+를 통해 LyX 사용법을 익히세요.
+ 
+\end_layout
+
+\begin_layout Enumerate
+우리는 LyX를 
+\begin_inset Quotes eld
+\end_inset
+
+문서 처리기
+\begin_inset Quotes erd
+\end_inset
+
+라고 부릅니다.
+ 설계상 문서 작성을 쉽게 만든다는 측면에서 일반 워드 프로세서와는 다릅니다.
+ 차이점은 아주 적으니 겁부터 먹진 마세요.
+ 문서를 보면 확실해질 것입니다.
+\end_layout
+
+\begin_layout Enumerate
+LyX의 출력물은 아주 훌륭합니다! 메뉴에서 
+\family sans
+보기\SpecialChar \menuseparator
+
+\begin_inset space ~
+\end_inset
+
+[PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)]로 보기
+\family default
+를 선택하거나 툴바에서 
+\begin_inset Info
+type  "icon"
+arg   "buffer-view"
+\end_inset
+
+ 버튼을 선택해서 직접 보세요.
+\end_layout
+
+\begin_layout Enumerate
+그렇습니다, LyX는 (거의) 모든 LaTeX 기능들을 흉내낼 수 있습니다.
+ 그리고 또한 LyX는 LaTeX 파일들을 가져올 수 있습니다.
+ LaTeX 사용 경험이 있는 사용자들은 나머지 
+\emph on
+자습서
+\emph default
+를 생략하고, 
+\begin_inset Quotes eld
+\end_inset
+
+LaTeX 사용자를 위한 LyX
+\begin_inset Quotes erd
+\end_inset
+
+ 장을 읽어주세요.
+ (해당되지 않는 모든 사람들: 걱정 마시압, LyX 사용을 위해 LaTeX를 꼭 알아야할 필요는 없습니다.) 
+\end_layout
+
+\begin_layout Enumerate
+LyX는 영어 이외의 언어를 읽고 쓰는 사람들을 위한 많은 기능을 가지고 있습니다.
+ 덧붙여, 키바인딩, 툴바, 다른 많은 특성들이 설정 변경 가능합니다.
+ 자세한 것은
+\family sans
+ 도움말(Help)\SpecialChar \menuseparator
+Customization
+\family default
+을 보세요.
+\end_layout
+
+\begin_layout Enumerate
+LyX 홈페이지는
+\family typewriter
+
+\begin_inset Flex URL
+status collapsed
+
+\begin_layout Plain Layout
+
+http://www.lyx.org/
+\end_layout
+
+\end_inset
+
+
+\family default
+입니다.
+ LyX에 대한 정보를 얻고, LyX 메일링 리스트에 가입하고, LyX 그림으로 배우기(Graphical Tour) 등 많은 것을 할 수 
있습니다.
+\end_layout
+
+\end_body
+\end_document

[LyX/master] Update credits and add Dal Ho Park.

[Juergen Spitzmueller]

commit cefbd644f3f8c6baa92613c7de40e1ea06a5305d
Author: Juergen Spitzmueller 
Date:   Sun Mar 9 12:53:47 2014 +0100

Update credits and add Dal Ho Park.

diff --git a/lib/CREDITS b/lib/CREDITS
index 6a0444d..98339e0 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -1,3 +1,6 @@
+@bRamanathan Vishnampet
+@iE-mail: rvishnampet () gmail ! com
+   Support for g++ on 4.8 Mac
 @bRonen Abravanel
 @iE-mail: ronena () gmail ! com
Support for feyn diagrams
@@ -193,9 +196,15 @@
 @bClaus Hentschel
 @iE-mail: claus.hentschel () mbau ! fh-hannover ! de
Win32 port of LyX 1.1.x
+@bJosh Hieronymous
+@iE-mail: josh.p.hieronymus () gmail ! com
+   XHTML and ePub Improvements (GSOC Student)
 @bClaus Hindsgaul
 @iE-mail: claus_h () image ! dk
Danish translation
+@bMartin Hoffmann
+@iE-mail: hoffimar () gmail ! com
+   Dialog usability fix
 @bBernard Hurley
 @iE-mail: bernard () fong-hurley ! org ! uk
Fixes to literate programming support
@@ -321,6 +330,9 @@
 @bGünter Milde
 @iE-mail: milde () users ! berlios ! de
Unicode and layout file fixes
+@bDustin J. Mitchell
+@iE-mail: dustin () v ! igoro ! us
+   Fix for csv2lyx
 @bJoan Montané
 @iE-mail: jmontane () gmail ! com
Catalan translations of menus
@@ -348,12 +360,18 @@
 @bCarl Ollivier-Gooch
 @iE-mail: cfog () mech ! ubc ! ca
Support for two-column figure (figure*) and table (table*) environments.  
Fixed minibuffer entry of floats.
+@bGilad Orr
+@iE-mail: giladorr () gmail ! com
+   Hebrew translation.
 @bPanayotis "PAP" Papasotiriou
 @iE-mail: papasot () upatras ! gr
Support for kluwer and ijmpd document classes
 @bAndrey V. Panov
 @iE-mail: panov () canopus ! iacp ! dvo ! ru
Russian translation of the user interface
+@bDal Ho Park
+@iE-mail: airdalho () gmail ! com
+   Korean translation
 @bBo Peng
 @iE-mail: ben.bob () gmail ! com
Conversion of all shell scripts to Python, shortcuts dialog, session, 
view-source, auto-view, embedding features and scons build system.
@@ -366,6 +384,9 @@
 @bZvezdan Petkovic
 @iE-mail: zpetkovic () acm ! org
Better support for serbian and serbocroatian
+@bPrannoy Pilligundla
+@iE-mail: prannoy.bits () gmail ! com
+   Full screen statusbar toggling
 @bGeoffroy Piroux
 @iE-mail: piroux () fyma ! ucl ! ac ! be
Mathematica backend for mathed
@@ -432,6 +453,9 @@
 @bPaul A. Rubin
 @iE-mail: rubin () msu ! edu
Major rework of the AMS classes
+@bGuy Rutenberg
+@iE-mail: guyrutenberg () gmail ! com
+   System call fixes
 @bRan Rutenberg
 @iE-mail: ran.rutenberg () gmail ! com
Hebrew translation
@@ -567,6 +591,9 @@
 @bRuss Woodroofe
 @iE-mail: paranoia () math ! cornell ! edu
question layout environment
+@bMingyi Wu
+@iE-mail: mingi.eo97g () g2 ! nctu ! edu ! tw
+   Chinese (traditional) translations
 @bYihui Xie
 @iE-mail: xie () yihui ! name
Bugfixing, Chinese translation, Sweave support
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index 72a8bf2..a43a8ed 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -1307,6 +1307,14 @@ contributors = [
  "24 December 2007",
  u"Russian translation of the user interface"),
 
+ contributor(u'Dal Ho Park',
+ "airdalho () gmail ! com",
+ "GPL",
+ "splash.lyx translation (Korean)",
+ "m=139436383128181",
+ "9 March 2014",
+ u"Korean translation"),
+
  contributor(u'Bo Peng',
  "ben.bob () gmail ! com",
  "GPL",

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

[spitz]

Author: spitz
Date: Sun Mar  9 12:56:54 2014
New Revision: 40989
URL: http://www.lyx.org/trac/changeset/40989

Log:
Update credits

Modified:
   www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
   www-user/trunk/farm/cookbook/LyX/credits.inc

Modified: www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
==
--- www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
11:22:43 2014(r40988)
+++ www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
12:56:54 2014(r40989)
@@ -43,6 +43,12 @@
 
 ";
 
+$output=$output.blanket_contrib("Ramanathan Vishnampet",
+"rvishnampet () gmail ! com",
+"Re: [Patch] -fobjc-exceptions for compiling linkback sources with g++ 
on Mac",
+"",
+"17 February 2014");
+
 $output=$output.blanket_contrib("Ronen Abravanel",
 "ronena () gmail ! com",
 "Re: Patch: Diagram inset",
@@ -409,12 +415,24 @@
 "m=124190107613441",
 "9 May 2009");
 
+$output=$output.blanket_contrib("Josh Hieronymous",
+"josh.p.hieronymus () gmail ! com",
+"licensing my contributions to LyX",
+"m=137426932127289",
+"19 July 2013");
+
 $output=$output.blanket_contrib("Claus Hindsgaul",
 "claus_h () image ! dk",
 "Re: The LyX licence",
 "m=110908607416324",
 "22 February 2005");
 
+$output=$output.blanket_contrib("Martin Hoffmann",
+"hoffimar () gmail ! com",
+"Re: #8703: 'new shortcut' box closes if no shortcut",
+"m=138105799411067",
+"6 October 2013");
+
 $output=$output.blanket_contrib("Bernard Hurley",
 "bernard () fong-hurley ! org ! uk",
 "Re: The LyX licence --- a gentle nudge",
@@ -637,6 +655,12 @@
 "m=122398147620761",
 "14 October 2008");
 
+$output=$output.blanket_contrib("Dustin J. Mitchell",
+"dustin () v ! igoro ! us",
+"Fwd: Your patch for LyX",
+"m=139255709609015",
+"16 February 2014");
+
 $output=$output.blanket_contrib("Joan Montané",
 "jmontane () gmail ! com",
 "Re: LyX translation updates needed",
@@ -679,6 +703,12 @@
 "m=111220662413921",
 "30 March 2005");
 
+$output=$output.blanket_contrib("Gilad Orr",
+"giladorr () gmail ! com",
+"Internationalization-Hebrew",
+"m=138314500901798",
+"28 October 2013");
+
 $output=$output.blanket_contrib("Panayotis PAP Papasotiriou",
 "papasot () upatras ! gr",
 "Re: The LyX licence",
@@ -691,6 +721,12 @@
 "m=119853644302866",
 "24 December 2007");
 
+$output=$output.blanket_contrib("Dal Ho Park",
+"airdalho () gmail ! com",
+"splash.lyx translation (Korean)",
+"m=139436383128181",
+"9 March 2014");
+
 $output=$output.blanket_contrib("Bo Peng",
 "ben.bob () gmail ! com",
 "Re: Python version of configure script (preview version)",
@@ -709,6 +745,12 @@
 "m=111276877900892",
 "6 April 2005");
 
+$output=$output.blanket_contrib("Prannoy Pilligundla",
+"prannoy.bits () gmail ! com",
+"Contribution license",
+"m=139332446711707",
+"25 February 2014");
+
 $output=$output.blanket_contrib("Benjamin Piwowarski",
 "benjamin ! piwowarski () lip6 ! fr",
 "GPL statement",
@@ -829,6 +871,12 @@
 "m=119072721929143",
 "25 September 2007");
 
+$output=$output.blanket_contrib("Guy Rutenberg",
+"guyrutenberg () gmail ! com",
+"Re: [PATCH] Strange Behaivor: xdg-open left as zombie",
+"m=137365070116624",
+"12 July 2013");
+
 $output=$output.blanket_contrib("Ran Rutenberg",
 "ran.rutenberg () gmail ! com",
 "The New Hebrew Translation of the Introduction",
@@ -1057,6 +1105,12 @@
 "m=123091448326090",
 "1 January 2009");
 
+$output=$output.blanket_contrib("Mingyi Wu",
+"mingi.eo97g () g2 ! nctu ! edu ! tw",
+"newcomer",
+"m=139389779502232",
+"3 March 2014");
+
 $output=$output.blanket_contrib("Yihui Xie",
 "xie () yihui ! name",
 "GPL Statement",

Modified: www-user/trunk/farm/cookbook/LyX/credits.inc
==
--- www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 11:22:43 
2014(r40988)
+++ www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 12:56:54 
2014(r40989)
@@ -40,6 +40,10 @@
 
 ";
 
+$output=$output.credits_contrib("Ramanathan Vishnampet",
+"rvishnampet () gmail ! com",
+"Support for g++ on 4.8 Mac");
+
 $output=$output.credits_contrib("Ronen Abravanel",
 "ronena () gmail ! com",
 "Support for feyn diagrams");
@@ -316,10 +320,18 @@
 "claus.hentschel () mbau ! fh-hannover ! de",
 "Win32 port of LyX 1.1.x");
 

[LyX/master] Re-sort credits.

[Juergen Spitzmueller]

commit 030d75187c03934f4e7f4f363251ad4620063d3d
Author: Juergen Spitzmueller 
Date:   Sun Mar 9 13:07:30 2014 +0100

Re-sort credits.

diff --git a/lib/CREDITS b/lib/CREDITS
index 98339e0..f61e57b 100644
--- a/lib/CREDITS
+++ b/lib/CREDITS
@@ -1,6 +1,3 @@
-@bRamanathan Vishnampet
-@iE-mail: rvishnampet () gmail ! com
-   Support for g++ on 4.8 Mac
 @bRonen Abravanel
 @iE-mail: ronena () gmail ! com
Support for feyn diagrams
@@ -561,6 +558,9 @@
 @bPauli Virtanen
 @iE-mail: pauli.virtanen () hut ! fi
Finnish localization of the interface
+@bRamanathan Vishnampet
+@iE-mail: rvishnampet () gmail ! com
+   Support for g++ on 4.8 Mac
 @bHerbert Voß
 @iE-mail: herbert.voss () alumni ! tu-berlin ! de
The one who answers all questions on lyx-users mailing list and maintains 
www.lyx.org/help/ Big insetgraphics and bibliography cleanups
diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py
index a43a8ed..0c7e59a 100755
--- a/lib/generate_contributions.py
+++ b/lib/generate_contributions.py
@@ -315,14 +315,6 @@ def main(argv, contributors):
 # Store the raw data.
 contributors = [
 
- contributor(u"Ramanathan Vishnampet",
- "rvishnampet () gmail ! com",
- "GPL",
- "Re: [Patch] -fobjc-exceptions for compiling linkback sources 
with g++ on Mac",
- "",
- "17 February 2014",
- u"Support for g++ on 4.8 Mac"),
-
  contributor(u"Ronen Abravanel",
  "ronena () gmail ! com",
  "GPL",
@@ -1819,6 +1811,14 @@ contributors = [
  "23 February 2005",
  u"Finnish localization of the interface"),
 
+ contributor(u"Ramanathan Vishnampet",
+ "rvishnampet () gmail ! com",
+ "GPL",
+ "Re: [Patch] -fobjc-exceptions for compiling linkback sources 
with g++ on Mac",
+ "",
+ "17 February 2014",
+ u"Support for g++ on 4.8 Mac"),
+
  contributor(u"Herbert Voß",
  "herbert.voss () alumni ! tu-berlin ! de",
  "GPL",

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

[spitz]

Author: spitz
Date: Sun Mar  9 13:08:45 2014
New Revision: 40990
URL: http://www.lyx.org/trac/changeset/40990

Log:
Re-sort credits

Modified:
   www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
   www-user/trunk/farm/cookbook/LyX/credits.inc

Modified: www-user/trunk/farm/cookbook/LyX/blanket-permission.inc
==
--- www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
12:56:54 2014(r40989)
+++ www-user/trunk/farm/cookbook/LyX/blanket-permission.inc Sun Mar  9 
13:08:45 2014(r40990)
@@ -43,12 +43,6 @@
 
 ";
 
-$output=$output.blanket_contrib("Ramanathan Vishnampet",
-"rvishnampet () gmail ! com",
-"Re: [Patch] -fobjc-exceptions for compiling linkback sources with g++ 
on Mac",
-"",
-"17 February 2014");
-
 $output=$output.blanket_contrib("Ronen Abravanel",
 "ronena () gmail ! com",
 "Re: Patch: Diagram inset",
@@ -1063,6 +1057,12 @@
 "m=110918662408397",
 "23 February 2005");
 
+$output=$output.blanket_contrib("Ramanathan Vishnampet",
+"rvishnampet () gmail ! com",
+"Re: [Patch] -fobjc-exceptions for compiling linkback sources with g++ 
on Mac",
+"",
+"17 February 2014");
+
 $output=$output.blanket_contrib("Herbert Voß",
 "herbert.voss () alumni ! tu-berlin ! de",
 "Fwd: Re: The LyX licence",

Modified: www-user/trunk/farm/cookbook/LyX/credits.inc
==
--- www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 12:56:54 
2014(r40989)
+++ www-user/trunk/farm/cookbook/LyX/credits.incSun Mar  9 13:08:45 
2014(r40990)
@@ -40,10 +40,6 @@
 
 ";
 
-$output=$output.credits_contrib("Ramanathan Vishnampet",
-"rvishnampet () gmail ! com",
-"Support for g++ on 4.8 Mac");
-
 $output=$output.credits_contrib("Ronen Abravanel",
 "ronena () gmail ! com",
 "Support for feyn diagrams");
@@ -839,6 +835,10 @@
 "pauli.virtanen () hut ! fi",
 "Finnish localization of the interface");
 
+$output=$output.credits_contrib("Ramanathan Vishnampet",
+"rvishnampet () gmail ! com",
+"Support for g++ on 4.8 Mac");
+
 $output=$output.credits_contrib("Herbert Voß",
 "herbert.voss () alumni ! tu-berlin ! de",
 "The one who answers all questions on lyx-users mailing list

[LyX/master] Prevent LyX from freezing in additional common cases where it would try to show dialogs or ask for user input while doing advanced find and replace. In many of these cases we should simpl

[Tommaso Cucinotta]

commit eef602cc9ebad680028f2ff61c23afcb2a0609ca
Author: Tommaso Cucinotta 
Date:   Sun Mar 9 15:40:13 2014 +

Prevent LyX from freezing in additional common cases where it would
try to show dialogs or ask for user input while doing advanced find
and replace. In many of these cases we should simply find a way for
avoiding lyx to show a dialog, however an extra info/warning dialog
is better than the GUI freezing and having to kill the process.

diff --git a/src/frontends/qt4/GuiAlert.cpp b/src/frontends/qt4/GuiAlert.cpp
index 0113389..4e9a8e4 100644
--- a/src/frontends/qt4/GuiAlert.cpp
+++ b/src/frontends/qt4/GuiAlert.cpp
@@ -161,6 +161,11 @@ void doWarning(docstring const & title0, docstring const & 
message,
return;
}
 
+   /// Long operation in progress prevents user from Ok-ing the error 
dialog
+   bool long_op = theApp()->longOperationStarted();
+   if (long_op)
+   theApp()->stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp->setOverrideCursor(Qt::ArrowCursor);
 
@@ -176,6 +181,9 @@ void doWarning(docstring const & title0, docstring const & 
message,
}
 
qApp->restoreOverrideCursor();
+
+   if (long_op)
+   theApp()->startLongOperation();
 }
 
 void warning(docstring const & title0, docstring const & message,
@@ -250,6 +258,11 @@ void doInformation(docstring const & title0, docstring 
const & message)
return;
}
 
+   /// Long operation in progress prevents user from Ok-ing the error 
dialog
+   bool long_op = theApp()->longOperationStarted();
+   if (long_op)
+   theApp()->stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp->setOverrideCursor(Qt::ArrowCursor);
 
@@ -258,6 +271,9 @@ void doInformation(docstring const & title0, docstring 
const & message)
toqstr(message));
 
qApp->restoreOverrideCursor();
+
+   if (long_op)
+   theApp()->startLongOperation();
 }
 
 void information(docstring const & title0, docstring const & message)
@@ -286,6 +302,11 @@ bool doAskForText(docstring & response, docstring const & 
msg,
 
docstring const title = bformat(_("LyX: %1$s"), msg);
 
+   /// Long operation in progress prevents user from Ok-ing the error 
dialog
+   bool long_op = theApp()->longOperationStarted();
+   if (long_op)
+   theApp()->stopLongOperation();
+
bool ok;
QString text = QInputDialog::getText(qApp->focusWidget(),
toqstr(title),
@@ -293,6 +314,9 @@ bool doAskForText(docstring & response, docstring const & 
msg,
QLineEdit::Normal,
toqstr(dflt), );
 
+   if (long_op)
+   theApp()->startLongOperation();
+
if (ok) {
response = qstring_to_ucs4(text);
return true;

[LyX/master] installer: update package list for LyX 2.1

[Uwe Stöhr]

commit fc3d1bcbb48883236cc017011e15425f6f5e9848
Author: Uwe Stöhr 
Date:   Sun Mar 9 18:16:20 2014 +0100

installer: update package list for LyX 2.1

diff --git a/development/Win32/packaging/installer/Packages.txt 
b/development/Win32/packaging/installer/Packages.txt
index 7e8d909..166ba62 100644
--- a/development/Win32/packaging/installer/Packages.txt
+++ b/development/Win32/packaging/installer/Packages.txt
@@ -3,11 +3,18 @@ l3packages
 mptopdf
 bezos
 algorithms
+algorithm2e
+apacite
+apalike
 arabi
+authordate
+babel
 bibtopic
+bidi
 booktabs
 braille
 breakurl
+cancel
 cjk
 covington
 csquotes
@@ -16,19 +23,28 @@ endnotes
 enumitem
 esint
 eso-pic
-greek-inputenc
+fontspec
 fancybox
 fancyhdr
+filehook
+float
 framed
+geometry
+greek-inputenc
+harvard
+hyperref
 hyphenat
+iftex
 jurabib
 lettrine
 listings
 lithuanian
+luainputenc
 genmisc
 mhchem
 mongolian-babel
 miktex-hyph-mongolian
+multirow
 natbib
 units
 nomencl
@@ -49,21 +65,25 @@ thailatex
 turkmen
 ulem
 undertilde
+unicode-math
 units
 url
 vntex
 wrapfig
 xargs
 xcolor
+xetex-def
+xkeyval
 arydshln
+binhex
 braket
 cancel
 caption
 colortbl
 diagbox
 etoolbox
+eurosym
 fp
-iftex
 koma-script
 makecmds
 marginnote
@@ -71,19 +91,35 @@ picinpar
 pict2e
 sidecap
 was
-xetex-def
 charter
+courier
+garamondx
+helvet
 mathpazo
+utopia
+ae
 bera
+cbgreek
 ccfonts
 cmbright
+concmath
+concrete
+ecc
 eco
+eulervm
 feyn
+fontaxes
 fourier
 lh
+lmodern
+lm-math
 luxi
+mdput
+mslapa
+stmaryrd
 symbol
 tipa
+txfonts
 wasy
 zhmetrics
 ascii
@@ -109,7 +145,6 @@ ctex
 dinbrief
 dtk
 elsarticle
-elsevier
 endfloat
 epsf
 europecv
@@ -155,4 +190,5 @@ type1cm
 ucs
 upquote
 xecjk
-xifthen
\ No newline at end of file
+xifthen
+pdfcrop
\ No newline at end of file

[LyX/master] MSVC compile fix

[Georg Baum]

commit a6f4aa2d181ee24fc913e573d971b5556f78fd71
Author: Georg Baum 
Date:   Sun Mar 9 18:18:17 2014 +0100

MSVC compile fix

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 274acd9..24e35c9 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -135,6 +135,8 @@ bool isUnicodeSymbolAvailable(docstring const & name, 
char_type & c)
is_combining, termination);
}
return c != 0 && !is_combining;
+#else
+   return false;
 #endif
 }
 

[LyX/master] installer: cleaner support for splitindex and pdfcrop

[Uwe Stöhr]

commit ea05826908abe2bab72575cae55fb7a7eb33584c
Author: Uwe Stöhr 
Date:   Sun Mar 9 18:19:58 2014 +0100

installer: cleaner support for splitindex and pdfcrop

- it turned out that the hack to install a stripped-down Perl directly to 
MiKTEX is not only error-prone, requires admin permission but that it is also 
not safe because MiKTeX changes the folder structure from time to time. With 
the new solution Perl is installed directly for LyX like we do for ImageMagick, 
Python etc.
- for pdfcrop support there is a bug in pdfcriop that the requirement is 
hardcoded to Ghostscript 32bit - I contacted the pdfcrop author to fix this

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index fc21866..48b8e4a 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -1,6 +1,10 @@
 Changelog for LyX-207-3:
 - fix serious bug that LyX could directly be installed to c:\programs
   the uninstaller would then delete the whole c:\programs folder
+- install a stripped-down version of Perl to be able to use LyX's feature
+  to have several indexe also when LyX is installed without admin privileges
+- updated to Qt 4.8.5
+- updated to Perl 5.18
 
 
 Changelog for LyX-207-2:
diff --git a/development/Win32/packaging/installer/include/LaTeX.nsh 
b/development/Win32/packaging/installer/include/LaTeX.nsh
index 70d50a8..1b4cf98 100644
--- a/development/Win32/packaging/installer/include/LaTeX.nsh
+++ b/development/Win32/packaging/installer/include/LaTeX.nsh
@@ -14,7 +14,7 @@ Handling of LaTeX distributions
 #
 # - ConfigureMiKTeX
 #   (installs the LaTeX class files that are delivered with LyX,
-#a Perl interpreter for splitindex
+#a Perl interpreter for splitindex and pdfcrop
 #and enable MiKTeX's automatic package installation)
 #
 # - ConfigureTeXLive
@@ -240,7 +240,7 @@ FunctionEnd
 
 Function ConfigureMiKTeX
  # installs the LaTeX class files that are delivered with LyX,
- # a Perl interpreter for splitindex
+ # a Perl interpreter for splitindex and pdfcrop
  # and enable MiKTeX's automatic package installation
  
  # install LyX's LaTeX class and style files and a Perl interpreter
@@ -276,59 +276,10 @@ Function ConfigureMiKTeX
   SetOutPath "$PathLaTeXLocal\tex\generic\babel"
   File "${FILES_DVIPOST_PKG}\magyar.ldf"
   
-  # only install a Perl interpreter if it is not already installed
-  # this is only possible if MikTeX _and_ LyX is installed with the same 
privileges
-  ${if} ${RunningX64}
-   SetRegView 32 # FIXME: recheck this if the 64bit version of MiKTeX is out 
of beta state 
-  ${endif}
-  ReadRegStr $0 HKCU 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX $MiKTeXVersion" 
"DisplayVersion"
-  ${if} $MultiUser.Privileges != "Admin"
-  ${andif} $MultiUser.Privileges != "Power"
-   ${if} $0 == ""
-${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
- MessageBox MB_OK|MB_ICONINFORMATION "$(MultipleIndexesNotAvailable)" /SD 
IDOK
-${endif}
-   ${else}
-# ${FileExists} is disabled for now to repair existing LyX installations 
using 64bit MiKTeX
-# re-enable this for LyX 2.1.1
-#${ifnot} ${FileExists} "$PathLaTeX\perl.exe" 
- ${if} $Is64bit == "true"
-  StrCpy $3 "$PathLaTeX" -15 # delete "\miktex\bin\x64"
- ${else}
-  StrCpy $3 "$PathLaTeX" -11 # delete "\miktex\bin"
- ${endif}
- SetOutPath "$3"
- File /r ${FILES_MIKTEX}
- # move the files to the correct location for 64bit
- # on 32bit MiKTeX the lib folder has to be parallel to the bin folder
- # while on 64bit MiKTeX the lib folder has to be inside the bin folder
- ${if} $Is64bit == "true"
-  CopyFiles /SILENT /FILESONLY "$3\miktex\bin\*.*" "$PathLaTeX"
-  CreateDirectory "$3\miktex\bin\x64\lib"
-  CopyFiles /SILENT "$3\miktex\lib\*.*" "$3\miktex\bin\x64\lib"
-  RMDir /r "$3\miktex\lib"
-  RMDir /r "$3\miktex\bin\lib" # to clean up existing installations; can 
be removed for LyX 2.1.1
-  Delete "$3\miktex\bin\*.*"
- ${endif}
-#${endif}
-   ${endif}
-  ${else} # if admin or power user
-   # ${FileExists} is disabled for now to repair existing LyX installations 
using 64bit MiKTeX
-   # re-enable this for LyX 2.1.1
-   #${ifnot} ${FileExists} "$PathLaTeX\perl.exe"
-SetOutPath "$PathLaTeXLocal"
-File /r ${FILES_MIKTEX}
-# move the files to the correct location for 64bit
-${if} $Is64bit == "true"
- CopyFiles /SILENT /FILESONLY "$PathLaTeXLocal\miktex\bin\*.*" "$PathLaTeX"
- CreateDirectory "$PathLaTeXLocal\miktex\bin\x64\lib"
- CopyFiles /SILENT "$PathLaTeXLocal\miktex\lib\*.*" 
"$PathLaTeXLocal\miktex\bin\x64\lib"
- RMDir /r "$PathLaTeXLocal\miktex\lib"
- RMDir /r "$PathLaTeXLocal\miktex\bin\lib" # to clean up existing 
installations; can be removed for LyX 2.1.1
- Delete "$PathLaTeXLocal\miktex\bin\*.*"
-${endif}
-   #${endif}
-  ${endif}

[LyX/master] Merge branch 'master' of git.lyx.org:lyx

[Uwe Stöhr]

commit 4f716cb0f8f350a1481dbdee12dbd558e0180a9b
Merge: ea05826 a6f4aa2
Author: Uwe Stöhr 
Date:   Sun Mar 9 18:20:55 2014 +0100

Merge branch 'master' of git.lyx.org:lyx

[LyX/master] Arrgh, fix warning

[Georg Baum]

commit c9a49d2145c60c71768d7df1a615f7e4e043e703
Author: Georg Baum 
Date:   Sun Mar 9 18:48:50 2014 +0100

Arrgh, fix warning

diff --git a/src/mathed/MathFactory.cpp b/src/mathed/MathFactory.cpp
index 24e35c9..d198998 100644
--- a/src/mathed/MathFactory.cpp
+++ b/src/mathed/MathFactory.cpp
@@ -118,7 +118,7 @@ bool canBeDisplayed(char_type c)
 }
 
 
-bool isUnicodeSymbolAvailable(docstring const & name, char_type & c)
+bool isUnicodeSymbolAvailable(docstring const & /*name*/, char_type & /*c*/)
 {
// this is too fragile, e.g. prodes W instead of capital omega on OS X
 #if 0

[LyX/master] UserGuide.lyx: remove a now obsolete info

[Uwe Stöhr]

commit 27fc428d43c851e9bb332a5c60ddac1cc98d22bf
Author: Uwe Stöhr 
Date:   Sun Mar 9 19:22:11 2014 +0100

UserGuide.lyx: remove a now obsolete info

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index e4694cd..d48c38c 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -8025,11 +8025,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 Because of these properties 
 \family sans
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 10a7ec0..1d77dc9 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8469,11 +8469,6 @@ Hyperlinks, Boxen, Fußnoten, (Rand)notizen, Formeln, 
Zitate, Stichworte,
 bungen und TeX-Code enthalten
 \end_layout
 
-\begin_layout Itemize
-der folgenden Zeichen enthalten (würde zu LaTeX-Fehlern führen): µ ; ´ ;
- ³ ; ²
-\end_layout
-
 \begin_layout Standard
 Aufgrund dieser Eigenschaften funktioniert 
 \family sans
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index c1d995d..9730988 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8320,13 +8320,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-
-\lang english
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 
 \lang english
@@ -8339,14 +8332,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8359,7 +8350,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in verbatim:"%&$§#~'`
 \backslash
 }][{|
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index 660954c..b610702 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -8487,13 +8487,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-
-\lang english
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 
 \lang english
@@ -8506,14 +8499,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -8526,7 +8517,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in verbatim:"%&$§#~'`
 \backslash
 }][{|
diff --git a/lib/doc/ja/UserGuide.lyx b/lib/doc/ja/UserGuide.lyx
index fa25ef5..d67a6ca 100644
--- a/lib/doc/ja/UserGuide.lyx
+++ b/lib/doc/ja/UserGuide.lyx
@@ -6992,13 +6992,6 @@ contain hyperlinks, boxes, foot- and margin notes, 
notes, math, citations,
  and TeX-Code
 \end_layout
 
-\begin_layout Itemize
-
-\lang english
-contain the following characters (you will get LaTeX errors): µ ; ´ ; ³
- ; ²
-\end_layout
-
 \begin_layout Standard
 
 \lang english
@@ -7011,14 +7004,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
-
 This is verbatim.
 \end_layout
 
 \begin_layout Verbatim
 \noindent
 \align block
-
 The following 2 lines are empty:
 \end_layout
 
@@ -7031,7 +7022,6 @@ The following 2 lines are empty:
 \end_layout
 
 \begin_layout Verbatim
-
 Almost everything is allowed in verbatim:"%&$§#~'`
 \backslash
 }][{|

[LyX/master] add the background image to distribution tarball

[Stephan Witt]

commit dff79377f43928f3505770e13a018bc2ea48e9e8
Author: Stephan Witt 
Date:   Sun Mar 9 19:49:31 2014 +0100

add the background image to distribution tarball

diff --git a/development/MacOSX/Makefile.am b/development/MacOSX/Makefile.am
index ad67e8d..579c928 100644
--- a/development/MacOSX/Makefile.am
+++ b/development/MacOSX/Makefile.am
@@ -10,7 +10,7 @@ nodist_bundle_DATA = Info.plist
 
 dist_bin_SCRIPTS = lyxeditor
 
-dist_pkgdata_DATA = COPYING LyXapp.icns LyX.icns LyX.sdef
+dist_pkgdata_DATA = COPYING LyXapp.icns LyX.icns LyX.sdef dmg-background.png
 nodist_pkgdata_DATA = lyxrc.dist
 
 

[LyX/master] UserGuide.lyx: describe new output format "PDF (cropped)"

[Uwe Stöhr]

commit dcde635d87ecf840f81a1ccf912936353ead039f
Author: Uwe Stöhr 
Date:   Sun Mar 9 21:40:01 2014 +0100

UserGuide.lyx: describe new output format "PDF (cropped)"

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index d48c38c..2e47bbf 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -15510,6 +15510,24 @@ PDF
 \begin_inset space ~
 \end_inset
 
+(cropped) This is the same as 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ but the result is a PDF with cropped page margins.
+ This is for example useful if you want to use LyX to generate good-looking
+ formulas to use them in other programs like for presentations.
+\end_layout
+
+\begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
 (dvipdfm) This uses the program 
 \family typewriter
 dvipdfm
@@ -34485,6 +34503,18 @@ Note:
 \end_layout
 
 \begin_layout Description
+EPS
+\begin_inset space ~
+\end_inset
+
+(cropped) the same as 
+\family sans
+PostScript
+\family default
+ but with cropped page margins.
+\end_layout
+
+\begin_layout Description
 Graphviz
 \begin_inset space ~
 \end_inset
@@ -34719,13 +34749,35 @@ yX
 \begin_inset space ~
 \end_inset
 
-Archive
+z.y.x LyX-Document in a format readable by the LyX versions z.y.x (e.
+\begin_inset space \thinspace{}
+\end_inset
+
+g.
+\begin_inset space \space{}
+\end_inset
+
+"LyX
 \begin_inset space ~
 \end_inset
 
-(zip|tar.gz) creates a zip-archive or a tar.gz-archive file (depending upon
- your system) that contains your document and all files that are necessary
- to compile it (images, child documents, BibTeX files, etc.)
+2.1.x"; 
+\begin_inset Quotes eld
+\end_inset
+
+z
+\begin_inset Quotes erd
+\end_inset
+
+ and 
+\begin_inset Quotes eld
+\end_inset
+
+y
+\begin_inset Quotes erd
+\end_inset
+
+ represent the version number)
 \end_layout
 
 \begin_layout Description
@@ -34748,23 +34800,13 @@ yX
 \begin_inset space ~
 \end_inset
 
-z.y.x LyX-Document in a format readable by the LyX versions z.y.x (
-\begin_inset Quotes eld
-\end_inset
-
-z
-\begin_inset Quotes erd
-\end_inset
-
- and 
-\begin_inset Quotes eld
-\end_inset
-
-y
-\begin_inset Quotes erd
+Archive
+\begin_inset space ~
 \end_inset
 
- represent the version number)
+(zip|tar.gz) creates a zip-archive or a tar.gz-archive file (depending upon
+ your system) that contains your document and all files that are necessary
+ to compile it (images, child documents, BibTeX files, etc.)
 \end_layout
 
 \begin_layout Description
@@ -34803,6 +34845,22 @@ LibreOffice, OpenOffice, KOffice, Abiword
 \end_layout
 
 \begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
+(cropped) the same as 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ but with cropped page margins.
+\end_layout
+
+\begin_layout Description
 
 \family sans
 PDF
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 1d77dc9..a226dca 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -8479,10 +8479,12 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 Dies ist Verbatim.
 \end_layout
 
 \begin_layout Verbatim
+
 Die folgenden 2 Zeilen sind leer:
 \end_layout
 
@@ -8495,6 +8497,7 @@ Die folgenden 2 Zeilen sind leer:
 \end_layout
 
 \begin_layout Verbatim
+
 Fast alles ist in Verbatim erlaubt:"%&$§#~'`
 \backslash
 }][{|
@@ -16206,6 +16209,34 @@ PDF
 \begin_inset space ~
 \end_inset
 
+(beschnitten) Dies ist dasselbe wie 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ aber das Ergebnis ist ein PDF mit beschnittenen Seitenrändern.
+ Das ist z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ nützlich wenn man LyX dazu benutzt, um gutaussehende Formeln zu erstellen,
+ die man in anderen Programmen z.
+\begin_inset space \thinspace{}
+\end_inset
+
+B.
+ für Präsentationen verwenden kann.
+\end_layout
+
+\begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
 (dvipdfm) Diese verwendet das Programm 
 \family typewriter
 dvipdfm
@@ -35042,6 +35073,18 @@ Achtung:
 \end_layout
 
 \begin_layout Description
+EPS
+\begin_inset space ~
+\end_inset
+
+(beschnitten) wie 
+\family sans
+PostScript
+\family default
+ aber mit beschnittenen Seitenrändern.
+\end_layout
+
+\begin_layout Description
 Graphviz
 \begin_inset space ~
 \end_inset
@@ -35332,6 +35375,22 @@ PDF
 \begin_inset space ~
 \end_inset
 
+(beschnitten) wie 
+\family sans
+PDF
+\begin_inset space ~
+\end_inset
+
+(pdflatex)
+\family default
+ aber mit beschnittenen Seitenrändern.
+\end_layout
+
+\begin_layout Description
+PDF
+\begin_inset space ~
+\end_inset
+
 (dvipdfm) PDF-Format unter Verwendung des Programms 
 \family typewriter
 dvipdfm
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 9730988..114d00f 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -8332,12 +8332,14 @@ Verbatim
 \end_layout
 
 \begin_layout Verbatim
+
 This is verbatim.
 \end_layout