subject:"\[LyX master\] Merge branch 'master' of git.lyx.org\:lyx"

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

2024-04-02 Thread Juergen Spitzmueller

commit 77b680546d08e4cf5cefac2feca30155d52ad183
Merge: 655cdfbb7b 34dbdad957
Author: Juergen Spitzmueller 
Date:   Wed Apr 3 07:26:11 2024 +0200

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

 .gitignore|   2 +-
 lib/doc/UserGuide.lyx |  87 --
 po/fr.gmo | Bin 656494 -> 656498 bytes
 po/fr.po  |  26 +++
 src/LyXAction.cpp |   4 ++-
 5 files changed, 101 insertions(+), 18 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2024-03-15 Thread Juergen Spitzmueller

commit 1fca6842a57f0cf9ccefbb4be178a227895f407a
Merge: 5f82a7a515 f9c60d477d
Author: Juergen Spitzmueller 
Date:   Sat Mar 16 05:03:16 2024 +0100

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

 src/graphics/PreviewLoader.cpp | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2024-03-15 Thread Juergen Spitzmueller

commit 5f82a7a515bffd3527c9e557ebfb1e39d1705a97
Merge: 1f4238c9fb b3fe9cb704
Author: Juergen Spitzmueller 
Date:   Sat Mar 16 04:59:08 2024 +0100

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

 src/graphics/PreviewLoader.cpp | 25 ++---
 1 file changed, 22 insertions(+), 3 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2023-07-21 Thread Juergen Spitzmueller

commit c3e0ae4bfdf7e718f0048cf73df9ca3002cd65a6
Merge: 07c2440 f31bf0d
Author: Juergen Spitzmueller 
Date:   Fri Jul 21 09:09:30 2023 +0200

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

 development/FORMAT |3 +
 po/sk.po   |  106 
 src/Cursor.cpp |6 +-
 3 files changed, 104 insertions(+), 11 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2023-04-23 Thread Juergen Spitzmueller

commit cb17dbf68db47435a38914df1028dba4ed32884f
Merge: 4f83a99 a156606
Author: Juergen Spitzmueller 
Date:   Sun Apr 23 14:49:44 2023 +0200

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

 po/cs.po |   79 +++--
 1 files changed, 30 insertions(+), 49 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2022-06-12 Thread Juergen Spitzmueller

commit c29f31e9822f1ae651129e9647be2de4afa4e918
Merge: b2a7b71 1e58d5c
Author: Juergen Spitzmueller 
Date:   Sun Jun 12 13:35:52 2022 +0200

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

 development/autotests/ctests-costs-benefits.txt |8 ++-
 src/Row.cpp |   12 +++-
 src/RowFlags.h  |   29 
 src/insets/InsetIndex.h |2 +
 src/insets/InsetLabel.h |2 +
 src/lyxfind.cpp |   80 +-
 6 files changed, 41 insertions(+), 92 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2021-03-01 Thread Juergen Spitzmueller

commit f28affd421a30b7c8620b6aedf76bfa665321733
Merge: 0e54e01 234886f
Author: Juergen Spitzmueller 
Date:   Tue Mar 2 07:04:03 2021 +0100

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

 src/Cursor.cpp|9 ++---
 src/frontends/qt/GuiAbout.cpp |2 +-
 src/mathed/InsetMathColor.cpp |9 -
 src/mathed/InsetMathColor.h   |4 
 4 files changed, 19 insertions(+), 5 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2021-03-01 Thread Juergen Spitzmueller

commit d49c4abb437f391efc00c1234df338ae1b4fa2c3
Merge: f28affd f92f2f9
Author: Juergen Spitzmueller 
Date:   Tue Mar 2 08:36:42 2021 +0100

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

 src/frontends/qt/GuiApplication.cpp |5 +
 1 files changed, 5 insertions(+), 0 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2020-07-19 Thread Thibaut Cuvelier

commit 85283760024ba87339677f693bc9c6f0f6a476c9
Merge: c6b17b7 a2e7830
Author: Thibaut Cuvelier 
Date:   Mon Jul 20 03:03:16 2020 +0200

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

-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2019-12-24 Thread Juergen Spitzmueller

commit bab184e49e4420ad5277eacd45f2447727f55bbd
Merge: a08cbf4 fc46e45
Author: Juergen Spitzmueller 
Date:   Tue Dec 24 18:09:34 2019 +0100

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

 po/de.po |  276 +++---
 po/sk.po |   57 +
 2 files changed, 177 insertions(+), 156 deletions(-)
-- 
lyx-cvs mailing list
lyx-cvs@lists.lyx.org
http://lists.lyx.org/mailman/listinfo/lyx-cvs

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

2019-07-15 Thread Juergen Spitzmueller

commit f83c5eab77f4f2c57ff8d05496468f5f1e9007b3
Merge: 317091c b9cc642
Author: Juergen Spitzmueller 
Date:   Mon Jul 15 18:23:04 2019 +0200

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

 INSTALL.Cygwin   |   34 +++
 Makefile.am  |2 +-
 README.Cygwin|   34 ---
 lib/configure.py |  253 +++---
 po/postats.py|   11 ++-
 5 files changed, 170 insertions(+), 164 deletions(-)

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

2019-07-15 Thread Juergen Spitzmueller

commit ebf0fe6756ab2d1a54848095284fb142431bb423
Merge: f83c5ea 10379ab
Author: Juergen Spitzmueller 
Date:   Tue Jul 16 07:18:29 2019 +0200

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

 lib/Makefile.am   |   21 ---
 lib/doc/Math.lyx  |   31 +---
 lib/images/classic/layout_Chunk.png   |  Bin 327 -> 0 bytes
 lib/images/classic/layout_Description.png |  Bin 210 -> 0 bytes
 lib/images/classic/layout_Enumerate.png   |  Bin 234 -> 0 bytes
 lib/images/classic/layout_Itemize.png |  Bin 202 -> 0 bytes
 lib/images/classic/layout_List.png|  Bin 199 -> 0 bytes
 lib/images/classic/layout_LyX-Code.png|  Bin 268 -> 0 bytes
 lib/images/classic/layout_Section.png |  Bin 238 -> 0 bytes
 lib/images/layout_Chunk.svgz  |  Bin 1646 -> 0 bytes
 lib/images/layout_Description.svgz|  Bin 1553 -> 0 bytes
 lib/images/layout_Enumerate.svgz  |  Bin 2043 -> 0 bytes
 lib/images/layout_Itemize.svgz|  Bin 1441 -> 0 bytes
 lib/images/layout_List.svgz   |  Bin 1568 -> 0 bytes
 lib/images/layout_LyX-Code.svgz   |  Bin 2163 -> 0 bytes
 lib/images/layout_Section.svgz|  Bin 3248 -> 0 bytes
 lib/images/oxygen/layout_Chunk.svgz   |  Bin 4675 -> 0 bytes
 lib/images/oxygen/layout_Description.svgz |  Bin 1714 -> 0 bytes
 lib/images/oxygen/layout_Enumerate.svgz   |  Bin 4278 -> 0 bytes
 lib/images/oxygen/layout_Itemize.svgz |  Bin 1850 -> 0 bytes
 lib/images/oxygen/layout_List.svgz|  Bin 1677 -> 0 bytes
 lib/images/oxygen/layout_LyX-Code.svgz|  Bin 3121 -> 0 bytes
 lib/images/oxygen/layout_Section.svgz |  Bin 2681 -> 0 bytes
 po/postats.py |   24 +++---
 24 files changed, 39 insertions(+), 37 deletions(-)

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

2019-03-26 Thread Juergen Spitzmueller

commit 2871b484a1730c528f902494e33ab7d9e35bcbfd
Merge: fd28958 c5fa523
Author: Juergen Spitzmueller 
Date:   Tue Mar 26 10:08:42 2019 +0100

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

 development/cmake/modules/LyXPaths.cmake |   16 
 1 files changed, 8 insertions(+), 8 deletions(-)

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

2019-01-25 Thread Juergen Spitzmueller

commit c1dabfebea21769c70d5ac6444747838afb1c4a8
Merge: 394f039 67ed1ec
Author: Juergen Spitzmueller 
Date:   Fri Jan 25 18:29:15 2019 +0100

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

 development/autotests/invertedTests |6 --
 lib/doc/zh_CN/Intro.lyx |2 +-
 lib/doc/zh_CN/Tutorial.lyx  |4 ++--
 lib/examples/ko/splash.lyx  |8 
 po/de.po|4 ++--
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --cc po/de.po
index 6310bd5,cee9fb6..4ce80aa
--- a/po/de.po
+++ b/po/de.po
@@@ -95,8 -95,8 +95,8 @@@ msgid "
  msgstr ""
  "Project-Id-Version: LyX 2.4git\n"
  "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
 -"POT-Creation-Date: 2018-12-29 18:15+0100\n"
 -"PO-Revision-Date: 2018-12-29 18:18+0100\n"
 +"POT-Creation-Date: 2019-01-25 14:43+0100\n"
- "PO-Revision-Date: 2019-01-25 14:48+0100\n"
++"PO-Revision-Date: 2019-01-25 15:00+0100\n"
  "Last-Translator: Juergen Spitzmueller \n"
  "Language-Team: German \n"
  "Language: de\n"
@@@ -26375,24 -26375,7 +26375,24 @@@ msgstr "Vergessen Sie nicht, ihre Date
  msgid "Remove emergency file now?"
  msgstr "Notspeicherungsdatei jetzt löschen?"
  
 -#: src/Buffer.cpp:4778
 +#: src/Buffer.cpp:4792
 +msgid "Can't rename emergency file!"
- msgstr "Notspeicherung kann nicht umbenannt werden!"
++msgstr "Notspeicherungsdatei kann nicht umbenannt werden!"
 +
 +#: src/Buffer.cpp:4793
 +msgid ""
 +"LyX was unable to rename the emergency file. You should do so manually. "
 +"Otherwise, you will be asked about it again the next time you try to load "
 +"this file, and may over-write your own work."
 +msgstr ""
 +"LyX konnte die Notspeicherungsdatei nicht umbenennen. Sie sollten das 
manuell"
 +" tun. "
 +"Sonst werden Sie nächstes Mal, wenn Sie diese Datei laden, wieder danach"
 +" gefragt, "
 +"und Ihre Datei könnte mit einer dann nicht mehr aktuellen Notspeicherung"
 +" überschrieben werden."
 +
 +#: src/Buffer.cpp:4818
  #, c-format
  msgid ""
  "The backup of the document %1$s is newer.\n"

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

2018-12-29 Thread José Matos

commit 8663a371f31dc7bb888071c15a0b2cd4c3669c60
Merge: 3f03f0a 69726b8
Author: José Matos 
Date:   Sat Dec 29 19:24:59 2018 +

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

 src/support/filetools.cpp |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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

2018-01-29 Thread Uwe Stöhr

commit 46037ea583dd5a15a119a1a5d44c7ee5ca4649e6
Merge: 59ce6da c2ed75f
Author: Uwe Stöhr 
Date:   Mon Jan 29 15:10:13 2018 +0100

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

 src/LyX.cpp |   53 +++--
 1 files changed, 27 insertions(+), 26 deletions(-)

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

2018-01-23 Thread Uwe Stöhr

commit 029a6aace60704616f65d9071cc655c79cf755a5
Merge: dceb7e3 a77cfef
Author: Uwe Stöhr 
Date:   Wed Jan 24 01:18:43 2018 +0100

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

 lib/examples/fr/seminar.lyx |   10 +
 lib/examples/seminar.lyx|8 +---
 lib/lyx2lyx/lyx_2_0.py  |   75 ---
 lib/lyx2lyx/lyx_2_2.py  |   21 
 lib/lyx2lyx/parser_tools.py |   43 +++-
 5 files changed, 73 insertions(+), 84 deletions(-)

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

2017-07-27 Thread Juergen Spitzmueller

commit 5eaee6b51ef95873457059d37ab1cfa48f4f22a0
Merge: ebca8ce 4b21634
Author: Juergen Spitzmueller 
Date:   Thu Jul 27 18:30:10 2017 +0200

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

 lib/doc/de/Additional.lyx |11531 +++--
 1 files changed, 5836 insertions(+), 5695 deletions(-)

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

2017-01-15 Thread Juergen Spitzmueller

commit a53847964dc44d15f7c83cc65dbc16fef88d54c9
Merge: 8f823ed fdf8059
Author: Juergen Spitzmueller 
Date:   Sun Jan 15 12:19:37 2017 +0100

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

 lib/RELEASE-NOTES|2 +
 lib/configure.py |1 +
 lib/languages|   69 +++---
 lib/layouts/amsart.layout|2 +-
 po/sk.gmo|  Bin 503639 -> 503738 bytes
 po/sk.po |  116 -
 src/Changes.cpp  |  110 ---
 src/Changes.h|   15 +++--
 src/Paragraph.cpp|6 +-
 src/Paragraph.h  |3 +-
 src/TextClass.cpp|   12 
 src/TextClass.h  |6 +-
 src/TocBackend.cpp   |   56 +-
 src/TocBackend.h |8 ++-
 src/frontends/qt4/Menus.cpp  |   34 +--
 src/frontends/qt4/TocModel.cpp   |   13 ++--
 src/frontends/qt4/qt_helpers.cpp |   42 --
 src/frontends/qt4/qt_helpers.h   |4 -
 src/insets/Inset.h   |6 ++-
 src/insets/InsetArgument.cpp |7 +-
 src/insets/InsetArgument.h   |2 +-
 src/insets/InsetCaption.cpp  |6 +-
 src/insets/InsetCaption.h|3 +-
 src/insets/InsetCaptionable.cpp  |6 +-
 src/insets/InsetCaptionable.h|2 +-
 src/insets/InsetCitation.cpp |4 +-
 src/insets/InsetCitation.h   |2 +-
 src/insets/InsetCollapsable.cpp  |8 +-
 src/insets/InsetCollapsable.h|2 +-
 src/insets/InsetExternal.cpp |4 +-
 src/insets/InsetExternal.h   |2 +-
 src/insets/InsetGraphics.cpp |4 +-
 src/insets/InsetGraphics.h   |2 +-
 src/insets/InsetInclude.cpp  |   22 
 src/insets/InsetInclude.h|2 +-
 src/insets/InsetIndex.cpp|6 +-
 src/insets/InsetIndex.h  |2 +-
 src/insets/InsetLabel.cpp|4 +-
 src/insets/InsetLabel.h  |2 +-
 src/insets/InsetNomencl.cpp  |4 +-
 src/insets/InsetNomencl.h|2 +-
 src/insets/InsetRef.cpp  |4 +-
 src/insets/InsetRef.h|2 +-
 src/insets/InsetTabular.cpp  |8 +-
 src/insets/InsetTabular.h|4 +-
 src/insets/InsetText.cpp |   27 +
 src/insets/InsetText.h   |   11 ++-
 src/mathed/InsetMathHull.cpp |6 +-
 src/mathed/InsetMathHull.h   |2 +-
 src/mathed/MathMacroTemplate.cpp |   22 
 src/mathed/MathMacroTemplate.h   |2 +-
 51 files changed, 376 insertions(+), 315 deletions(-)

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

2016-06-26 Thread Juergen Spitzmueller

commit 57b69a5efddf9f3c148007322f00dad6c253a2ed
Merge: ecc90a9 3c6f242
Author: Juergen Spitzmueller 
Date:   Sun Jun 26 14:27:30 2016 +0200

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

 src/mathed/MathExtern.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

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

2016-05-29 Thread Uwe Stöhr

commit b917c4e40f9f5cd3d101444600eddafcca54d6e3
Merge: e7aaaed 82e0ad3
Author: Uwe Stöhr 
Date:   Sun May 29 23:58:10 2016 +0200

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

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

2016-05-08 Thread Uwe Stöhr

commit c62cad7a71bf6ee80afba8c9aca2fde7d4e1b10b
Merge: 41e928b 654f213
Author: Uwe Stöhr 
Date:   Mon May 9 01:24:14 2016 +0200

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

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

2016-01-31 Thread Uwe Stöhr

commit bd3dd7873a3e7a424e90cf24e1f3d65051c67bc2
Merge: 4848c43 d569431
Author: Uwe Stöhr 
Date:   Sun Jan 31 21:27:47 2016 +0100

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

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

2016-01-23 Thread Uwe Stöhr

commit 716f44d5b93f13b3fd9d8e37c5abe4932f70fe38
Merge: d0ca4dd d763840
Author: Uwe Stöhr 
Date:   Sat Jan 23 16:20:01 2016 +0100

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

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

2015-12-31 Thread Kornel Benko

commit 42f1f5841809eec3751490a3f1177c7d20e16885
Merge: 1fbcd26 9e135d9
Author: Kornel Benko 
Date:   Thu Dec 31 15:24:33 2015 +0100

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

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

2015-11-22 Thread Kornel Benko

commit c08a5ade542d971c8e23f86f709279f4491906fa
Merge: 5a9ddb3 08317ec
Author: Kornel Benko 
Date:   Sun Nov 22 13:57:13 2015 +0100

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

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

2015-10-25 Thread Kornel Benko

commit 49f50022319834a4bd8851f02f7015b9aad77005
Merge: 5439f4e a0b3eaf
Author: Kornel Benko 
Date:   Sun Oct 25 16:29:11 2015 +0100

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

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

2015-06-01 Thread Uwe Stöhr

commit f9d9a71df49229a17db3b684a8c086d67e8f0f02
Merge: b621975 d4ae233
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Mon Jun 1 20:46:16 2015 +0200

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

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

2015-06-01 Thread Uwe Stöhr

commit f9d9a71df49229a17db3b684a8c086d67e8f0f02
Merge: b621975 d4ae233
Author: Uwe Stöhr 
Date:   Mon Jun 1 20:46:16 2015 +0200

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

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

2015-05-28 Thread Juergen Spitzmueller

commit 5c97c15e0334bdbe1ca5b2f2d6e43725c8431e34
Merge: 6501bb0 24af3f8
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Thu May 28 09:47:18 2015 +0200

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

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

2015-05-28 Thread Juergen Spitzmueller

commit 5c97c15e0334bdbe1ca5b2f2d6e43725c8431e34
Merge: 6501bb0 24af3f8
Author: Juergen Spitzmueller 
Date:   Thu May 28 09:47:18 2015 +0200

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

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

2015-05-24 Thread Uwe Stöhr

commit 9ba270462f29f4ddd913c3b02ed3154181803e62
Merge: 041a3ad bf24ea6
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 24 17:03:24 2015 +0200

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

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

2015-05-24 Thread Uwe Stöhr

commit 0863b7e0fcf7d767d457ea3bdd4613a699209d6e
Merge: f69d5ab 701a100
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 24 23:25:31 2015 +0200

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

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

2015-05-24 Thread Uwe Stöhr

commit 9ba270462f29f4ddd913c3b02ed3154181803e62
Merge: 041a3ad bf24ea6
Author: Uwe Stöhr 
Date:   Sun May 24 17:03:24 2015 +0200

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

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

2015-05-24 Thread Uwe Stöhr

commit 0863b7e0fcf7d767d457ea3bdd4613a699209d6e
Merge: f69d5ab 701a100
Author: Uwe Stöhr 
Date:   Sun May 24 23:25:31 2015 +0200

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

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

2015-05-04 Thread Uwe Stöhr

commit 328dbe06026d5fef1ed663a7743daa4b62ccb3d0
Merge: 0fbd25a 6e6abe1
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Tue May 5 01:43:51 2015 +0200

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

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

2015-05-04 Thread Uwe Stöhr

commit 328dbe06026d5fef1ed663a7743daa4b62ccb3d0
Merge: 0fbd25a 6e6abe1
Author: Uwe Stöhr 
Date:   Tue May 5 01:43:51 2015 +0200

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

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

2015-05-03 Thread Uwe Stöhr

commit f5648006fbd0c816488c6a9167b4787d1e3a839a
Merge: 9e87cf0 8c351e3
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Mon May 4 01:51:21 2015 +0200

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

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

2015-05-03 Thread Uwe Stöhr

commit f5648006fbd0c816488c6a9167b4787d1e3a839a
Merge: 9e87cf0 8c351e3
Author: Uwe Stöhr 
Date:   Mon May 4 01:51:21 2015 +0200

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

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

2015-04-29 Thread Uwe Stöhr

commit f6fde9dbb243b4ddb7a0e73feaf86b632a23e164
Merge: f6029f7 d3eae5b
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Thu Apr 30 01:23:03 2015 +0200

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

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

2015-04-29 Thread Uwe Stöhr

commit f6fde9dbb243b4ddb7a0e73feaf86b632a23e164
Merge: f6029f7 d3eae5b
Author: Uwe Stöhr 
Date:   Thu Apr 30 01:23:03 2015 +0200

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

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

2014-04-28 Thread Uwe Stöhr

commit 40aedb51466eb74f1b4ef54fad92dc47bab5f1cc
Merge: 6faa9b6 79a59fc
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Mon Apr 28 22:57:23 2014 +0200

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

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

2014-04-28 Thread Uwe Stöhr

commit 40aedb51466eb74f1b4ef54fad92dc47bab5f1cc
Merge: 6faa9b6 79a59fc
Author: Uwe Stöhr 
Date:   Mon Apr 28 22:57:23 2014 +0200

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

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

2014-03-09 Thread 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] Merge branch 'master' of git.lyx.org:lyx

2014-03-09 Thread 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] Merge branch 'master' of git.lyx.org:lyx

2013-05-30 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit db06f8c2e804185bbf6340e1c3a5cdfd9f4cadaa
Merge: 0a1c894 73c0f7c
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Thu May 30 16:45:51 2013 +0200

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


commit 0a1c8944a14724780e2623424b1be6fae402465b
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Thu May 30 16:45:32 2013 +0200

