[LyX/master] Adjust tex2lyx InsetArgument to format 446

commit 16eb4f1ed7d3d95fd022b21f867151ec74387125 Author: Georg Baum b...@lyx.org Date: Fri Dec 26 20:08:37 2014 +0100 Adjust tex2lyx InsetArgument to format 446 tex2lyx does now allow mixed order of required and optional arguments. diff --git a/src/tex2lyx/text.cpp

[LyX/master] Move cjk check out of the loop

commit 614862fcccafc9bf1bd05b13d6e34fef1decb586 Author: Georg Baum b...@lyx.org Date: Fri Dec 26 20:44:29 2014 +0100 Move cjk check out of the loop According to the indentation this was probably a merge error, and the check is only needed once. diff --git

[LyX/master] Remove InsetArgument 999 workaround

commit f4417e8125d6f2c1137977b328a421b163525229 Author: Georg Baum b...@lyx.org Date: Fri Dec 26 22:13:09 2014 +0100 Remove InsetArgument 999 workaround Since we iterate through all arguments we can as well compute the correct id directly. diff --git

[LyX/master] Do not compile trivstring.cpp if not needed

commit 2e5ecd9dfbd6a9068ba384bf60726d5eae546b84 Author: Georg Baum b...@lyx.org Date: Fri Dec 26 20:09:58 2014 +0100 Do not compile trivstring.cpp if not needed This avoids a MSVC warning. diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt index b0d1c6d..42a9134

[LyX/master] whitespace

commit cb7ace91432cf0776c060f687df3c324969b73a6 Author: Georg Baum b...@lyx.org Date: Fri Dec 26 22:08:07 2014 +0100 whitespace diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index 804be7a..4c27323 100644 --- a/src/insets/InsetArgument.cpp +++

[LyX/master] Parse starred InsetLayout correctly

commit 0c90821138a39366e60127500dcae7151badb9d2 Author: Georg Baum b...@lyx.org Date: Fri Dec 26 21:01:08 2014 +0100 Parse starred InsetLayout correctly Previously, an InsetLayout was not found if the LaTeX name was starred, e.g. for \caption*. diff --git

[LyX/master] Output caption insets collapsed

commit e01886327d365a570a7fb0b9bb361eec262fa0b8 Author: Georg Baum b...@lyx.org Date: Sat Dec 27 16:10:11 2014 +0100 Output caption insets collapsed Like all other collapsable insets, there is not reason to treat captions specially. diff --git a/src/tex2lyx/test/algo2e.lyx.lyx

[LyX/master] Revert e01886327d

commit eda5f69cc0e32e19fa890fa0c1cffa5075c95106 Author: Georg Baum b...@lyx.org Date: Sat Dec 27 17:03:39 2014 +0100 Revert e01886327d Sorry, this was nonsense. diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index 07e4797..be80280 100644 ---

[LyX/2.1.x] de.po

commit 6d58fba55f3d06b8ba50ba3c2b788a2732b0921e Author: Juergen Spitzmueller sp...@lyx.org Date: Sat Dec 27 17:45:21 2014 +0100 de.po diff --git a/po/de.gmo b/po/de.gmo index 5061f1b..62c990b 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index

[LyX/master] Reduce caption hardcoding

commit e15d3d35cba7266d8a1a22c7e4cd92d12599e103 Author: Georg Baum b...@lyx.org Date: Sat Dec 27 18:15:07 2014 +0100 Reduce caption hardcoding Now we can handle all types of captions defined in layout files or modules. This does also mean that \captionabove and \captionbelow

[LyX/master] Adjust tex2lyx InsetArgument to format 446

commit 16eb4f1ed7d3d95fd022b21f867151ec74387125 Author: Georg Baum Date: Fri Dec 26 20:08:37 2014 +0100 Adjust tex2lyx InsetArgument to format 446 tex2lyx does now allow mixed order of required and optional arguments. diff --git a/src/tex2lyx/text.cpp

[LyX/master] Move cjk check out of the loop

commit 614862fcccafc9bf1bd05b13d6e34fef1decb586 Author: Georg Baum Date: Fri Dec 26 20:44:29 2014 +0100 Move cjk check out of the loop According to the indentation this was probably a merge error, and the check is only needed once. diff --git

[LyX/master] Remove InsetArgument 999 workaround

commit f4417e8125d6f2c1137977b328a421b163525229 Author: Georg Baum Date: Fri Dec 26 22:13:09 2014 +0100 Remove InsetArgument 999 workaround Since we iterate through all arguments we can as well compute the correct id directly. diff --git

[LyX/master] Do not compile trivstring.cpp if not needed

commit 2e5ecd9dfbd6a9068ba384bf60726d5eae546b84 Author: Georg Baum Date: Fri Dec 26 20:09:58 2014 +0100 Do not compile trivstring.cpp if not needed This avoids a MSVC warning. diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt index

[LyX/master] whitespace

commit cb7ace91432cf0776c060f687df3c324969b73a6 Author: Georg Baum Date: Fri Dec 26 22:08:07 2014 +0100 whitespace diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp index 804be7a..4c27323 100644 --- a/src/insets/InsetArgument.cpp +++

[LyX/master] Parse starred InsetLayout correctly

commit 0c90821138a39366e60127500dcae7151badb9d2 Author: Georg Baum Date: Fri Dec 26 21:01:08 2014 +0100 Parse starred InsetLayout correctly Previously, an InsetLayout was not found if the LaTeX name was starred, e.g. for "\caption*". diff --git

[LyX/master] Output caption insets collapsed

commit e01886327d365a570a7fb0b9bb361eec262fa0b8 Author: Georg Baum Date: Sat Dec 27 16:10:11 2014 +0100 Output caption insets collapsed Like all other collapsable insets, there is not reason to treat captions specially. diff --git

[LyX/master] Revert e01886327d

commit eda5f69cc0e32e19fa890fa0c1cffa5075c95106 Author: Georg Baum Date: Sat Dec 27 17:03:39 2014 +0100 Revert e01886327d Sorry, this was nonsense. diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx index 07e4797..be80280 100644 ---

[LyX/2.1.x] de.po

commit 6d58fba55f3d06b8ba50ba3c2b788a2732b0921e Author: Juergen Spitzmueller Date: Sat Dec 27 17:45:21 2014 +0100 de.po diff --git a/po/de.gmo b/po/de.gmo index 5061f1b..62c990b 100644 Binary files a/po/de.gmo and b/po/de.gmo differ diff --git a/po/de.po b/po/de.po index

[LyX/master] Reduce caption hardcoding

commit e15d3d35cba7266d8a1a22c7e4cd92d12599e103 Author: Georg Baum Date: Sat Dec 27 18:15:07 2014 +0100 Reduce caption hardcoding Now we can handle all types of captions defined in layout files or modules. This does also mean that \captionabove and \captionbelow