Some fixes to the < (dash) ornament suggested by Paul Overell

CHANGELOG

@@ -1,3 +1,6 @@
+VERSION "4.3.105
+A correction for < used as a dash ornament submitted by Paul Overell
+
 VERSION "4.3.104"
 change file name length to be greater than 120 chars
 

README

@@ -452,8 +452,8 @@ of tablature, as the second to tenth character.
 			  a 0 no longer indicates a space!
 	z		- a zero
 	\\		- one backslash in note position
-	. 		- one dot below tab
-	:		- two dots below tab
+	. 		- one dot below tab - fingering
+	:		- two horizontal dots below tab - fingering
 	|		- stroke - for thumb
                           two in a row give two side by side strokes 
 	-		- vertical bar - play similtaneously
@@ -463,18 +463,19 @@ of tablature, as the second to tenth character.
 			  # makes a hash sign
 			  x makes an x
 			  $ makes four small dots in a rectangle
-			  < makes a short horizontal lain - a dash
+			  < makes a short horizontal line - a dash
 		'	- a comma above the line
 		,	- a comma on the line
 		Q	- character is highlighted
-	%		- two dots (colon )preceeding next note
+	%		- two horizontal dots preceeding next note
 	?		- a flat
 	>		- something like a flat but different
 	@		- an asterix
 	= or &=		- colon
 	$ or &$		- double colon
 	_ or &_ 	- a smiley
 	&+ &* &# &' &`	- an ornament after preceeding note
+	&%		- two dots above the note
 	w, u		- "hold" for italian style tab
 	&x		- a postfix x
 	<		- two dots as an ornament
@@ -514,8 +515,8 @@ of tablature, as the second to tenth character.
 	//		- two slashes
  	///		- three slashes
 	<!tilde>	- the same as the ~ - looks like a sine wave
-	<!2mordent>     - a 2 lobed squiggle 
-	<!3mordent>     - a 3 lobed squiggle 
+	<!2mordent>     - a 2 lobed squiggle, baroque tab only
+	<!3mordent>     - a 3 lobed squiggle, baroque tab only
         1 3 4 5 6 7	- the number for bass string when you 
 			  run out of slashes
 	\1 \2 \3 \4	- left hand fingerings placed

getsys.cc

@@ -635,6 +635,7 @@ int getsystem(file_in *fi, i_buf *ib, struct file_info *f,char buf[])
 		  }
 		  else { ornament[i] = buf[i+skip];
 		    skip++;
+		    i--; //* Paul Overell Sept 1 2022 */
 		  }
 		  break;
 		case '`':	/* comma on line is now a no-op */
@@ -754,25 +755,27 @@ int getsystem(file_in *fi, i_buf *ib, struct file_info *f,char buf[])
 		}
 		/*  after ornaments */
 		if ((cc = buf[i + skip + 1]) == '&' ) {
-		  // printf("getsys.cc:line 690 got &\n");
+		  // printf("getsys.cc:line 757 got &\n");
 		  char ccc;
 		  cc = buf[i + (skip += 2)];
 		  if (cc == '*' ) cc = '.'; /* was Z */
 		  if (cc == '%' ) cc = ':'; /* was Z */
+
+		  // printf("HERE getsys.cc 764 i %d cc %c skip %d buf %s result %c\n", i, cc, skip, buf, buf[i+skip]);
 
 		  if (cc == ']') {
 		    ccc = buf[i + (skip += 1)];
-
+		    
 		    if ( ccc == 'v' )
 		      cc = (char)133;
 		    else if ( ccc == 'w' )
 		      cc = (char)134;
 		    else
 		      skip -= 1;
 		  }
-		  else if (cc == '<' && buf[i + (skip += 3) == '!']) {
-		    // printf("HERE getsys.cc 737 \n");
-		    skip -= 3;
+		  else if (cc == '<' && buf[i + skip + 1] == '!') {
+		    // printf("HERE getsys.cc 777 i %d skip %d buf %s\n", i, skip, buf);
+		    /* skip -= 3; Paul Overell Sept 1 2022 */
 		    cc = read_special_ornament (buf, &i, &skip);
 		  }
 		  else if (cc == '\n') {
@@ -1324,7 +1327,7 @@ do_music(i_buf *ib, unsigned char staff[], char buf[], int *l_p, int *skip,
 }
 
 
-char get_special_ornament(char * str) {
+char get_special_ornament(char * str) { //  <!tilde
   //   printf("getsys.cc: get_special_ornament: %s\n", str);
 
   if (!strcmp (str, "tilde"))

t.tab

@@ -6,12 +6,29 @@
 % $line=o
 % a / is 47 
 % $slur_depth=-6.0
--CC
+% -CC
 
+%b
+%1 1
+%bXQ
+b
+1 <a
+x a&<
+x "<a a&,
+x '<a a&'
+x >a
+x a&>
+x +a
+x a&+
+x <!tilde>a
+x <!tilde>
+x a&<!tilde>+bc&+'<a&<
+x <!2mordent>
+x <!3mordent>
+x  %aa&%:bb&:
+x ":aa&:
 b
-1 1
-bXQ
-1 2
+e
 bQX
 1 3
 bL

version.h

@@ -1 +1 @@
-#define VERSION "4.3.104"
+#define VERSION "4.3.105"