Menu

#2026 Make markup utility definitions available via new (scm markup-utility-defs) scheme module

Accepted
nobody
None
abandoned
Maintainability
2015-10-22
2011-11-06
Anonymous
No

Originally created by: *anonymous

Originally created by: ianhuli...@gmail.com
Originally owned by: ianhuli...@gmail.com

The interface between the markup utility and the rest of the scheme code is messy, and needs to be migrated from its current half-way house solution (moving some markup code to scm/markup-modules.scm and loading this first in lily.scm's load list) to a proper module.

This affects the following scheme files.

scm/lily.scm
scm/markup.scm (will be gutted)
scm/markup-macros.scm (will be deleted)
scm/define-markup-commands.scm
scm/define-woodwind-diagrams.scm
scm/display-woodwind-diagrams.scm
scm/fret-diagrams.scm
scm/harp-pedals.scm
scm/tablature.scm

New file
scm/markup-utility-defs.scm

Bug Squad: Criteria for verifying this change - passes reg tests and does no harm when running with Guile V1.8.*,

Discussion

1 2 > >> (Page 1 of 2)
  • Google Importer

    Google Importer - 2011-11-06

    Originally posted by: ianhuli...@gmail.com

    (No comment was entered for this change.)

    Blocking: 1686

     
  • Google Importer

    Google Importer - 2011-11-06

    Originally posted by: ianhuli...@gmail.com

    (No comment was entered for this change.)

    Status: Started

     
  • Google Importer

    Google Importer - 2011-11-30

    Originally posted by: Carl.D.S...@gmail.com

    Patch available on rietveld at http://codereview.appspot.com/5451058

    Labels: Patch-new

     
  • Google Importer

    Google Importer - 2011-12-01

    Originally posted by: pkx1...@gmail.com

    Passes make but make check fails:

    --snip---

    Writing snippets...
    Processing...
    Running lilypond...GNU LilyPond 2.15.21
    <unnamed port>: In procedure scm-error in expression (scm-error (quote misc-error) #f ...):
    <unnamed port>: no code for module (scm markup-facility-defs)
    command failed: /home/jlowe/lilypond-git/build/out/bin/lilypond -I /home/jlowe/lilypond-git/input/regression/ -I ./out-test -I /home/jlowe/lilypond-git/input -I /home/jlowe/lilypond-git/Documentation -I /home/jlowe/lilypond-git/Documentation/snippets -I /home/jlowe/lilypond-git/input/regression/ -I /home/jlowe/lilypond-git/Documentation/included/ -I /home/jlowe/lilypond-git/build/mf/out/ -I /home/jlowe/lilypond-git/build/mf/out/ -I /home/jlowe/lilypond-git/Documentation/pictures -I /home/jlowe/lilypond-git/build/Documentation/pictures/./out-test -dbackend=eps --formats=ps -djob-count=7 -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I /home/jlowe/lilypond-git/Documentation/included/ -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1 -I  "/home/jlowe/lilypond-git/build/out/lybook-testdb"  -I  "/home/jlowe/lilypond-git/build/input/regression"  -I  "/home/jlowe/lilypond-git/input/regression"  -I  "/home/jlowe/lilypond-git/build/input/regression/out-test"  -I  "/home/jlowe/lilypond-git/input"  -I  "/home/jlowe/lilypond-git/Documentation"  -I  "/home/jlowe/lilypond-git/Documentation/snippets"  -I  "/home/jlowe/lilypond-git/input/regression"  -I  "/home/jlowe/lilypond-git/Documentation/included"  -I  "/home/jlowe/lilypond-git/build/mf/out"  -I  "/home/jlowe/lilypond-git/build/mf/out"  -I  "/home/jlowe/lilypond-git/Documentation/pictures"  -I  "/home/jlowe/lilypond-git/build/Documentation/pictures/out-test" --formats=eps  -deps-box-padding=3.000000  -dread-file-list -dno-strip-output-dir  "/home/jlowe/lilypond-git/build/out/lybook-testdb/snippet-names--1023650345.ly"
    Child returned 1
    make[2]: *** [out-test/collated-files.texi] Error 1
    make[2]: Leaving directory `/home/jlowe/lilypond-git/build/input/regression'
    make[1]: *** [local-test] Error 2
    make[1]: Leaving directory `/home/jlowe/lilypond-git/build/input/regression'
    make: *** [test] Error 2
    jlowe@jlowe-lilybuntu2:~/lilypond-git/build$

    --snip--

    James

    Labels: -Patch-new Patch-needs_work

     
  • Google Importer

    Google Importer - 2011-12-08

    Originally posted by: ianhuli...@gmail.com

    New patch available for review at http://codereview.appspot.com/5464045

    Cheers,
    Ian

    Labels: -Patch-needs_work Patch-new

     
  • Google Importer

    Google Importer - 2011-12-08

    Originally posted by: lilypond...@gmail.com

    Patchy the autobot says: LGTM.

    Labels: Patch-review

     
  • Google Importer

    Google Importer - 2011-12-08

    Originally posted by: ColinPKC...@gmail.com

    (No comment was entered for this change.)

    Labels: -Patch-review Patch-countdown

     
  • Google Importer

    Google Importer - 2011-12-11

    Originally posted by: ColinPKC...@gmail.com

    Counted down to 20111211

    Labels: -Patch-countdown Patch-push

     
  • Google Importer

    Google Importer - 2011-12-11

    Originally posted by: ianhuli...@gmail.com

    Pushed to staging as
    f8e03b1..6b15f83

    Labels: -Patch-push
    Status: Fixed

     
  • Google Importer

    Google Importer - 2011-12-18

    Originally posted by: ianhuli...@gmail.com

    Problems identified with docs build.  Lots of discussions on devel- mailing list.

    Labels: Patch-needs_work
    Status: Started

     
  • Google Importer

    Google Importer - 2011-12-19

    Originally posted by: ianhuli...@gmail.com

    New patchset uploaded to Rietveld http://codereview.appspot.com/5464045

    Reg-tests fine locally, Documentation also builds locally.

    Ian

    Labels: -Patch-needs_work Patch-new

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: lilypond...@gmail.com

    Patchy the autobot says: LGTM.  accepted, but there's tons of false warnings in display-lily-tests.ly

    Labels: Patch-review

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: dak@gnu.org

    Then there would appear to be something wrong.  There is no reason for display-lily-tests.ly to turn out false warnings.

    Hm.  It would appear that the material which you moved around is quite outdated.  You erased the new versions, and inserted old versions in a different place.

    That's not good.  Certainly one reason to avoid large reorganizations like that.  They are not easy to notice, least at all on Rietveld which has no clue about moving material.

    Labels: -Patch-review Patch-needs_work

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: gra...@percival-music.ca

    it was mostly changes like this:
      { c'4  c'4 }
      { c'4 c'4}

    I didn't notice any non-whitespace changes.  IIRC the new version removed the extra whitespace, but I wouldn't swear to that.

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: dak@gnu.org

    Exactly.  The changes made spacing more regular.  It just does not do to check in old versions of files.  I have not checked whether we have similar problems in other files Ian moved around, but we can't just check in old material again in a change.  That totally fouls up development since it mixes, depending on the file, various different versions of material possibly never used together before.

    One can let git produce diffs that recognize moved material, and then it would likely also flag gratuitious changes like that (if one did not reformat).

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: ianhuli...@gmail.com

    This will be sorted in the next patch-set.  Newest version of
    define-music-display methods appended to display-lily.scm.  Re-run of
    regtests locally don't show the diffs Graham noted.

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: ianhuli...@gmail.com

    New patchset available for review at http://codereview.appspot.com/5464045

    Labels: -Patch-needs_work Patch-new

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: lilypond...@gmail.com

    Patchy the autobot says: LGTM.

    Labels: Patch-review

     
  • Google Importer

    Google Importer - 2011-12-20

    Originally posted by: ColinPKC...@gmail.com

    (No comment was entered for this change.)

    Labels: -Patch-review Patch-countdown

     
  • Google Importer

    Google Importer - 2011-12-24

    Originally posted by: ColinPKC...@gmail.com

    Carl has concerns on Reitveld.

    Labels: -Patch-countdown Patch-needs_work

     
  • Google Importer

    Google Importer - 2011-12-27

    Originally posted by: ianhuli...@gmail.com

    New patch-set uploaded to http://codereview.appspot.com/5464045

    Ian Hulin

    Labels: -Patch-needs_work Patch-new

     
  • Google Importer

    Google Importer - 2011-12-27

    Originally posted by: ianhuli...@gmail.com

    Here's a small test file to trigger the ly-not-markup-command throw

    \version "2.15.22"

    #(define-markup-command   (test-bad-markup layout props trigger)
      (number?)
      (interpret-markup layout props
        (if (eqv? trigger 0.5)
          (markup #:garbage))))

    \markup { \bold abc }
    \markup \test-bad-markup #0.5

    When compiled together with a valid file ../testing.ly this produces:
    ian@nanny-ogg ~/src/lilypond/build (T2026)$ out/bin/lilypond ../test-bad-markup.ly ../testing.ly
    GNU LilyPond 2.15.24
    Processing `/home/ian/src/lilypond/build/out/share/lilypond/current/scm/../test-bad-markup.ly'
    Parsing...
    programming error:
      ly-not-markup-command - Markup syntax error
             Not a markup command, garbage
             from token (((#:garbage)))
             "garbage" defined neither in current module #<module b69e5340> nor (lily) module

    continuing, cross fingers
    Processing `/home/ian/src/lilypond/build/out/share/lilypond/current/scm/../testing.ly'
    Parsing...
    Interpreting music...
    Preprocessing graphical objects...
    Interpreting music...
    Preprocessing graphical objects...
    Finding the ideal number of pages...
    Fitting music on 1 page...
    Drawing systems...
    Layout output to `testing.ps'...
    Converting to `./testing.pdf'...
    fatal error: failed files: "../test-bad-markup.ly"
    ian@nanny-ogg ~/src/lilypond/build (T2026)$

     
  • Google Importer

    Google Importer - 2011-12-28

    Originally posted by: lilypond...@gmail.com

    Patchy the autobot says: LGTM.

    Labels: Patch-review

     
  • Google Importer

    Google Importer - 2011-12-29

    Originally posted by: ColinPKC...@gmail.com

    (No comment was entered for this change.)

    Labels: -Patch-review Patch-countdown

     
  • Google Importer

    Google Importer - 2012-01-02

    Originally posted by: ianhuli...@gmail.com

    (No comment was entered for this change.)

    Labels: -Patch-countdown Patch-push

     
1 2 > >> (Page 1 of 2)