Fix issue 1900 -- multiple fret-diagram-terse markups commands crash (issue 5432081)

[Carl . D . Sorensen]

Reviewers: ,

Message:
I've created a patch for Issue 1900.  It solves the crash, but perhaps
in a non-optimal way.
David, will you please review this, since I've changed code that you
added to scm/fret-diagrams.scm?

Thanks,

Carl


Description:
Fix issue 1900 -- multiple fret-diagram-terse markups commands crash

This fix uses an explicit definition of the default properties for
fret-diagram-terse and fret-diagram markups, instead of copying those
from the fret-diagram-verbose markup.

No regression test will be included, since it requires a special
lilypond-book call to test.  But the Lilypond issue will have a
regression test file posted.

Please review this at http://codereview.appspot.com/5432081/

Affected files:
  M scm/fret-diagrams.scm


Index: scm/fret-diagrams.scm
diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index  
9247a115f70696dc444c1f6264abe59daa636150..09d2881525a602035480b5f328aeedbc8f301592  
100644
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -1004,7 +1004,10 @@ indications per string.
 (define-markup-command (fret-diagram layout props definition-string)
   (string?) ; argument type
   #:category instrument-specific-markup ; markup category
-  #:properties (fret-diagram-verbose-markup) ; properties and defaults
+  #:properties ((align-dir -0.4) ; properties and defaults
+               (size 1.0)
+               (fret-diagram-details)
+               (thickness 0.5))
   "Make a (guitar) fret diagram.  For example, say

 @example
@@ -1082,7 +1085,10 @@ Note: There is no limit to the number of fret  
indications per string.
   (fret-diagram-terse layout props definition-string)
   (string?) ; argument type
   #:category instrument-specific-markup ; markup category
-  #:properties (fret-diagram-verbose-markup) ; properties
+  #:properties ((align-dir -0.4) ; properties and defaults
+               (size 1.0)
+               (fret-diagram-details)
+               (thickness 0.5))
   "Make a fret diagram markup using terse string-based syntax.

 Here is an example



_______________________________________________
lilypond-devel mailing list
lilypond-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/lilypond-devel