gmane.editors.lyx.cvs

[LyX master] Just comment

Pavel Sanda — 2012-05-22T13:55:14

The branch, master, has been updated.

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

commit 255b218ce346127a5f3ae5f2d10c9abc83dc8c76
Author: Pavel Sanda <sanda< at >lyx.org>
Date:   Tue May 22 15:54:26 2012 +0200

    Just comment

diff --git a/src/Converter.h b/src/Converter.h
index f4c8458..83f2ea7 100644
--- a/src/Converter.h
+++ b/src/Converter.h
< at >< at > -60,7 +60,7 < at >< at > public:
 bool xml;
 /// This converter needs the .aux files
 bool need_aux;
-/// we need a "nice" file from the backend
+/// we need a "nice" file from the backend, c.f. OutputParams.nice.
 bool nice;
 /// If the converter put the result in a directory, then result_dir
 /// is the name of the directory

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

Summary of changes:
 src/Converter.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive

[LyX master] Update customization manual with "nice" info.

Richard Heck — 2012-05-22T13:27:20

The branch, master, has been updated.

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

commit 2693b911b7cc2c3a95e716e05147ef6ff1fdb02a
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 09:26:52 2012 -0400

    Update customization manual with "nice" info.

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

[LyX master] Prettify the prefs2prefs file a bit.

Richard Heck — 2012-05-22T13:02:33

The branch, master, has been updated.

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

commit c9d2794d937dc01eda8b2de1a76d037e6739d8eb
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 09:02:12 2012 -0400

    Prettify the prefs2prefs file a bit.

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 9369ffc..5d4a769 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
< at >< at > -41,6 +41,7 < at >< at >
 
 # Incremented to format 8, 288c1e0f by rgh
 #   Add "nice" flag for converters
+#   No conversion necessary.
 
 import re
 
< at >< at > -83,8 +84,8 < at >< at > def simple_renaming(line, old, new):
 
 no_match = (False, [])
 