multicol.module: style refinements by JÃ¼rgen

- fixes bug #8568

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index 0636a2f..eecbbbf 100644
--- a/lib/layouts/multicol.module
+++ b/lib/layouts/multicol.module
@@ -1,7 +1,6 @@
 #\DeclareLyXModule[multicol.sty]{Multiple Columns}
 #DescriptionBegin
-#Adds 2 styles to begin and end text in multiple columns.
-#The begin style contains the number of columns, the end style must be kept 
empty.
+#Adds a custom inset whose content is set with multiple columns (2 by default).
 #See the Additional manual, section 'Multiple Text Columns', for a detailed
 #description of multiple columns.
 #DescriptionEnd
@@ -9,45 +8,27 @@
 
 Format 45
 
-AddToPreamble
- % used for multiple text columns
- \usepackage{multicol}
-
-EndPreamble
-
-Style Begin Multiple Columns
-  Category MainText
-  Margin   First_Dynamic
-  LatexTypecommand
-  LabelTypeStatic
-  LabelSep xx
-  LatexNamebegin{multicols}
-  LabelString  ---Begin Multiple Columns---
-  Argument post:1
-LabelStringPreface
-TooltipAn optional preface
+InsetLayout Flex:Multiple_Columns
+  LyXType   custom
+  Decorationclassic
+  LabelString   Columns
+  LatexType environment
+  LatexName multicols
+  Argument 1
+LabelString Number of Columns
+Tooltip Insert the number of columns here
+Mandatory   1
+DefaultArg  2
   EndArgument
-  Argument post:2
-LabelStringSpace Before Page Break
-TooltipFree space that needs to be on the page to start the 
multiple columns on this page
+  Argument 2
+LabelString Preface
+Tooltip An optional preface
   EndArgument
-  KeepEmpty1
-  ParSkip  0
-  TopSep   0
-  BottomSep0
-  ParSep   0
-  Font
-Color  Blue
-  EndFont
-  LabelFont
-Color  Green
-  EndFont
-End
-
-Style End Multiple Columns
-  CopyStyleBegin Multiple Columns
-  LatexNameend{multicols}
-  LabelString  ---End Multiple Columns---
-  ResetArgs1
+  Argument 3
+LabelString Space Before Page Break
+Tooltip Free space that needs to be on the page to start the 
multiple columns on this page
+Requires2
+  EndArgument
+  Requires  multicol
 End
 

---

Summary of changes:
 lib/layouts/multicol.module |   61 +++
 1 files changed, 21 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-30 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 6baa65119b22e88186ecc5291445e1f2f595d906
Merge: f33454b 1b6c138
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Thu May 30 18:15:57 2013 +0200

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


commit f33454b3c7c58aa86c9e30ae92f3c9e909909f52
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Thu May 30 18:15:44 2013 +0200

LaTeXFeatures.cpp: add rsphrase

- also modify the rsphrase.module
- correct naming scheme for the bicaption.module

diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index 5f87a8f..4d3c872 100644
--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@@ -1,4 +1,4 @@
-#\DeclareLyXModule[bicaption.sty]{Multilingual captions}
+#\DeclareLyXModule[bicaption.sty]{Multilingual Captions}
 #DescriptionBegin
 #Provides two styles to typeset multilingual captions.
 #For a description see the file MultilingualCaptions.lyx in LyX's examples 
folder.
diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module
index 06fde1b..935da9f 100644
--- a/lib/layouts/rsphrase.module
+++ b/lib/layouts/rsphrase.module
@@ -8,14 +8,11 @@
 
 Format 45
 
-AddToPreamble
-   \usepackage{rsphrase}
-EndPreamble
-
 InsetLayout Flex:R-S number
LyxType custom
LatexType   command
LatexName   rsnumber
+   Requiresrsphrase
LabelString R-S number
Font
  Color foreground
@@ -42,6 +39,7 @@ End
 Style Safety phrase
