Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

[Kornel Benko]

Am Dienstag, 28. Mai 2013 um 13:42:33, schrieb Jean-Marc Lasgouttes 
lasgout...@lyx.org
 27/05/2013 22:18, Vincent van Ravesteijn:
  I tested the branch a bit more.
 
  - When you just implemented this, my LyX was translated immediately, but
  now it can't find the translations anymore. This is a pity.
 
  I don't really understand the following:
 
  + if (in_build_dir_)
  +return FileName(top_srcdir().absFileName() + /po/
  ++ c + .gmo);
 
  So, if we run in the build dir, we look for the gmo files in the source
  dir ? Shouldn't we be looking the build dir then ? What about the
  attached ?
 
 Traditionally, autotools put the .gmo files in the source directory. The 
 reason is that these files are distributed in the tar.gz file, so that 
 users do not need gettext to compile LyX.
 
 It seems that cmake does not follow this rule. Does this mean that .gmo 
 files are not distributed?

They are created in the build-directory. And not distributed yet.
 
 I would be OK with either having cmake generate gmo file in source or 
 have special code in Package.cpp to catter for different build systems.
 
...
 JMarc

Kornel

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

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

[Kornel Benko]

Am Dienstag, 28. Mai 2013 um 13:42:33, schrieb Jean-Marc Lasgouttes 

> 27/05/2013 22:18, Vincent van Ravesteijn:
> > I tested the branch a bit more.
> >
> > - When you just implemented this, my LyX was translated immediately, but
> > now it can't find the translations anymore. This is a pity.
> >
> > I don't really understand the following:
> >
> > + if (in_build_dir_)
> > +return FileName(top_srcdir().absFileName() + "/po/"
> > ++ c + ".gmo");
> >
> > So, if we run in the build dir, we look for the gmo files in the source
> > dir ? Shouldn't we be looking the build dir then ? What about the
> > attached ?
> 
> Traditionally, autotools put the .gmo files in the source directory. The 
> reason is that these files are distributed in the tar.gz file, so that 
> users do not need gettext to compile LyX.
> 
> It seems that cmake does not follow this rule. Does this mean that .gmo 
> files are not distributed?

They are created in the build-directory. And not distributed yet.
 
> I would be OK with either having cmake generate gmo file in source or 
> have special code in Package.cpp to catter for different build systems.
> 
...
> JMarc

Kornel

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

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

[Kornel Benko]

Am Montag, 27. Mai 2013 um 19:59:44, schrieb Vincent van Ravesteijn 
v...@lyx.org
 Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef:
  24/05/2013 15:07, Vincent van Ravesteijn:
  By the way, this doesn't always work. The kill-gettext branch, for
  instance, has master merged in a few times to fix merge conflicts. Now,
  rebasing onto the merge-base does do no good.
 
  Vincent, I want to merge this kill-gettext branch now. Is there 
  something I should do to make it less ugly? I do not understand why it 
  requires such ugly merges in the middle. What about good old hand-made 
  conflict resolution?
 
  Anyway, if you tell me to merge it as it is, it will be fine with me.
 
  JMarc
 
 It's not that ugly. It was required to immediately fix the merge 
 conflicts at the moment they arise.
 
 First, if you would do it at the end, it would be more difficult and you 
 might forget some conflicts. For example, you probably would forget the 
 added 'intl' dependency of check_layout.
 
 Second, other people that would like to try out the feature could not 
 merge it directly in their master because of the merge conflicts. So, we 
 can offer them a branch that can be merged into master.
 
 Anyway, I rebased the branch onto master now. Shall I push it later ?
 
 Vincent

I vote for merging it with the master now, and get rid of this branch.

Kornel

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

Re: Re: [LyX features/empty-length] Latest changes from Uwe for tex2lyx and lyx2lyx

[Kornel Benko]

Am Montag, 27. Mai 2013 um 19:59:44, schrieb Vincent van Ravesteijn 

> Op 27-5-2013 18:05, Jean-Marc Lasgouttes schreef:
> > 24/05/2013 15:07, Vincent van Ravesteijn:
> >> By the way, this doesn't always work. The kill-gettext branch, for
> >> instance, has master merged in a few times to fix merge conflicts. Now,
> >> rebasing onto the merge-base does do no good.
> >
> > Vincent, I want to merge this kill-gettext branch now. Is there 
> > something I should do to make it less ugly? I do not understand why it 
> > requires such ugly merges in the middle. What about good old hand-made 
> > conflict resolution?
> >
> > Anyway, if you tell me to merge it as it is, it will be fine with me.
> >
> > JMarc
> 
> It's not that ugly. It was required to immediately fix the merge 
> conflicts at the moment they arise.
> 
> First, if you would do it at the end, it would be more difficult and you 
> might forget some conflicts. For example, you probably would forget the 
> added 'intl' dependency of check_layout.
> 
> Second, other people that would like to try out the feature could not 
> merge it directly in their master because of the merge conflicts. So, we 
> can offer them a branch that can be merged into master.
> 
> Anyway, I rebased the branch onto master now. Shall I push it later ?
> 
> Vincent

I vote for merging it with the master now, and get rid of this branch.

Kornel

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