From: Han-Wen Nienhuys Date: Tue, 24 Dec 2002 20:24:13 +0000 (+0000) Subject: * scm/chord-name.scm: don't export anything from chord module. X-Git-Tag: release/1.7.10~4 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=42cb3790dc032c37e7ab99f5bb1528fdaaed9eb4;p=lilypond.git * scm/chord-name.scm: don't export anything from chord module. * input/test/american-chords.ly: idem * input/test/banter-chords.ly (texidoc): idem * input/test/Cc-chords.ly: add breakage notes. * Documentation/user/refman.itely (Text markup): rewrite manual section. * scm/chord-name.scm: complete new markup usage * scm/grob-description.scm (all-grob-descriptions): use new markup texts by default --- diff --git a/ChangeLog b/ChangeLog index 7d1c4f3ac6..369f1cf903 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2002-12-24 Han-Wen Nienhuys + * scm/chord-name.scm: don't export anything from chord module. + + * input/test/american-chords.ly: idem + + * input/test/banter-chords.ly (texidoc): idem + + * input/test/Cc-chords.ly: add breakage notes. + * Documentation/user/refman.itely (Text markup): rewrite manual section. * lily/parser.yy (scalar): allow \markup { } as property value. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index a2c3e86dd0..9ee10571c8 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -22,7 +22,7 @@ @end html This document describes GNU LilyPond and its input format. The last -revision of this document was made for LilyPond 1.6.2. It assumes +revision of this document was made for LilyPond 1.7.10. It assumes that you already know a little bit about LilyPond input (how to make an input file, how to create sheet music from that input file, etc). New users are encouraged to study the tutorial before reading diff --git a/NEWS b/NEWS index 9023c89530..42e668e58f 100644 --- a/NEWS +++ b/NEWS @@ -1,49 +1,69 @@ New features in 1.7 since 1.6 -* Deeper integration of the input language and Scheme. You can now use +* INPUT + +** Text entry is now done in a separate mode, and is more ergonomic +than the previous Scheme texts. + +** Deeper integration of the input language and Scheme. You can now use LilyPond identifiers in Scheme, and use Scheme expressions instead of LilyPond identifiers. -* Music types cleaned up and Schemified. +** Music types cleaned up and Schemified. -* New syntax for chords: +** New syntax for chords: << PITCHES >> -This is in addition to the < MUSICS > syntax for simultaneous music. Combined with this: uniform postfix syntax for articulations: +This is in addition to the < MUSICS > syntax for simultaneous +music. Combined with this: uniform postfix syntax for articulations: c8-[-( d8-]-) for a beamed slurred pair of eighth notes. -* Texts on multimeasure rests can be set by the user. +** User code evaluation during interpreting. Syntax + + \applycontext #SCHEME-FUNCTION + +** XML music output. + + + +* OUTPUT + +** Preliminary Sodipodi/SVG output -* Zigzagged glissandi -* XML music output. -* Preliminary Sodipodi/SVG output +* NOTATION -* Cluster support. Syntax: +* Completely rewritten text formatting support. It is implemented in a +completely modular way. + +** Texts on multimeasure rests can be set by the user. + +** Zigzagged glissandi + +** Cluster support. Syntax: NOTE-\openCluster .. NOTE-\closeCluster -* Beat grouping indications. Syntax: +** Beat grouping indications. Syntax: #(set-time-signature 7 8 '(3 2 2)) -* User code evaluation during interpreting. Syntax - - \applycontext #SCHEME-FUNCTION - -* Nested horizontal brackets for music analysis. +** Nested horizontal brackets for music analysis. NOTE-\groupOpen .. NOTE-\groupClose + + + New features in 1.6 since 1.4 * Support for figured bass and tablature. diff --git a/VERSION b/VERSION index 63a6402caa..14717bb7ef 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=7 -PATCH_LEVEL=9 +PATCH_LEVEL=10 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/input/test/Cc-chords.ly b/input/test/Cc-chords.ly index 9190c8a993..f26556285c 100644 --- a/input/test/Cc-chords.ly +++ b/input/test/Cc-chords.ly @@ -1,13 +1,32 @@ \version "1.7.6" \header { - texidoc="Jazz chord names, but with lower case names for minor chords" + texidoc="Jazz chord names, but with lower case names for minor chords + +BROKEN. FIXME. +" } -#(assoc-set! chord::names-alist-jazz - '((0 . 0) (2 . -1)) '("")) -#(assoc-set! chord::names-alist-jazz - '((0 . 0) (2 . -1) (4 . 0) (6 . -1)) '("7")) +%%% +%% UGH UH GUG UHGUHGHGH GHG +% -- this is fucking up global name space. +% +% imagine doing +% +% lilypond Cc-chords.ly ..other-files-testing-chords... +% +% then the other files will get messed up. +%% + +%{ + +FIXME: + +%#(assoc-set! chord::names-alist-jazz +% '((0 . 0) (2 . -1)) '("")) + +%#(assoc-set! chord::names-alist-jazz +% '((0 . 0) (2 . -1) (4 . 0) (6 . -1)) '("7")) #(define (pitch->chord-name-text-banter pitch additions) (let ((name (pitch->text-banter pitch))) @@ -17,6 +36,8 @@ (substring (car name) 1)) (cdr name)) name))) +%} + \score { < diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 5c4294dbf1..287066c091 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,15 +1,26 @@ \version "1.7.6" \header { - texidoc = "Chord names in american styles, according to one of our users." + texidoc = "Chord names in american styles, according to one of our users. + + +FIXME + +" } \include "english.ly" -#(set! chord::names-alist-american - (append - '( - ;; any changes here, see scm/chord-name.scm - ) - chord::names-alist-american)) + + +%%FIXME: + +% DON'T do this in the test file, it messes up all other files in the directory. + +% #(set! chord::names-alist-american +% (append +% '( +% ;; any changes here, see scm/chord-name.scm +% ) +% chord::names-alist-american)) scheme = \chords { c % Major triad diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index 84b68a23ab..51539b3087 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -2,9 +2,12 @@ \header{ -enteredby = "jcn" -copyright = "public domain" -TestedFeatures = "Banter named chords" +texidoc = "banter chords + + +FIXME + +" } % test German (Banter) naming @@ -16,7 +19,10 @@ TestedFeatures = "Banter named chords" % eachother. These guile lists are fixed in the guile environment % when this file has been parsed... -% { +%{ + + +%% FIXME: #;(define chord::names-alist-banter '()) #(set! chord::names-alist-banter @@ -45,7 +51,7 @@ TestedFeatures = "Banter named chords" (number->string (caddr pitch))) '(font . "feta"))))))) -% } +%} chord = \notes\transpose c' c''\chords{ % dim modifier means: lower all implicit additions diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 33bc295c71..6cc1c3ea84 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -20,20 +20,15 @@ " - TODO: - Use lilypond Pitch objects -- SCM pitch objects lead to duplication. LilyPond pitch objects force meaningful names (i.e. (ly:pitch-octave PITCH) ) - - Pitches are musical objects. The pitches -> markup step should happen earlier (during interpreting), brew-molecule () should only -dump reinterpret the markup as a molecule. - - -" +dump reinterpret the markup as a molecule. " ; " ;; pitch = (octave notename alteration) @@ -60,9 +55,7 @@ dump reinterpret the markup as a molecule. ;; ;; * doc strings -(define-public chord::names-alist-banter '()) -(set! chord::names-alist-banter - (append +(define chord::names-alist-banter `( ; C iso C.no3.no5 (((0 . 0)) . ,empty-markup) @@ -89,8 +82,7 @@ dump reinterpret the markup as a molecule. . (,line-markup ((,simple-markup "dim") (,super-markup (,simple-markup "11 "))))) - ) - chord::names-alist-banter)) + )) ;;;;;;;;;; @@ -345,7 +337,7 @@ dump reinterpret the markup as a molecule. (list (ly:pitch-octave p) (ly:pitch-notename p) (ly:pitch-alteration p)) #f)) -(define-public (chord::name-banter tonic exception-part unmatched-steps +(define (chord::name-banter tonic exception-part unmatched-steps bass-and-inversion steps) (let ((additions (chord::additions unmatched-steps)) (subtractions (chord::subtractions unmatched-steps))) @@ -354,12 +346,15 @@ dump reinterpret the markup as a molecule. bass-and-inversion steps))) +(define chord-module (current-module)) (define (chord::restyle name style) - (primitive-eval ;; "UGGHGUGHUGHG" - + ;; "UGGHGUGHUGHG" + (eval (string->symbol (string-append (symbol->string name) - (symbol->string style))))) + (symbol->string style))) + chord-module + )) ;; this is unintelligible. @@ -478,10 +473,9 @@ dump reinterpret the markup as a molecule. ;; DONT use non-ascii characters, even if ``it works'' in Windows -(define-public chord::names-alist-american '()) -(set! chord::names-alist-american - (append +(define chord::names-alist-american + `( (((0 . 0)) . ,empty-markup) (((0 . 0) (2 . 0)) . ,empty-markup) @@ -535,8 +529,7 @@ dump reinterpret the markup as a molecule. (((0 . 0) (2 . 0) (4 . 0) (6 . -1) (1 . 0)) . (,simple-markup "9")) (((0 . 0) (2 . -1) (4 . 0) (6 . -1) (1 . 0)) . (,simple-markup "m9")) - ) - chord::names-alist-american)) + )) ;; American style chordnames use no "no", ;; but otherwise very similar to banter for now @@ -583,9 +576,8 @@ dump reinterpret the markup as a molecule. `(line-markup ,(map do-one arg-list))) -(define-public chord::names-alist-jazz '()) -(set! chord::names-alist-jazz - (append +(define chord::names-alist-jazz + (append '( ;; major chords ; major sixth chord = 6 diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 8ec3691833..e208d4eb9d 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -119,6 +119,7 @@ (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self)) (direction . 1) (font-family . number) + (font-magnification . 0.6) (font-relative-size . -3) (padding . 0.1) (kern . 0.2) diff --git a/scm/pdf.scm b/scm/pdf.scm index 004f37e9a5..07c5b145f0 100644 --- a/scm/pdf.scm +++ b/scm/pdf.scm @@ -264,15 +264,8 @@ (define (define-origin a b c ) "") (define (no-origin) "") -(define my-eval-in-module eval) - -(if (or (equal? (minor-version) "4.1") - (equal? (minor-version) "4") - (equal? (minor-version) "3.4")) - (set! my-eval-in-module eval-in-module)) - (define-public (pdf-output-expression expr port) - (display (my-eval-in-module expr this-module) port) ) + (display (eval expr this-module) port) ) ; Local Variables: diff --git a/scm/pdftex.scm b/scm/pdftex.scm index 23ed01adb8..3a287439ce 100644 --- a/scm/pdftex.scm +++ b/scm/pdftex.scm @@ -261,12 +261,6 @@ -(define my-eval-in-module eval) - -(if (or (equal? (minor-version) "4.1") - (equal? (minor-version) "4") - (equal? (minor-version) "3.4")) - (set! my-eval-in-module eval-in-module)) (define-public (pdftex-output-expression expr port) - (display (my-eval-in-module expr this-module) port) ) + (display (eval expr this-module) port) ) diff --git a/scm/tex.scm b/scm/tex.scm index 378821ac6d..cdb5cec39e 100644 --- a/scm/tex.scm +++ b/scm/tex.scm @@ -286,15 +286,8 @@ ;; no-origin not yet supported by Xdvi (define (no-origin) "") -(define my-eval-in-module eval) - -(if (or (equal? (minor-version) "4.1") - (equal? (minor-version) "4") - (equal? (minor-version) "3.4")) - (set! my-eval-in-module eval-in-module)) - (define-public (tex-output-expression expr port) - (display (my-eval-in-module expr this-module) port ) + (display (eval expr this-module) port ) )