fixed tablature edge-case bug occuring when lines were uneven length …

…(longest line was sometimes truncated); refactored tabs class to use module pattern, check longest line, and, when tab line ends with a "|" place it at exact end (canvas); follow naming convention of constant all upper case and use local "alias" variable for dependency (better minimization); fixed F#7 definition;
buzcarter · Mar 7, 2014 · c98e56e · c98e56e
1 parent 7e8a4a8
commit c98e56e
Show file tree

Hide file tree

Showing 8 changed files with 358 additions and 280 deletions.
diff --git a/cpm/how-to-markup-tablature.mr-ukegeek.cpm.txt b/cpm/how-to-markup-tablature.mr-ukegeek.cpm.txt
@@ -49,3 +49,22 @@ C|-0-----------|-0---------
 G|-------------|-----------
 {eot}
 A pen-ny a kiss | A pen-ny a hug
+
+{c: Mulitple Tab Staffs In One Block}
+
+These begin/end tab block markers wrap two Staffs.
+Also, note that the second groups lines are "uneven";
+in this case the longest line sets final width/length.
+
+{start_of_tab}
+A----------------------------------------------0----------0---2---2--|
+E---0-------0---2-------0---2---3------2---3----------3--------------|
+C-------3------------------------------------------------------------|
+G--------------------------------------------------------------------|
+
+A----------2---0-----------------------------------------------------|
+E---0--------------3---2---0-----------
+C-----------------------------------------
+G---------------
+{eot}
+
diff --git a/js/editor/ugsChordBuilder.js b/js/editor/ugsChordBuilder.js
@@ -106,9 +106,10 @@ ugsChordBuilder.settings = (function() {
 
 	//'Geneva, "Lucida Sans", "Lucida Grande", "Lucida Sans Unicode", Verdana, Arial, sans-serif';
 	/**
-	 * San-Serif font stack used on Canvas
-	 * @constant FONT_STACK
-	 * @type {String}
+	 * San-serif font stack used when drawing text on Canvas.
+	 * @property {String} FONT_STACK
+	 * @final
+	 * @constant
 	 */
 	var FONT_STACK = 'Arial, "Helvetica Neue", Helvetica, Verdana, sans-serif';
 
@@ -333,7 +334,8 @@ ugsChordBuilder.fretDots = new function() {
 		var index = find(dot);
 		if (index < 0) {
 			_dots.push(dot);
-		} else {
+		}
+		else {
 			_dots.splice(index, 1);
 		}
 	};
@@ -502,7 +504,8 @@ ugsChordBuilder.cursorCanvas = new function() {
 		erase(_lastPos);
 		if (!_imgOk || _dotCursor) {
 			drawDotCursor(pos);
-		} else {
+		}
+		else {
 			drawHandCursor(pos);
 		}
 		_lastPos = pos;

diff --git a/js/editor/ugsEditorPlus.typeahead.js b/js/editor/ugsEditorPlus.typeahead.js
@@ -44,8 +44,6 @@ ugsEditorPlus.typeahead = function(){
 			var $this = $(this);
 
 			var plainText = crushText($this.text());
-			plainText = plainText.toLowerCase();
-
 			var href = $this.children('a').attr('href');
 			var key = href.toLowerCase();
 

diff --git a/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js b/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js
@@ -157,7 +157,7 @@ ukeGeeks.definitions.sopranoUkuleleGcea = [
 	// -------------------------------------------------------
 	'{define: F# frets 3 1 2 1 fingers 3 1 2 1 add: string 1 fret 1 finger 1 add: string 3 fret 1 finger 1}',
 	'{define: F#m frets 2 1 2 0 fingers 2 1 3 0}',
-	'{define: F#7 frets 3 4 2 1 fingers 3 4 2 1}',
+	'{define: F#7 frets 3 4 2 4 fingers 2 3 1 4}',
 	'{define: F#7sus4 frets 4 4 2 4 fingers 2 3 1 4}',
 	'{define: F#m7 frets 2 4 2 4 fingers 1 3 2 4}',
 	'{define: F#dim frets 2 3 2 3 fingers 1 3 2 4}',