? mf/feta-alphabet11.tfm
? mf/feta-alphabet13.tfm
? mf/feta-alphabet14.tfm
? mf/feta-alphabet16.tfm
? mf/feta-alphabet18.tfm
? mf/feta-alphabet20.tfm
? mf/feta-alphabet23.tfm
? mf/feta-alphabet26.tfm
Index: ChangeLog
===================================================================
RCS file: /cvsroot/lilypond/lilypond/ChangeLog,v
retrieving revision 1.3492
diff -p -u -u -r1.3492 ChangeLog
--- ChangeLog	21 Apr 2005 18:45:04 -0000	1.3492
+++ ChangeLog	22 Apr 2005 13:37:16 -0000
@@ -1,3 +1,13 @@
+2005-04-22  Laura Conrad <address@hidden>
+
+	* scripts/abc2ly fix \version output; 
+	* second title line append with punctuation dash character;
+	* encode abc2ly python strings in utf-8
+	
+2005-04-21  Laura Conrad <address@hidden>
+
+	* scripts/abc2ly fix chords (again)
+	
 2005-04-21  Jan Nieuwenhuizen  <address@hidden>
 
 	* lily/translator-scheme.cc (ly:translator-property): Remove.
@@ -52,6 +62,7 @@
 
 	* flower/rational.cc (operator %): Bugfix.
 
+>>>>>>> 1.3492
 2005-04-21  Erik Sandberg  <address@hidden>
 
 	* scripts/abc2ly: Bugfix
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	22 Apr 2005 13:37:18 -0000
@@ -1,3 +1,9 @@
+lilypond (2.5.050416.local.1) unstable; urgency=low
+
+  * Local build from CVS.
+
+ -- Laura Conrad <address@hidden>  Sat, 16 Apr 2005 10:17:27 -0400
+
 lilypond (2.2.6-1) unstable; urgency=high
 
   * New upstream stable release.  (Closes: Bug#264263)
Index: scripts/abc2ly.py
===================================================================
RCS file: /cvsroot/lilypond/lilypond/scripts/abc2ly.py,v
retrieving revision 1.49
diff -p -u -u -r1.49 abc2ly.py
--- scripts/abc2ly.py	20 Apr 2005 23:49:30 -0000	1.49
+++ scripts/abc2ly.py	22 Apr 2005 13:37:18 -0000
@@ -1,5 +1,5 @@
 address@hidden@
-
+# -*- coding: utf-8 -*-
 # once upon a rainy monday afternoon.
 #
 #   ...
@@ -636,7 +636,10 @@ def try_parse_header_line (ln, state):
 			if header.has_key('title'):
 				if a:
  					if len(header['title']):
- 						header['title'] = header['title'] + '\\\\\\\\' + a
+						# the non-ascii character
+						# in the string below is a
+						# punctuation dash. (TeX ---)
+ 						header['title'] = header['title'] + ' — ' + a
  					else:
  						header['subtitle'] = a
 			else:
@@ -1208,7 +1211,7 @@ def try_parse_chord_delims (str, state):
 	ch = ''
 	if str[:1] ==']':
 		str = str[1:]
-		ch = '>'
+		ch = '>>'
 
 	end = 0
 	while str[:1] ==')':
@@ -1388,7 +1391,7 @@ for f in files:
 	sys.stderr.write ('lilypond output to: `%s\'...' % out_filename)
 	outf = open (out_filename, 'w')
 
-	outf.write ('\\version "2.3.25"\n')
+	outf.write ('\\version "%s"\n' % version)
 
 #	dump_global (outf)
 	dump_header (outf, header)