? input/tutorial/lbook-latex-test.lytex
? input/tutorial/outdir
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.3836.2.9
diff -p -u -u -r1.3836.2.9 ChangeLog
--- ChangeLog	20 Jul 2005 22:35:33 -0000	1.3836.2.9
+++ ChangeLog	21 Jul 2005 16:38:39 -0000
@@ -1,3 +1,16 @@
+<<<<<<< ChangeLog
+<<<<<<< ChangeLog
+
+2005-07-06  Laura Conrad       <address@hidden>
+	* abc2ly.py; close alternative endings on a "major" barline.
+
+2005-07-01  Mats Bengtsson  <address@hidden>
+
+	* Documentation/user/advanced-notation.itely (Setting automatic
+	beam behavior): Correct the documentation of
+	revert-auto-beam-setting (backportme)
+=======
+=======
 2005-07-21  Han-Wen Nienhuys  <address@hidden>
 
 	* scm/output-lib.scm (tablature-stem-attachment-function): stem
@@ -38,7 +51,9 @@
 
 	* po/{de,fr}.po: update.
 
+>>>>>>> 1.3836.2.9
 2005-07-01  Han-Wen Nienhuys  <address@hidden>
+>>>>>>> 1.3836.2.1
 
 	* python/lilylib.py: remove set_environment()
 
@@ -298,6 +313,7 @@
 	* python/GNUmakefile (INSTALLATION_OUT_DIR): Install .so module in
 	datadir with .py modules.
 
+>>>>>>> 1.3850
 2005-06-15  Heikki Junes  <address@hidden>
 
 	* Documentation/user/basic-notation.itely (Ties): add tieDashed.
@@ -416,6 +432,7 @@
 	* GNUmakefile.in: remove links for .map, .enc
 	don't fail if out/ doesn't exist yet.
 
+>>>>>>> 1.3785
 2005-06-10  Han-Wen Nienhuys  <address@hidden>
 
 	* ttftool/util.c (surely_read): return nbytes
@@ -696,6 +713,7 @@
 	process anything unless we're at the end of a pending beam. Fixes
 	syncopated 8ths beamed across a beat.
 
+>>>>>>> 1.3761
 2005-06-03  Jan Nieuwenhuizen  <address@hidden>
 
 	* scm/editor.scm (editor-command-template-alist): Start emacs if
@@ -762,6 +780,7 @@
 
 	* scm/lily.scm (PLATFORM, slashify): Remove double slashes.
 
+>>>>>>> 1.3713
 2005-06-01  Han-Wen Nienhuys  <address@hidden>
 
 	* input/mutopia/R.Schumann/romanze-op28-2.ly (leftb): bugfix.
@@ -852,6 +871,7 @@
 	instrument-notation.itely, lilypond-book.itely: misc small
 	changes.
 
+>>>>>>> 1.3701
 2005-05-30  Jan Nieuwenhuizen  <address@hidden>
 
 	* lily/lexer.ll: Skip UTF-8 BOM at BOF.
@@ -876,7 +896,7 @@
 	* scm/framework-ps.scm (dump-stencil-as-EPS): Add silly fix for
 	numerical overflow error.
 
-2005-05-29 Laura Conrad <address@hidden>
+2005-05-29 Laura Conrad 
 	
 	* abc2ly.py: fix to syntax error in multi-part output.
 
@@ -888,6 +908,7 @@
 	* lily/property-iterator.cc (check_grob): use is-grob?
 	object-property. Fixes crash-key-sig-font-size.ly. 
 
+>>>>>>> 1.3679
 2005-05-29  Han-Wen Nienhuys  <address@hidden>
 
 	* lily/bar-line.cc (print): don't round barlines; this produces
Index: debian/changelog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/debian/changelog,v
retrieving revision 1.40
diff -p -u -u -r1.40 changelog
--- debian/changelog	27 Aug 2004 17:33:49 -0000	1.40
+++ debian/changelog	21 Jul 2005 16:38:39 -0000
@@ -1,3 +1,9 @@
+lilypond (2.5.26.local.1) unstable; urgency=low
+
+  * Local build.
+
+ -- root <address@hidden>  Sat, 28 May 2005 07:03:22 -0400
+
 lilypond (2.2.6-1) unstable; urgency=high
 
   * New upstream stable release.  (Closes: Bug#264263)
Index: scm/lily.scm
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scm/lily.scm,v
retrieving revision 1.367.2.2
diff -p -u -u -r1.367.2.2 lily.scm
--- scm/lily.scm	20 Jul 2005 21:31:27 -0000	1.367.2.2
+++ scm/lily.scm	21 Jul 2005 16:38:40 -0000
@@ -249,7 +249,7 @@ The syntax is the same as `define*-publi
 	    
 	    "paper.scm"
 	    "backend-library.scm"
-	    "x11-color.scm"
+;;	    "x11-color.scm"
 
 	    ;; must be after everything has been defined
 	    "safe-lily.scm"))
Index: scripts/abc2ly.py
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scripts/abc2ly.py,v
retrieving revision 1.52
diff -p -u -u -r1.52 abc2ly.py
--- scripts/abc2ly.py	30 May 2005 09:50:37 -0000	1.52
+++ scripts/abc2ly.py	21 Jul 2005 16:38:41 -0000
@@ -876,6 +876,7 @@ artic_tbl = {
 	 '~' : '^"~" ',
 	 'J' : '',		# ignore slide
 	 'R' : '',		# ignore roll
+	 'S' : '^\\segno',
 	 'v' : '^\\downbow'
 }
 	
@@ -1098,6 +1099,7 @@ bar_dict = {
 
 warn_about = ['|:', '::', ':|', '|1', ':|2', '|2']
 alternative_opener = ['|1', '|2', ':|2']
+alternative_ender = '|]', '||', '|:'
 repeat_ender = ['::', ':|']
 repeat_opener = ['::', '|:']
 in_repeat = [''] * 8
@@ -1146,6 +1148,10 @@ def try_parse_bar (str,state):
 					bs = "\\bar \"%s\"" % old_bar_dict[s]
 				else:
 					bs =  bar_dict[s]
+			if s in alternative_ender:
+				if doing_alternative[current_voice_idx]:
+					doing_alternative[current_voice_idx] = ''
+					voices_append("} }")
 			break
 	if str[:1] == '|':
 		state.next_bar = '|\n'