[LyX/master] Restore original icons inadvertently replaced in a7182e42.

2013-09-29 Thread Enrico Forestieri
commit 1d47e3aa61835c0f0e1ad14273908046c3de3473 Author: Enrico Forestieri Date: Sun Sep 29 23:12:42 2013 +0200 Restore original icons inadvertently replaced in a7182e42. diff --git a/lib/images/math/centerdot.png b/lib/images/math/centerdot.png index ee84b99..b98b52d 100644 Binary files a/

[LyX/master] Replace autogenerated icons for the math toolbar

2013-09-29 Thread Enrico Forestieri
commit a7182e427f20dde6178f5b890fb61f41c6ba50f8 Author: Enrico Forestieri Date: Sun Sep 29 22:51:27 2013 +0200 Replace autogenerated icons for the math toolbar The autogenerated icons are in most cases ugly, do not conform to the style of the other icons, and do not respect rel

[LyX/master] Encodings: Use BufferEncodings where needed

2013-09-29 Thread Vincent van Ravesteijn
commit 8164fea772121e41145fabed8172ea6b8ec0f007 Author: Vincent van Ravesteijn Date: Thu Sep 26 22:22:02 2013 +0200 Encodings: Use BufferEncodings where needed diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 394e12d..948f9cc 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -28,7 +28,

[LyX/master] Merge: Remove tex2lyx defines to allow for newer automake

2013-09-29 Thread Vincent van Ravesteijn
commit c6c07d28ae99a0dee5fc4b76aae2827d3d09cf93 Merge: b293bd3 03343bd Author: Vincent van Ravesteijn Date: Sun Sep 29 16:46:35 2013 +0200 Merge: Remove tex2lyx defines to allow for newer automake Automake version 1.14 warns that subdir-objects needs to be enabled to avoid futu

[LyX/master] Remove the TEX2LYX define when compiling tex2lyx

2013-09-29 Thread Vincent van Ravesteijn
commit c75db6757a03ba74a2908fadb8401c6d0bc40d5d Author: Vincent van Ravesteijn Date: Thu Sep 26 22:58:22 2013 +0200 Remove the TEX2LYX define when compiling tex2lyx diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt index 789c3f8..a744b50 100644 --- a/src/tex2lyx/CMakeLis

[LyX/master] Enable automake subdir-objects

2013-09-29 Thread Vincent van Ravesteijn
commit 03343bd4e63f946b463fa4e97e70d449cadf6622 Author: Vincent van Ravesteijn Date: Thu Sep 26 22:58:41 2013 +0200 Enable automake subdir-objects diff --git a/configure.ac b/configure.ac index 75e74ac..8c56ab5 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ fi AM_MAINTAINE

[LyX/master] Move tex2lyx dummy implementations in their own file.

2013-09-29 Thread Jean-Marc Lasgouttes
commit fa5519d4f06b6d7c6e560d7a60f13bd9a26d9f5b Author: Jean-Marc Lasgouttes Date: Wed Aug 21 12:20:20 2013 +0200 Move tex2lyx dummy implementations in their own file. Also try to document their use. diff --git a/src/tex2lyx/Makefile.am b/src/tex2lyx/Makefile.am index 2cbe658..5b9

[LyX/master] Remove dependency on NO_LAYOUT_CSS #define in Layout.cpp

2013-09-29 Thread Jean-Marc Lasgouttes
commit 72c13323d8c2631adc23d2d23fb12d04e58d2d29 Author: Jean-Marc Lasgouttes Date: Wed Aug 21 12:45:00 2013 +0200 Remove dependency on NO_LAYOUT_CSS #define in Layout.cpp Remove all traces of this #define. diff --git a/src/Layout.cpp b/src/Layout.cpp index 4603551..08540ef 100644

[LyX/master] Remove dependency on TEX2LYX #define in Lexer.cpp

2013-09-29 Thread Jean-Marc Lasgouttes
commit aef31d666e2225db850af9efc2fe24c1aa41af94 Author: Jean-Marc Lasgouttes Date: Wed Aug 21 11:31:55 2013 +0200 Remove dependency on TEX2LYX #define in Lexer.cpp diff --git a/src/Lexer.cpp b/src/Lexer.cpp index 06a3408..df2ce69 100644 --- a/src/Lexer.cpp +++ b/src/Lexer.cpp @@ -238,14 +2

[LyX/master] Encodings: Add CharInfo to Encoding.h

2013-09-29 Thread Vincent van Ravesteijn
commit 01e94f5e038602ac29ee9c4e9afbca268a4a1f98 Author: Vincent van Ravesteijn Date: Sun Sep 29 14:27:48 2013 +0200 Encodings: Add CharInfo to Encoding.h diff --git a/src/Encoding.cpp b/src/Encoding.cpp index d925292..06d599d 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -231,57

[LyX/master] Encodings: Split off the functions that need Buffer

2013-09-29 Thread Stephan Witt
commit 2e23774c6c65376512b31ec8a5248242a68c20e3 Author: Stephan Witt Date: Fri Aug 23 07:46:35 2013 +0200 Encodings: Split off the functions that need Buffer This is needed to be able to use Encodings in tex2lyx without the need to compile Buffer as well, or to use a TEX2LYX de

[LyX/master] Remove dependency on TEX2LYX #define in ModuleList.cpp

2013-09-29 Thread Jean-Marc Lasgouttes
commit 9a1e972edbe5a1cf10f2b3da7c25c35cf4a741e2 Author: Jean-Marc Lasgouttes Date: Wed Aug 21 11:44:08 2013 +0200 Remove dependency on TEX2LYX #define in ModuleList.cpp diff --git a/src/ModuleList.cpp b/src/ModuleList.cpp index 6b693b1..d442d20 100644 --- a/src/ModuleList.cpp +++ b/src/Mod

[LyX/master] cosmetics: remove unneeded std:: prefix

2013-09-29 Thread Stephan Witt
commit b293bd3670e551c10590af266f4d605bc5ff4152 Author: Stephan Witt Date: Thu Sep 26 22:22:40 2013 +0200 cosmetics: remove unneeded std:: prefix Amended-by: Vincent van Ravesteijn diff --git a/src/Encoding.cpp b/src/Encoding.cpp index ff83ab8..d925292 100644 --- a/src/Encoding.c

[LyX/master] Handle is_child runparam in preview (bug #8445)

2013-09-29 Thread Juergen Spitzmueller
commit 1ace930f7dfe1bf154888009a1b76981908d913f Author: Juergen Spitzmueller Date: Sun Sep 29 14:14:15 2013 +0200 Handle is_child runparam in preview (bug #8445) diff --git a/src/graphics/PreviewLoader.cpp b/src/graphics/PreviewLoader.cpp index 103..b4d78e0 100644 --- a/src/graphics/Pr