Re: lyx2lyx conversion routines

On Thu, May 30, 2013 at 4:27 PM, Richard Heck rgh...@lyx.org wrote: OK, I have fixed this, and I have also done the reversion routine. I am going to go ahead and commit it. We can work out any other problems we see more easily at that point. I've tested trunk and cannot find any residual

Re: lyx2lyx conversion routines

On Thu, May 30, 2013 at 4:27 PM, Richard Heck wrote: > OK, I have fixed this, and I have also done the reversion routine. I am > going to go ahead and commit it. We can work out any other problems we see > more easily at that point. > I've tested trunk and cannot find any residual

Re: lyx2lyx conversion routines

On 05/29/2013 06:35 PM, Liviu Andronic wrote: Hey Richard, On Wed, May 29, 2013 at 3:37 PM, Richard Heck rgh...@lyx.org wrote: I think this is due to other format changes in trunk. New patch attached. Much nicer! The only issue that I still see is when the chunks follow each other as in the

Re: lyx2lyx conversion routines

On 05/29/2013 06:35 PM, Liviu Andronic wrote: Hey Richard, On Wed, May 29, 2013 at 3:37 PM, Richard Heck wrote: I think this is due to other format changes in trunk. New patch attached. Much nicer! The only issue that I still see is when the chunks follow each other as in

Re: lyx2lyx conversion routines

On 05/28/2013 04:42 PM, Liviu Andronic wrote: Richard, On Tue, May 28, 2013 at 6:46 AM, Richard Heck rgh...@lyx.org wrote: Try the attached. (The first patch is unchanged.) I still have trouble with this patch (after removing EOL and whitespace issues). When applying it fails on latest

Re: lyx2lyx conversion routines

Hey Richard, On Wed, May 29, 2013 at 3:37 PM, Richard Heck rgh...@lyx.org wrote: I think this is due to other format changes in trunk. New patch attached. Much nicer! The only issue that I still see is when the chunks follow each other as in the attached. Now the conversion routines lump the

Re: lyx2lyx conversion routines

On 05/28/2013 04:42 PM, Liviu Andronic wrote: Richard, On Tue, May 28, 2013 at 6:46 AM, Richard Heck wrote: Try the attached. (The first patch is unchanged.) I still have trouble with this patch (after removing EOL and whitespace issues). When applying it fails on latest

Re: lyx2lyx conversion routines

Hey Richard, On Wed, May 29, 2013 at 3:37 PM, Richard Heck wrote: > I think this is due to other format changes in trunk. New patch attached. > Much nicer! The only issue that I still see is when the chunks follow each other as in the attached. Now the conversion routines lump

Re: lyx2lyx conversion routines

Richard, On Tue, May 28, 2013 at 6:46 AM, Richard Heck rgh...@lyx.org wrote: Try the attached. (The first patch is unchanged.) I still have trouble with this patch (after removing EOL and whitespace issues). When applying it fails on latest trunk: shpatch -p1

Re: lyx2lyx conversion routines

Richard, On Tue, May 28, 2013 at 6:46 AM, Richard Heck wrote: > Try the attached. (The first patch is unchanged.) > I still have trouble with this patch (after removing EOL and whitespace issues). When applying it fails on latest trunk: sh>patch -p1 <

Re: lyx2lyx conversion routines

On 05/26/2013 07:30 AM, Liviu Andronic wrote: On Sun, May 26, 2013 at 12:38 PM, Vincent van Ravesteijn v...@lyx.org wrote: I had the same error in the first try. After correcting the eol-style of the patch file, everything was ok again. To correct the eol-style I used 'dos2unix' in a Git bash

Re: lyx2lyx conversion routines

On 05/26/2013 09:35 AM, Liviu Andronic wrote: Hello, On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so,

Re: lyx2lyx conversion routines

On 05/26/2013 09:35 AM, Liviu Andronic wrote: Hello, On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so,

Re: lyx2lyx conversion routines

On 05/26/2013 07:30 AM, Liviu Andronic wrote: On Sun, May 26, 2013 at 12:38 PM, Vincent van Ravesteijn wrote: I had the same error in the first try. After correcting the eol-style of the patch file, everything was ok again. To correct the eol-style I used 'dos2unix' in a Git bash

Re: lyx2lyx conversion routines

On 05/26/2013 09:35 AM, Liviu Andronic wrote: Hello, On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If

Re: lyx2lyx conversion routines

On 05/26/2013 09:35 AM, Liviu Andronic wrote: Hello, On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If

Re: lyx2lyx conversion routines

Hello Richard, On Sun, May 26, 2013 at 12:24 AM, Richard Heck rgh...@lyx.org wrote: These are just whitespace issues. I've fixed them in the attached, which are also rebased to current trunk. I made some partial progress. I managed to apply the first patch only after I stripped trailing

