Merge branch 'dev' into main

paulrosen · Feb 25, 2022 · 0d573f0 · 0d573f0
2 parents 946eab4 + 3848245
commit 0d573f0
Show file tree

Hide file tree

Showing 11 changed files with 197 additions and 174 deletions.
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,3 +1,13 @@
+# Version 6.0.1
+
+## Bugs
+
+* Make the printable example long enough to be on two pages.
+
+* Fix paper size so that the bottom of a narrow staff is not cut off.
+
+* Add a little padding to stems so they aren't cut off.
+
 # Version 6.0.0
 
 ## Bugs

diff --git a/dist/abcjs-basic-min.js b/dist/abcjs-basic-min.js
diff --git a/dist/abcjs-basic.js b/dist/abcjs-basic.js
@@ -19714,7 +19714,8 @@ AbstractEngraver.prototype.addNoteToAbcElement = function (abselem, elem, dot, s
     abselem.addRight(new RelativeElement(null, dx, 0, p1, {
       "type": "stem",
       "pitch2": p2,
-      linewidth: width
+      linewidth: width,
+      bottom: p1 - 1
     })); //var RelativeElement = function RelativeElement(c, dx, w, pitch, opt) {
 
     min = Math.min(p1, p2);
@@ -24558,7 +24559,7 @@ module.exports = drawSeparator;
 
 function setPaperSize(renderer, maxwidth, scale, responsive) {
   var w = (maxwidth + renderer.padding.right) * scale;
-  var h = (renderer.y + renderer.padding.bottom) * scale;
+  var h = renderer.y * scale;
   if (renderer.isPrint) h = Math.max(h, 1056); // 11in x 72pt/in x 1.33px/pt
   // TODO-PER: We are letting the page get as long as it needs now, but eventually that should go to a second page.
   // for accessibility
@@ -28186,7 +28187,7 @@ module.exports = unhighlight;
   \********************/
 /***/ (function(module) {
 
-var version = '6.0.0';
+var version = '6.0.1';
 module.exports = version;
 
 /***/ })

diff --git a/dist/abcjs-basic.js.map b/dist/abcjs-basic.js.map
diff --git a/dist/abcjs-plugin-min.js b/dist/abcjs-plugin-min.js
diff --git a/examples/printable.html b/examples/printable.html
@@ -75,6 +75,18 @@ <h1>PDF Maker</h1>
 |:D2|EB{c}BA B2 EB|~B2 AB dBAG|FDAD BDAD|FDAD dAFD|
 EBBA B2 EB|B2 AB defg|afe^c dBAF|DEFD E2:|
 |:gf|eB B2 efge|eB B2 gedB|A2 FA DAFA|A2 FA defg|
+eB B2 eBgB|eB B2 defg|afe^c dBAF|DEFD E2:|
+|:D2|EB{c}BA B2 EB|~B2 AB dBAG|FDAD BDAD|FDAD dAFD|
+EBBA B2 EB|B2 AB defg|afe^c dBAF|DEFD E2:|
+|:gf|eB B2 efge|eB B2 gedB|A2 FA DAFA|A2 FA defg|
+eB B2 eBgB|eB B2 defg|afe^c dBAF|DEFD E2:|
+|:D2|EB{c}BA B2 EB|~B2 AB dBAG|FDAD BDAD|FDAD dAFD|
+EBBA B2 EB|B2 AB defg|afe^c dBAF|DEFD E2:|
+|:gf|eB B2 efge|eB B2 gedB|A2 FA DAFA|A2 FA defg|
+eB B2 eBgB|eB B2 defg|afe^c dBAF|DEFD E2:|
+|:D2|EB{c}BA B2 EB|~B2 AB dBAG|FDAD BDAD|FDAD dAFD|
+EBBA B2 EB|B2 AB defg|afe^c dBAF|DEFD E2:|
+|:gf|eB B2 efge|eB B2 gedB|A2 FA DAFA|A2 FA defg|
 eB B2 eBgB|eB B2 defg|afe^c dBAF|DEFD E2:|
         </textarea>
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abcjs",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "description": "Renderer for abc music notation",
   "main": "index.js",
   "types": "types/index.d.ts",

diff --git a/src/write/abc_abstract_engraver.js b/src/write/abc_abstract_engraver.js
@@ -729,7 +729,7 @@ var ledgerLines = function(abselem, minPitch, maxPitch, isRest, symbolWidth, add
 				else
 					p1 += 1;
 			}
-			abselem.addRight(new RelativeElement(null, dx, 0, p1, {"type": "stem", "pitch2":p2, linewidth: width}));
+			abselem.addRight(new RelativeElement(null, dx, 0, p1, {"type": "stem", "pitch2":p2, linewidth: width, bottom: p1-1}));
 			//var RelativeElement = function RelativeElement(c, dx, w, pitch, opt) {
 			min = Math.min(p1, p2);
 		}

diff --git a/src/write/draw/set-paper-size.js b/src/write/draw/set-paper-size.js
@@ -1,6 +1,6 @@
 function setPaperSize(renderer, maxwidth, scale, responsive) {
 	var w = (maxwidth+renderer.padding.right)*scale;
-	var h = (renderer.y+renderer.padding.bottom)*scale;
+	var h = (renderer.y)*scale;
 	if (renderer.isPrint)
 		h = Math.max(h, 1056); // 11in x 72pt/in x 1.33px/pt
 	// TODO-PER: We are letting the page get as long as it needs now, but eventually that should go to a second page.