update.

diff --git a/ChangeLog b/ChangeLog
index ba427b3ca200d0f812473d69c604e67074f4257f..eea9b1ea84c9f8849727bdd60c4fcec60d28bfe9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-12-01  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * NEWS: update.
+
        * lily/font-interface.cc (get-font): take alist chain i.s.o. alist
        argument
        
@@ -17,7 +19,6 @@
        format for parser.
 
        * lily/lexer.ll: preliminary \markup syntax. 
-       
 
 2002-11-30  Heikki Junes <hjunes@cc.hut.fi>
 

diff --git a/NEWS b/NEWS
index d291fc40e247150dba954ffd991069acfb4a2aa5..9023c8953077046d1663d3e089103ab6ab137927 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,44 @@ LilyPond identifiers.
 
 * Music types cleaned up and Schemified.  
 
+* New syntax for chords:
+
+       << PITCHES >>
+
+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.
+
+* Zigzagged glissandi
+
+* XML music output.
+
+* Preliminary Sodipodi/SVG output
+
+* Cluster support. Syntax:
+
+       NOTE-\openCluster
+       ..
+       NOTE-\closeCluster
+
+* 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.
+
+       NOTE-\groupOpen
+               ..
+       NOTE-\groupClose
+
 New features in 1.6 since 1.4
 
 * Support for figured bass and tablature.

diff --git a/scm/c++.scm b/scm/c++.scm
index d9ac2d5339e07a27a94773e4fc3be5dc05d96cb2..9231f51b7cd310119567c12b34086591e81d2b66 100644 (file)
--- a/scm/c++.scm
+++ b/scm/c++.scm
@@ -31,7 +31,8 @@
   (or (number? x) (string? x)))
 
 (define-public (markup? x)
-  (or (string? x) (list? x)))
+  (or (string? x) (list? x)
+      (new-markup? x)))
 
 (define-public (scheme? x) #t)
 

diff --git a/scm/sodipodi.scm b/scm/sodipodi.scm
index 9f299d78e4986879bd614a9e668b5efc155aa671..31cadb6123cc5232c7a5bcc70bd7e0d06c736579 100644 (file)
--- a/scm/sodipodi.scm
+++ b/scm/sodipodi.scm
@@ -17,7 +17,6 @@
 
 (debug-enable 'backtrace)
 
-
 (define-module (scm sodipodi))
 (define this-module (current-module))
 
@@ -25,9 +24,6 @@
  (guile)
  (lily))
 
-
-
-
 ;;; Lily output interface --- cleanup and docme
 
 ;;; Bare minimum interface for \score { \notes c } }
@@ -51,8 +47,6 @@
 ;;;    comment
 ;;;    stop-last-system
 
-
-
 ;; Module entry
 ;;(define-public (sodipodi-output-expression expr port)
 ;;  (display (eval expr this-module) port))
@@ -60,7 +54,6 @@
 (define-public (sodipodi-output-expression expr port)
   (display (dispatch expr) port))
 
-
 (define (dispatch expr)
   (let ((keyword (car expr)))
     (cond