LatexType   command
LatexName   rsphrase
+   Requiresrsphrase
CategoryMainText
NextNoIndent1
Argument 1
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 924308c..d23f8b0 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -734,7 +734,8 @@ char const * simplefeatures[] = {
multicol,
multirow,
tfrupee,
-   shapepar
+   shapepar,
+   rsphrase
 };
 
 char const * bibliofeatures[] = {

---

Summary of changes:
 lib/layouts/bicaption.module |2 +-
 lib/layouts/rsphrase.module  |6 ++
 src/LaTeXFeatures.cpp|3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-30 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit db06f8c2e804185bbf6340e1c3a5cdfd9f4cadaa
Merge: 0a1c894 73c0f7c
Author: Uwe StÃ¶hr 
Date:   Thu May 30 16:45:51 2013 +0200

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


commit 0a1c8944a14724780e2623424b1be6fae402465b
Author: Uwe StÃ¶hr 
Date:   Thu May 30 16:45:32 2013 +0200

multicol.module: style refinements by JÃ¼rgen

- fixes bug #8568

diff --git a/lib/layouts/multicol.module b/lib/layouts/multicol.module
index 0636a2f..eecbbbf 100644
--- a/lib/layouts/multicol.module
+++ b/lib/layouts/multicol.module
@@ -1,7 +1,6 @@
 #\DeclareLyXModule[multicol.sty]{Multiple Columns}
 #DescriptionBegin
-#Adds 2 styles to begin and end text in multiple columns.
-#The begin style contains the number of columns, the end style must be kept 
empty.
+#Adds a custom inset whose content is set with multiple columns (2 by default).
 #See the Additional manual, section 'Multiple Text Columns', for a detailed
 #description of multiple columns.
 #DescriptionEnd
@@ -9,45 +8,27 @@
 
 Format 45
 
-AddToPreamble
- % used for multiple text columns
- \usepackage{multicol}
-
-EndPreamble
-
-Style "Begin Multiple Columns"
-  Category MainText
-  Margin   First_Dynamic
-  LatexTypecommand
-  LabelTypeStatic
-  LabelSep xx
-  LatexNamebegin{multicols}
-  LabelString  "---Begin Multiple Columns---"
-  Argument post:1
-LabelString"Preface"
-Tooltip"An optional preface"
+InsetLayout Flex:Multiple_Columns
+  LyXType   custom
+  Decorationclassic
+  LabelString   Columns
+  LatexType environment
+  LatexName multicols
+  Argument 1
+LabelString "Number of Columns"
+Tooltip "Insert the number of columns here"
+Mandatory   1
+DefaultArg  2
   EndArgument
-  Argument post:2
-LabelString"Space Before Page Break"
-Tooltip"Free space that needs to be on the page to start the 
multiple columns on this page"
+  Argument 2
+LabelString "Preface"
+Tooltip "An optional preface"
   EndArgument
-  KeepEmpty1
-  ParSkip  0
-  TopSep   0
-  BottomSep0
-  ParSep   0
-  Font
-Color  Blue
-  EndFont
-  LabelFont
-Color  Green
-  EndFont
-End
-
-Style "End Multiple Columns"
-  CopyStyle"Begin Multiple Columns"
-  LatexNameend{multicols}
-  LabelString  "---End Multiple Columns---"
-  ResetArgs1
+  Argument 3
+LabelString "Space Before Page Break"
+Tooltip "Free space that needs to be on the page to start the 
multiple columns on this page"
+Requires2
+  EndArgument
+  Requires  multicol
 End
 

---

Summary of changes:
 lib/layouts/multicol.module |   61 +++
 1 files changed, 21 insertions(+), 40 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-30 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 6baa65119b22e88186ecc5291445e1f2f595d906
Merge: f33454b 1b6c138
Author: Uwe StÃ¶hr 
Date:   Thu May 30 18:15:57 2013 +0200

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


commit f33454b3c7c58aa86c9e30ae92f3c9e909909f52
Author: Uwe StÃ¶hr 
Date:   Thu May 30 18:15:44 2013 +0200

LaTeXFeatures.cpp: add rsphrase

- also modify the rsphrase.module
- correct naming scheme for the bicaption.module

diff --git a/lib/layouts/bicaption.module b/lib/layouts/bicaption.module
index 5f87a8f..4d3c872 100644
--- a/lib/layouts/bicaption.module
+++ b/lib/layouts/bicaption.module
@@ -1,4 +1,4 @@
-#\DeclareLyXModule[bicaption.sty]{Multilingual captions}
+#\DeclareLyXModule[bicaption.sty]{Multilingual Captions}
 #DescriptionBegin
 #Provides two styles to typeset multilingual captions.
 #For a description see the file MultilingualCaptions.lyx in LyX's examples 
folder.
diff --git a/lib/layouts/rsphrase.module b/lib/layouts/rsphrase.module
index 06fde1b..935da9f 100644
--- a/lib/layouts/rsphrase.module
+++ b/lib/layouts/rsphrase.module
@@ -8,14 +8,11 @@
 
 Format 45
 
-AddToPreamble
-   \usepackage{rsphrase}
-EndPreamble
-
 InsetLayout "Flex:R-S number"
LyxType custom
LatexType   command
LatexName   rsnumber
+   Requiresrsphrase
LabelString "R-S number"
Font
  Color foreground
@@ -42,6 +39,7 @@ End
 Style "Safety phrase"
LatexType   command
LatexName   rsphrase
+   Requiresrsphrase
CategoryMainText
NextNoIndent1
Argument 1
diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 924308c..d23f8b0 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -734,7 +734,8 @@ char const * simplefeatures[] = {
"multicol",
"multirow",
"tfrupee",
-   "shapepar"
+   "shapepar",
+   "rsphrase"
 };
 
 char const * bibliofeatures[] = {

---

Summary of changes:
 lib/layouts/bicaption.module |2 +-
 lib/layouts/rsphrase.module  |6 ++
 src/LaTeXFeatures.cpp|3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-25 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 92a2e179035a9c67bb042a3b6eac00a72d1ef862
Merge: 472732f c8000f9
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sat May 25 13:52:38 2013 +0200

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


commit 472732f92d7287c47ff1003094df5f6826c15c2e
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sat May 25 13:52:09 2013 +0200

GuiBox.cpp: addendum to [f04c7711/lyxgit]

- this was forgotten to commit;
(without this we would get invalid LaTeX code when changing in the box 
dialog a makebox without a width to a minipage and press apply - a makebox 
required to specify a width, at least an invisible one like 0cm)

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 90f5659..afca9ab 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -378,6 +378,9 @@ docstring GuiBox::dialogToParams() const
params.width = Length(value.toDouble(), Length::IN);
} else {
params.special = none;
+   // we must specify a valid length in this case
+   if (value.isEmpty())
+   widthED-setText(0);
params.width = Length(widgetsToLength(widthED, 
widthUnitsLC));
}
} else {

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-25 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 586124c6a7bbad3d28bb756622613334da4a9a23
Merge: 5002ef3 f75becd
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun May 26 03:05:28 2013 +0200

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


commit 5002ef33f03fdd5a7e401b6dd36285e2e4dee004
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun May 26 03:04:59 2013 +0200

aa: fix compilation of the templates/aa.lyx

- aa already loads inputenc

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 5decd34..57f6c80 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{Astronomy  Astrophysics}
+#  \DeclareLaTeXClass[aa,answers.sty]{Astronomy  Astrophysics}
 #  \DeclareCategory{Articles}
 #
 # Author: Peter SÃ¼tterlin p...@uni-sw.gwdg.de
@@ -24,6 +24,8 @@ SecNumDepth 3
 TocDepth0
 PageStyle   Plain
 
+# Pre-loaded packages
+Provides inputenc  1
 
 Style Standard
Category  MainText
diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 240f7ae..09d03fb 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -8,9 +8,9 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding default
 \fontencoding global
-\font_roman times
+\font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default

---

Summary of changes:
 lib/layouts/aa.layout |4 +++-
 lib/templates/aa.lyx  |4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-25 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 92a2e179035a9c67bb042a3b6eac00a72d1ef862
Merge: 472732f c8000f9
Author: Uwe StÃ¶hr 
Date:   Sat May 25 13:52:38 2013 +0200

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


commit 472732f92d7287c47ff1003094df5f6826c15c2e
Author: Uwe StÃ¶hr 
Date:   Sat May 25 13:52:09 2013 +0200

GuiBox.cpp: addendum to [f04c7711/lyxgit]

- this was forgotten to commit;
(without this we would get invalid LaTeX code when changing in the box 
dialog a makebox without a width to a minipage and press apply - a makebox 
required to specify a width, at least an invisible one like "0cm")

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 90f5659..afca9ab 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -378,6 +378,9 @@ docstring GuiBox::dialogToParams() const
params.width = Length(value.toDouble(), Length::IN);
} else {
params.special = "none";
+   // we must specify a valid length in this case
+   if (value.isEmpty())
+   widthED->setText("0");
params.width = Length(widgetsToLength(widthED, 
widthUnitsLC));
}
} else {

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2013-05-25 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 586124c6a7bbad3d28bb756622613334da4a9a23
Merge: 5002ef3 f75becd
Author: Uwe StÃ¶hr 
Date:   Sun May 26 03:05:28 2013 +0200

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


commit 5002ef33f03fdd5a7e401b6dd36285e2e4dee004
Author: Uwe StÃ¶hr 
Date:   Sun May 26 03:04:59 2013 +0200

aa: fix compilation of the templates/aa.lyx

- aa already loads inputenc

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 5decd34..57f6c80 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{Astronomy & Astrophysics}
+#  \DeclareLaTeXClass[aa,answers.sty]{Astronomy & Astrophysics}
 #  \DeclareCategory{Articles}
 #
 # Author: Peter SÃ¼tterlin 
@@ -24,6 +24,8 @@ SecNumDepth 3
 TocDepth0
 PageStyle   Plain
 
+# Pre-loaded packages
+Provides inputenc  1
 
 Style Standard
Category  MainText
diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 240f7ae..09d03fb 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -8,9 +8,9 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding default
 \fontencoding global
-\font_roman times
+\font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default

---

Summary of changes:
 lib/layouts/aa.layout |4 +++-
 lib/templates/aa.lyx  |4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-04-21 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 7c88c843cb550f29dd3da62d42f32f889844fe99
Merge: 9769596 928dc03
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Apr 21 21:18:17 2013 +0200

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


commit 976959685cd37da9f13815acf81881589d991d47
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Apr 21 21:17:48 2013 +0200

French UserGuide.lyx: translations by Jean-Pierre

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index c5f6ef9..88dca10 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -2274,11 +2274,8 @@ d'apprentissage
 \emph default
 .
  Avec LyX, la touche de tabulation n'est utilisÃ©e que pour accepter les
- suggestions de la complÃ©tion de saisie ou 
-\lang english
-to move the cursor in tables or math matrices
-\lang french
-;
+ suggestions de la complÃ©tion de saisie ou pour dÃ©placer le curseur dans
+ les tables ou les matrices mathÃ©matiques.
 \end_layout
 
 \begin_layout Labeling
@@ -4326,11 +4323,8 @@ Document ! ParamÃ¨tres
 
 
 \family default
-vous pouvez changer 
-\lang english
-for the whole document
-\lang french
- l'espacement entre les lignes dans la rubrique 
+vous pouvez changer, pour l'ensemble du document, l'espacement entre les
+ lignes dans la rubrique 
 \family sans
 Format
 \begin_inset space ~
@@ -4370,9 +4364,9 @@ Paquetages LaTeX ! setspace
 
 \end_inset
 
- 
+ Vous pouvez le changer pour un seul paragraphe dans la fenÃªtre de dialogue
 \lang english
-You can set it for a single paragraph in the 
+ 
 \family sans
 \lang french
 Ãdition\SpecialChar \menuseparator
@@ -4386,9 +4380,8 @@ de
 
 Paragraphe
 \family default
-\lang english
- dialog but this should be used very exceptionally because vertical spacing
- is normally defined in the environment's style.
+ , mais ceci devrait Ãªtre utilisÃ© trÃ¨s exceptionnellement car l'espacement
+ vertical est normalement dÃ©fini par le style de l'environnement concernÃ©.
 \end_layout
 
 \begin_layout Section
@@ -4717,26 +4710,16 @@ Date
 \end_layout
 
 \begin_layout Itemize
-si vous ne voulez pas de date du tout, 
-\lang english
-use the option 
+si vous ne voulez pas de date du tout, utilisez l'option 
 \family sans
-Suppress default date on front page
+Supprimer la date implicite sur la premiÃ¨re page
 \family default
- in the menu 
+ dans le menu 
 \family sans
-\lang french
 Document\SpecialChar \menuseparator
 ParamÃ¨tres\SpecialChar \menuseparator
-
-\lang english
-Document
-\begin_inset space ~
-\end_inset
-
-class
+Classe de document
 \family default
-\lang french
 .
 \end_layout
 
@@ -5565,13 +5548,12 @@ arg   break-paragraph inverse
 \end_inset
 
 .
- 
-\lang english
-If you do this at the top level of a list, it returns you to the 
+ Si vus faites ceci au premier niveau d'une liste, vous revenez Ã  
l'environnemen
+t 
 \family sans
 Standard
 \family default
- environment.
+.
 \end_layout
 
 \begin_layout Standard
@@ -24783,26 +24765,19 @@ Il y a plusieurs dÃ©limiteurs disponibles avec LyX.
 
 \end_inset
 
-et pour rendre plus les parenthÃ¨ses.
- 
-\lang english
-Below, the expression on the left was entered using the delimiter icon 
-\lang french
-
+pour rendre plus visibles les niveaux de parenthÃ¨ses.
+ Ci-dessous, l'expression de gauche a Ã©tÃ© saisie en utilisant l'icÃ´ne de
+ dÃ©limitation
 \begin_inset Info
 type  icon
 arg   dialog-show mathdelimiter
 \end_inset
 
-
-\lang english
- and the expression on the right was entered using the 
+ et l'expression de droite a Ã©tÃ© saisie en utilisant les parenthÃ¨ses
 \family typewriter
 ()
 \family default
- keys.
-
-\lang french
+.
  
 \begin_inset Formula 
 \[
@@ -24811,12 +24786,8 @@ arg   dialog-show mathdelimiter
 
 \end_inset
 
-
-\lang english
-If you use the delimiter icon, 
-\lang french
-les parenthÃ¨ses, et autres dÃ©limiteurs, de ce menu s'adaptent Ã  la taille
- de ce qu'elles contiennent.
+Si vous utilisez l'icÃ´ne de dÃ©limitation, les parenthÃ¨ses et autres 
dÃ©limiteurs
+ choisis dans ce menu s'adaptent Ã  la taille de ce qu'elles contiennent.
 \end_layout
 
 \begin_layout Standard
@@ -24855,14 +24826,10 @@ Insertion
 \family default
 .
  Les parenthÃ¨ses seront placÃ©es autour de la structure sÃ©lectionnÃ©e.
- 
-\lang english
-The most common bracket combinations (parentheses, square brackets, and
- braces, on both sides) can be entered more quickly using keyboard shortcuts.
- For example, to insert a pair of flexible parentheses on both sides, select
- the structure and enter
-\lang french
- 
+ Les combinaisons les plus courantes (parenthÃ¨ses, crochets et accolades
+ associÃ©es) peuvent Ãªtre saisies via les raccourcis clavier.
+ Par exemple, pour insÃ©rer une paire de parenthÃ¨ses flexibles, sÃ©lectionner
+ la structure Ã  parenthÃ©ser et saisir 
 \begin_inset Info
 type  shortcut
 arg   math-delim ( )

---

Summary of changes:

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

2013-04-21 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 7c88c843cb550f29dd3da62d42f32f889844fe99
Merge: 9769596 928dc03
Author: Uwe StÃ¶hr 
Date:   Sun Apr 21 21:18:17 2013 +0200

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


commit 976959685cd37da9f13815acf81881589d991d47
Author: Uwe StÃ¶hr 
Date:   Sun Apr 21 21:17:48 2013 +0200

French UserGuide.lyx: translations by Jean-Pierre

diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index c5f6ef9..88dca10 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -2274,11 +2274,8 @@ d'apprentissage
 \emph default
 .
  Avec LyX, la touche de tabulation n'est utilisÃ©e que pour accepter les
- suggestions de la complÃ©tion de saisie ou 
-\lang english
-to move the cursor in tables or math matrices
-\lang french
-;
+ suggestions de la complÃ©tion de saisie ou pour dÃ©placer le curseur dans
+ les tables ou les matrices mathÃ©matiques.
 \end_layout
 
 \begin_layout Labeling
@@ -4326,11 +4323,8 @@ Document ! ParamÃ¨tres
 
 
 \family default
-vous pouvez changer 
-\lang english
-for the whole document
-\lang french
- l'espacement entre les lignes dans la rubrique 
+vous pouvez changer, pour l'ensemble du document, l'espacement entre les
+ lignes dans la rubrique 
 \family sans
 Format
 \begin_inset space ~
@@ -4370,9 +4364,9 @@ Paquetages LaTeX ! setspace
 
 \end_inset
 
- 
+ Vous pouvez le changer pour un seul paragraphe dans la fenÃªtre de dialogue
 \lang english
-You can set it for a single paragraph in the 
+ 
 \family sans
 \lang french
 Ãdition\SpecialChar \menuseparator
@@ -4386,9 +4380,8 @@ de
 
 Paragraphe
 \family default
-\lang english
- dialog but this should be used very exceptionally because vertical spacing
- is normally defined in the environment's style.
+ , mais ceci devrait Ãªtre utilisÃ© trÃ¨s exceptionnellement car l'espacement
+ vertical est normalement dÃ©fini par le style de l'environnement concernÃ©.
 \end_layout
 
 \begin_layout Section
@@ -4717,26 +4710,16 @@ Date
 \end_layout
 
 \begin_layout Itemize
-si vous ne voulez pas de date du tout, 
-\lang english
-use the option 
+si vous ne voulez pas de date du tout, utilisez l'option 
 \family sans
-Suppress default date on front page
+Supprimer la date implicite sur la premiÃ¨re page
 \family default
- in the menu 
+ dans le menu 
 \family sans
-\lang french
 Document\SpecialChar \menuseparator
 ParamÃ¨tres\SpecialChar \menuseparator
-
-\lang english
-Document
-\begin_inset space ~
-\end_inset
-
-class
+Classe de document
 \family default
-\lang french
 .
 \end_layout
 
@@ -5565,13 +5548,12 @@ arg   "break-paragraph inverse"
 \end_inset
 
 .
- 
-\lang english
-If you do this at the top level of a list, it returns you to the 
+ Si vus faites ceci au premier niveau d'une liste, vous revenez Ã  
l'environnemen
+t 
 \family sans
 Standard
 \family default
- environment.
+.
 \end_layout
 
 \begin_layout Standard
@@ -24783,26 +24765,19 @@ Il y a plusieurs dÃ©limiteurs disponibles avec LyX.
 
 \end_inset
 
-et pour rendre plus les parenthÃ¨ses.
- 
-\lang english
-Below, the expression on the left was entered using the delimiter icon 
-\lang french
-
+pour rendre plus visibles les niveaux de parenthÃ¨ses.
+ Ci-dessous, l'expression de gauche a Ã©tÃ© saisie en utilisant l'icÃ´ne de
+ dÃ©limitation
 \begin_inset Info
 type  "icon"
 arg   "dialog-show mathdelimiter"
 \end_inset
 
-
-\lang english
- and the expression on the right was entered using the 
+ et l'expression de droite a Ã©tÃ© saisie en utilisant les parenthÃ¨ses
 \family typewriter
 ()
 \family default
- keys.
-
-\lang french
+.
  
 \begin_inset Formula 
 \[
@@ -24811,12 +24786,8 @@ arg   "dialog-show mathdelimiter"
 
 \end_inset
 
-
-\lang english
-If you use the delimiter icon, 
-\lang french
-les parenthÃ¨ses, et autres dÃ©limiteurs, de ce menu s'adaptent Ã  la taille
- de ce qu'elles contiennent.
+Si vous utilisez l'icÃ´ne de dÃ©limitation, les parenthÃ¨ses et autres 
dÃ©limiteurs
+ choisis dans ce menu s'adaptent Ã  la taille de ce qu'elles contiennent.
 \end_layout
 
 \begin_layout Standard
@@ -24855,14 +24826,10 @@ Insertion
 \family default
 .
  Les parenthÃ¨ses seront placÃ©es autour de la structure sÃ©lectionnÃ©e.
- 
-\lang english
-The most common bracket combinations (parentheses, square brackets, and
- braces, on both sides) can be entered more quickly using keyboard shortcuts.
- For example, to insert a pair of flexible parentheses on both sides, select
- the structure and enter
-\lang french
- 
+ Les combinaisons les plus courantes (parenthÃ¨ses, crochets et accolades
+ associÃ©es) peuvent Ãªtre saisies via les raccourcis clavier.
+ Par exemple, pour insÃ©rer une paire de parenthÃ¨ses flexibles, sÃ©lectionner
+ la structure Ã  parenthÃ©ser et saisir 
 \begin_inset Info
 type  "shortcut"
 arg   "math-delim ( )"

---

Summary of

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

2013-03-18 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 575d98664addea9ff21e74d61a2dba30465bf728
Merge: f08f582 6dac777
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Tue Mar 19 00:57:50 2013 +0100

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


commit f08f5821ec5d29232bccb342a5b1ff86600b0716
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Tue Mar 19 00:57:37 2013 +0100

support for the Iwona fonts

- the support for Iwona is exactly the same as for the Kurier fonts
- fileformat change

diff --git a/development/FORMAT b/development/FORMAT
index 79a2322..9d4c8c1 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in 
lyx2lyx.
 
 ---
 
+2013-08-19 Uwe StÃ¶hr uwesto...@web.de
+   * Format incremented to 467: support for iwona fonts
+ new supported sansserif fonts iwona, iwonal, iwonac
+ and iwonalc and the math font iwona-math
+
 2013-03-17 JÃ¼rgen SpitzmÃ¼ller sp...@lyx.org
  * Format incremented to 466: Powerdot updates.
- Support for item arguments ([...], ...)
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index c51026b..a6b660b 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -413,6 +413,7 @@
 \TestPackage{fourier}
 \TestPackage{garamondx}
 \TestFont[zgmr8r]{garamondx-fonts}
+\TestPackage{iwona}
 \TestPackage{kurier}
 \TestPackage{lh-lcy}
 \TestPackage{libertine}
diff --git a/lib/latexfonts b/lib/latexfonts
index a89c93e..446e83a 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -460,6 +460,34 @@ Font helvet
Requires psnfss
 EndFont
 
+Font iwona
+   GuiName Iwona
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
+Font iwonal
+   GuiName Iwona (Light)
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
+Font iwonac
+   GuiName Iwona (Condensed)
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
+Font iwonalc
+   GuiName Iwona (Light Condensed)
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
 Font kurier
GuiName Kurier
Family  sf
@@ -600,6 +628,19 @@ Font garamondx-ntxm
Provides amssymb,amsfonts
 EndFont
 
+Font iwona-math
+   GuiName Iwona (Math)
+   Family  math
+   Requiresiwona
+   Preamble
+   % store roman font
+   \let\origrmdefault\rmdefault
+   \usepackage[math]{iwona}
+   % reset stored roman font
+   \renewcommand{\rmdefault}{\origrmdefault}
+   EndPreamble
+EndFont
+
 Font kurier-math
GuiName Kurier (Math)
Family  math
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 771748e..f42af73 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3630,6 +3630,28 @@ def revert_kurier_fonts(document):
 add_to_preamble(document, \\renewcommand{\\sfdefault}{%s} % sf)
 document.header[k] = \\font_sans default
 
+def revert_iwona_fonts(document):
+   Revert iwona font definition to LaTeX 
+  
+  i = find_token(document.header, \\font_math, 0)
+  if i != -1:
+if find_token(document.header, \\use_non_tex_fonts false, 0) != -1: 
+  val = get_value(document.header, \\font_math, i)
+  if val == iwona-math:
+add_to_preamble(document, \\let\\Myrmdefault\\rmdefault\n \
+  \\usepackage[math]{iwona}\n \
+  \\renewcommand{\\rmdefault}{\\Myrmdefault})
+document.header[i] = \\font_math auto
+  
+  if find_token(document.header, \\use_non_tex_fonts false, 0) != -1: 
+iwona_fonts = [iwona, iwonac, iwonal, iwonalc]
+k = find_token(document.header, \\font_sans iwona, 0)
+if k != -1:
+  sf = get_value(document.header, \\font_sans, k)
+  if sf in iwona_fonts:
+add_to_preamble(document, \\renewcommand{\\sfdefault}{%s} % sf)
+document.header[k] = \\font_sans default
+
 
 def revert_new_libertines(document):
  Revert new libertine font definition to LaTeX 
@@ -4087,10 +4109,12 @@ convert = [
[463, [convert_encodings]],
[464, [convert_use_cancel]],
[465, [convert_lyxframes, remove_endframes]],
-   [466, []]
+   [466, []],
+   [467, []]
   ]
 
 revert =  [
+   [466, [revert_iwona_fonts]],
[465, [revert_powerdot_flexes, revert_powerdot_pause, 
revert_powerdot_itemargs, revert_powerdot_columns]],
[464, []],
[463, [revert_use_cancel]],
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index dbf4d5c..6c84f06 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -129,7 +129,8 @@ const char * const known_roman_fonts[] = { ae, 
beraserif, bookman,
 tgbonum, tgchorus,

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

2013-03-18 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 575d98664addea9ff21e74d61a2dba30465bf728
Merge: f08f582 6dac777
Author: Uwe StÃ¶hr 
Date:   Tue Mar 19 00:57:50 2013 +0100

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


commit f08f5821ec5d29232bccb342a5b1ff86600b0716
Author: Uwe StÃ¶hr 
Date:   Tue Mar 19 00:57:37 2013 +0100

support for the Iwona fonts

- the support for Iwona is exactly the same as for the Kurier fonts
- fileformat change

diff --git a/development/FORMAT b/development/FORMAT
index 79a2322..9d4c8c1 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,11 @@ adjustments are made to tex2lyx and bugs are fixed in 
lyx2lyx.
 
 ---
 
+2013-08-19 Uwe StÃ¶hr 
+   * Format incremented to 467: support for iwona fonts
+ new supported sansserif fonts "iwona", "iwonal", "iwonac"
+ and "iwonalc" and the math font "iwona-math"
+
 2013-03-17 JÃ¼rgen SpitzmÃ¼ller 
  * Format incremented to 466: Powerdot updates.
- Support for item arguments ([...], <...>)
diff --git a/lib/chkconfig.ltx b/lib/chkconfig.ltx
index c51026b..a6b660b 100644
--- a/lib/chkconfig.ltx
+++ b/lib/chkconfig.ltx
@@ -413,6 +413,7 @@
 \TestPackage{fourier}
 \TestPackage{garamondx}
 \TestFont[zgmr8r]{garamondx-fonts}
+\TestPackage{iwona}
 \TestPackage{kurier}
 \TestPackage{lh-lcy}
 \TestPackage{libertine}
diff --git a/lib/latexfonts b/lib/latexfonts
index a89c93e..446e83a 100644
--- a/lib/latexfonts
+++ b/lib/latexfonts
@@ -460,6 +460,34 @@ Font helvet
Requires psnfss
 EndFont
 
+Font iwona
+   GuiName "Iwona"
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
+Font iwonal
+   GuiName "Iwona (Light)"
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
+Font iwonac
+   GuiName "Iwona (Condensed)"
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
+Font iwonalc
+   GuiName "Iwona (Light Condensed)"
+   Family  sf
+   Requiresiwona
+   SwitchDefault   1
+EndFont
+
 Font kurier
GuiName "Kurier"
Family  sf
@@ -600,6 +628,19 @@ Font garamondx-ntxm
Provides amssymb,amsfonts
 EndFont
 
+Font iwona-math
+   GuiName "Iwona (Math)"
+   Family  math
+   Requiresiwona
+   Preamble
+   % store roman font
+   \let\origrmdefault\rmdefault
+   \usepackage[math]{iwona}
+   % reset stored roman font
+   \renewcommand{\rmdefault}{\origrmdefault}
+   EndPreamble
+EndFont
+
 Font kurier-math
GuiName "Kurier (Math)"
Family  math
diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index 771748e..f42af73 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -3630,6 +3630,28 @@ def revert_kurier_fonts(document):
 add_to_preamble(document, "\\renewcommand{\\sfdefault}{%s}" % sf)
 document.header[k] = "\\font_sans default"
 
+def revert_iwona_fonts(document):
+  " Revert iwona font definition to LaTeX "
+  
+  i = find_token(document.header, "\\font_math", 0)
+  if i != -1:
+if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1: 
+  val = get_value(document.header, "\\font_math", i)
+  if val == "iwona-math":
+add_to_preamble(document, "\\let\\Myrmdefault\\rmdefault\n" \
+  "\\usepackage[math]{iwona}\n" \
+  "\\renewcommand{\\rmdefault}{\\Myrmdefault}")
+document.header[i] = "\\font_math auto"
+  
+  if find_token(document.header, "\\use_non_tex_fonts false", 0) != -1: 
+iwona_fonts = ["iwona", "iwonac", "iwonal", "iwonalc"]
+k = find_token(document.header, "\\font_sans iwona", 0)
+if k != -1:
+  sf = get_value(document.header, "\\font_sans", k)
+  if sf in iwona_fonts:
+add_to_preamble(document, "\\renewcommand{\\sfdefault}{%s}" % sf)
+document.header[k] = "\\font_sans default"
+
 
 def revert_new_libertines(document):
 " Revert new libertine font definition to LaTeX "
@@ -4087,10 +4109,12 @@ convert = [
[463, [convert_encodings]],
[464, [convert_use_cancel]],
[465, [convert_lyxframes, remove_endframes]],
-   [466, []]
+   [466, []],
+   [467, []]
   ]
 
 revert =  [
+   [466, [revert_iwona_fonts]],
[465, [revert_powerdot_flexes, revert_powerdot_pause, 
revert_powerdot_itemargs, revert_powerdot_columns]],
[464, []],
[463, [revert_use_cancel]],
diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index dbf4d5c..6c84f06 100644
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -129,7 +129,8 @@ const char *

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

2013-02-21 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 8254e84f8f696f0372ccc77f5914e17a85fe
Merge: e7c7529 84e1768
Author: Uwe StÃ¶hr 
Date:   Thu Feb 21 23:13:57 2013 +0100

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


commit e7c75296d6f13e1bb08b254f3a2fe3c57ccf6bae
Author: Uwe StÃ¶hr 
Date:   Thu Feb 21 23:13:05 2013 +0100

tex2lyx/text.cpp: correction for TIPA character support

- for all TIPA characters the tipa and tipx package must always be 
registered because these characters are also allowed outside a TIPA inset
- include \textvertline because we again reached the maximum number of if 
statements allowed by MSCV (so safe at least one for now)

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 855ac28..f29d65c 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3257,8 +3257,15 @@ void parse_text(Parser & p, ostream & os, unsigned 
flags, bool outer,
}
 
// the TIPA Combining diacritical marks
-   else if (is_known(t.cs(), known_tipa_marks)) {
+   else if (is_known(t.cs(), known_tipa_marks) || t.cs() == 
"textvertline") {
+   preamble.registerAutomaticallyLoadedPackage("tipa");
+   preamble.registerAutomaticallyLoadedPackage("tipx");
context.check_layout(os);
+   if (t.cs() == "textvertline") {
+   os << "|";
+   skip_braces(p);
+   continue;
+   }
// try to see whether the string is in unicodesymbols
bool termination;
docstring rem;
@@ -3274,10 +3281,6 @@ void parse_text(Parser & p, ostream & os, unsigned 
flags, bool outer,
 << ", result is " << to_utf8(s)
 << "+" << to_utf8(rem) << endl;
os << content << to_utf8(s);
-   // tipa is already registered because of the 
surrounding IPA environment
-   // or \textipa but it does not harm to register 
it again if necessary
-   for (set::const_iterator it = 
req.begin(); it != req.end(); ++it)
-   
preamble.registerAutomaticallyLoadedPackage(*it);
} else
// we did not find a non-ert version
output_ert_inset(os, command, context);
@@ -3312,14 +3315,6 @@ void parse_text(Parser & p, ostream & os, unsigned 
flags, bool outer,
output_ert_inset(os, command, context);
}
 
-   else if (t.cs() == "textvertline" ) {
-   // this TIPA character does not occur in
-   // unicodesymbols because it is in the ASCII range
-   context.check_layout(os);
-   os << "|";
-   skip_braces(p);
-   }
-
else if (t.cs() == "phantom" || t.cs() == "hphantom" ||
 t.cs() == "vphantom") {
context.check_layout(os);

---

Summary of changes:
 src/tex2lyx/text.cpp |   21 -
 1 files changed, 8 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit c741a148c9ee0d99854c3dbfbb003e3ab8cf9100
Merge: 8e4f656 05ec893
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 09:28:49 2013 +0100

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


commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
Author: Kornel Benko kor...@lyx.org
Date:   Tue Feb 19 09:26:05 2013 +0100

Add new output format dvi4 ( == DVI(pLaTeX)
Add converter for this format (platex without extra parameters)

diff --git a/lib/configure.py b/lib/configure.py
index fa3b8a3..00b2fa7 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -409,6 +409,7 @@ def checkLatex(dtl_tools):
 if cmdOutput(PLATEX + ' chklatex.ltx').find('pLaTeX2e') != -1:
 # We have the Japanese pLaTeX2e
 addToRC(r'\converter platex dvi%s -kanji=$$E $$i 
latex=platex' % PLATEX)
+addToRC(r'\converter platex dvi4   %s $$i
 latex=platex' % PLATEX)
 else:
 PLATEX = ''
 removeFiles(['chklatex.ltx', 'chklatex.log'])
@@ -589,7 +590,8 @@ def checkFormatEntries(dtl_tools):
 #
 checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout 
-Set=!m'],
 rc_entry = [r'''\Format dvidvi DVID  
%%document,vector,menu=export   application/x-dvi
-\Format dvi3   dvi DVI (LuaTeX)  V  %%   
document,vector,menu=export   '''])
+\Format dvi3   dvi DVI (LuaTeX)  V  %%   
document,vector,menu=export   
+\Format dvi4   dvi DVI (pLaTeX)  V  %%   
document,vector,menu=export   '''])
 if dtl_tools:
 # Windows only: DraftDVI
 addToRC(r'\Format dvi2   dvi DraftDVI  
  vector')

---

Summary of changes:
 lib/configure.py |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Jürgen Spitzmüller

Am Dienstag 19 Februar 2013, 09:28:58 schrieb Kornel Benko:
 commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
 Author: Kornel Benko kor...@lyx.org
 Date:   Tue Feb 19 09:26:05 2013 +0100
 
 Add new output format dvi4 ( == DVI(pLaTeX)
 Add converter for this format (platex without extra parameters)

As said, I don't think this is correct. Instead, the current platex support 
should be fixed.

Jürgen

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

2013-02-19 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit c741a148c9ee0d99854c3dbfbb003e3ab8cf9100
Merge: 8e4f656 05ec893
Author: Kornel Benko 
Date:   Tue Feb 19 09:28:49 2013 +0100

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


commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
Author: Kornel Benko 
Date:   Tue Feb 19 09:26:05 2013 +0100

Add new output format dvi4 ( == DVI(pLaTeX)
Add converter for this format (platex without extra parameters)

diff --git a/lib/configure.py b/lib/configure.py
index fa3b8a3..00b2fa7 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -409,6 +409,7 @@ def checkLatex(dtl_tools):
 if cmdOutput(PLATEX + ' chklatex.ltx').find('pLaTeX2e') != -1:
 # We have the Japanese pLaTeX2e
 addToRC(r'\converter platex dvi"%s -kanji=$$E $$i" 
"latex=platex"' % PLATEX)
+addToRC(r'\converter platex dvi4   "%s $$i"
 "latex=platex"' % PLATEX)
 else:
 PLATEX = ''
 removeFiles(['chklatex.ltx', 'chklatex.log'])
@@ -589,7 +590,8 @@ def checkFormatEntries(dtl_tools):
 #
 checkViewer('a DVI previewer', ['xdvi', 'kdvi', 'okular', 'yap', 'dviout 
-Set=!m'],
 rc_entry = [r'''\Format dvidvi DVID  
"%%"  ""  "document,vector,menu=export"   "application/x-dvi"
-\Format dvi3   dvi "DVI (LuaTeX)"  V  "%%" ""  
"document,vector,menu=export"   ""'''])
+\Format dvi3   dvi "DVI (LuaTeX)"  V  "%%" ""  
"document,vector,menu=export"   ""
+\Format dvi4   dvi "DVI (pLaTeX)"  V  "%%" ""  
"document,vector,menu=export"   ""'''])
 if dtl_tools:
 # Windows only: DraftDVI
 addToRC(r'\Format dvi2   dvi DraftDVI   "" ""  
""  "vector"""')

---

Summary of changes:
 lib/configure.py |4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-19 Thread Jürgen Spitzmüller

Am Dienstag 19 Februar 2013, 09:28:58 schrieb Kornel Benko:
> commit 8e4f656aa79cb1e39a4b8b3fc18b0d4571b8eee4
> Author: Kornel Benko 
> Date:   Tue Feb 19 09:26:05 2013 +0100
> 
> Add new output format dvi4 ( == DVI(pLaTeX)
> Add converter for this format (platex without extra parameters)

As said, I don't think this is correct. Instead, the current platex support 
should be fixed.

Jürgen

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

2013-02-18 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit df6589a97e1dd6647b98cecd8ee071031563fe85
Merge: 6deb2b7 9dd1b7c
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Tue Feb 19 00:07:42 2013 +0100

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


commit 6deb2b76804b1e8e7faf7d204e424aa203e7c76c
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Tue Feb 19 00:07:24 2013 +0100

tex2lyx: support further TIPA characters

- support for \textdoublevertline, \textvertline, \textglobfall
- support \!o and \!b and \!d and \!g and \!G and \!j
- support  and \*k and \*r and \*t and \*w
- register the package tipa if \textipa is detected in an equation
- add a \textipa equation to the testfile

(I failed to implement support for the TIPA character \t*{ } and the 
command \=*.)

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 8754a29..60c48e1 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -51,10 +51,7 @@ Format LaTeX featureLyX feature
 407vertical offset for multirowsInsetTabular
 411support for polyglossia  \language_package  (the cases of 
no package, of babel and of custom package is supported)
 415automatic undertilde loading \use_package undertilde
-438\=*{a}, \*r and \*w, \!o InsetTIPA
-   and \!b and \!d and \!g and \!G,
-   \textvertline, \t*{ },
-   \textdoublevertline, \textglobfall
+438\t*{ } and \=*{a}InsetTIPA
 439MinionPro.sty\font_roman, \font_osf
 440MinionPro.sty,   \font_math
 443unicode-math.sty InsetMath*
diff --git a/src/tex2lyx/math.cpp b/src/tex2lyx/math.cpp
index 83e2101..9fddeea 100644
--- a/src/tex2lyx/math.cpp
+++ b/src/tex2lyx/math.cpp
@@ -237,6 +237,11 @@ void parse_math(Parser  p, ostream  os, unsigned flags, 
const mode_type mode)
preamble.registerAutomaticallyLoadedPackage(varioref);
}
 
+   else if (t.cs() == textipa) {
+   os  t.asInput();
+   preamble.registerAutomaticallyLoadedPackage(tipa);
+   }
+
else
os  t.asInput();
 
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx 
b/src/tex2lyx/test/test-insets.lyx.lyx
index 59f7a1b..b9deacb 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -5915,19 +5915,7 @@ PmMnânÉ²NâNâBrâRR
 \begin_inset IPA
 
 \begin_layout Standard
-É®V
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-*
-\end_layout
-
-\end_inset
-
-râRhÉ°lâlLâL
+É®VÉ¹âRhÉ°lâlLâL
 \end_layout
 
 \end_inset
@@ -5940,79 +5928,7 @@ râRhÉ°lâlLâL
 \begin_inset IPA
 
 \begin_layout Standard
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-o|!Ç||
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-b
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-d
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-j
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-g
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-Ge'
+Ê|!Ç||ÉÉÊÉ Êe'
 \end_layout
 
 \end_inset
@@ -6042,19 +5958,7 @@ UeÃ¸987o@EÅ3É2OÃ¦5aÉ¶A6
 \begin_inset IPA
 
 \begin_layout Standard
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-*
-\end_layout
-
-\end_inset
-
-ww4âHÊ¢Ê¡CÊÉºÉ§
+Êw4âHÊ¢Ê¡CÊÉºÉ§
 \begin_inset IPADeco toptiebar
 status open
 
@@ -6087,51 +5991,7 @@ tz
 \begin_inset IPA
 
 \begin_layout Standard
-:;eËË
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-textvertline
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-textdoublevertline
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{}
-\end_layout
-
-\end_inset
-
-.
+:;eËË|â.
 \begin_inset ERT
 status collapsed
 
@@ -6181,24 +6041,7 @@ status collapsed
 \IPAChar \tone{45}
 \IPAChar \tone{12}
 \IPAChar \tone{454}
-â
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-textglobfall
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{}
+ââ
 \end_layout
 
 \end_inset
@@ -6206,6 +6049,9 @@ status collapsed
 
 \end_layout
 
+\begin_layout Standard
+TIPA code in math: 
+\begin_inset

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

2013-02-18 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit df6589a97e1dd6647b98cecd8ee071031563fe85
Merge: 6deb2b7 9dd1b7c
Author: Uwe StÃ¶hr 
Date:   Tue Feb 19 00:07:42 2013 +0100

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


commit 6deb2b76804b1e8e7faf7d204e424aa203e7c76c
Author: Uwe StÃ¶hr 
Date:   Tue Feb 19 00:07:24 2013 +0100

tex2lyx: support further TIPA characters

- support for \textdoublevertline, \textvertline, \textglobfall
- support \!o and \!b and \!d and \!g and \!G and \!j
- support  and \*k and \*r and \*t and \*w
- register the package "tipa" if \textipa is detected in an equation
- add a \textipa equation to the testfile

(I failed to implement support for the TIPA character "\t*{ }" and the 
command "\=*".)

diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt
index 8754a29..60c48e1 100644
--- a/src/tex2lyx/TODO.txt
+++ b/src/tex2lyx/TODO.txt
@@ -51,10 +51,7 @@ Format LaTeX featureLyX feature
 407vertical offset for multirowsInsetTabular
 411support for polyglossia  \language_package  (the cases of 
no package, of babel and of custom package is supported)
 415automatic undertilde loading \use_package undertilde
-438\=*{a}, \*r and \*w, \!o InsetTIPA
-   and \!b and \!d and \!g and \!G,
-   \textvertline, \t*{ },
-   \textdoublevertline, \textglobfall
+438\t*{ } and \=*{a}InsetTIPA
 439MinionPro.sty\font_roman, \font_osf
 440MinionPro.sty,   \font_math
 443unicode-math.sty InsetMath*
diff --git a/src/tex2lyx/math.cpp b/src/tex2lyx/math.cpp
index 83e2101..9fddeea 100644
--- a/src/tex2lyx/math.cpp
+++ b/src/tex2lyx/math.cpp
@@ -237,6 +237,11 @@ void parse_math(Parser & p, ostream & os, unsigned flags, 
const mode_type mode)
preamble.registerAutomaticallyLoadedPackage("varioref");
}
 
+   else if (t.cs() == "textipa") {
+   os << t.asInput();
+   preamble.registerAutomaticallyLoadedPackage("tipa");
+   }
+
else
os << t.asInput();
 
diff --git a/src/tex2lyx/test/test-insets.lyx.lyx 
b/src/tex2lyx/test/test-insets.lyx.lyx
index 59f7a1b..b9deacb 100644
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -5915,19 +5915,7 @@ PmMnânÉ²NâNâBrâRR
 \begin_inset IPA
 
 \begin_layout Standard
-É®V
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-*
-\end_layout
-
-\end_inset
-
-râRhÉ°lâlLâL
+É®VÉ¹âRhÉ°lâlLâL
 \end_layout
 
 \end_inset
@@ -5940,79 +5928,7 @@ râRhÉ°lâlLâL
 \begin_inset IPA
 
 \begin_layout Standard
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-o|!Ç||
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-b
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-d
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-j
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-g
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-!
-\end_layout
-
-\end_inset
-
-Ge'
+Ê|!Ç||ÉÉÊÉ Êe'
 \end_layout
 
 \end_inset
@@ -6042,19 +5958,7 @@ UeÃ¸987o@EÅ3É2OÃ¦5aÉ¶A6
 \begin_inset IPA
 
 \begin_layout Standard
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-*
-\end_layout
-
-\end_inset
-
-ww4âHÊ¢Ê¡CÊÉºÉ§
+Êw4âHÊ¢Ê¡CÊÉºÉ§
 \begin_inset IPADeco toptiebar
 status open
 
@@ -6087,51 +5991,7 @@ tz
 \begin_inset IPA
 
 \begin_layout Standard
-:;eËË
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-textvertline
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{}
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-textdoublevertline
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{}
-\end_layout
-
-\end_inset
-
-.
+:;eËË|â.
 \begin_inset ERT
 status collapsed
 
@@ -6181,24 +6041,7 @@ status collapsed
 \IPAChar \tone{45}
 \IPAChar \tone{12}
 \IPAChar \tone{454}
-â
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-\backslash
-textglobfall
-\end_layout
-
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-{}
+ââ
 \end_layout
 
 \end_inset
@@ -6206,6 +6049,9 @@ status collapsed
 
 \end_layout
 
+\begin_layout Standard
+TIPA code in

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

2013-02-15 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 78be5467e1eec376bbe2dc38cd5ae87284834f80
Merge: ac7d08c a1edd7b
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Fri Feb 15 16:28:38 2013 +0100

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


commit ac7d08cb327115630ee0a160d416d2ad7283046f
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Fri Feb 15 16:28:02 2013 +0100

environment.cpp: MSVC compile fix

MSVC told me
environment.cpp(139): error C4716: 'lyx::support::unsetEnv' : must return 
a value

diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index 6deb230..dfdc2d4 100644
--- a/src/support/environment.cpp
+++ b/src/support/environment.cpp
@@ -132,7 +132,7 @@ bool unsetEnv(string const  name)
return unsetenv(name.c_str()) == 0;
 #elif defined(HAVE_PUTENV)
// This is OK with MSVC and MinGW at least.
-   putenv((name + =).c_str()) == 0;
+   return putenv((name + =).c_str()) == 0;
 #else
 #error No environment-unsetting function has been defined.
 #endif

---

Summary of changes:
 src/support/environment.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-02-15 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 78be5467e1eec376bbe2dc38cd5ae87284834f80
Merge: ac7d08c a1edd7b
Author: Uwe StÃ¶hr 
Date:   Fri Feb 15 16:28:38 2013 +0100

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


commit ac7d08cb327115630ee0a160d416d2ad7283046f
Author: Uwe StÃ¶hr 
Date:   Fri Feb 15 16:28:02 2013 +0100

environment.cpp: MSVC compile fix

MSVC told me
"environment.cpp(139): error C4716: 'lyx::support::unsetEnv' : must return 
a value"

diff --git a/src/support/environment.cpp b/src/support/environment.cpp
index 6deb230..dfdc2d4 100644
--- a/src/support/environment.cpp
+++ b/src/support/environment.cpp
@@ -132,7 +132,7 @@ bool unsetEnv(string const & name)
return unsetenv(name.c_str()) == 0;
 #elif defined(HAVE_PUTENV)
// This is OK with MSVC and MinGW at least.
-   putenv((name + "=").c_str()) == 0;
+   return putenv((name + "=").c_str()) == 0;
 #else
 #error No environment-unsetting function has been defined.
 #endif

---

Summary of changes:
 src/support/environment.cpp |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-01-05 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit 40b0f3dfaeb6d381493cc6b5b880bcec712ca92b
Merge: 9481d41 364de0c
Author: Kornel Benko kor...@lyx.org
Date:   Sat Jan 5 10:10:19 2013 +0100

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


commit 9481d4182e225012632cc36a7cbc77e4beaf3d0e
Author: Kornel Benko kor...@lyx.org
Date:   Sat Jan 5 10:07:37 2013 +0100

autotests: Enable the suffixed lyx to run the test too.
(Hard coded 'lyx' replaced with real lyx-exe-file-name)

diff --git a/development/autotests/CMakeLists.txt 
b/development/autotests/CMakeLists.txt
index 3901ffd..d611307 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -37,6 +37,7 @@ if(Q_WS_X11)
 -DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
 -DKEYTEST_INFILE=${_tf}
 -DBINDIR=$TARGET_FILE_DIR:${_lyx}
+   -DLYX=${_lyx}
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
 -DKEYTEST_OUTFILE=${_t}-out.txt
 -DPACKAGE=${PACKAGE}
diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index 82f316c..f403fdc 100755
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -258,9 +258,13 @@ PO_BUILD_DIR = os.environ.get('PO_BUILD_DIR')
 if not PO_BUILD_DIR is None:
   print PO_BUILD_DIR =  + PO_BUILD_DIR + \n
 
+lyx = os.environ.get('LYX')
+if lyx is None:
+lyx = lyx
+
 lyx_exe = os.environ.get('LYX_EXE')
 if lyx_exe is None:
-lyx_exe = lyx
+lyx_exe = lyx
 
 xvkbd_exe = os.environ.get('XVKBD_EXE')
 if xvkbd_exe is None:
@@ -326,12 +330,12 @@ while not failed:
 print Ignoring comment line:  + c
 elif c[0:9] == 'TestBegin':
 print \n
-lyx_pid=os.popen(pidof lyx).read()
+lyx_pid=os.popen(pidof  + lyx).read()
 if lyx_pid != :
 print Found running instance(s) of LyX:  + lyx_pid + : killing 
them all\n
-intr_system(killall lyx, True)
+intr_system(killall  + lyx, True)
 time.sleep(0.5)
-intr_system(killall -KILL lyx, True)
+intr_system(killall -KILL  + lyx, True)
 time.sleep(0.2)
 print Starting LyX . . .
 if lyx_userdir is None:
@@ -339,7 +343,7 @@ while not failed:
 else:
 intr_system(lyx_exe +  -userdir  + lyx_userdir +   + c[9:] + 
)
 while True:
-lyx_pid=os.popen(pidof lyx).read().rstrip()
+lyx_pid=os.popen(pidof  + lyx).read().rstrip()
 if lyx_pid != :
 lyx_window_name=os.popen(wmctrl -l -p | grep '  + 
str(lyx_pid) +   ' | cut -d ' ' -f 1).read().rstrip()
 if lyx_window_name != :
diff --git a/development/autotests/single-test.cmake 
b/development/autotests/single-test.cmake
index 15b96ea..d09bc5a 100755
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -15,6 +15,7 @@
 #   -DKEYTEST_INFILE= \
 #   -DKEYTEST_OUTFILE=xxx \
 #   -DBINDIR=xxx \
+#   -DLYX=xxx \
 #   -DWORKDIR=xxx \
 #   -DLOCALE_DIR=xxx \
 #   -DPO_BUILD_DIR=xxx \
@@ -23,7 +24,7 @@
 
 set(KEYTEST ${AUTOTEST_ROOT}/keytest.py)
 
-execute_process(COMMAND pidof lyx OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE 
pidstat OUTPUT_VARIABLE pidres)
+execute_process(COMMAND pidof ${LYX} OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE 
pidstat OUTPUT_VARIABLE pidres)
 message(STATUS pidres = ${pidres})
 if (NOT pidstat)
   # lyx already running, remove trailing '\n' from pid
@@ -44,7 +45,7 @@ else()
   set(LYX_WINDOW_NAME )
 endif()
 
-set(LYX_EXE ${BINDIR}/lyx)
+set(LYX_EXE ${BINDIR}/${LYX})
 set(XVKBD_EXE ${BINDIR}/xvkbd)
 
 # Environments needed by keytest.py
@@ -55,6 +56,7 @@ set(ENV{LYX_USERDIR} ${WORKDIR})
 set(ENV{LYX_PID} ${pidres})
 set(ENV{LYX_WINDOW_NAME} ${LYX_WINDOW_NAME})
 set(ENV{LYX_EXE} ${LYX_EXE})
+set(ENV{LYX} ${LYX})
 set(ENV{XVKBD_EXE} ${XVKBD_EXE})
 set(ENV{KEYTEST_INFILE} ${AUTOTEST_ROOT}/${KEYTEST_INFILE})
 set(ENV{KEYTEST_OUTFILE} ${WORKDIR}/${KEYTEST_OUTFILE})

---

Summary of changes:
 development/autotests/CMakeLists.txt|1 +
 development/autotests/keytest.py|   14 +-
 development/autotests/single-test.cmake |6 --
 3 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2013-01-05 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit 40b0f3dfaeb6d381493cc6b5b880bcec712ca92b
Merge: 9481d41 364de0c
Author: Kornel Benko 
Date:   Sat Jan 5 10:10:19 2013 +0100

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


commit 9481d4182e225012632cc36a7cbc77e4beaf3d0e
Author: Kornel Benko 
Date:   Sat Jan 5 10:07:37 2013 +0100

autotests: Enable the suffixed lyx to run the test too.
(Hard coded 'lyx' replaced with real lyx-exe-file-name)

diff --git a/development/autotests/CMakeLists.txt 
b/development/autotests/CMakeLists.txt
index 3901ffd..d611307 100644
--- a/development/autotests/CMakeLists.txt
+++ b/development/autotests/CMakeLists.txt
@@ -37,6 +37,7 @@ if(Q_WS_X11)
 -DPO_BUILD_DIR=${TOP_BINARY_DIR}/po
 -DKEYTEST_INFILE=${_tf}
 -DBINDIR=$
+   -DLYX=${_lyx}
-DWORKDIR=${CMAKE_CURRENT_BINARY_DIR}/${LYX_HOME}
 -DKEYTEST_OUTFILE=${_t}-out.txt
 -DPACKAGE=${PACKAGE}
diff --git a/development/autotests/keytest.py b/development/autotests/keytest.py
index 82f316c..f403fdc 100755
--- a/development/autotests/keytest.py
+++ b/development/autotests/keytest.py
@@ -258,9 +258,13 @@ PO_BUILD_DIR = os.environ.get('PO_BUILD_DIR')
 if not PO_BUILD_DIR is None:
   print "PO_BUILD_DIR = " + PO_BUILD_DIR + "\n"
 
+lyx = os.environ.get('LYX')
+if lyx is None:
+lyx = "lyx"
+
 lyx_exe = os.environ.get('LYX_EXE')
 if lyx_exe is None:
-lyx_exe = "lyx"
+lyx_exe = lyx
 
 xvkbd_exe = os.environ.get('XVKBD_EXE')
 if xvkbd_exe is None:
@@ -326,12 +330,12 @@ while not failed:
 print "Ignoring comment line: " + c
 elif c[0:9] == 'TestBegin':
 print "\n"
-lyx_pid=os.popen("pidof lyx").read()
+lyx_pid=os.popen("pidof " + lyx).read()
 if lyx_pid != "":
 print "Found running instance(s) of LyX: " + lyx_pid + ": killing 
them all\n"
-intr_system("killall lyx", True)
+intr_system("killall " + lyx, True)
 time.sleep(0.5)
-intr_system("killall -KILL lyx", True)
+intr_system("killall -KILL " + lyx, True)
 time.sleep(0.2)
 print "Starting LyX . . ."
 if lyx_userdir is None:
@@ -339,7 +343,7 @@ while not failed:
 else:
 intr_system(lyx_exe + " -userdir " + lyx_userdir + " " + c[9:] + 
"&")
 while True:
-lyx_pid=os.popen("pidof lyx").read().rstrip()
+lyx_pid=os.popen("pidof " + lyx).read().rstrip()
 if lyx_pid != "":
 lyx_window_name=os.popen("wmctrl -l -p | grep ' " + 
str(lyx_pid) +  " ' | cut -d ' ' -f 1").read().rstrip()
 if lyx_window_name != "":
diff --git a/development/autotests/single-test.cmake 
b/development/autotests/single-test.cmake
index 15b96ea..d09bc5a 100755
--- a/development/autotests/single-test.cmake
+++ b/development/autotests/single-test.cmake
@@ -15,6 +15,7 @@
 #   -DKEYTEST_INFILE= \
 #   -DKEYTEST_OUTFILE=xxx \
 #   -DBINDIR=xxx \
+#   -DLYX=xxx \
 #   -DWORKDIR=xxx \
 #   -DLOCALE_DIR=xxx \
 #   -DPO_BUILD_DIR=xxx \
@@ -23,7 +24,7 @@
 
 set(KEYTEST "${AUTOTEST_ROOT}/keytest.py")
 
-execute_process(COMMAND pidof lyx OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE 
pidstat OUTPUT_VARIABLE pidres)
+execute_process(COMMAND pidof ${LYX} OUTPUT_VARIABLE LYX_PID RESULT_VARIABLE 
pidstat OUTPUT_VARIABLE pidres)
 message(STATUS "pidres = ${pidres}")
 if (NOT pidstat)
   # lyx already running, remove trailing '\n' from pid
@@ -44,7 +45,7 @@ else()
   set(LYX_WINDOW_NAME "")
 endif()
 
-set(LYX_EXE "${BINDIR}/lyx")
+set(LYX_EXE "${BINDIR}/${LYX}")
 set(XVKBD_EXE "${BINDIR}/xvkbd")
 
 # Environments needed by keytest.py
@@ -55,6 +56,7 @@ set(ENV{LYX_USERDIR} ${WORKDIR})
 set(ENV{LYX_PID} ${pidres})
 set(ENV{LYX_WINDOW_NAME} ${LYX_WINDOW_NAME})
 set(ENV{LYX_EXE} ${LYX_EXE})
+set(ENV{LYX} ${LYX})
 set(ENV{XVKBD_EXE} ${XVKBD_EXE})
 set(ENV{KEYTEST_INFILE} "${AUTOTEST_ROOT}/${KEYTEST_INFILE}")
 set(ENV{KEYTEST_OUTFILE} "${WORKDIR}/${KEYTEST_OUTFILE}")

---

Summary of changes:
 development/autotests/CMakeLists.txt|1 +
 development/autotests/keytest.py|   14 +-
 development/autotests/single-test.cmake |6 --
 3 files changed, 14 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-12-31 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 8f2c474234c20e23561bf181000ff495fe4f1597
Merge: b8dbaab a98f7ad
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Mon Dec 31 18:35:02 2012 +0100

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


commit b8dbaab9158fa13f24ae018241c95c8a9fd1c29c
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Mon Dec 31 18:34:49 2012 +0100

installer: a comment format fix

diff --git a/development/Win32/pdfview/pdfview.nsi 
b/development/Win32/pdfview/pdfview.nsi
index 36da7d5..aab892f 100644
--- a/development/Win32/pdfview/pdfview.nsi
+++ b/development/Win32/pdfview/pdfview.nsi
@@ -100,15 +100,15 @@ Var TimeDiff
 
 Function GetFileTimeS

-   Exch $0  ;; File / hi
-   Push $1  ;; lo
+   Exch $0  # File / hi
+   Push $1  # lo
  
ClearErrors
GetFileTime $0 $0 $1
IfErrors err
System::Call '*(i r1, i r0) i .r0'
System::Call '*$0(l .r0)'
-   System::Int64Op $0 / 1000  ;; Conversion From '100 ns' to '1 sec' unit
+   System::Int64Op $0 / 1000  # Conversion From '100 ns' to '1 sec' unit
Goto end
  
err:
@@ -135,9 +135,9 @@ FunctionEnd
 !macroend
 
 Function FileTimeDiff 
-   Exch $0  ;; FileA
+   Exch $0  # FileA
Exch 
-   Exch $1  ;; FileB
+   Exch $1  # FileB
  
${GetFileTimeS} $0 $0
IfErrors err

---

Summary of changes:
 development/Win32/pdfview/pdfview.nsi |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-12-31 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 4f652a6f6504ec3200640eef36f8042bac9ef9ad
Merge: 21fab2c 297d534
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Mon Dec 31 19:22:36 2012 +0100

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


commit 21fab2cb98b5e0ecf17f6de92fb9ba8c769d8b44
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Mon Dec 31 19:22:19 2012 +0100

installer: initialize a variable

diff --git a/development/Win32/packaging/installer/include/detection.nsh 
b/development/Win32/packaging/installer/include/detection.nsh
index b9f61af..b0d09b3 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -40,6 +40,7 @@ Function MissingPrograms
   # 2. 64bit Windows but 32bit Ghostscript
   # 3. 64bit Windows and 64bit Ghostscript
   StrCpy $3 0
+  StrCpy $4 0
   ${if} ${RunningX64}
SetRegView 64
   ${endif}

---

Summary of changes:
 .../packaging/installer/include/detection.nsh  |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-12-31 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 8f2c474234c20e23561bf181000ff495fe4f1597
Merge: b8dbaab a98f7ad
Author: Uwe StÃ¶hr 
Date:   Mon Dec 31 18:35:02 2012 +0100

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


commit b8dbaab9158fa13f24ae018241c95c8a9fd1c29c
Author: Uwe StÃ¶hr 
Date:   Mon Dec 31 18:34:49 2012 +0100

installer: a comment format fix

diff --git a/development/Win32/pdfview/pdfview.nsi 
b/development/Win32/pdfview/pdfview.nsi
index 36da7d5..aab892f 100644
--- a/development/Win32/pdfview/pdfview.nsi
+++ b/development/Win32/pdfview/pdfview.nsi
@@ -100,15 +100,15 @@ Var TimeDiff
 
 Function GetFileTimeS

-   Exch $0  ;; File / hi
-   Push $1  ;; lo
+   Exch $0  # File / hi
+   Push $1  # lo
  
ClearErrors
GetFileTime "$0" $0 $1
IfErrors err
System::Call '*(i r1, i r0) i .r0'
System::Call '*$0(l .r0)'
-   System::Int64Op $0 / 1000  ;; Conversion From '100 ns' to '1 sec' unit
+   System::Int64Op $0 / 1000  # Conversion From '100 ns' to '1 sec' unit
Goto end
  
err:
@@ -135,9 +135,9 @@ FunctionEnd
 !macroend
 
 Function FileTimeDiff 
-   Exch $0  ;; FileA
+   Exch $0  # FileA
Exch 
-   Exch $1  ;; FileB
+   Exch $1  # FileB
  
${GetFileTimeS} $0 "$0"
IfErrors err

---

Summary of changes:
 development/Win32/pdfview/pdfview.nsi |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-12-31 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 4f652a6f6504ec3200640eef36f8042bac9ef9ad
Merge: 21fab2c 297d534
Author: Uwe StÃ¶hr 
Date:   Mon Dec 31 19:22:36 2012 +0100

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


commit 21fab2cb98b5e0ecf17f6de92fb9ba8c769d8b44
Author: Uwe StÃ¶hr 
Date:   Mon Dec 31 19:22:19 2012 +0100

installer: initialize a variable

diff --git a/development/Win32/packaging/installer/include/detection.nsh 
b/development/Win32/packaging/installer/include/detection.nsh
index b9f61af..b0d09b3 100644
--- a/development/Win32/packaging/installer/include/detection.nsh
+++ b/development/Win32/packaging/installer/include/detection.nsh
@@ -40,6 +40,7 @@ Function MissingPrograms
   # 2. 64bit Windows but 32bit Ghostscript
   # 3. 64bit Windows and 64bit Ghostscript
   StrCpy $3 0
+  StrCpy $4 "0"
   ${if} ${RunningX64}
SetRegView 64
   ${endif}

---

Summary of changes:
 .../packaging/installer/include/detection.nsh  |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-11-26 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 41014dec49cd889cb6daa498311ca302b0036e8e
Merge: e0f392e c5dccc8
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Mon Nov 26 09:10:34 2012 +0100

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


commit e0f392e075e8e99732f4e2966700158185b5fb95
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Mon Nov 26 09:10:14 2012 +0100

Allow for some argument visual customization

diff --git a/src/Layout.cpp b/src/Layout.cpp
index a5d3550..7fcf882 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -877,6 +877,8 @@ void Layout::readArgument(Lexer  lex)
arg.mandatory = false;
bool error = false;
bool finished = false;
+   arg.font = inherit_font;
+   arg.labelfont = inherit_font;
unsigned int nr;
lex  nr;
while (!finished  lex.isOK()  !error) {
@@ -905,6 +907,13 @@ void Layout::readArgument(Lexer  lex)
} else if (tok == requires) {
lex.next();
arg.requires = lex.getString();
+   } else if (tok == decoration) {
+   lex.next();
+   arg.decoration = lex.getString();
+   } else if (tok == font) {
+   arg.font = lyxRead(lex, arg.font);
+   } else if (tok == labelfont) {
+   arg.labelfont = lyxRead(lex, arg.labelfont);
} else {
lex.printError(Unknown tag);
error = true;
diff --git a/src/Layout.h b/src/Layout.h
index 45bdf46..b0c3ac5 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -95,6 +95,9 @@ public:
docstring rdelim;
docstring tooltip;
std::string requires;
+   std::string decoration;
+   FontInfo font;
+   FontInfo labelfont;
};
///
typedef std::mapunsigned int, latexarg LaTeXArgMap;
diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 256afcf..b113878 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -34,7 +34,8 @@ namespace lyx {
 
 
 InsetArgument::InsetArgument(Buffer * buf, string const  name)
-: InsetCollapsable(buf), name_(name), labelstring_(docstring())
+: InsetCollapsable(buf), name_(name), labelstring_(docstring()),
+  font_(inherit_font), labelfont_(inherit_font), decoration_(string())
 {}
 
 
@@ -102,6 +103,9 @@ void InsetArgument::updateBuffer(ParIterator const  it, 
UpdateType utype)
support::rsplit(label, striplabel, '|');
labelstring_ = striplabel.empty() ? label: striplabel;
tooltip_ = translateIfPossible((*lait).second.tooltip);
+   font_ = (*lait).second.font;
+   labelfont_ = (*lait).second.labelfont;
+   decoration_ = (*lait).second.decoration;
} else {
labelstring_ = _(Unknown Argument);
tooltip_ = _(Argument not known in this Layout. Will be 
supressed in the output.);
@@ -202,6 +206,43 @@ string InsetArgument::contextMenuName() const
return context-argument;
 }
 
+FontInfo InsetArgument::getFont() const
+{
+   if (font_ != inherit_font)
+   return font_;
+   return getLayout().font();
+}
+
+FontInfo InsetArgument::getLabelfont() const
+{
+   if (labelfont_ != inherit_font)
+   return labelfont_;
+   return getLayout().labelfont();
+}
+
+namespace {
+
+InsetLayout::InsetDecoration translateDecoration(std::string const  str) 
+{
+   if (support::compare_ascii_no_case(str, classic) == 0)
+   return InsetLayout::CLASSIC;
+   if (support::compare_ascii_no_case(str, minimalistic) == 0)
+   return InsetLayout::MINIMALISTIC;
+   if (support::compare_ascii_no_case(str, conglomerate) == 0)
+   return InsetLayout::CONGLOMERATE;
+   return InsetLayout::DEFAULT;
+}
+
+}// namespace anon
+
+InsetLayout::InsetDecoration InsetArgument::decoration() const
+{
+   InsetLayout::InsetDecoration dec = getLayout().decoration();
+   if (!decoration_.empty())
+   dec = translateDecoration(decoration_);
+   return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
+}
+
 void InsetArgument::latexArgument(otexstream  os,
OutputParams const  runparams_in, docstring const  ldelim,
docstring const  rdelim) const
diff --git a/src/insets/InsetArgument.h b/src/insets/InsetArgument.h
index 274623a..bff6056 100644
--- a/src/insets/InsetArgument.h
+++ b/src/insets/InsetArgument.h
@@ -66,6 +66,12 @@ public:
/// \name Public functions inherited from InsetCollapsable class
//@{
///
+   InsetLayout::InsetDecoration decoration() const;
+   ///
+   FontInfo getFont() const;
+   ///
+   FontInfo getLabelfont() const;
+

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

2012-11-26 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 41014dec49cd889cb6daa498311ca302b0036e8e
Merge: e0f392e c5dccc8
Author: Juergen Spitzmueller 
Date:   Mon Nov 26 09:10:34 2012 +0100

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


commit e0f392e075e8e99732f4e2966700158185b5fb95
Author: Juergen Spitzmueller 
Date:   Mon Nov 26 09:10:14 2012 +0100

Allow for some argument visual customization

diff --git a/src/Layout.cpp b/src/Layout.cpp
index a5d3550..7fcf882 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -877,6 +877,8 @@ void Layout::readArgument(Lexer & lex)
arg.mandatory = false;
bool error = false;
bool finished = false;
+   arg.font = inherit_font;
+   arg.labelfont = inherit_font;
unsigned int nr;
lex >> nr;
while (!finished && lex.isOK() && !error) {
@@ -905,6 +907,13 @@ void Layout::readArgument(Lexer & lex)
} else if (tok == "requires") {
lex.next();
arg.requires = lex.getString();
+   } else if (tok == "decoration") {
+   lex.next();
+   arg.decoration = lex.getString();
+   } else if (tok == "font") {
+   arg.font = lyxRead(lex, arg.font);
+   } else if (tok == "labelfont") {
+   arg.labelfont = lyxRead(lex, arg.labelfont);
} else {
lex.printError("Unknown tag");
error = true;
diff --git a/src/Layout.h b/src/Layout.h
index 45bdf46..b0c3ac5 100644
--- a/src/Layout.h
+++ b/src/Layout.h
@@ -95,6 +95,9 @@ public:
docstring rdelim;
docstring tooltip;
std::string requires;
+   std::string decoration;
+   FontInfo font;
+   FontInfo labelfont;
};
///
typedef std::map LaTeXArgMap;
diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 256afcf..b113878 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -34,7 +34,8 @@ namespace lyx {
 
 
 InsetArgument::InsetArgument(Buffer * buf, string const & name)
-: InsetCollapsable(buf), name_(name), labelstring_(docstring())
+: InsetCollapsable(buf), name_(name), labelstring_(docstring()),
+  font_(inherit_font), labelfont_(inherit_font), decoration_(string())
 {}
 
 
@@ -102,6 +103,9 @@ void InsetArgument::updateBuffer(ParIterator const & it, 
UpdateType utype)
support::rsplit(label, striplabel, '|');
labelstring_ = striplabel.empty() ? label: striplabel;
tooltip_ = translateIfPossible((*lait).second.tooltip);
+   font_ = (*lait).second.font;
+   labelfont_ = (*lait).second.labelfont;
+   decoration_ = (*lait).second.decoration;
} else {
labelstring_ = _("Unknown Argument");
tooltip_ = _("Argument not known in this Layout. Will be 
supressed in the output.");
@@ -202,6 +206,43 @@ string InsetArgument::contextMenuName() const
return "context-argument";
 }
 
+FontInfo InsetArgument::getFont() const
+{
+   if (font_ != inherit_font)
+   return font_;
+   return getLayout().font();
+}
+
+FontInfo InsetArgument::getLabelfont() const
+{
+   if (labelfont_ != inherit_font)
+   return labelfont_;
+   return getLayout().labelfont();
+}
+
+namespace {
+
+InsetLayout::InsetDecoration translateDecoration(std::string const & str) 
+{
+   if (support::compare_ascii_no_case(str, "classic") == 0)
+   return InsetLayout::CLASSIC;
+   if (support::compare_ascii_no_case(str, "minimalistic") == 0)
+   return InsetLayout::MINIMALISTIC;
+   if (support::compare_ascii_no_case(str, "conglomerate") == 0)
+   return InsetLayout::CONGLOMERATE;
+   return InsetLayout::DEFAULT;
+}
+
+}// namespace anon
+
+InsetLayout::InsetDecoration InsetArgument::decoration() const
+{
+   InsetLayout::InsetDecoration dec = getLayout().decoration();
+   if (!decoration_.empty())
+   dec = translateDecoration(decoration_);
+   return dec == InsetLayout::DEFAULT ? InsetLayout::CLASSIC : dec;
+}
+
 void InsetArgument::latexArgument(otexstream & os,
OutputParams const & runparams_in, docstring const & ldelim,
docstring const & rdelim) const
diff --git a/src/insets/InsetArgument.h b/src/insets/InsetArgument.h
index 274623a..bff6056 100644
--- a/src/insets/InsetArgument.h
+++ b/src/insets/InsetArgument.h
@@ -66,6 +66,12 @@ public:
/// \name Public functions inherited from InsetCollapsable class
//@{
///
+   InsetLayout::InsetDecoration decoration() const;
+   ///
+   FontInfo getFont() const;
+   ///
+   FontInfo

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

2012-11-25 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 9c4929ca406091267dafa40f5e083a27db046bf6
Merge: 6f08676 89c60f3
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Nov 25 19:10:40 2012 +0100

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


commit 6f086763ae543b7e221c17b243bb777b36829023
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sun Nov 25 19:10:16 2012 +0100

Add LeftDelim and RightDelim to the Style and InsetLayout repertoire

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index b4f0e42..e733e8f 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -12443,6 +12443,35 @@ depending upon the LaTeX type.
 
 \end_deeper
 \begin_layout Description
+
+\change_inserted -712698321 1353866861
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866852
+LeftDelim
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866852
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the beginning of the style content.
+\end_layout
+
+\begin_layout Description
 \begin_inset Flex Code
 status collapsed
 
@@ -13443,6 +13472,35 @@ CopyStyle
 \end_layout
 
 \begin_layout Description
+
+\change_inserted -712698321 1353866881
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866876
+RightDelim
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866873
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the end of the layout content.
+\end_layout
+
+\begin_layout Description
 \begin_inset Flex Code
 status collapsed
 
@@ -15178,7 +15236,15 @@ Note:Greyedout
 status collapsed
 
 \begin_layout Plain Layout
-OptArg
+
+\change_deleted -712698321 1353866704
+Opt
+\change_unchanged
+Arg
+\change_inserted -712698321 1353866707
+ument
+\change_unchanged
+
 \end_layout
 
 \end_inset
@@ -16422,6 +16488,39 @@ depending upon the LaTeX type.
 
 \end_deeper
 \begin_layout Description
+
+\change_inserted -712698321 1353866797
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866742
+LeftDelim
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866752
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the beginning of the layout content.
+\change_unchanged
+
+\end_layout
+
+\begin_layout Description
 \begin_inset Flex Code
 status collapsed
 
@@ -16884,6 +16983,39 @@ status collapsed
 ] Whether this inset should use the font of its surrounding environment
  or uses its own.
  Default is true: uses its own.
+\change_inserted -712698321 1353866806
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1353866814
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866810
+RightDelim
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866806
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the end of the layout content.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
diff --git a/src/Layout.cpp b/src/Layout.cpp
index a2c98ac..a5d3550 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -69,6 +69,7 @@ enum LayoutTags {
LT_LATEXNAME,
LT_LATEXPARAM,
LT_LATEXTYPE,
+   LT_LEFTDELIM,
LT_LEFTMARGIN,
LT_NEED_PROTECT,
LT_NEWLINE,
@@ -102,6 +103,7 @@ enum LayoutTags {
LT_SPELLCHECK,
LT_REFPREFIX,
LT_RESETARGS,
+   LT_RIGHTDELIM,
LT_INTITLE // keep this last!
 };
 
@@ -194,6 +196,7 @@ bool Layout::read(Lexer  lex, TextClass const  tclass)
{ latexname,  LT_LATEXNAME },
{ latexparam, LT_LATEXPARAM },
{ latextype,  LT_LATEXTYPE },
+   { leftdelim,  LT_LEFTDELIM },
{ leftmargin, LT_LEFTMARGIN },
{ margin, LT_MARGIN },
{ needprotect,LT_NEED_PROTECT },
@@ -209,6 +212,7 @@ bool Layout::read(Lexer  lex, TextClass const  tclass)
{ refprefix,  LT_REFPREFIX },
{ requires,   LT_REQUIRES },
{ resetargs,  LT_RESETARGS },
+   { rightdelim, LT_RIGHTDELIM },
{ rightmargin,LT_RIGHTMARGIN },
{ spacing,LT_SPACING },
{ spellcheck, LT_SPELLCHECK },
@@ -364,6 +368,14 @@ bool Layout::read(Lexer  lex, TextClass const  tclass)
latexparam_ = subst(latexparam_, quot;, \);
break;
 
+

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

2012-11-25 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 9c4929ca406091267dafa40f5e083a27db046bf6
Merge: 6f08676 89c60f3
Author: Juergen Spitzmueller 
Date:   Sun Nov 25 19:10:40 2012 +0100

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


commit 6f086763ae543b7e221c17b243bb777b36829023
Author: Juergen Spitzmueller 
Date:   Sun Nov 25 19:10:16 2012 +0100

Add LeftDelim and RightDelim to the Style and InsetLayout repertoire

diff --git a/lib/doc/Customization.lyx b/lib/doc/Customization.lyx
index b4f0e42..e733e8f 100644
--- a/lib/doc/Customization.lyx
+++ b/lib/doc/Customization.lyx
@@ -12443,6 +12443,35 @@ depending upon the LaTeX type.
 
 \end_deeper
 \begin_layout Description
+
+\change_inserted -712698321 1353866861
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866852
+LeftDelim
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866852
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the beginning of the style content.
+\end_layout
+
+\begin_layout Description
 \begin_inset Flex Code
 status collapsed
 
@@ -13443,6 +13472,35 @@ CopyStyle
 \end_layout
 
 \begin_layout Description
+
+\change_inserted -712698321 1353866881
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866876
+RightDelim
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866873
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the end of the layout content.
+\end_layout
+
+\begin_layout Description
 \begin_inset Flex Code
 status collapsed
 
@@ -15178,7 +15236,15 @@ Note:Greyedout
 status collapsed
 
 \begin_layout Plain Layout
-OptArg
+
+\change_deleted -712698321 1353866704
+Opt
+\change_unchanged
+Arg
+\change_inserted -712698321 1353866707
+ument
+\change_unchanged
+
 \end_layout
 
 \end_inset
@@ -16422,6 +16488,39 @@ depending upon the LaTeX type.
 
 \end_deeper
 \begin_layout Description
+
+\change_inserted -712698321 1353866797
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866742
+LeftDelim
+\change_unchanged
+
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866752
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the beginning of the layout content.
+\change_unchanged
+
+\end_layout
+
+\begin_layout Description
 \begin_inset Flex Code
 status collapsed
 
@@ -16884,6 +16983,39 @@ status collapsed
 ] Whether this inset should use the font of its surrounding environment
  or uses its own.
  Default is true: uses its own.
+\change_inserted -712698321 1353866806
+
+\end_layout
+
+\begin_layout Description
+
+\change_inserted -712698321 1353866814
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866810
+RightDelim
+\end_layout
+
+\end_inset
+
+ [
+\begin_inset Flex Code
+status collapsed
+
+\begin_layout Plain Layout
+
+\change_inserted -712698321 1353866806
+string
+\end_layout
+
+\end_inset
+
+] A string that is put at the end of the layout content.
+\change_unchanged
+
 \end_layout
 
 \begin_layout Description
diff --git a/src/Layout.cpp b/src/Layout.cpp
index a2c98ac..a5d3550 100644
--- a/src/Layout.cpp
+++ b/src/Layout.cpp
@@ -69,6 +69,7 @@ enum LayoutTags {
LT_LATEXNAME,
LT_LATEXPARAM,
LT_LATEXTYPE,
+   LT_LEFTDELIM,
LT_LEFTMARGIN,
LT_NEED_PROTECT,
LT_NEWLINE,
@@ -102,6 +103,7 @@ enum LayoutTags {
LT_SPELLCHECK,
LT_REFPREFIX,
LT_RESETARGS,
+   LT_RIGHTDELIM,
LT_INTITLE // keep this last!
 };
 
@@ -194,6 +196,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
{ "latexname",  LT_LATEXNAME },
{ "latexparam", LT_LATEXPARAM },
{ "latextype",  LT_LATEXTYPE },
+   { "leftdelim",  LT_LEFTDELIM },
{ "leftmargin", LT_LEFTMARGIN },
{ "margin", LT_MARGIN },
{ "needprotect",LT_NEED_PROTECT },
@@ -209,6 +212,7 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
{ "refprefix",  LT_REFPREFIX },
{ "requires",   LT_REQUIRES },
{ "resetargs",  LT_RESETARGS },
+   { "rightdelim", LT_RIGHTDELIM },
{ "rightmargin",LT_RIGHTMARGIN },
{ "spacing",LT_SPACING },
{ "spellcheck", LT_SPELLCHECK },
@@ -364,6 +368,14 @@ bool Layout::read(Lexer & lex, TextClass const & tclass)
latexparam_ = subst(latexparam_, "", "\"");

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

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit f90a396488fda1f915af83f6584e6025ff69f486
Merge: a41bdfa 00ac474
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 15:46:37 2012 +0100

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


commit a41bdfa4536b3f5a2daab8ce949b94199df5b943
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 15:46:20 2012 +0100

Missing pieces for InsetLayout arguments

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 768..9f1deb9 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -469,6 +469,8 @@ InsetLayout Info:shortcuts
 End
 
 InsetLayout Caption
+   LaTeXTypecommand
+   LatexNamecaption
Argument 1
LabelString   Short Title|S
Tooltip   The caption as it appears in the list of 
figures/tables
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index a637d90..22548a4 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -227,11 +227,7 @@ void InsetCaption::latex(otexstream  os,
// FIXME: actually, it is moving only when there is no
// optional argument.
runparams.moving_arg = true;
-   os  \\caption;
-   getOptArg(os, runparams);
-   os  '{';
InsetText::latex(os, runparams);
-   os  }\n;
runparams_in.encoding = runparams.encoding;
 }
 
@@ -280,13 +276,6 @@ void InsetCaption::getArgument(otexstream  os,
 }
 
 
-void InsetCaption::getOptArg(otexstream  os,
-   OutputParams const  runparams) const
-{
-   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
-}
-
-
 int InsetCaption::getCaptionAsPlaintext(odocstream  os,
OutputParams const  runparams) const
 {
diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index dc28873..d446da8 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -28,8 +28,6 @@ public:
docstring layoutName() const;
/// return the mandatory argument (LaTeX format) only
void getArgument(otexstream  os, OutputParams const ) const;
-   /// return the optional argument(s) only
-   void getOptArg(otexstream  os, OutputParams const ) const;
/// return the caption text
int getCaptionAsPlaintext(odocstream  os, OutputParams const ) const;
/// return the caption text as HTML
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 06644ad..7432f5a 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -436,6 +436,7 @@ void InsetText::latex(otexstream  os, OutputParams const  
runparams) const
if (runparams.moving_arg)
os  \\protect;
os  '\\'  from_utf8(il.latexname());
+   getOptArg(os, runparams);
if (!il.latexparam().empty())
os  from_utf8(il.latexparam());
os  '{';
@@ -590,6 +591,12 @@ docstring InsetText::insetAsXHTML(XHTMLStream  xs, 
OutputParams const  rp,
return docstring();
 }
 
+void InsetText::getOptArg(otexstream  os,
+   OutputParams const  runparams) const
+{
+   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+}
+
 
 void InsetText::cursorPos(BufferView const  bv,
CursorSlice const  sl, bool boundary, int  x, int  y) const
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 0110adf..4fb9fc3 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -93,6 +93,9 @@ public:
   XHTMLOptions) const;
///
void validate(LaTeXFeatures  features) const;
+   
+   /// return the optional argument(s) only
+   void getOptArg(otexstream  os, OutputParams const ) const;
 
/// return x,y of given position relative to the inset's baseline
void cursorPos(BufferView const  bv, CursorSlice const  sl,

---

Summary of changes:
 lib/layouts/stdinsets.inc   |2 ++
 src/insets/InsetCaption.cpp |   11 ---
 src/insets/InsetCaption.h   |2 --
 src/insets/InsetText.cpp|7 +++
 src/insets/InsetText.h  |3 +++
 5 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit f90a396488fda1f915af83f6584e6025ff69f486
Merge: a41bdfa 00ac474
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 15:46:37 2012 +0100

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


commit a41bdfa4536b3f5a2daab8ce949b94199df5b943
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 15:46:20 2012 +0100

Missing pieces for InsetLayout arguments

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 768..9f1deb9 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -469,6 +469,8 @@ InsetLayout Info:shortcuts
 End
 
 InsetLayout Caption
+   LaTeXTypecommand
+   LatexNamecaption
Argument 1
LabelString   "Short Title|S"
Tooltip   "The caption as it appears in the list of 
figures/tables"
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index a637d90..22548a4 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -227,11 +227,7 @@ void InsetCaption::latex(otexstream & os,
// FIXME: actually, it is moving only when there is no
// optional argument.
runparams.moving_arg = true;
-   os << "\\caption";
-   getOptArg(os, runparams);
-   os << '{';
InsetText::latex(os, runparams);
-   os << "}\n";
runparams_in.encoding = runparams.encoding;
 }
 
@@ -280,13 +276,6 @@ void InsetCaption::getArgument(otexstream & os,
 }
 
 
-void InsetCaption::getOptArg(otexstream & os,
-   OutputParams const & runparams) const
-{
-   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
-}
-
-
 int InsetCaption::getCaptionAsPlaintext(odocstream & os,
OutputParams const & runparams) const
 {
diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index dc28873..d446da8 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -28,8 +28,6 @@ public:
docstring layoutName() const;
/// return the mandatory argument (LaTeX format) only
void getArgument(otexstream & os, OutputParams const &) const;
-   /// return the optional argument(s) only
-   void getOptArg(otexstream & os, OutputParams const &) const;
/// return the caption text
int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
/// return the caption text as HTML
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 06644ad..7432f5a 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -436,6 +436,7 @@ void InsetText::latex(otexstream & os, OutputParams const & 
runparams) const
if (runparams.moving_arg)
os << "\\protect";
os << '\\' << from_utf8(il.latexname());
+   getOptArg(os, runparams);
if (!il.latexparam().empty())
os << from_utf8(il.latexparam());
os << '{';
@@ -590,6 +591,12 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, 
OutputParams const & rp,
return docstring();
 }
 
+void InsetText::getOptArg(otexstream & os,
+   OutputParams const & runparams) const
+{
+   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+}
+
 
 void InsetText::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 0110adf..4fb9fc3 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -93,6 +93,9 @@ public:
   XHTMLOptions) const;
///
void validate(LaTeXFeatures & features) const;
+   
+   /// return the optional argument(s) only
+   void getOptArg(otexstream & os, OutputParams const &) const;
 
/// return x,y of given position relative to the inset's baseline
void cursorPos(BufferView const & bv, CursorSlice const & sl,

---

Summary of changes:
 lib/layouts/stdinsets.inc   |2 ++
 src/insets/InsetCaption.cpp |   11 ---
 src/insets/InsetCaption.h   |2 --
 src/insets/InsetText.cpp|7 +++
 src/insets/InsetText.h  |3 +++
 5 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-11-20 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit aafd52f44167d5510be1ddcb974daa9dae486933
Merge: d3488d6 d1e3646
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Nov 20 18:10:18 2012 +0100

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


commit d3488d6f86f693e466387e485a4a8ffdec3e49f2
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Nov 20 18:09:38 2012 +0100

Whitespace

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 49bd65a..79615ff 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -549,7 +549,7 @@ void LyXAction::init()
  * \li Origin: spitz, 05 Mar 2012
  * \endvar
  */
-{ LFUN_IPA_INSERT, ipa-insert, Noop, Edit },
+   { LFUN_IPA_INSERT, ipa-insert, Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_IN_IPA
  * \li Action: Only active in IPA inset.

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-11-20 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit aafd52f44167d5510be1ddcb974daa9dae486933
Merge: d3488d6 d1e3646
Author: Juergen Spitzmueller 
Date:   Tue Nov 20 18:10:18 2012 +0100

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


commit d3488d6f86f693e466387e485a4a8ffdec3e49f2
Author: Juergen Spitzmueller 
Date:   Tue Nov 20 18:09:38 2012 +0100

Whitespace

diff --git a/src/LyXAction.cpp b/src/LyXAction.cpp
index 49bd65a..79615ff 100644
--- a/src/LyXAction.cpp
+++ b/src/LyXAction.cpp
@@ -549,7 +549,7 @@ void LyXAction::init()
  * \li Origin: spitz, 05 Mar 2012
  * \endvar
  */
-{ LFUN_IPA_INSERT, "ipa-insert", Noop, Edit },
+   { LFUN_IPA_INSERT, "ipa-insert", Noop, Edit },
 /*!
  * \var lyx::FuncCode lyx::LFUN_IN_IPA
  * \li Action: Only active in IPA inset.

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-15 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit f2b2ed43ecfc403e17c80aa7899085f513271dc1
Merge: 419f32d e72c56d
Author: Kornel Benko kor...@lyx.org
Date:   Mon Oct 15 22:53:25 2012 +0200

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


commit 419f32df91d744378808afdf04bbe68cb8a11f9a
Author: Kornel Benko kor...@lyx.org
Date:   Mon Oct 15 22:50:39 2012 +0200

Cmake build:
Creating LYX_DATE dynamically at configure-time caused unwanted 
recompilation
of the whole directories (src + src/tex2lyx) because all the relevant 
objects
were dependent of a common file (flags.make in case of Unix makefiles) 
which changed
accordingly.
There is now a new include (lyx_date.h, with only one definition)

Nothing changes for automake, since in this case LYX_DATE is defined in 
config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00fe870..700ff04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -673,6 +673,7 @@ else()
 endif()
 
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+configure_file(${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.h)
 
 # Compute qt4-version from ${QTVERSION}
 if(QTVERSION MATCHES ^([0-9]+)\\.([0-9]+)\\.([0-9]+).*)
diff --git a/development/cmake/lyx_date.h.cmake 
b/development/cmake/lyx_date.h.cmake
new file mode 100644
index 000..ddbffea
--- /dev/null
+++ b/development/cmake/lyx_date.h.cmake
@@ -0,0 +1,18 @@
+/*
+ * \file config.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * This is the compilation configuration file for LyX.
+ * It was generated by cmake.
+ * You might want to change some of the defaults if something goes wrong
+ * during the compilation.
+ */
+
+#ifndef _LYX_DATE_H
+#define _LYX_DATE_H
+
+#cmakedefine LYX_DATE ${LYX_DATE}
+
+#endif
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f57845..5862136 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,8 +31,6 @@ list(REMOVE_ITEM lyx_sources
${TOP_SRC_DIR}/src/lyxinsets.cpp
${TOP_SRC_DIR}/src/lyxmathed.cpp)
 
-set_property(SOURCE ${TOP_SRC_DIR}/src/version.cpp APPEND PROPERTY 
COMPILE_DEFINITIONS  LYX_DATE=${LYX_DATE})
-
 list(REMOVE_ITEM lyx_headers
${TOP_SRC_DIR}/src/Variables.h
${TOP_SRC_DIR}/src/Section.h)
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 4fa809a..1952a81 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -21,8 +21,6 @@ foreach(_src graphics/GraphicsParams insets/ExternalTemplate
list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
 
-set_property(SOURCE ${TOP_SRC_DIR}/src/version.cpp APPEND PROPERTY 
COMPILE_DEFINITIONS  LYX_DATE=${LYX_DATE})
-
 file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_FILES})
 
 file(GLOB tex2lyx_headers ${TOP_SRC_DIR}/src/tex2lyx/${LYX_HPP_FILES})
diff --git a/src/version.cpp b/src/version.cpp
index 2ae5992..1e4aa32 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -10,6 +10,9 @@
  */
 
 #include config.h
+#if ! defined(LYX_DATE)
+   #include lyx_date.h
+#endif
 
 ///
 extern char const * const lyx_version = PACKAGE_VERSION;

---

Summary of changes:
 CMakeLists.txt |1 +
 .../cmake/{config.cpp.cmake = lyx_date.h.cmake}   |   12 +---
 src/CMakeLists.txt |2 --
 src/tex2lyx/CMakeLists.txt |2 --
 src/version.cpp|3 +++
 5 files changed, 13 insertions(+), 7 deletions(-)
 copy development/cmake/{config.cpp.cmake = lyx_date.h.cmake} (66%)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-15 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit f2b2ed43ecfc403e17c80aa7899085f513271dc1
Merge: 419f32d e72c56d
Author: Kornel Benko 
Date:   Mon Oct 15 22:53:25 2012 +0200

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


commit 419f32df91d744378808afdf04bbe68cb8a11f9a
Author: Kornel Benko 
Date:   Mon Oct 15 22:50:39 2012 +0200

Cmake build:
Creating LYX_DATE dynamically at configure-time caused unwanted 
recompilation
of the whole directories (src + src/tex2lyx) because all the relevant 
objects
were dependent of a common file (flags.make in case of "Unix makefiles") 
which changed
accordingly.
There is now a new include (lyx_date.h, with only one definition)

Nothing changes for automake, since in this case LYX_DATE is defined in 
config.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00fe870..700ff04 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -673,6 +673,7 @@ else()
 endif()
 
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+configure_file(${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.h)
 
 # Compute qt4-version from ${QTVERSION}
 if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
diff --git a/development/cmake/lyx_date.h.cmake 
b/development/cmake/lyx_date.h.cmake
new file mode 100644
index 000..ddbffea
--- /dev/null
+++ b/development/cmake/lyx_date.h.cmake
@@ -0,0 +1,18 @@
+/*
+ * \file config.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * This is the compilation configuration file for LyX.
+ * It was generated by cmake.
+ * You might want to change some of the defaults if something goes wrong
+ * during the compilation.
+ */
+
+#ifndef _LYX_DATE_H
+#define _LYX_DATE_H
+
+#cmakedefine LYX_DATE "${LYX_DATE}"
+
+#endif
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f57845..5862136 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,8 +31,6 @@ list(REMOVE_ITEM lyx_sources
${TOP_SRC_DIR}/src/lyxinsets.cpp
${TOP_SRC_DIR}/src/lyxmathed.cpp)
 
-set_property(SOURCE "${TOP_SRC_DIR}/src/version.cpp" APPEND PROPERTY 
COMPILE_DEFINITIONS  LYX_DATE="${LYX_DATE}")
-
 list(REMOVE_ITEM lyx_headers
${TOP_SRC_DIR}/src/Variables.h
${TOP_SRC_DIR}/src/Section.h)
diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 4fa809a..1952a81 100644
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -21,8 +21,6 @@ foreach(_src graphics/GraphicsParams insets/ExternalTemplate
list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
 
-set_property(SOURCE "${TOP_SRC_DIR}/src/version.cpp" APPEND PROPERTY 
COMPILE_DEFINITIONS  LYX_DATE="${LYX_DATE}")
-
 file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_FILES})
 
 file(GLOB tex2lyx_headers ${TOP_SRC_DIR}/src/tex2lyx/${LYX_HPP_FILES})
diff --git a/src/version.cpp b/src/version.cpp
index 2ae5992..1e4aa32 100644
--- a/src/version.cpp
+++ b/src/version.cpp
@@ -10,6 +10,9 @@
  */
 
 #include 
+#if ! defined(LYX_DATE)
+   #include 
+#endif
 
 ///
 extern char const * const lyx_version = PACKAGE_VERSION;

---

Summary of changes:
 CMakeLists.txt |1 +
 .../cmake/{config.cpp.cmake => lyx_date.h.cmake}   |   12 +---
 src/CMakeLists.txt |2 --
 src/tex2lyx/CMakeLists.txt |2 --
 src/version.cpp|3 +++
 5 files changed, 13 insertions(+), 7 deletions(-)
 copy development/cmake/{config.cpp.cmake => lyx_date.h.cmake} (66%)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-09 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit df880b8e924900c388ca856f5b2c5475ee1f8e9a
Merge: 280b1ca 7c8f4d5
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 13:24:39 2012 +0200

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


commit 280b1ca76445a97b7192593689de38a8a5db9fd0
Author: Kornel Benko kor...@lyx.org
Date:   Tue Oct 9 13:24:09 2012 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index aba71fa..9ab7854 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: LyX-2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2012-10-08 19:42+0200\n
-PO-Revision-Date: 2012-10-07 19:17+0200\n
+POT-Creation-Date: 2012-10-09 11:04+0200\n
+PO-Revision-Date: 2012-10-09 12:48+0200\n
 Last-Translator: Kornel Benko kor...@lyx.org\n
 Language-Team: Slovak lyx-d...@lists.lyx.org\n
 Language: sk\n
@@ -5106,6 +5106,42 @@ msgstr PovoÄ¾uje premenlivÃ© umiestnenie
 msgid Allow floating
 msgstr UmoÅ¾ni plÃ¡vajÃºce objekty
 
+#: lib/layouts/AEA.layout:3
+msgid American Economic Association (AEA)
+msgstr American Economic Association (AEA)
+
+#: lib/layouts/AEA.layout:4 lib/layouts/IEEEtran.layout:4
+#: lib/layouts/aa.layout:4 lib/layouts/aapaper.layout:4
+#: lib/layouts/aastex.layout:4 lib/layouts/achemso.layout:4
+#: lib/layouts/acmsiggraph.layout:4 lib/layouts/agums.layout:4
+#: lib/layouts/agutex.layout:4 lib/layouts/amsart.layout:4
+#: lib/layouts/apa.layout:4 lib/layouts/arab-article.layout:4
+#: lib/layouts/article-beamer.layout:4 lib/layouts/article.layout:4
+#: lib/layouts/chess.layout:4 lib/layouts/cl2emult.layout:4
+#: lib/layouts/ctex-article.layout:4 lib/layouts/doublecol-new.layout:4
+#: lib/layouts/dtk.layout:4 lib/layouts/ectaart.layout:4
+#: lib/layouts/egs.layout:4 lib/layouts/elsart.layout:4
+#: lib/layouts/elsarticle.layout:4 lib/layouts/entcs.layout:4
+#: lib/layouts/extarticle.layout:4 lib/layouts/heb-article.layout:4
+#: lib/layouts/ijmpc.layout:4 lib/layouts/ijmpd.layout:4
+#: lib/layouts/iopart.layout:4 lib/layouts/isprs.layout:4
+#: lib/layouts/jarticle.layout:4 lib/layouts/jasatex.layout:4
+#: lib/layouts/jgrga.layout:4 lib/layouts/jsarticle.layout:4
+#: lib/layouts/jss.layout:4 lib/layouts/kluwer.layout:4
+#: lib/layouts/latex8.layout:4 lib/layouts/literate-article.layout:4
+#: lib/layouts/llncs.layout:4 lib/layouts/ltugboat.layout:4
+#: lib/layouts/mwart.layout:4 lib/layouts/paper.layout:4
+#: lib/layouts/revtex.layout:4 lib/layouts/revtex4-1.layout:4
+#: lib/layouts/revtex4.layout:4 lib/layouts/scrartcl.layout:4
+#: lib/layouts/scrarticle-beamer.layout:4 lib/layouts/siamltex.layout:4
+#: lib/layouts/sigplanconf.layout:4 lib/layouts/singlecol-new.layout:4
+#: lib/layouts/singlecol.layout:4 lib/layouts/spie.layout:4
+#: lib/layouts/svglobal.layout:4 lib/layouts/svglobal3.layout:4
+#: lib/layouts/svjog.layout:4 lib/layouts/svprobth.layout:4
+#: lib/layouts/tarticle.layout:4
+msgid Articles
+msgstr ÄlÃ¡nky
+
 #: lib/layouts/AEA.layout:55 lib/layouts/apa.layout:92
 msgid ShortTitle
 msgstr KrÃ¡tkyTitul
@@ -5651,6 +5687,10 @@ msgstr Popis: 
 msgid Proof
 msgstr DÃ´kaz
 
+#: lib/layouts/IEEEtran.layout:3
+msgid IEEE Transactions
+msgstr IEEE Transactions
+
 #: lib/layouts/IEEEtran.layout:34 lib/layouts/aa.layout:27
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:52
 #: lib/layouts/achemso.layout:32 lib/layouts/acmsiggraph.layout:34
@@ -5886,6 +5926,10 @@ msgstr Å½ivotopisBezFotky
 msgid Proof.
 msgstr DÃ´kaz.
 
+#: lib/layouts/aa.layout:3
+msgid Astronomy  Astrophysics
+msgstr Astronomy  Astrophysics
+
 #: lib/layouts/aa.layout:42 lib/layouts/aa.layout:229
 #: lib/layouts/aapaper.layout:64 lib/layouts/aapaper.layout:137
 #: lib/layouts/aastex.layout:67 lib/layouts/aastex.layout:177
@@ -6099,11 +6143,19 @@ msgstr E-mail
 msgid email
 msgstr E-mail
 
+#: lib/layouts/aapaper.layout:3 lib/layouts/aapaper.layout:14
+msgid Astronomy  Astrophysics (V. 4, Obsolete)
+msgstr Astronomy  Astrophysics (V. 4, zastaralÃ©)
+
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.inc:103
 #: lib/ui/stdtoolbars.inc:139 src/frontends/qt4/GuiThesaurus.cpp:46
 msgid Thesaurus
 msgstr Tezaurus
 
+#: lib/layouts/aastex.layout:3
+msgid American Astronomical Society (AASTeX)
+msgstr American Astronomical Society (AASTeX)
+
 #: lib/layouts/aastex.layout:79 lib/layouts/agutex.layout:149
 #: lib/layouts/amsbook.layout:126 lib/layouts/apa.layout:341
 #: lib/layouts/egs.layout:71 lib/layouts/kluwer.layout:89
@@ -6264,6 +6316,10 @@ msgstr Obj:
 msgid Dataset:
 msgstr Dataset:
 
+#: lib/layouts/achemso.layout:3
+msgid American Chemical Society (ACS)
+msgstr American Chemical Society (ACS)
+
 #: lib/layouts/achemso.layout:100
 msgid Alt Affiliation
 msgstr AlternatÃvne PrÃsluÅ¡enstvo
@@ -6323,6 +6379,10 @@ msgstr Chemistry
 msgid chemistry
 msgstr chemistry
 
+#: lib/layouts/acmsiggraph.layout:3
+msgid ACM SIGGRAPH
+msgstr ACM SIGGRAPH
+
 #: lib/layouts/acmsiggraph.layout:64
 msgid

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

2012-10-09 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 9a0f82d44141e63ff9818a9a1e426ea3e232
Merge: c851350 df880b8
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 16:13:00 2012 +0200

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


commit c85135090e230c046851603c372b3ad0fd47a788
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Oct 9 16:12:32 2012 +0200

Stick to bformat

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index d4410cf..878d277 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -493,7 +493,9 @@ void CategorizedCombo::addItemSort(QString const  item, 
QString const  guiname
   bool sorted, bool sortedByCat, bool sortCats,
   bool available)
 {
-   QString titem = available ? guiname : qt_(Unavailable: 
%1).arg(guiname);
+   QString titem = available ? guiname
+ : toqstr(bformat(_(Unavailable: %1$s),
+  qstring_to_ucs4(guiname)));
bool const uncategorized = category.isEmpty();
QString qcat = uncategorized ? qt_(Uncategorized) : category;
 

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-09 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit df880b8e924900c388ca856f5b2c5475ee1f8e9a
Merge: 280b1ca 7c8f4d5
Author: Kornel Benko 
Date:   Tue Oct 9 13:24:39 2012 +0200

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


commit 280b1ca76445a97b7192593689de38a8a5db9fd0
Author: Kornel Benko 
Date:   Tue Oct 9 13:24:09 2012 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index aba71fa..9ab7854 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2012-10-08 19:42+0200\n"
-"PO-Revision-Date: 2012-10-07 19:17+0200\n"
+"POT-Creation-Date: 2012-10-09 11:04+0200\n"
+"PO-Revision-Date: 2012-10-09 12:48+0200\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -5106,6 +5106,42 @@ msgstr "PovoÄ¾uje premenlivÃ© umiestnenie"
 msgid "Allow "
 msgstr "UÅ¾ni plÃ¡vajÃºce objekty"
 
+#: lib/layouts/AEA.layout:3
+msgid "American Economic Association (AEA)"
+msgstr "American Economic Association (AEA)"
+
+#: lib/layouts/AEA.layout:4 lib/layouts/IEEEtran.layout:4
+#: lib/layouts/aa.layout:4 lib/layouts/aapaper.layout:4
+#: lib/layouts/aastex.layout:4 lib/layouts/achemso.layout:4
+#: lib/layouts/acmsiggraph.layout:4 lib/layouts/agums.layout:4
+#: lib/layouts/agutex.layout:4 lib/layouts/amsart.layout:4
+#: lib/layouts/apa.layout:4 lib/layouts/arab-article.layout:4
+#: lib/layouts/article-beamer.layout:4 lib/layouts/article.layout:4
+#: lib/layouts/chess.layout:4 lib/layouts/cl2emult.layout:4
+#: lib/layouts/ctex-article.layout:4 lib/layouts/doublecol-new.layout:4
+#: lib/layouts/dtk.layout:4 lib/layouts/ectaart.layout:4
+#: lib/layouts/egs.layout:4 lib/layouts/elsart.layout:4
+#: lib/layouts/elsarticle.layout:4 lib/layouts/entcs.layout:4
+#: lib/layouts/extarticle.layout:4 lib/layouts/heb-article.layout:4
+#: lib/layouts/ijmpc.layout:4 lib/layouts/ijmpd.layout:4
+#: lib/layouts/iopart.layout:4 lib/layouts/isprs.layout:4
+#: lib/layouts/jarticle.layout:4 lib/layouts/jasatex.layout:4
+#: lib/layouts/jgrga.layout:4 lib/layouts/jsarticle.layout:4
+#: lib/layouts/jss.layout:4 lib/layouts/kluwer.layout:4
+#: lib/layouts/latex8.layout:4 lib/layouts/literate-article.layout:4
+#: lib/layouts/llncs.layout:4 lib/layouts/ltugboat.layout:4
+#: lib/layouts/mwart.layout:4 lib/layouts/paper.layout:4
+#: lib/layouts/revtex.layout:4 lib/layouts/revtex4-1.layout:4
+#: lib/layouts/revtex4.layout:4 lib/layouts/scrartcl.layout:4
+#: lib/layouts/scrarticle-beamer.layout:4 lib/layouts/siamltex.layout:4
+#: lib/layouts/sigplanconf.layout:4 lib/layouts/singlecol-new.layout:4
+#: lib/layouts/singlecol.layout:4 lib/layouts/spie.layout:4
+#: lib/layouts/svglobal.layout:4 lib/layouts/svglobal3.layout:4
+#: lib/layouts/svjog.layout:4 lib/layouts/svprobth.layout:4
+#: lib/layouts/tarticle.layout:4
+msgid "Articles"
+msgstr "ÄlÃ¡nky"
+
 #: lib/layouts/AEA.layout:55 lib/layouts/apa.layout:92
 msgid "ShortTitle"
 msgstr "KrÃ¡tkyTitul"
@@ -5651,6 +5687,10 @@ msgstr "Popis: "
 msgid "Proof"
 msgstr "DÃ´kaz"
 
+#: lib/layouts/IEEEtran.layout:3
+msgid "IEEE Transactions"
+msgstr "IEEE Transactions"
+
 #: lib/layouts/IEEEtran.layout:34 lib/layouts/aa.layout:27
 #: lib/layouts/aapaper.layout:34 lib/layouts/aastex.layout:52
 #: lib/layouts/achemso.layout:32 lib/layouts/acmsiggraph.layout:34
@@ -5886,6 +5926,10 @@ msgstr "Å½ivotopisBezFotky"
 msgid "Proof."
 msgstr "DÃ´kaz."
 
+#: lib/layouts/aa.layout:3
+msgid "Astronomy & Astrophysics"
+msgstr "Astronomy & Astrophysics"
+
 #: lib/layouts/aa.layout:42 lib/layouts/aa.layout:229
 #: lib/layouts/aapaper.layout:64 lib/layouts/aapaper.layout:137
 #: lib/layouts/aastex.layout:67 lib/layouts/aastex.layout:177
@@ -6099,11 +6143,19 @@ msgstr "E-mail"
 msgid "email"
 msgstr "E-mail"
 
+#: lib/layouts/aapaper.layout:3 lib/layouts/aapaper.layout:14
+msgid "Astronomy & Astrophysics (V. 4, Obsolete)"
+msgstr "Astronomy & Astrophysics (V. 4, zastaralÃ©)"
+
 #: lib/layouts/aapaper.layout:94 lib/layouts/aapaper.inc:103
 #: lib/ui/stdtoolbars.inc:139 src/frontends/qt4/GuiThesaurus.cpp:46
 msgid "Thesaurus"
 msgstr "Tezaurus"
 
+#: lib/layouts/aastex.layout:3
+msgid "American Astronomical Society (AASTeX)"
+msgstr "American Astronomical Society (AASTeX)"
+
 #: lib/layouts/aastex.layout:79 lib/layouts/agutex.layout:149
 #: lib/layouts/amsbook.layout:126 lib/layouts/apa.layout:341
 #: lib/layouts/egs.layout:71 lib/layouts/kluwer.layout:89
@@ -6264,6 +6316,10 @@ msgstr "Obj:"
 msgid "Dataset:"
 msgstr "Dataset:"
 
+#: lib/layouts/achemso.layout:3
+msgid "American Chemical Society (ACS)"
+msgstr "American Chemical Society (ACS)"
+
 #: lib/layouts/achemso.layout:100
 msgid "Alt Affiliation"
 msgstr "AlternatÃvne PrÃsluÅ¡enstvo"
@@ -6323,6 +6379,10 @@ msgstr "Chemistry"
 msgid "chemistry"
 msgstr "chemistry"
 
+#:

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

2012-10-09 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 9a0f82d44141e63ff9818a9a1e426ea3e232
Merge: c851350 df880b8
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 16:13:00 2012 +0200

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


commit c85135090e230c046851603c372b3ad0fd47a788
Author: Juergen Spitzmueller 
Date:   Tue Oct 9 16:12:32 2012 +0200

Stick to bformat

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index d4410cf..878d277 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -493,7 +493,9 @@ void CategorizedCombo::addItemSort(QString const & item, 
QString const & guiname
   bool sorted, bool sortedByCat, bool sortCats,
   bool available)
 {
-   QString titem = available ? guiname : qt_("Unavailable: 
%1").arg(guiname);
+   QString titem = available ? guiname
+ : toqstr(bformat(_("Unavailable: %1$s"),
+  qstring_to_ucs4(guiname)));
bool const uncategorized = category.isEmpty();
QString qcat = uncategorized ? qt_("Uncategorized") : category;
 

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-08 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 43583e3ba6f4a366a16e682e97caf57821888427
Merge: 04d39dd 51cc826
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Mon Oct 8 17:04:34 2012 +0200

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


commit 04d39dd5be73e6b6ca83dd9487cdbc118c4a1f29
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Mon Oct 8 17:02:10 2012 +0200

Proper string translation

diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp
index a1514c1..9460427 100644
--- a/src/frontends/qt4/LayoutBox.cpp
+++ b/src/frontends/qt4/LayoutBox.cpp
@@ -569,9 +569,9 @@ void LayoutBox::addItemSort(docstring const  item, 
docstring const  category,
bool sorted, bool sortedByCat, bool unknown)
 {
QString qitem = toqstr(item);
-   // FIXME This is wrong for RTL, I'd suppose.
-   QString titem = toqstr(translateIfPossible(item) +
-  (unknown ? _( (unknown)) : from_ascii()));
+   docstring const loc_item = translateIfPossible(item);
+   QString titem = unknown ? toqstr(bformat(_(%1$s (unknown)), loc_item))
+   : toqstr(loc_item);
QString qcat = toqstr(translateIfPossible(category));
 
QListQStandardItem * row;

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-08 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 43583e3ba6f4a366a16e682e97caf57821888427
Merge: 04d39dd 51cc826
Author: Juergen Spitzmueller 
Date:   Mon Oct 8 17:04:34 2012 +0200

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


commit 04d39dd5be73e6b6ca83dd9487cdbc118c4a1f29
Author: Juergen Spitzmueller 
Date:   Mon Oct 8 17:02:10 2012 +0200

Proper string translation

diff --git a/src/frontends/qt4/LayoutBox.cpp b/src/frontends/qt4/LayoutBox.cpp
index a1514c1..9460427 100644
--- a/src/frontends/qt4/LayoutBox.cpp
+++ b/src/frontends/qt4/LayoutBox.cpp
@@ -569,9 +569,9 @@ void LayoutBox::addItemSort(docstring const & item, 
docstring const & category,
bool sorted, bool sortedByCat, bool unknown)
 {
QString qitem = toqstr(item);
-   // FIXME This is wrong for RTL, I'd suppose.
-   QString titem = toqstr(translateIfPossible(item) +
-  (unknown ? _(" (unknown)") : from_ascii("")));
+   docstring const loc_item = translateIfPossible(item);
+   QString titem = unknown ? toqstr(bformat(_("%1$s (unknown)"), loc_item))
+   : toqstr(loc_item);
QString qcat = toqstr(translateIfPossible(category));
 
QList row;

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-06 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 2801f40ad2a5de39b1a9815c5b2cd7531a9ad2f3
Merge: 3a79273 23d7d64
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Oct 6 12:10:39 2012 +0200

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


commit 3a792732cbd51197e2d2e85267d0e5548d85402a
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Oct 6 12:10:21 2012 +0200

de.po: update

diff --git a/po/de.po b/po/de.po
index 25015cd..453bb19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid 
 msgstr 
 Project-Id-Version: LyX 2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2012-09-30 10:42+0200\n
-PO-Revision-Date: 2012-09-30 10:53+0200\n
+POT-Creation-Date: 2012-10-06 11:55+0200\n
+PO-Revision-Date: 2012-10-06 12:05+0200\n
 Last-Translator: JÃ¼rgen SpitzmÃ¼ller sp...@lyx.org\n
 Language-Team: German lyx-d...@lists.lyx.org\n
 Language: de\n
@@ -465,7 +465,7 @@ msgstr Ãbernehmen
 
 #: src/frontends/qt4/ui/InsetParamsUi.ui:138
 #: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/ui/ThesaurusUi.ui:138
-#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/frontends/qt4/ui/AboutUi.ui:131
+#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/frontends/qt4/ui/AboutUi.ui:134
 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66
 #: src/frontends/qt4/ui/ExternalUi.ui:608 src/frontends/qt4/ui/PrefsUi.ui:90
 #: src/frontends/qt4/ui/DelimiterUi.ui:286
@@ -1250,7 +1250,7 @@ msgstr Zeilenabstand
 #: src/frontends/qt4/GuiListings.cpp:152 src/frontends/qt4/GuiListings.cpp:159
 #: src/frontends/qt4/GuiPrefs.cpp:2290 src/frontends/qt4/GuiPrefs.cpp:2551
 #: src/frontends/qt4/GuiPrintNomencl.cpp:47
-#: src/frontends/qt4/GuiViewSource.cpp:198
+#: src/frontends/qt4/GuiViewSource.cpp:203
 msgid Default
 msgstr Standard
 
@@ -1306,11 +1306,11 @@ msgstr Version
 msgid Version goes here
 msgstr Version kommt hierher
 
-#: src/frontends/qt4/ui/AboutUi.ui:64
+#: src/frontends/qt4/ui/AboutUi.ui:67
 msgid Credits
 msgstr Mitwirkende
 
-#: src/frontends/qt4/ui/AboutUi.ui:80 lib/layouts/apa.layout:192
+#: src/frontends/qt4/ui/AboutUi.ui:83 lib/layouts/apa.layout:192
 #: lib/layouts/agu_stdtitle.inc:81
 msgid Copyright
 msgstr Urheberrecht
@@ -1750,8 +1750,8 @@ msgstr Alle hinzufÃ¼gen
 #: src/frontends/qt4/ui/CompareHistoryUi.ui:205
 #: src/frontends/qt4/ui/IndexUi.ui:78 src/frontends/qt4/ui/ListingsUi.ui:559
 #: src/frontends/qt4/ui/DocumentUi.ui:84
-#: src/frontends/qt4/ui/CitationUi.ui:220 src/Buffer.cpp:1169
-#: src/Buffer.cpp:2476 src/Buffer.cpp:3982 src/Buffer.cpp:4045
+#: src/frontends/qt4/ui/CitationUi.ui:220 src/Buffer.cpp:1176
+#: src/Buffer.cpp:2489 src/Buffer.cpp:4009 src/Buffer.cpp:4072
 #: src/LyXVC.cpp:89 src/LyXVC.cpp:224 src/frontends/qt4/GuiBranches.cpp:219
 #: src/frontends/qt4/GuiClipboard.cpp:242
 #: src/frontends/qt4/GuiDocument.cpp:2066
@@ -3192,8 +3192,8 @@ msgid Remove the selected branch
 msgstr Den ausgewÃ¤hlten Zweig entfernen
 
 #: src/frontends/qt4/ui/BranchesUi.ui:136
-#: src/frontends/qt4/ui/IndicesUi.ui:165 src/Buffer.cpp:4007
-#: src/Buffer.cpp:4020
+#: src/frontends/qt4/ui/IndicesUi.ui:165 src/Buffer.cpp:4034
+#: src/Buffer.cpp:4047
 msgid Remove
 msgstr Entfernen
 
@@ -3330,14 +3330,22 @@ msgstr Nur Vorspann
 msgid Body Only
 msgstr Nur Haupttext
 
-#: src/frontends/qt4/ui/ViewSourceUi.ui:82 src/frontends/qt4/ui/RefUi.ui:294
-#: src/frontends/qt4/ui/LogUi.ui:77
-msgid Update
-msgstr Aktualisieren
+#: src/frontends/qt4/ui/ViewSourceUi.ui:79
+msgid Master's perspective
+msgstr Sicht des Hauptdokuments
+
+#: src/frontends/qt4/ui/ViewSourceUi.ui:82
+msgid Show the source as the master document gets it
+msgstr Die Quelle so zeigen, wie sie fÃ¼r das Hauptdokument ausgegeben wird
 
 #: src/frontends/qt4/ui/ViewSourceUi.ui:89
 msgid Automatic update
-msgstr Automatische Aktualisierung
+msgstr Automatische Aktualisierung
+
+#: src/frontends/qt4/ui/ViewSourceUi.ui:102 src/frontends/qt4/ui/RefUi.ui:294
+#: src/frontends/qt4/ui/LogUi.ui:77
+msgid Update
+msgstr Aktualisieren
 
 #: src/frontends/qt4/ui/IncludeUi.ui:36
 msgid Listing Parameters
@@ -3403,8 +3411,8 @@ msgstr Input
 msgid Verbatim
 msgstr Unformatiert
 
-#: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1161
-#: src/insets/InsetInclude.cpp:1167
+#: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1165
+#: src/insets/InsetInclude.cpp:1171
 msgid Program Listing
 msgstr Programmlisting
 
@@ -12504,17 +12512,17 @@ msgid Redo|R
 msgstr Wiederholen|W
 
 #: lib/ui/stdmenus.inc:103 lib/ui/stdcontext.inc:293 lib/ui/stdtoolbars.inc:80
-#: src/Text3.cpp:1280 src/mathed/InsetMathNest.cpp:596
+#: src/Text3.cpp:1285 src/mathed/InsetMathNest.cpp:596
 msgid Cut
 msgstr Ausschneiden
 
 #: lib/ui/stdmenus.inc:104 lib/ui/stdcontext.inc:294 lib/ui/stdtoolbars.inc:81
-#: src/Text3.cpp:1285 src/mathed/InsetMathNest.cpp:605
+#: src/Text3.cpp:1290 src/mathed/InsetMathNest.cpp:605
 msgid Copy
 msgstr Kopieren
 
 #:

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

2012-10-06 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 2801f40ad2a5de39b1a9815c5b2cd7531a9ad2f3
Merge: 3a79273 23d7d64
Author: Juergen Spitzmueller 
Date:   Sat Oct 6 12:10:39 2012 +0200

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


commit 3a792732cbd51197e2d2e85267d0e5548d85402a
Author: Juergen Spitzmueller 
Date:   Sat Oct 6 12:10:21 2012 +0200

de.po: update

diff --git a/po/de.po b/po/de.po
index 25015cd..453bb19 100644
--- a/po/de.po
+++ b/po/de.po
@@ -95,8 +95,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX 2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2012-09-30 10:42+0200\n"
-"PO-Revision-Date: 2012-09-30 10:53+0200\n"
+"POT-Creation-Date: 2012-10-06 11:55+0200\n"
+"PO-Revision-Date: 2012-10-06 12:05+0200\n"
 "Last-Translator: JÃ¼rgen SpitzmÃ¼ller \n"
 "Language-Team: German \n"
 "Language: de\n"
@@ -465,7 +465,7 @@ msgstr "&Ãbernehmen"
 
 #: src/frontends/qt4/ui/InsetParamsUi.ui:138
 #: src/frontends/qt4/ui/WrapUi.ui:173 src/frontends/qt4/ui/ThesaurusUi.ui:138
-#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/frontends/qt4/ui/AboutUi.ui:131
+#: src/frontends/qt4/ui/ParagraphUi.ui:260 src/frontends/qt4/ui/AboutUi.ui:134
 #: src/frontends/qt4/ui/ShowFileUi.ui:55 src/frontends/qt4/ui/SymbolsUi.ui:66
 #: src/frontends/qt4/ui/ExternalUi.ui:608 src/frontends/qt4/ui/PrefsUi.ui:90
 #: src/frontends/qt4/ui/DelimiterUi.ui:286
@@ -1250,7 +1250,7 @@ msgstr "Zeilen"
 #: src/frontends/qt4/GuiListings.cpp:152 src/frontends/qt4/GuiListings.cpp:159
 #: src/frontends/qt4/GuiPrefs.cpp:2290 src/frontends/qt4/GuiPrefs.cpp:2551
 #: src/frontends/qt4/GuiPrintNomencl.cpp:47
-#: src/frontends/qt4/GuiViewSource.cpp:198
+#: src/frontends/qt4/GuiViewSource.cpp:203
 msgid "Default"
 msgstr "Standard"
 
@@ -1306,11 +1306,11 @@ msgstr "Version"
 msgid "Version goes here"
 msgstr "Version kommt hierher"
 
-#: src/frontends/qt4/ui/AboutUi.ui:64
+#: src/frontends/qt4/ui/AboutUi.ui:67
 msgid "Credits"
 msgstr "Mitwirkende"
 
-#: src/frontends/qt4/ui/AboutUi.ui:80 lib/layouts/apa.layout:192
+#: src/frontends/qt4/ui/AboutUi.ui:83 lib/layouts/apa.layout:192
 #: lib/layouts/agu_stdtitle.inc:81
 msgid "Copyright"
 msgstr "Urheberrecht"
@@ -1750,8 +1750,8 @@ msgstr "A hinzufÃ¼gen"
 #: src/frontends/qt4/ui/CompareHistoryUi.ui:205
 #: src/frontends/qt4/ui/IndexUi.ui:78 src/frontends/qt4/ui/ListingsUi.ui:559
 #: src/frontends/qt4/ui/DocumentUi.ui:84
-#: src/frontends/qt4/ui/CitationUi.ui:220 src/Buffer.cpp:1169
-#: src/Buffer.cpp:2476 src/Buffer.cpp:3982 src/Buffer.cpp:4045
+#: src/frontends/qt4/ui/CitationUi.ui:220 src/Buffer.cpp:1176
+#: src/Buffer.cpp:2489 src/Buffer.cpp:4009 src/Buffer.cpp:4072
 #: src/LyXVC.cpp:89 src/LyXVC.cpp:224 src/frontends/qt4/GuiBranches.cpp:219
 #: src/frontends/qt4/GuiClipboard.cpp:242
 #: src/frontends/qt4/GuiDocument.cpp:2066
@@ -3192,8 +3192,8 @@ msgid "Remove the selected branch"
 msgstr "Den ausgewÃ¤hlten Zweig entfernen"
 
 #: src/frontends/qt4/ui/BranchesUi.ui:136
-#: src/frontends/qt4/ui/IndicesUi.ui:165 src/Buffer.cpp:4007
-#: src/Buffer.cpp:4020
+#: src/frontends/qt4/ui/IndicesUi.ui:165 src/Buffer.cpp:4034
+#: src/Buffer.cpp:4047
 msgid ""
 msgstr ""
 
@@ -3330,14 +3330,22 @@ msgstr "Nur Vorspann"
 msgid "Body Only"
 msgstr "Nur Haupttext"
 
-#: src/frontends/qt4/ui/ViewSourceUi.ui:82 src/frontends/qt4/ui/RefUi.ui:294
-#: src/frontends/qt4/ui/LogUi.ui:77
-msgid ""
-msgstr "A"
+#: src/frontends/qt4/ui/ViewSourceUi.ui:79
+msgid "'s perspective"
+msgstr "Sicht des "
+
+#: src/frontends/qt4/ui/ViewSourceUi.ui:82
+msgid "Show the source as the master document gets it"
+msgstr "Die Quelle so zeigen, wie sie fÃ¼r das Hauptdokument ausgegeben wird"
 
 #: src/frontends/qt4/ui/ViewSourceUi.ui:89
 msgid "Automatic update"
-msgstr "Automatische Aktualisierung"
+msgstr " Aktualisierung"
+
+#: src/frontends/qt4/ui/ViewSourceUi.ui:102 src/frontends/qt4/ui/RefUi.ui:294
+#: src/frontends/qt4/ui/LogUi.ui:77
+msgid ""
+msgstr "A"
 
 #: src/frontends/qt4/ui/IncludeUi.ui:36
 msgid "Listing Parameters"
@@ -3403,8 +3411,8 @@ msgstr "Input"
 msgid "Verbatim"
 msgstr "Unformatiert"
 
-#: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1161
-#: src/insets/InsetInclude.cpp:1167
+#: src/frontends/qt4/ui/IncludeUi.ui:308 src/insets/InsetInclude.cpp:1165
+#: src/insets/InsetInclude.cpp:1171
 msgid "Program Listing"
 msgstr "Programmlisting"
 
@@ -12504,17 +12512,17 @@ msgid "Redo|R"
 msgstr "Wiederholen|W"
 
 #: lib/ui/stdmenus.inc:103 lib/ui/stdcontext.inc:293 lib/ui/stdtoolbars.inc:80
-#: src/Text3.cpp:1280 src/mathed/InsetMathNest.cpp:596
+#: src/Text3.cpp:1285 src/mathed/InsetMathNest.cpp:596
 msgid "Cut"
 msgstr "Ausschneiden"
 
 #: lib/ui/stdmenus.inc:104 lib/ui/stdcontext.inc:294 lib/ui/stdtoolbars.inc:81
-#: src/Text3.cpp:1285 src/mathed/InsetMathNest.cpp:605
+#: src/Text3.cpp:1290 src/mathed/InsetMathNest.cpp:605
 msgid "Copy"

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

2012-10-05 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 08157b5050bb3cc5d9d5dac7c963763685e06ba9
Merge: 2fa840b 4729b1c
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Fri Oct 5 10:00:13 2012 +0200

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


commit 2fa840b7716f5907362a1457b5ed189e675cfb57
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Fri Oct 5 09:59:44 2012 +0200

Do not let the children's buffer params leak into the master (#5941)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2c18655..b0db5c7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1922,7 +1922,11 @@ int Buffer::runChktex()
 
 void Buffer::validate(LaTeXFeatures  features) const
 {
-   params().validate(features);
+   // Validate the buffer params, but not for included
+   // files, since they also use the parent buffer's
+   // params (# 5941)
+   if (!features.runparams().is_child)
+   params().validate(features);
 
for_each(paragraphs().begin(), paragraphs().end(),
 bind(Paragraph::validate, _1, ref(features)));
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 2a6f92b..2c0c412 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -934,7 +934,9 @@ void InsetInclude::validate(LaTeXFeatures  features) const
// otherwise it would always be the master buffer,
// and nested includes would not work.
features.setBuffer(*tmp);
+   features.runparams().is_child = true;
tmp-validate(features);
+   features.runparams().is_child = false;
features.setBuffer(buffer());
}
}

---

Summary of changes:
 src/Buffer.cpp  |6 +-
 src/insets/InsetInclude.cpp |2 ++
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-05 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 08157b5050bb3cc5d9d5dac7c963763685e06ba9
Merge: 2fa840b 4729b1c
Author: Juergen Spitzmueller 
Date:   Fri Oct 5 10:00:13 2012 +0200

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


commit 2fa840b7716f5907362a1457b5ed189e675cfb57
Author: Juergen Spitzmueller 
Date:   Fri Oct 5 09:59:44 2012 +0200

Do not let the children's buffer params leak into the master (#5941)

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 2c18655..b0db5c7 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -1922,7 +1922,11 @@ int Buffer::runChktex()
 
 void Buffer::validate(LaTeXFeatures & features) const
 {
-   params().validate(features);
+   // Validate the buffer params, but not for included
+   // files, since they also use the parent buffer's
+   // params (# 5941)
+   if (!features.runparams().is_child)
+   params().validate(features);
 
for_each(paragraphs().begin(), paragraphs().end(),
 bind(::validate, _1, ref(features)));
diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index 2a6f92b..2c0c412 100644
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -934,7 +934,9 @@ void InsetInclude::validate(LaTeXFeatures & features) const
// otherwise it would always be the master buffer,
// and nested includes would not work.
features.setBuffer(*tmp);
+   features.runparams().is_child = true;
tmp->validate(features);
+   features.runparams().is_child = false;
features.setBuffer(buffer());
}
}

---

Summary of changes:
 src/Buffer.cpp  |6 +-
 src/insets/InsetInclude.cpp |2 ++
 2 files changed, 7 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-01 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit dbb1ac30e9a87007af7c53f0f93ec9e21826f90b
Merge: f881835 7da8d99
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Mon Oct 1 12:37:33 2012 +0200

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


commit f881835da210fa98d822010c3c9afae4d65d5572
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Mon Oct 1 12:37:16 2012 +0200

Ask for saving changes when branch state in child was altered

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index e966de2..db047c2 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -33,6 +33,7 @@
 #include support/gettext.h
 #include support/lstrings.h
 
+#include frontends/alert.h
 #include frontends/Application.h
 
 #include sstream
@@ -159,10 +160,19 @@ void InsetBranch::doDispatch(Cursor  cur, FuncRequest  
cmd)
// call recordUndo..., because the master may be 
hidden, and
// the code presently assumes that hidden documents can 
never
// be dirty. See GuiView::closeBufferAll(), for example.
+   // An option would be to check if the master is hidden.
+   // If it is, unhide.
if (!master)
buffer().undo().recordUndoFullDocument(cur);
+   else
+   // at least issue a warning for now (ugly, but 
better than dataloss).
+   frontend::Alert::warning(_(Branch state 
changes in master document),
+   lyx::support::bformat(_(The state of the 
branch '%1$s' 
+   was changed in the master file. 
+   Please make sure to save the 
master.), params_.branch), true);
our_branch-setSelected(activate);
-   cur.forceBufferUpdate();
+   // cur.forceBufferUpdate() is not enough
+   buf-updateBuffer();
}
break;
}

---

Summary of changes:
 src/insets/InsetBranch.cpp |   12 +++-
 1 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-10-01 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit dbb1ac30e9a87007af7c53f0f93ec9e21826f90b
Merge: f881835 7da8d99
Author: Juergen Spitzmueller 
Date:   Mon Oct 1 12:37:33 2012 +0200

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


commit f881835da210fa98d822010c3c9afae4d65d5572
Author: Juergen Spitzmueller 
Date:   Mon Oct 1 12:37:16 2012 +0200

Ask for saving changes when branch state in child was altered

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index e966de2..db047c2 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -33,6 +33,7 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include "frontends/alert.h"
 #include "frontends/Application.h"
 
 #include 
@@ -159,10 +160,19 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & 
cmd)
// call recordUndo..., because the master may be 
hidden, and
// the code presently assumes that hidden documents can 
never
// be dirty. See GuiView::closeBufferAll(), for example.
+   // An option would be to check if the master is hidden.
+   // If it is, unhide.
if (!master)
buffer().undo().recordUndoFullDocument(cur);
+   else
+   // at least issue a warning for now (ugly, but 
better than dataloss).
+   frontend::Alert::warning(_("Branch state 
changes in master document"),
+   lyx::support::bformat(_("The state of the 
branch '%1$s' "
+   "was changed in the master file. "
+   "Please make sure to save the 
master."), params_.branch), true);
our_branch->setSelected(activate);
-   cur.forceBufferUpdate();
+   // cur.forceBufferUpdate() is not enough
+   buf->updateBuffer();
}
break;
}

---

Summary of changes:
 src/insets/InsetBranch.cpp |   12 +++-
 1 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

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

2012-09-30 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit de45075defffd47a59f211c22db9100419f98162
Merge: 4ed535d 31c7ccd
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Mon Oct 1 01:43:06 2012 +0200

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


commit 4ed535df5245c2aab3f4d5b51313646221285e16
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Mon Oct 1 01:42:56 2012 +0200

UserGuide.lyx: mention new feature spell check of current selection

the new feature: re35d7a0f

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 08c04aa..286b930 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -31809,7 +31809,8 @@ type  icon
 arg   dialog-show spellchecker
 \end_inset
 
- starts the spell checking beginning from the current cursor position.
+ starts the spell checking from either the current cursor position or the
+ beginning of the currently selected text.
  A sidebar will appear showing any incorrect (or unknown) word found, allowing
  you to edit and replace it in a second line.
  Whenever an unknown word is found, the word is highlighted and the text
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 05678f9..5ee6e8c 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -32730,7 +32730,8 @@ arg   dialog-show spellchecker
 \end_inset
 
  starten.
- Die PrÃ¼fung beginnt an der Cursorposition.
+ Die PrÃ¼fung beginnt entweder an der aktuellen Cursorposition oder dem Beginn
+ des momentan markierten Textabschnitts.
  Eine Seitenleiste erscheint und zeigt jedes falsche (oder unbekannte) 
gefundene
  Wort an und erlaubt es diese zu korrigieren.
  Wenn ein unbekanntes Wort gefunden wird, wird das Wort markiert und der
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 1468262..151c25b 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -32135,7 +32135,11 @@ type  icon
 arg   dialog-show spellchecker
 \end_inset
 
- inicia la revisiÃ³n a partir de la posiciÃ³n del cursor.
+ inicia la revisiÃ³n o a partir de la posiciÃ³n del cursor o a la 
+\lang english
+beginning of the currently selected text
+\lang spanish
+.
  Se muestra una ventana en la que aparece un cuadro con cualquier palabra
  incorrecta o desconocida, que puedes reemplazar en el cuadro siguiente.
  Siempre que se encuentra una palabra incorrecta el texto se desplaza hasta
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index d373432..84a823c 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -33154,168 +33154,63 @@ name sec:Correcteur-Orthographique
 \end_layout
 
 \begin_layout Standard
-LyX n'a pas lui-mÃªme de correcteur orthographique incorporÃ©.
- Il utilise plutÃ´t un programme extÃ©rieur comme 
-\family typewriter
-aspell
-\family default
-, 
-\family typewriter
-ispell
-\family default
-, 
-\family typewriter
-hspell
-\family default
-, ou encore 
-\family typewriter
-pspell
-\family default
-.
- Cette section suppose que vous avez dÃ©jÃ  installÃ© et configurÃ© un de ces
- programmes.
- 
-\family typewriter
-aspell
-\family default
- peut Ãªtre considÃ©rÃ© comme le successeur de
-\family typewriter
- ispell
-\family default
-, il est donc prÃ©fÃ©rable d'utiliser 
-\family typewriter
-aspell
-\family default
-.
- 
-\family typewriter
-hspell
-\family default
- est un correcteur orthographique en HÃ©breu.
- Le correcteur orthographique utilisÃ© et ses paramÃ¨tres sont modifiÃ©s dans
- le menu 
-\family sans
-Outils\SpecialChar \menuseparator
-PrÃ©fÃ©rences
-\family default
- dans la rubrique 
-\family sans
-ParamÃ¨tres
-\begin_inset space ~
-\end_inset
-
-de
-\begin_inset space ~
-\end_inset
-
-langue
-\family default
-.
- 
-\end_layout
-
-\begin_layout Standard
-Avec LyX pour Windows, la case de sÃ©lection pour le programme de correction
- orthographique est dÃ©sactivÃ©e puisque seul 
-\family typewriter
-aspell
-\family default
- peut Ãªtre utilisÃ©.
-\end_layout
 
-\begin_layout Standard
-LyX est dotÃ© d'un correcteur orthographique intÃ©grÃ©.
- On appelle le correcteur orthographique Ã  partir de la position courante
- du curseur, soit en activant le menu
+\lang english
+LyX has a built-in spell checker.
+ The menu
 \family sans
- Outils\SpecialChar \menuseparator
+ 
+\lang french
+Outils\SpecialChar \menuseparator
 Correcteur
 \begin_inset space ~
 \end_inset
 
 orthographique
 \family default
-, soit en cliquant sur le bouton 
+\lang english
+, the key 
+\family sans
+F7
+\family default
+ or the toolbar button 
 \begin_inset Info
 type  icon
 arg   dialog-show spellchecker
 \end_inset
 
- de la barre d'outils, soit encore en utilisant le raccourci clavier 
+ starts the spell checking beginning from either the current cursor position
+ or the beginning of the currently selected text.
+ A sidebar will appear showing any incorrect (or unknown) word found, allowing
+ you to edit and replace it in a second line.
+ Whenever an unknown word is

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

2012-09-30 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit de45075defffd47a59f211c22db9100419f98162
Merge: 4ed535d 31c7ccd
Author: Uwe StÃ¶hr 
Date:   Mon Oct 1 01:43:06 2012 +0200

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


commit 4ed535df5245c2aab3f4d5b51313646221285e16
Author: Uwe StÃ¶hr 
Date:   Mon Oct 1 01:42:56 2012 +0200

UserGuide.lyx: mention new feature "spell check of current selection"

the new feature: re35d7a0f

diff --git a/lib/doc/UserGuide.lyx b/lib/doc/UserGuide.lyx
index 08c04aa..286b930 100644
--- a/lib/doc/UserGuide.lyx
+++ b/lib/doc/UserGuide.lyx
@@ -31809,7 +31809,8 @@ type  "icon"
 arg   "dialog-show spellchecker"
 \end_inset
 
- starts the spell checking beginning from the current cursor position.
+ starts the spell checking from either the current cursor position or the
+ beginning of the currently selected text.
  A sidebar will appear showing any incorrect (or unknown) word found, allowing
  you to edit and replace it in a second line.
  Whenever an unknown word is found, the word is highlighted and the text
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index 05678f9..5ee6e8c 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -32730,7 +32730,8 @@ arg   "dialog-show spellchecker"
 \end_inset
 
  starten.
- Die PrÃ¼fung beginnt an der Cursorposition.
+ Die PrÃ¼fung beginnt entweder an der aktuellen Cursorposition oder dem Beginn
+ des momentan markierten Textabschnitts.
  Eine Seitenleiste erscheint und zeigt jedes falsche (oder unbekannte) 
gefundene
  Wort an und erlaubt es diese zu korrigieren.
  Wenn ein unbekanntes Wort gefunden wird, wird das Wort markiert und der
diff --git a/lib/doc/es/UserGuide.lyx b/lib/doc/es/UserGuide.lyx
index 1468262..151c25b 100644
--- a/lib/doc/es/UserGuide.lyx
+++ b/lib/doc/es/UserGuide.lyx
@@ -32135,7 +32135,11 @@ type  "icon"
 arg   "dialog-show spellchecker"
 \end_inset
 
- inicia la revisiÃ³n a partir de la posiciÃ³n del cursor.
+ inicia la revisiÃ³n o a partir de la posiciÃ³n del cursor o a la 
+\lang english
+beginning of the currently selected text
+\lang spanish
+.
  Se muestra una ventana en la que aparece un cuadro con cualquier palabra
  incorrecta o desconocida, que puedes reemplazar en el cuadro siguiente.
  Siempre que se encuentra una palabra incorrecta el texto se desplaza hasta
diff --git a/lib/doc/fr/UserGuide.lyx b/lib/doc/fr/UserGuide.lyx
index d373432..84a823c 100644
--- a/lib/doc/fr/UserGuide.lyx
+++ b/lib/doc/fr/UserGuide.lyx
@@ -33154,168 +33154,63 @@ name "sec:Correcteur-Orthographique"
 \end_layout
 
 \begin_layout Standard
-LyX n'a pas lui-mÃªme de correcteur orthographique incorporÃ©.
- Il utilise plutÃ´t un programme extÃ©rieur comme 
-\family typewriter
-aspell
-\family default
-, 
-\family typewriter
-ispell
-\family default
-, 
-\family typewriter
-hspell
-\family default
-, ou encore 
-\family typewriter
-pspell
-\family default
-.
- Cette section suppose que vous avez dÃ©jÃ  installÃ© et configurÃ© un de ces
- programmes.
- 
-\family typewriter
-aspell
-\family default
- peut Ãªtre considÃ©rÃ© comme le successeur de
-\family typewriter
- ispell
-\family default
-, il est donc prÃ©fÃ©rable d'utiliser 
-\family typewriter
-aspell
-\family default
-.
- 
-\family typewriter
-hspell
-\family default
- est un correcteur orthographique en HÃ©breu.
- Le correcteur orthographique utilisÃ© et ses paramÃ¨tres sont modifiÃ©s dans
- le menu 
-\family sans
-Outils\SpecialChar \menuseparator
-PrÃ©fÃ©rences
-\family default
- dans la rubrique 
-\family sans
-ParamÃ¨tres
-\begin_inset space ~
-\end_inset
-
-de
-\begin_inset space ~
-\end_inset
-
-langue
-\family default
-.
- 
-\end_layout
-
-\begin_layout Standard
-Avec LyX pour Windows, la case de sÃ©lection pour le programme de correction
- orthographique est dÃ©sactivÃ©e puisque seul 
-\family typewriter
-aspell
-\family default
- peut Ãªtre utilisÃ©.
-\end_layout
 
-\begin_layout Standard
-LyX est dotÃ© d'un correcteur orthographique intÃ©grÃ©.
- On appelle le correcteur orthographique Ã  partir de la position courante
- du curseur, soit en activant le menu
+\lang english
+LyX has a built-in spell checker.
+ The menu
 \family sans
- Outils\SpecialChar \menuseparator
+ 
+\lang french
+Outils\SpecialChar \menuseparator
 Correcteur
 \begin_inset space ~
 \end_inset
 
 orthographique
 \family default
-, soit en cliquant sur le bouton 
+\lang english
+, the key 
+\family sans
+F7
+\family default
+ or the toolbar button 
 \begin_inset Info
 type  "icon"
 arg   "dialog-show spellchecker"
 \end_inset
 
- de la barre d'outils, soit encore en utilisant le raccourci clavier 
+ starts the spell checking beginning from either the current cursor position
+ or the beginning of the currently selected text.
+ A sidebar will appear showing any incorrect (or unknown) word found, allowing
+ you to edit and replace it in a second line.
+

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

2012-09-25 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 061924e2758fc43aed4b94ee2027026997343a51
Merge: 04618bc 7c82605
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Sep 25 15:56:36 2012 +0200

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


commit 04618bc07049b723654a08c0cec990028180c67f
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Sep 25 15:56:18 2012 +0200

Fix LyXBlogger entry

diff --git a/lib/configure.py b/lib/configure.py
index 168b379..5956771 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -714,7 +714,7 @@ def checkConverterEntries():
 # Check if LyXBlogger is installed
 lyxblogger_found = checkModule('lyxblogger')
 if lyxblogger_found:
-  addToRC(r'\Formatblog   blog   LyXBlogger 
  document')
+  addToRC(r'\Formatblog   blog   LyXBlogger 
  document  ')
   addToRC(r'\converter xhtml  blog   python -m lyxblogger $$i
   ')
 
 #

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-09-25 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit f3ff5e083a6e89861db5fce9eea4532504f8341d
Merge: 4df9eb3 e0787e8
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Sep 25 17:01:39 2012 +0200

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


commit 4df9eb36a05c037bb4b191677de3a348d45456a4
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Tue Sep 25 17:01:23 2012 +0200

Remove annoying warning

diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py
index 09ac3a9..71849ce 100755
--- a/lib/scripts/lyxpreview2bitmap.py
+++ b/lib/scripts/lyxpreview2bitmap.py
@@ -367,8 +367,7 @@ def main(argv):
 progress(Altering the latex file for font size and colors)
 
 # Omit font size specification in latex file.
-if not fix_latex_file(latex_file):
-warning(Unable to remove font size from the latex file)
+fix_latex_file(latex_file)
 
 if lilypond:
 progress(Preprocess the latex file through %s % lilypond_book)

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-09-25 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 061924e2758fc43aed4b94ee2027026997343a51
Merge: 04618bc 7c82605
Author: Juergen Spitzmueller 
Date:   Tue Sep 25 15:56:36 2012 +0200

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


commit 04618bc07049b723654a08c0cec990028180c67f
Author: Juergen Spitzmueller 
Date:   Tue Sep 25 15:56:18 2012 +0200

Fix LyXBlogger entry

diff --git a/lib/configure.py b/lib/configure.py
index 168b379..5956771 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -714,7 +714,7 @@ def checkConverterEntries():
 # Check if LyXBlogger is installed
 lyxblogger_found = checkModule('lyxblogger')
 if lyxblogger_found:
-  addToRC(r'\Formatblog   blog   "LyXBlogger"   "" "" 
""  "document"')
+  addToRC(r'\Formatblog   blog   "LyXBlogger"   "" "" 
""  "document"  ""')
   addToRC(r'\converter xhtml  blog   "python -m lyxblogger $$i"
   ""')
 
 #

---

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


hooks/post-receive
-- 
The LyX Source Repository

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

2012-09-25 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit f3ff5e083a6e89861db5fce9eea4532504f8341d
Merge: 4df9eb3 e0787e8
Author: Juergen Spitzmueller 
Date:   Tue Sep 25 17:01:39 2012 +0200

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


commit 4df9eb36a05c037bb4b191677de3a348d45456a4
Author: Juergen Spitzmueller 
Date:   Tue Sep 25 17:01:23 2012 +0200

Remove annoying warning

diff --git a/lib/scripts/lyxpreview2bitmap.py b/lib/scripts/lyxpreview2bitmap.py
index 09ac3a9..71849ce 100755
--- a/lib/scripts/lyxpreview2bitmap.py
+++ b/lib/scripts/lyxpreview2bitmap.py
@@ -367,8 +367,7 @@ def main(argv):
 progress("Altering the latex file for font size and colors")
 
 # Omit font size specification in latex file.
-if not fix_latex_file(latex_file):
-warning("Unable to remove font size from the latex file")
+fix_latex_file(latex_file)
 
 if lilypond:
 progress("Preprocess the latex file through %s" % lilypond_book)

---

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


hooks/post-receive
-- 
The LyX Source Repository

1 2 >

1 - 100 of 127 matches

Mail list logo