Re: lyx2lyx conversion routines

On Sun, May 26, 2013 at 8:53 AM, Liviu Andronic landronim...@gmail.com wrote: However I'm still stumbling on the second, even after the post-processing above: git apply 0002-A-start-on-lyx2lyx-for-chunks.patch (15371) error: patch failed: lib/lyx2lyx/lyx_2_1.py:4152 error:

Re: lyx2lyx conversion routines

Op 26-5-2013 8:53, Liviu Andronic schreef: Hello Richard, On Sun, May 26, 2013 at 12:24 AM, Richard Heck rgh...@lyx.org wrote: These are just whitespace issues. I've fixed them in the attached, which are also rebased to current trunk. I made some partial progress. I managed to apply the

Re: lyx2lyx conversion routines

On Sun, May 26, 2013 at 12:38 PM, Vincent van Ravesteijn v...@lyx.org wrote: I had the same error in the first try. After correcting the eol-style of the patch file, everything was ok again. To correct the eol-style I used 'dos2unix' in a Git bash shell. I did the EOL corrections using Geany.

lyx2lyx conversion routines

Hello, On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so, please post the file causing the problems

Re: lyx2lyx conversion routines

Hello Richard, On Sun, May 26, 2013 at 12:24 AM, Richard Heck wrote: > These are just whitespace issues. I've fixed them in the attached, which are > also rebased to current trunk. > I made some partial progress. I managed to apply the first patch only after I stripped trailing

Re: lyx2lyx conversion routines

On Sun, May 26, 2013 at 8:53 AM, Liviu Andronic wrote: > However I'm still stumbling on the second, even after the > post-processing above: >>git apply "0002-A-start-on-lyx2lyx-for-chunks.patch" (15371) > error: patch failed: lib/lyx2lyx/lyx_2_1.py:4152 > error:

Re: lyx2lyx conversion routines

Op 26-5-2013 8:53, Liviu Andronic schreef: Hello Richard, On Sun, May 26, 2013 at 12:24 AM, Richard Heck wrote: These are just whitespace issues. I've fixed them in the attached, which are also rebased to current trunk. I made some partial progress. I managed to apply the

Re: lyx2lyx conversion routines

On Sun, May 26, 2013 at 12:38 PM, Vincent van Ravesteijn wrote: > I had the same error in the first try. After correcting the eol-style of the > patch file, everything was ok again. To correct the eol-style I used > 'dos2unix' in a Git bash shell. > I did the EOL corrections using

lyx2lyx conversion routines

Hello, On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote: > > I have posted a lyx2lyx conversion routine to the bug report > http://www.lyx.org/trac/ticket/8588#comment:23 > Please test and let me know if there are problems. If so, please post the > file causing the

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Dear Richard, I must admit that I'm a bit lost. On Sat, May 25, 2013 at 12:20 AM, Richard Heck rgh...@lyx.org wrote: Try: git apply FILE.patch That should work. The patches are based off 01add2d52f, so you could do: git checkout -b Chunks 01add2d52f first, if you want. I tried to

Re: lyx2lyx conversion routines

On 05/25/2013 03:54 PM, Liviu Andronic wrote: Dear Richard, I must admit that I'm a bit lost. On Sat, May 25, 2013 at 12:20 AM, Richard Heck rgh...@lyx.org wrote: Try: git apply FILE.patch That should work. The patches are based off 01add2d52f, so you could do: git checkout -b

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Dear Richard, I must admit that I'm a bit lost. On Sat, May 25, 2013 at 12:20 AM, Richard Heck wrote: > Try: > git apply FILE.patch > That should work. The patches are based off 01add2d52f, so you could do: > git checkout -b Chunks 01add2d52f > first, if you want. > I

Re: lyx2lyx conversion routines

On 05/25/2013 03:54 PM, Liviu Andronic wrote: Dear Richard, I must admit that I'm a bit lost. On Sat, May 25, 2013 at 12:20 AM, Richard Heck wrote: Try: git apply FILE.patch That should work. The patches are based off 01add2d52f, so you could do: git checkout -b

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so, please post the Richard, I'm afraid I'm having

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On 05/24/2013 05:55 PM, Liviu Andronic wrote: On Thu, May 23, 2013 at 10:11 PM, Richard Heck rgh...@lyx.org wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so, please

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote: > > I have posted a lyx2lyx conversion routine to the bug report > http://www.lyx.org/trac/ticket/8588#comment:23 > Please test and let me know if there are problems. If so, please post the > Richard, I'm afraid I'm having

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On 05/24/2013 05:55 PM, Liviu Andronic wrote: On Thu, May 23, 2013 at 10:11 PM, Richard Heck wrote: I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so, please

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On 05/18/2013 03:02 AM, Liviu Andronic wrote: Dear all, JMarc and I decided to go ahead with the Chunk inset for the literate modules in 2.1, and now we're only missing the lyx2lyx conversion routines. Now the patch is available on the bug tracker ( http://www.lyx.org/trac/ticket/8588

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Hello Richard, On Thu, May 23, 2013 at 3:55 PM, Richard Heck rgh...@lyx.org wrote: provide the lyx2lyx bits. We need to take any sequence of Chunk layouts and replace them by a Chunk inset. If the Chunk has some alignments parameters, they should be given to the Standard layout paragraph

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

