Re: repo.or.cz, was Re: Copyright, new branches etc

[Han-Wen Nienhuys]

Hi,

thanks for this work!

There is an odd change going on in

  d94fe757a8a226d314f035572d58dfee9e084847
  fix documentation files for new fret-diagram-details

you've changed almost all of define-grobs.scm; can you double check
that your editor is not changing tabs & spaces at the start of the
line, and create a new commit, on top of

  f438e3328d83244cbfcd6db6812f0edb52b2e4e2
  update fret-diagram interface

?

I tried to merge in

  f438e3328d83244cbfcd6db6812f0edb52b2e4e2
  update fret-diagram interface

and got lots of hairy conflicts in

  scm/define-grob-properties.scm

can you merge the mainline in and resolve the conflicts so I can pull cleanly?

Thanks!


2007/10/13, Carl D. Sorensen <address@hidden>:
>
>
> > -----Original Message-----
> > From: Han-Wen Nienhuys [mailto:address@hidden
> > Sent: Saturday, October 06, 2007 3:04 PM
> > To: Carl D. Sorensen
> > Cc: Johannes Schindelin; Ralph Little; address@hidden
> > Subject: Re: repo.or.cz, was Re: Copyright, new branches etc
> >
> >
> > 6. Once you verified that it's working, send me the URL of your fork.
> > I will pull your changes in when it is time.
>
> I've got the changes done.  The URL is
> git://repo.or.cz/lilypond/csorensen.git
>
> >
> > Kill them or comment them so others understand what's going on
> I believe that all of the debug code and the spare properties code has
> been commented out.
>
> >
> > >> Also, merged-alist-values is not completely cleaar to me.
>
> I changed from merged-alist-values to merge-markup-override.  It still
> uses append, but not as part of a recursive function.  It recognizes
> that there are two places that can contain overrides -- TextScript and
> markup.  These two locations are separate in the props, so
> merge-markup-override finds the first, then appends the second by
> calling chain-assoc-get.
>
> Fret-diagram-details has been changed to a strict alist.
>
> Destructive overrides have been changed to acons.
>
> I also modified the regression test, define-grobs.scm,
> define-grob-preperties.scm, and define-grob-interfaces.scm.
> Ly/generate-documentation now works, although it does give a couple of
> warnings, but the .itely file looks fine to my eyes.
>
> I've struggled some with making git do what I wanted it to do, but I
> think that everything is right, now.
>
> Thanks for your help, and for checking this out.
>
> Carl
>


-- 
Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen