[LyX/master] Fix reversion of box insets.

commit da75d3194824c87e2b2fc92fa4644e080aeaf962 Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 10:44:02 2014 +0200 Fix reversion of box insets. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 4999368..6752eb9 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++

[LyX/master] Fix an off-by-one error in the reversion of beamer documents.

commit dbd4d781dcbe73d347a76fed9ca51faf2841e133 Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 10:55:30 2014 +0200 Fix an off-by-one error in the reversion of beamer documents. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 6752eb9..a94ef52 100644 ---

[LyX/master] Avoid processing multiple times the same paragraph when converting latex arguments.

commit 00802019771bd1b9779d3b39899089abfc38201f Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 11:05:34 2014 +0200 Avoid processing multiple times the same paragraph when converting latex arguments. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index

[LyX/master] Add layout tag that determines if/when a paragraph can be indented.

commit 20bcaec061193a3984d42040ee65d2723872ecf4 Author: Juergen Spitzmueller sp...@lyx.org Date: Thu May 29 14:10:32 2014 +0200 Add layout tag that determines if/when a paragraph can be indented. Fixes: #7327, #7458, #8670 diff --git a/lib/doc/Customization.lyx

[LyX/master] Fix the fix

commit 55af9cb006563032e35fcc8bc5c8c1284c0344da Author: Georg Baum b...@lyx.org Date: Thu May 29 14:44:38 2014 +0200 Fix the fix MAC-style (pre-OS X) line ends were not recognized anymore diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 93006c3..5ee8d5f 100644 ---

[LyX/master] Execute lyx2lyx unit test when running tests

commit 11be833a2ef24e5c80f942aa6e22769f3fe9bfb1 Author: Georg Baum b...@lyx.org Date: Thu May 29 14:57:05 2014 +0200 Execute lyx2lyx unit test when running tests Actually lyx2lyx has a tiny unit test. Add it to the autotools test machinery and fix it: Since nobody knew about

[LyX/master] Make layout test compile

commit 53f8d6d6d373460bdcfebd20d6f826e3915c84ff Author: Georg Baum b...@lyx.org Date: Thu May 29 15:07:07 2014 +0200 Make layout test compile diff --git a/src/tests/dummy_functions.cpp b/src/tests/dummy_functions.cpp index 5a99081..ce4261c 100644 --- a/src/tests/dummy_functions.cpp +++

[LyX/master] Include lyx2lyx test in tarball

commit 1187b8834e2df2cd9867b3d47044f321692828e5 Author: Georg Baum b...@lyx.org Date: Thu May 29 15:13:59 2014 +0200 Include lyx2lyx test in tarball diff --git a/lib/lyx2lyx/Makefile.am b/lib/lyx2lyx/Makefile.am index b581136..4bc7641 100644 --- a/lib/lyx2lyx/Makefile.am +++

[LyX/2.1.x] Do not corrupt documents without newline at EOF

commit 76417c7326a9ad6822e0351f565000ecc950d636 Author: Georg Baum b...@lyx.org Date: Thu May 29 13:15:07 2014 +0200 Do not corrupt documents without newline at EOF trim_eol() assumes that a line always ends either with \n, \r, or \r\n. This assumption is always valid except

[LyX/2.1.x] Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133)

commit 20214ee224f0bb83dda183852cbfdc37619b57b8 Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 10:55:30 2014 +0200 Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133) diff --git

[LyX/2.1.x] Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f)

commit b851a60376737a71aac8c7ebe9d9e7ab5f15fe1f Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 11:05:34 2014 +0200 Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f) diff

[LyX/2.0.x] Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133)

commit a2336c489e5aeb2eda2cac209b89fd19fb0c541f Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 10:55:30 2014 +0200 Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133) diff --git

[LyX/2.0.x] Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f)

commit e1350913ba5d67d999521c721542c541af520b96 Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 11:05:34 2014 +0200 Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f) diff

[LyX/master] Update layouts with separators to format 50

commit 4e078230a0335f196caf40943ef1c03da13b0680 Author: Georg Baum b...@lyx.org Date: Thu May 29 21:22:15 2014 +0200 Update layouts with separators to format 50 diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index b02f162..14b0499 100644 --- a/lib/layouts/beamer.layout

[LyX/master] Add missing bits of layout file format update

commit 953a4d13d928517be121cca2a8f2c4bd93ca2137 Author: Georg Baum b...@lyx.org Date: Thu May 29 21:25:08 2014 +0200 Add missing bits of layout file format update This is needed so that the new format number is actually used. Since the conversion is a noop I did not update the

[LyX/master] Cleanup seminar.layout after the upgrade to format 50.

commit 00547009c293151dcadb53c93242dca5404813f6 Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 22:07:37 2014 +0200 Cleanup seminar.layout after the upgrade to format 50. diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout index 982512d..34fd4dc 100644 ---

[LyX/master] Fix compilation on Solaris after last boost upgrade.

commit bc001595302ee63f0c1a4c07a6e15f04ec7143eb Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 22:31:16 2014 +0200 Fix compilation on Solaris after last boost upgrade. diff --git a/boost/boost/predef/architecture/sparc.h b/boost/boost/predef/architecture/sparc.h index

[LyX/2.0.x] Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962)

commit d466bedce47c4905724141a78dfcd844ccacef92 Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 10:44:02 2014 +0200 Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962) diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py

[LyX/2.1.x] Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962)

commit 94ed54b51a676fe395809493a7a38dec0cc2b44c Author: Enrico Forestieri for...@lyx.org Date: Thu May 29 10:44:02 2014 +0200 Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962) diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py

[LyX/2.0.x] Copy over other changes that never got cherry-picked.

commit 257562f7d685c55289d7636238242d2f30b099ac Author: Richard Heck rgh...@lyx.org Date: Thu May 29 18:08:14 2014 -0400 Copy over other changes that never got cherry-picked. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 7e9fbe2..ae95841 100644 ---

[LyX/2.1.x] Copy over changes to lyx2lyx made in master. Unfortunately, some of these got committed to stable and some did not, and now it is all but impossible (I've tried) to do this by cherry-picki

commit 0f3746400ebe7fbbbd310471345ca1c5e0159a59 Author: Richard Heck rgh...@lyx.org Date: Thu May 29 18:17:08 2014 -0400 Copy over changes to lyx2lyx made in master. Unfortunately, some of these got committed to stable and some did not, and now it is all but impossible (I've tried)

[LyX/master] Fix reversion of box insets.

commit da75d3194824c87e2b2fc92fa4644e080aeaf962 Author: Enrico Forestieri Date: Thu May 29 10:44:02 2014 +0200 Fix reversion of box insets. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 4999368..6752eb9 100644 --- a/lib/lyx2lyx/lyx_2_1.py +++

[LyX/master] Fix an off-by-one error in the reversion of beamer documents.

commit dbd4d781dcbe73d347a76fed9ca51faf2841e133 Author: Enrico Forestieri Date: Thu May 29 10:55:30 2014 +0200 Fix an off-by-one error in the reversion of beamer documents. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 6752eb9..a94ef52 100644 ---

[LyX/master] Avoid processing multiple times the same paragraph when converting latex arguments.

commit 00802019771bd1b9779d3b39899089abfc38201f Author: Enrico Forestieri Date: Thu May 29 11:05:34 2014 +0200 Avoid processing multiple times the same paragraph when converting latex arguments. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index

[LyX/master] Add layout tag that determines if/when a paragraph can be indented.

commit 20bcaec061193a3984d42040ee65d2723872ecf4 Author: Juergen Spitzmueller Date: Thu May 29 14:10:32 2014 +0200 Add layout tag that determines if/when a paragraph can be indented. Fixes: #7327, #7458, #8670 diff --git a/lib/doc/Customization.lyx

[LyX/master] Fix the fix

commit 55af9cb006563032e35fcc8bc5c8c1284c0344da Author: Georg Baum Date: Thu May 29 14:44:38 2014 +0200 Fix the fix MAC-style (pre-OS X) line ends were not recognized anymore diff --git a/lib/lyx2lyx/LyX.py b/lib/lyx2lyx/LyX.py index 93006c3..5ee8d5f 100644 ---

[LyX/master] Execute lyx2lyx unit test when running tests

commit 11be833a2ef24e5c80f942aa6e22769f3fe9bfb1 Author: Georg Baum Date: Thu May 29 14:57:05 2014 +0200 Execute lyx2lyx unit test when running tests Actually lyx2lyx has a tiny unit test. Add it to the autotools test machinery and fix it: Since nobody knew about

[LyX/master] Make layout test compile

commit 53f8d6d6d373460bdcfebd20d6f826e3915c84ff Author: Georg Baum Date: Thu May 29 15:07:07 2014 +0200 Make layout test compile diff --git a/src/tests/dummy_functions.cpp b/src/tests/dummy_functions.cpp index 5a99081..ce4261c 100644 --- a/src/tests/dummy_functions.cpp +++

[LyX/master] Include lyx2lyx test in tarball

commit 1187b8834e2df2cd9867b3d47044f321692828e5 Author: Georg Baum Date: Thu May 29 15:13:59 2014 +0200 Include lyx2lyx test in tarball diff --git a/lib/lyx2lyx/Makefile.am b/lib/lyx2lyx/Makefile.am index b581136..4bc7641 100644 --- a/lib/lyx2lyx/Makefile.am +++

[LyX/2.1.x] Do not corrupt documents without newline at EOF

commit 76417c7326a9ad6822e0351f565000ecc950d636 Author: Georg Baum Date: Thu May 29 13:15:07 2014 +0200 Do not corrupt documents without newline at EOF trim_eol() assumes that a line always ends either with \n, \r, or \r\n. This assumption is always valid except

[LyX/2.1.x] Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133)

commit 20214ee224f0bb83dda183852cbfdc37619b57b8 Author: Enrico Forestieri Date: Thu May 29 10:55:30 2014 +0200 Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133) diff --git