-########################
-### Format 1 conversions
+######################################
+### Format 1 conversions (for LyX 2.0)
 
 def remove_obsolete(line):
 tags = ("\\use_tempdir", "\\spell_command", "\\personal_dictionary",
< at >< at > -98,6 +99,7 < at >< at > def remove_obsolete(line):
 return (True, "")
 return no_match
 
+
 def

[LyX master] Typo.

Richard Heck — 2012-05-22T12:59:09

The branch, master, has been updated.

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

commit aeca5e6f0d67c8fe15dd3f86c5f2f7e834a5256e
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 08:58:55 2012 -0400

    Typo.

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 8d02f71..9369ffc 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
< at >< at > -1,7 +1,7 < at >< at >
 #! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# file prefs2prefs-lfuns.py
+# file prefs2prefs-prefs.py
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 

commit cd05753107b8d4b94a2ec59babec630c52dcc543
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 08:58:40 2012 -0400

    Forgot to change format in LyXRC.cpp.

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index a07c8e6..e2083ef 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
< at >< at > -55,7 +55,7 < at >< at > namespace os = support::os;
 
 namespace {
 
-stati

[LyX master] Add commit to prefs2prefs.

Richard Heck — 2012-05-22T12:57:50

The branch, master, has been updated.

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

commit abbc07026bb5b6747095113f5b06340eae785dcd
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 08:57:25 2012 -0400

    Add commit to prefs2prefs.

diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 4115453..8d02f71 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
< at >< at > -39,7 +39,7 < at >< at >
 # Incremented to format 7, r40789 by gb
 #   Add mime type to file format
 
-# Incremented to format 8, by rgh
+# Incremented to format 8, 288c1e0f by rgh
 #   Add "nice" flag for converters
 
 import re

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

Summary of changes:
 lib/scripts/prefs2prefs_prefs.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive

[LyX master] Add "nice" flag for converters, addressing final problem with bug #4624.

Richard Heck — 2012-05-22T12:56:59

The branch, master, has been updated.

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

commit 288c1e0faad85d4b0f17e366cb5c44473a133957
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 08:23:27 2012 -0400

    Add "nice" flag for converters, addressing final problem with bug #4624.

diff --git a/lib/scripts/include_bib.py b/lib/scripts/include_bib.py
index bf8ee96..d9c0e83 100644
--- a/lib/scripts/include_bib.py
+++ b/lib/scripts/include_bib.py
< at >< at > -19,7 +19,10 < at >< at >
 # check it as a document format. Then create a LaTeX-->ltxbbl converter, 
 # with the command:
 #   python -tt $$s/scripts/include_bib.py $$i $$o
-# and give it the "needaux" flag. You'll then have it in the export menu.
+# and give it the flags:
+#   needaux,nice
+# You'll then have it in the export menu.
+# 
 # We do not activate this converter by default, because there are problems
 # when one tries to use multiple bibliographies.
 #
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py

[LyX master] Fix typo.

Richard Heck — 2012-05-22T12:14:45

The branch, master, has been updated.

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

commit a7c3567452325644681ab1b68960fa93b88b0855
Author: Richard Heck <rgheck< at >lyx.org>
Date:   Tue May 22 08:14:33 2012 -0400

    Fix typo.

diff --git a/lib/scripts/include_bib.py b/lib/scripts/include_bib.py
index cf3d453..bf8ee96 100644
--- a/lib/scripts/include_bib.py
+++ b/lib/scripts/include_bib.py
< at >< at > -18,7 +18,7 < at >< at >
 # automatically. To set it up, create a format "ltxbbl"; make sure to 
 # check it as a document format. Then create a LaTeX-->ltxbbl converter, 
 # with the command:
-#   python -tt $$s/scripts/include_bib.py $$i $$0
+#   python -tt $$s/scripts/include_bib.py $$i $$o
 # and give it the "needaux" flag. You'll then have it in the export menu.
 # We do not activate this converter by default, because there are problems
 # when one tries to use multiple bibliographies.

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

Summary of changes:
 lib/scripts/include_b

[LyX master] Update it.po

Enrico Forestieri — 2012-05-20T21:36:23

The branch, master, has been updated.

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

commit 56bb54cf9f47215d220ad45293ddf26c257b3bde
Author: Enrico Forestieri <forenr< at >lyx.org>
Date:   Sun May 20 23:35:42 2012 +0200

    Update it.po

diff --git a/po/it.po b/po/it.po
index 699157b..269cc0d 100755
--- a/po/it.po
+++ b/po/it.po
< at >< at > -6,8 +6,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-04-22 23:40+0200\n"
-"PO-Revision-Date: 2012-04-23 00:14+0100\n"
+"POT-Creation-Date: 2012-05-20 23:15+0200\n"
+"PO-Revision-Date: 2012-05-20 23:32+0100\n"
 "Last-Translator: Enrico Forestieri <forenr< at >lyx.org>\n"
 "Language-Team: italiano <it< at >li.org>\n"
 "Language: it\n"
< at >< at > -565,8 +565,8 < at >< at > msgstr "Rimuove il ramo selezionato"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:136
 #: src/frontends/qt4/ui/IndicesUi.ui:165
-#: src/Buffer.cpp:3954
-#: src/Buffer.cpp:3967
+#: src/Buffer.cpp:3977
+#: src/Buffer.cpp:3990
 msgid "&Remove"

[LyX 2.0.x] Update it.po

Enrico Forestieri — 2012-05-20T21:13:49

The branch, 2.0.x, has been updated.

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

commit fbf9e5e1c255120ce40a57a4276ee1be2bd1e076
Author: Enrico Forestieri <forenr< at >lyx.org>
Date:   Sun May 20 23:12:24 2012 +0200

    Update it.po

diff --git a/po/it.po b/po/it.po
index b516a1d..d068b9e 100644
--- a/po/it.po
+++ b/po/it.po
< at >< at > -6,8 +6,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-04-12 07:51-0400\n"
-"PO-Revision-Date: 2012-04-22 23:29+0100\n"
+"POT-Creation-Date: 2012-05-20 22:39+0200\n"
+"PO-Revision-Date: 2012-05-20 23:08+0100\n"
 "Last-Translator: Enrico Forestieri <forenr< at >lyx.org>\n"
 "Language-Team: italiano <it< at >li.org>\n"
 "Language: it\n"
< at >< at > -54,7 +54,6 < at >< at > msgstr "Copyright"
 #: src/frontends/qt4/ui/ThesaurusUi.ui:138
 #: src/frontends/qt4/ui/WrapUi.ui:173
 #: src/frontends/qt4/GuiParagraph.cpp:161
-#: src/frontends/qt4/ui_RefUi.h:339
 msgid "&Close"
 msgstr "&Chiudi"
 
< at >< at > -71,7 +70,6 < at >< at > msg

[LyX 2.0.x] Fix bug #8164: lyxpak.py fails to include filenames with spaces

Enrico Forestieri — 2012-05-20T20:28:04

The branch, 2.0.x, has been updated.

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

commit 5909fc467a2e1106b57561fb811c8d2f4198db63
Author: Enrico Forestieri <forenr< at >lyx.org>
Date:   Sun May 20 16:32:47 2012 +0200

    Fix bug #8164: lyxpak.py fails to include filenames with spaces
    
    People love embedding spaces in filenames, so account for that.
    
    (cherry picked from commit fbcf2486d84b4ea543560cb7f583bc38e6cf67f5)

diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index 37829e0..d341977 100755
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
< at >< at > -23,15 +23,15 < at >< at > from getopt import getopt
 
 # Pre-compiled regular expressions.
 re_lyxfile = re.compile("\.lyx$")
-re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$')
-re_ertinput = re.compile(r'^(input|include)({)(\s*)(\S+)(\s*)}.*$')
-re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$')
-re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$')
-re_norecur = re.compile(r'^(.*)\

[LyX master] Fix bug #8164: lyxpak.py fails to include filenames with spaces

Enrico Forestieri — 2012-05-20T14:34:42

The branch, master, has been updated.

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

commit fbcf2486d84b4ea543560cb7f583bc38e6cf67f5
Author: Enrico Forestieri <forenr< at >lyx.org>
Date:   Sun May 20 16:32:47 2012 +0200

    Fix bug #8164: lyxpak.py fails to include filenames with spaces
    
    People love embedding spaces in filenames, so account for that.

diff --git a/lib/scripts/lyxpak.py b/lib/scripts/lyxpak.py
index 37829e0..d341977 100755
--- a/lib/scripts/lyxpak.py
+++ b/lib/scripts/lyxpak.py
< at >< at > -23,15 +23,15 < at >< at > from getopt import getopt
 
 # Pre-compiled regular expressions.
 re_lyxfile = re.compile("\.lyx$")
-re_input = re.compile(r'^(.*)\\(input|include){(\s*)(\S+)(\s*)}.*$')
-re_ertinput = re.compile(r'^(input|include)({)(\s*)(\S+)(\s*)}.*$')
-re_package = re.compile(r'^(.*)\\(usepackage){(\s*)(\S+)(\s*)}.*$')
-re_class = re.compile(r'^(\\)(textclass)(\s+)(\S+)$')
-re_norecur = re.compile(r'^(.*)\\(verbatiminput|lstinputlisting|includegraphics\[*.*\]*){(\s*)(\S+)(\s*)}.*$'

[LyX 2.0.x] If a file is saved as, reset its master if it has any, thus preventing a crash (bug 8161)

Juergen Spitzmueller — 2012-05-19T12:05:35

The branch, 2.0.x, has been updated.

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

commit 993fa8900910570db095093292dfb4b50c497eb6
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 19 14:03:50 2012 +0200

    If a file is saved as, reset its master if it has any, thus preventing a crash (bug 8161)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index bba3610..7bafb4e 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
< at >< at > -4417,6 +4417,7 < at >< at > bool Buffer::saveAs(FileName const & fn)
 // we need to check that the locations of child buffers
 // are still valid.
 checkChildBuffers();
+checkMasterBuffer();
 return true;
 } else {
 // save failed
< at >< at > -4465,4 +4466,25 < at >< at > void Buffer::checkChildBuffers()
 d->position_to_children.clear();
 }
 
+
+// If a child has been saved under a different name/path, it might have been
+// orphaned. Therefore the master needs to be reset (bug 8161).
+void Buffer::checkMasterBuffer()
+{
+Buffer const * const master = masterBuffer();
+i

[LyX master] de.po: update

Juergen Spitzmueller — 2012-05-19T11:49:28

The branch, master, has been updated.

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

commit e3ccd64f2eea000c6a68bb7f47c9ec1245294ed5
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 19 13:49:19 2012 +0200

    de.po: update

diff --git a/po/de.po b/po/de.po
index b4a5ce8..152e697 100644
--- a/po/de.po
+++ b/po/de.po
< at >< at > -95,8 +95,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-03-18 15:38+0100\n"
-"PO-Revision-Date: 2012-04-29 11:33+0200\n"
+"POT-Creation-Date: 2012-05-19 13:34+0200\n"
+"PO-Revision-Date: 2012-05-19 13:48+0200\n"
 "Last-Translator: JÃ¼rgen SpitzmÃ¼ller <spitz< at >lyx.org>\n"
 "Language-Team: German <lyx-docs< at >lists.lyx.org>\n"
 "Language: de\n"
< at >< at > -118,45 +118,35 < at >< at > msgstr "Version kommt hierher"
 msgid "Credits"
 msgstr "Mitwirkende"
 
-#: src/frontends/qt4/ui/AboutUi.ui:80
-#: lib/layouts/apa.layout:199
+#: src/frontends/qt4/ui/AboutUi.ui:80 lib/layouts/apa.layout:199

[LyX 2.0.x] de.po: updates

Juergen Spitzmueller — 2012-05-19T11:31:03

The branch, 2.0.x, has been updated.

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

commit c3fef458c7882995ba2ce575a25ca7799e8beee8
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 19 13:30:39 2012 +0200

    de.po: updates

diff --git a/po/de.po b/po/de.po
index 3392826..7f97e19 100644
--- a/po/de.po
+++ b/po/de.po
< at >< at > -95,8 +95,8 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.0\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-04-12 07:51-0400\n"
-"PO-Revision-Date: 2012-04-29 11:33+0200\n"
+"POT-Creation-Date: 2012-05-19 13:19+0200\n"
+"PO-Revision-Date: 2012-05-19 13:29+0200\n"
 "Last-Translator: JÃ¼rgen SpitzmÃ¼ller <spitz< at >lyx.org>\n"
 "Language-Team: German <lyx-docs< at >lists.lyx.org>\n"
 "Language: de\n"
< at >< at > -134,7 +134,7 < at >< at > msgstr "Urheberrecht"
 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66
 #: src/frontends/qt4/ui/TexinfoUi.ui:58
 #: src/frontends/qt4/ui/ThesaurusUi.ui:138 src/frontends/qt4/ui/Wr

[LyX 2.0.x] * sk.po

Kornel Benko — 2012-05-19T09:12:09

The branch, 2.0.x, has been updated.

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

commit b28680de119497eb9b229d2371a1f5b3e311ac03
Author: Kornel Benko <kornel< at >lyx.org>
Date:   Sat May 19 11:11:50 2012 +0200

    * sk.po

diff --git a/po/sk.po b/po/sk.po
index 21a34dd..000d141 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -8,7 +8,7 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-05-05 10:14+0200\n"
+"POT-Creation-Date: 2012-05-14 17:48+0200\n"
 "PO-Revision-Date: 2012-04-08 11:27+0100\n"
 "Last-Translator: Kornel Benko <kornel< at >lyx.org>\n"
 "Language-Team: Slovak <lyx-docs< at >lists.lyx.org>\n"
< at >< at > -9172,31 +9172,23 < at >< at > msgstr "KoniecDopis"
 msgid "End of letter"
 msgstr "Koniec dopisu"
 
-#: lib/layouts/seminar.layout:24
+#: lib/layouts/seminar.layout:25 lib/layouts/seminar.layout:84
 msgid "LandscapeSlide"
 msgstr "FÃ³liaNaÅ Ãrku"
 
-#: lib/layouts/seminar.layout:34
-msgid "Landscape Slide:"
-msgstr "

[LyX master] * sk.po

Kornel Benko — 2012-05-19T09:11:13

The branch, master, has been updated.

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

commit e8bfe85ea3002e1112828ffe4602e93d5b205905
Author: Kornel Benko <kornel< at >lyx.org>
Date:   Sat May 19 11:10:54 2012 +0200

    * sk.po

diff --git a/po/sk.po b/po/sk.po
index 036154f..37a19bd 100644
--- a/po/sk.po
+++ b/po/sk.po
< at >< at > -8,7 +8,7 < at >< at > msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-devel< at >lists.lyx.org\n"
-"POT-Creation-Date: 2012-05-10 12:01+0200\n"
+"POT-Creation-Date: 2012-05-12 09:24+0200\n"
 "PO-Revision-Date: 2012-04-08 11:27+0100\n"
 "Last-Translator: Kornel Benko <kornel< at >lyx.org>\n"
 "Language-Team: Slovak <lyx-docs< at >lists.lyx.org>\n"
< at >< at > -9129,31 +9129,23 < at >< at > msgstr "KoniecDopis"
 msgid "End of letter"
 msgstr "Koniec dopisu"
 
-#: lib/layouts/seminar.layout:24
+#: lib/layouts/seminar.layout:25 lib/layouts/seminar.layout:84
 msgid "LandscapeSlide"
 msgstr "FÃ³liaNaÅ Ãrku"
 
-#: lib/layouts/seminar.layout:34
-msgid "Landscape Slide:"
-msgstr

[LyX master] If a file is saved as, reset its master if it has any, thus preventing a crash (bug 8161)

Juergen Spitzmueller — 2012-05-19T08:16:57

The branch, master, has been updated.

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

commit ab1434dce321d2f7dc9619ae54112f5203494590
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 19 10:16:28 2012 +0200

    If a file is saved as, reset its master if it has any, thus preventing a crash (bug 8161)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index ad119bd..54c34c2 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
< at >< at > -4591,6 +4591,7 < at >< at > bool Buffer::saveAs(FileName const & fn)
 // we need to check that the locations of child buffers
 // are still valid.
 checkChildBuffers();
+checkMasterBuffer();
 return true;
 } else {
 // save failed
< at >< at > -4639,4 +4640,25 < at >< at > void Buffer::checkChildBuffers()
 d->position_to_children.clear();
 }
 
+
+// If a child has been saved under a different name/path, it might have been
+// orphaned. Therefore the master needs to be reset (bug 8161).
+void Buffer::checkMasterBuffer()
+{
+Buffer const * const master = masterBuffer();
+

[LyX master] Revert this change. Needs more thought

Juergen Spitzmueller — 2012-05-19T07:56:12

The branch, master, has been updated.

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

commit 9d69d9937947cd605fdd53805ccc3f2fbfbef06e
Author: Juergen Spitzmueller <spitz< at >lyx.org>
Date:   Sat May 19 09:56:00 2012 +0200

    Revert this change. Needs more thought

diff --git a/lib/unicodesymbols b/lib/unicodesymbols
index 980c717..b92a823 100644
--- a/lib/unicodesymbols
+++ b/lib/unicodesymbols
< at >< at > -1598,7 +1598,7 < at >< at >
 #0x200e ""                         "" "" "" "" # LEFT-TO-RIGHT MARK
 #0x200f ""                         "" "" "" "" # RIGHT-TO-LEFT MARK
 0x2010 "-"                        "" "notermination=text" "" "" # HYPHEN # identic in LaTeX to FIGURE DASH
-0x2011 "\\nobreakdash-\\hspace{0pt}"           "amsmath" "notermination=text" "" "" # NON-BREAKING HYPHEN (0pt space to allow normal hypenation in the following word.)
+0x2011 "\\nobreakdash-"           "amsmath" "notermination=text" "" "" # NON-BREAKING HYPHEN
 0x2012 "-"                        "" "notermination=text" "" "" # FIG

[LyX master] installer: Jabref 2.8 is out; updates for next release

Uwe Stöhr — 2012-05-18T21:23:57

The branch, master, has been updated.

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

commit 07d3b5bc237b39ba72a94819cdb1451ad8f98289
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Fri May 18 23:23:50 2012 +0200

    installer: Jabref 2.8 is out; updates for next release

diff --git a/development/Win32/packaging/installer/settings.nsh b/development/Win32/packaging/installer/settings.nsh
index 03ed48f..7a6eb13 100644
--- a/development/Win32/packaging/installer/settings.nsh
+++ b/development/Win32/packaging/installer/settings.nsh
< at >< at > -48,15 +48,15 < at >< at > These typically need to be modified for each LyX release
 
 !define MiKTeXRepo "ftp://ftp.tu-chemnitz.de/pub/tex/systems/win32/miktex/tm/packages/"
 
-!define JabRefVersion "2.7"
+!define JabRefVersion "2.8"
 !define MiKTeXDeliveredVersion "2.9"
-!define ImageMagickVersion "6.7.5"
+!define ImageMagickVersion "6.7.6"
  
 # definitions for the Complete installer
 !if ${SETUPTYPE} == BUNDLE
  !define JabRefInstall "external\JabRef-2.7-setup

[LyX master] seminar.lyx: new example file from Günter Milde (forgot it in last commit)

Uwe Stöhr — 2012-05-18T21:21:40

The branch, master, has been updated.

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

commit de42d09e1e77cb7b8f3333865fcacba3ac2dc8af
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Fri May 18 23:21:35 2012 +0200

    seminar.lyx: new example file from GÃ¼nter Milde (forgot it in last commit)

diff --git a/lib/examples/seminar.lyx b/lib/examples/seminar.lyx
index 17944b1..05557ea 100644
--- a/lib/examples/seminar.lyx
+++ b/lib/examples/seminar.lyx
< at >< at > -5,10 +5,16 < at >< at >
 \textclass seminar
 \begin_preamble
 \renewcommand{\printlandscape}{\special{landscape}}
+
+% if slides come out in the viewer upside down, try:
 %\sliderotation{right}
+
+%\AtBeginDocument{%
+%  \pdfpageheight = \paperheight
+%  \pdfpagewidth = \paperwidth
+%}
 \end_preamble
-\options a4paper, semrot, slidesec
-\use_default_options false
+\use_default_options true
 \maintain_unincluded_children false
 \language english
 \language_package default
< at >< at > -24,15 +30,24 < at >< at >
 \font_sf_scale 100
 \font_tt_scale 100
 
-\graphics

[LyX 2.0.x] seminar.lyx: new example file from Günter Milde (forgot it in last commit)

Uwe Stöhr — 2012-05-18T21:20:25

The branch, 2.0.x, has been updated.

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

commit ab28040ca42253710afef1de5bb1a1e098cc06a4
Author: Uwe StÃ¶hr <uwestoehr< at >lyx.org>
Date:   Fri May 18 23:20:20 2012 +0200

    seminar.lyx: new example file from GÃ¼nter Milde (forgot it in last commit)

diff --git a/lib/examples/seminar.lyx b/lib/examples/seminar.lyx
index 17944b1..05557ea 100644
--- a/lib/examples/seminar.lyx
+++ b/lib/examples/seminar.lyx
< at >< at > -5,10 +5,16 < at >< at >
 \textclass seminar
 \begin_preamble
 \renewcommand{\printlandscape}{\special{landscape}}
+
+% if slides come out in the viewer upside down, try:
 %\sliderotation{right}
+
+%\AtBeginDocument{%
+%  \pdfpageheight = \paperheight
+%  \pdfpagewidth = \paperwidth
+%}
 \end_preamble
-\options a4paper, semrot, slidesec
-\use_default_options false
+\use_default_options true
 \maintain_unincluded_children false
 \language english
 \language_package default
< at >< at > -24,15 +30,24 < at >< at >
 \font_sf_scale 100
 \font_tt_scale 100
 
-\graphics