From 782b37d572a0ad91bb5dc9e675684ed72ffff477 Mon Sep 17 00:00:00 2001
From: Matthias Neeracher <neeri@users.sourceforge.net>
Date: Fri, 15 Aug 2008 13:28:06 +0000
Subject: [PATCH] Need to quote and escape in some further situations

---
 Sources/VLLilypondWriter.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/Sources/VLLilypondWriter.cpp b/Sources/VLLilypondWriter.cpp
index 22be3ef..9075152 100644
--- a/Sources/VLLilypondWriter.cpp
+++ b/Sources/VLLilypondWriter.cpp
@@ -202,10 +202,12 @@ static std::string	LilypondPitchName(int8_t pitch, bool useSharps)
 
 static std::string EscapeSyllable(std::string syll)
 {
+	bool seenAlpha = false;
 	for (size_t i=0; i<syll.size(); ++i)
-		if (isalpha(syll[i]))
+		if (isalpha(syll[i])) {
+			seenAlpha = true;
 			continue;
-		else 
+		} else {
 			switch (syll[i]) {
 			case '-':
 			case ':':
@@ -214,10 +216,13 @@ static std::string EscapeSyllable(std::string syll)
 			case ';':
 			case '\'':
 			case '_':
-				continue;
+				if (seenAlpha)
+					continue;
+				/* Else fall through */
 			default:
 				goto escape;
 			}
+		}
 	//
 	// Purely alphabetic syllable, no need to escape.
 	//
@@ -225,6 +230,11 @@ static std::string EscapeSyllable(std::string syll)
 
  escape:
 	size_t q=0;
+	while ((q = syll.find_first_of('\\', q)) != std::string::npos) {
+		syll.replace(q, 1, "\\\\", 2);
+		q += 2;
+	}
+	q = 0;
 	while ((q = syll.find_first_of('"', q)) != std::string::npos) {
 		syll.replace(q, 1, "\\\"", 2);
 		q += 2;