lilypond-user
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Lilypond source code indenter and formatter


From: Colin Hall
Subject: Re: Lilypond source code indenter and formatter
Date: Thu, 7 Jun 2012 14:02:04 +0100
User-agent: Mutt/1.5.20 (2009-06-14)

On Thu, Jun 07, 2012 at 01:32:08PM +0200, David Kastrup wrote:
> Colin Hall <address@hidden> writes:
> 
> > On Thu, Jun 07, 2012 at 12:49:31PM +0200, David Kastrup wrote:
> 
> [...]
> >> > What is your point?
> >> 
> >> That automatically enforced indentation is not necessarily the best
> >> choice for colloboration.
> >
> > Thanks, that's clear. Our experiences differ.
> >
> >> You don't have the choice to make indentation compromises while a
> >> file is actively being worked on.  Reverts and merges often fail.
> >
> > Yes, that's a feature. One only gets to check in code that meets the
> > agreed standard. Compromise the indentation on your own branch.

So, do you accept this is a feature?

> You are using Emacs diff.

I take your point but for the record I used meld [1]

> The tool to consult about merge conflicts is git, and using git in a
> colloborative setting was what the thread was supposed to be about.

Yes, that's a good point. If I may quote you again:

> > > It is not really helpful for diffs if you get completely different
> > > indentation for a while file because of having to add a delimiter pair
> > > somewhere.
> >
> > Please describe a chain of events leading to that scenario.
>
> { 50 lines }  =>  << { 50 lines } { mixture of s and dynamics } >>

Let's see how that looks in git diff:

$         
$ git diff
diff --git a/score.ly b/score.ly
index 9000b2f..a12e07e 100644
--- a/score.ly
+++ b/score.ly
@@ -1,10 +1,17 @@
 \score
 {
-  {
-    c c c c |
-    c c c c |
-    c c c c |
-    c c c c |
-    c c c c |
-  }
+  <<
+    {
+      c c c c |
+      c c c c |
+      c c c c |
+      c c c c |
+    }
+    {
+      s\p s s s |
+      s s s s |
+      s\mf s s s |
+      s s s s |
+    }
+  >>
}
$ 
$ 

I think this is pretty clear and not the least unhelpful.

Cheers,
Colin.

Refs:
[1] http://meldmerge.org/

-- 

Colin Hall



reply via email to

[Prev in Thread] Current Thread [Next in Thread]