So the relevant bits of these files look like: \begin_layout Chunk TEST= \end_layout \begin_layout Chunk 2+2 \end_layout \begin_layout Chunk @ \end_layout and: \begin_layout Standard \begin_inset Flex Chunk status open \begin_layout Plain Layout 2+2 \end_layout \end_inset \end_layout

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Richard, I'm sorry but I gave you an imperfect equivalent for the inset example. The attached knitr-new.lyx is better, and also uses the argument inset. The relevant bits are: \begin_layout Standard \begin_inset Flex Chunk status open \begin_layout Plain Layout \begin_inset Argument 1 status

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

So we take what's in the first Chunk paragraph, strip off the and = delimiters, and put that into the argument of the Chunk inset. Then we take everything up to the last Chunk paragraph, put that as a sequence of paragraphs into the Chunk inset, and discard the last Chunk paragraph. Yes?

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On Thu, May 23, 2013 at 6:14 PM, Richard Heck rgh...@lyx.org wrote: So we take what's in the first Chunk paragraph, strip off the and = delimiters, and put that into the argument of the Chunk inset. Yes. Often after stripping the contents will be an empty string (). Then I think there is no

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so, please post the file causing the problems here, stripped down to be as minimal as possible. I have not yet written the

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On 05/18/2013 03:02 AM, Liviu Andronic wrote: Dear all, JMarc and I decided to go ahead with the Chunk inset for the literate modules in 2.1, and now we're only missing the lyx2lyx conversion routines. Now the patch is available on the bug tracker ( http://www.lyx.org/trac/ticket/8588

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Hello Richard, On Thu, May 23, 2013 at 3:55 PM, Richard Heck wrote: >> provide the lyx2lyx bits. We need to take any sequence of Chunk >> layouts and replace them by a Chunk inset. If the Chunk has some >> alignments parameters, they should be given to the Standard layout >>

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

So the relevant bits of these files look like: \begin_layout Chunk <>= \end_layout \begin_layout Chunk 2+2 \end_layout \begin_layout Chunk @ \end_layout and: \begin_layout Standard \begin_inset Flex Chunk status open \begin_layout Plain Layout 2+2 \end_layout \end_inset \end_layout Is

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Richard, I'm sorry but I gave you an imperfect equivalent for the inset example. The attached knitr-new.lyx is better, and also uses the argument inset. The relevant bits are: \begin_layout Standard \begin_inset Flex Chunk status open \begin_layout Plain Layout \begin_inset Argument 1 status

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

So we take what's in the first Chunk paragraph, strip off the << and >>= delimiters, and put that into the argument of the Chunk inset. Then we take everything up to the last Chunk paragraph, put that as a sequence of paragraphs into the Chunk inset, and discard the last Chunk paragraph.

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

On Thu, May 23, 2013 at 6:14 PM, Richard Heck wrote: > > So we take what's in the first Chunk paragraph, strip off the << and >>= > delimiters, and put that into the argument of the Chunk inset. > Yes. Often after stripping the contents will be an empty string (""). Then I think

Re: lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

I have posted a lyx2lyx conversion routine to the bug report http://www.lyx.org/trac/ticket/8588#comment:23 Please test and let me know if there are problems. If so, please post the file causing the problems here, stripped down to be as minimal as possible. I have not yet written the

lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Dear all, JMarc and I decided to go ahead with the Chunk inset for the literate modules in 2.1, and now we're only missing the lyx2lyx conversion routines. Now the patch is available on the bug tracker ( http://www.lyx.org/trac/ticket/8588 : litinsets.inc and sweave-knitr-noweb-inset-chunk.patch

lyx2lyx conversion routines (was: Re: #8588: add Sweave Chunk inset)

Dear all, JMarc and I decided to go ahead with the Chunk inset for the literate modules in 2.1, and now we're only missing the lyx2lyx conversion routines. Now the patch is available on the bug tracker ( http://www.lyx.org/trac/ticket/8588 : litinsets.inc and sweave-knitr-noweb-inset-chunk.patch