From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 24 Apr 2005 22:02:34 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: release/2.5.21~9
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cdb21b2ad016654c3396d6930da4ef36b886a612;p=lilypond.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index dd4fe9bf84..15b17e2ff0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-04-22  Laura Conrad <lconrad@laymusic.org>
+ 
+	* scripts/abc2ly:
+	second title line append with punctuation dash character;
+	encode abc2ly python strings in utf-8
+       
+2005-04-21  Laura Conrad <lconrad@laymusic.org>
+
+	* scripts/abc2ly fix chords (again)
+ 
 2005-04-22  Bernard Hurley  <bernard@fong-hurley.org.uk>
 
 	* scm/x11-color.scm: new file
diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index c17eb39591..7f7a241169 100644
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -1,5 +1,5 @@
 #!@PYTHON@
-
+# -*- 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,9 @@ 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')
+# don't substitute @VERSION@. We want this to reflect
+# the last version that was verified to work.
+	outf.write ('\\version "2.5.20"\n' % version)
 
 #	dump_global (outf)
 	dump_header (outf, header)