[LyX/2.1.x] Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f)

commit b851a60376737a71aac8c7ebe9d9e7ab5f15fe1f Author: Enrico Forestieri Date: Thu May 29 11:05:34 2014 +0200 Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f) diff

[LyX/2.0.x] Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133)

commit a2336c489e5aeb2eda2cac209b89fd19fb0c541f Author: Enrico Forestieri Date: Thu May 29 10:55:30 2014 +0200 Fix an off-by-one error in the reversion of beamer documents. (cherry picked from commit dbd4d781dcbe73d347a76fed9ca51faf2841e133) diff --git

[LyX/2.0.x] Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f)

commit e1350913ba5d67d999521c721542c541af520b96 Author: Enrico Forestieri Date: Thu May 29 11:05:34 2014 +0200 Avoid processing multiple times the same paragraph when converting latex arguments. (cherry picked from commit 00802019771bd1b9779d3b39899089abfc38201f) diff

[LyX/master] Update layouts with separators to format 50

commit 4e078230a0335f196caf40943ef1c03da13b0680 Author: Georg Baum Date: Thu May 29 21:22:15 2014 +0200 Update layouts with separators to format 50 diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index b02f162..14b0499 100644 ---

[LyX/master] Add missing bits of layout file format update

commit 953a4d13d928517be121cca2a8f2c4bd93ca2137 Author: Georg Baum Date: Thu May 29 21:25:08 2014 +0200 Add missing bits of layout file format update This is needed so that the new format number is actually used. Since the conversion is a noop I did not update

[LyX/master] Cleanup seminar.layout after the upgrade to format 50.

commit 00547009c293151dcadb53c93242dca5404813f6 Author: Enrico Forestieri Date: Thu May 29 22:07:37 2014 +0200 Cleanup seminar.layout after the upgrade to format 50. diff --git a/lib/layouts/seminar.layout b/lib/layouts/seminar.layout index 982512d..34fd4dc 100644 ---

[LyX/master] Fix compilation on Solaris after last boost upgrade.

commit bc001595302ee63f0c1a4c07a6e15f04ec7143eb Author: Enrico Forestieri Date: Thu May 29 22:31:16 2014 +0200 Fix compilation on Solaris after last boost upgrade. diff --git a/boost/boost/predef/architecture/sparc.h b/boost/boost/predef/architecture/sparc.h index

[LyX/2.0.x] Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962)

commit d466bedce47c4905724141a78dfcd844ccacef92 Author: Enrico Forestieri Date: Thu May 29 10:44:02 2014 +0200 Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962) diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py

[LyX/2.1.x] Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962)

commit 94ed54b51a676fe395809493a7a38dec0cc2b44c Author: Enrico Forestieri Date: Thu May 29 10:44:02 2014 +0200 Fix reversion of box insets. (cherry picked from commit da75d3194824c87e2b2fc92fa4644e080aeaf962) diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py

[LyX/2.0.x] Copy over other changes that never got cherry-picked.

commit 257562f7d685c55289d7636238242d2f30b099ac Author: Richard Heck Date: Thu May 29 18:08:14 2014 -0400 Copy over other changes that never got cherry-picked. diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py index 7e9fbe2..ae95841 100644 ---

[LyX/2.1.x] Copy over changes to lyx2lyx made in master. Unfortunately, some of these got committed to stable and some did not, and now it is all but impossible (I've tried) to do this by cherry-picki

commit 0f3746400ebe7fbbbd310471345ca1c5e0159a59 Author: Richard Heck Date: Thu May 29 18:17:08 2014 -0400 Copy over changes to lyx2lyx made in master. Unfortunately, some of these got committed to stable and some did not, and now it is all but impossible (I've