about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZach DeCook <zachdecook@gmail.com>2018-04-15 20:09:22 -0400
committerZach DeCook <zachdecook@gmail.com>2018-04-15 20:09:22 -0400
commitd9fe293f012567119d36eb219236d95c87ed2c6b (patch)
tree5a903fef8c2b1364e4fbfb90e60ba26eb76cfd4b
parent82837c94ca5b29b76bf3468a0426e1b4188684a4 (diff)
downloadprosongsa-d9fe293f012567119d36eb219236d95c87ed2c6b.tar.gz
* Make chordline detection more discerning
-rw-r--r--page.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/page.php b/page.php
index 6367001..47f39d3 100644
--- a/page.php
+++ b/page.php
@@ -274,13 +274,14 @@ function chordline($line)
 
 	$badtokens = 0;
 	$ambtokens = 0;
+	$goodtokens = 0;
 	foreach ($tokens as $token) {
-		if( in_array( substr($token, 0,2), $chords ) ) return TRUE;
+		if( in_array( substr($token, 0,2), $chords ) ) $goodtokens++;
 		else if ( in_array( substr( $token, 0,2), $ambiguous) ) $ambtokens++;
 		else if( $badtokens > 10 ) return FALSE;
 		else $badtokens++;
 	}
-	return $ambtokens >= $badtokens;
+	return ($goodtokens *2)+ $ambtokens >= $badtokens;
 }
 
 function normalizechords($line, $space=TRUE)