Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-13 Thread Jürgen Spitzmüller 
Am Freitag, den 13.10.2017, 11:45 -0400 schrieb Scott Kostyshak:
> On Fri, Oct 13, 2017 at 09:10:11AM +, Jürgen Spitzmüller wrote:
> > Am Freitag, den 13.10.2017, 10:57 +0200 schrieb Helge Hafting:
> > > 
> > > Den 13. okt. 2017 10:10, skrev Jürgen Spitzmüller:
> > > > Helge, can you please still verify whether this fixes your
> > > > problem?
> > > 
> > > Yes, the patch fixes my problem. LyX 2.3 now used my format 60
> > > layout 
> > > file with no problems at all.
> > 
> > Excellent. Thanks for testing, Helge.
> 
> Please push to 2.3.x, Jürgen.

Done.

Jürgen

signature.asc
Description: This is a digitally signed message part

Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-13 Thread Scott Kostyshak 
On Fri, Oct 13, 2017 at 09:10:11AM +, Jürgen Spitzmüller wrote:
> Am Freitag, den 13.10.2017, 10:57 +0200 schrieb Helge Hafting:
> > 
> > Den 13. okt. 2017 10:10, skrev Jürgen Spitzmüller:
> > > Helge, can you please still verify whether this fixes your problem?
> > 
> > Yes, the patch fixes my problem. LyX 2.3 now used my format 60
> > layout 
> > file with no problems at all.
> 
> Excellent. Thanks for testing, Helge.

Please push to 2.3.x, Jürgen.

Thanks to you both,

Scott


signature.asc
Description: PGP signature

Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-13 Thread Jürgen Spitzmüller 
Am Freitag, den 13.10.2017, 10:57 +0200 schrieb Helge Hafting:
> 
> Den 13. okt. 2017 10:10, skrev Jürgen Spitzmüller:
> > Helge, can you please still verify whether this fixes your problem?
> 
> Yes, the patch fixes my problem. LyX 2.3 now used my format 60
> layout 
> file with no problems at all.

Excellent. Thanks for testing, Helge.

Jürgen

> 
> Helge Hafting

signature.asc
Description: This is a digitally signed message part

Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-13 Thread Helge Hafting 



Den 13. okt. 2017 10:10, skrev Jürgen Spitzmüller:

Helge, can you please still verify whether this fixes your problem?
Yes, the patch fixes my problem. LyX 2.3 now used my format 60 layout 
file with no problems at all.


Helge Hafting

Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-13 Thread Jürgen Spitzmüller 
Am Donnerstag, den 12.10.2017, 13:47 +0200 schrieb Jürgen Spitzmüller:
> 2017-10-12 11:38 GMT+02:00 Helge Hafting:
> > If there is a problem in layout2layout, finding it may be useful
> > before release?
> > 
> 
> Yes. Can you try if the attached patch fixes the problem?

I have pushed the patch to master, since it fixes an obvious oversight,
and I propose to backport to 2.3.x.

Helge, can you please still verify whether this fixes your problem?

Jürgen

> 
> Jürgen
>  
> > 
> > Helge Hafting
> > 
> 
> 

signature.asc
Description: This is a digitally signed message part

Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-12 Thread Kornel Benko 
Am Donnerstag, 12. Oktober 2017 um 13:47:09, schrieb Jürgen Spitzmüller 

> 2017-10-12 11:38 GMT+02:00 Helge Hafting:
> 
> > If there is a problem in layout2layout, finding it may be useful before
> > release?
> >
> 
> Yes. Can you try if the attached patch fixes the problem?
> 
> Jürgen
> 
> 
> >
> >
> > Helge Hafting
> >

It could also be that this layout file (fu-leksjon.layout) is _not_ in UTF-8 
encoding?

Kornel

signature.asc
Description: This is a digitally signed message part.

Re: LyX 2.3 failure to convert from layout format 60 to 64

2017-10-12 Thread Jürgen Spitzmüller 
2017-10-12 11:38 GMT+02:00 Helge Hafting:

> If there is a problem in layout2layout, finding it may be useful before
> release?
>

Yes. Can you try if the attached patch fixes the problem?

Jürgen


>
>
> Helge Hafting
>
>
diff --git a/lib/scripts/layout2layout.py b/lib/scripts/layout2layout.py
index eebacf883d..77cafa048a 100644
--- a/lib/scripts/layout2layout.py
+++ b/lib/scripts/layout2layout.py
@@ -471,7 +471,7 @@ def convert(lines, end_format):
   re_trimEndLabelString, re_trimLabelCounter):
 m = r.match(lines[i])
 if m:
-lines[i] = m.group(1) + '"' + m.group(2) + '"'
+lines[i] = m.group(1) + b'"' + m.group(2) + b'"'
 i += 1
 continue