(LilyPond-command-alist): invoke lilypond

iso. ly2dvi.

diff --git a/ChangeLog b/ChangeLog
index 828c3b12646b9f889a7f35c3a14af219e1ec6556..ac2da4f032eab70c1804f41c18cf43734b90204d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2003-09-16  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lilypond-mode.el (LilyPond-command-alist): invoke lilypond
+       iso. ly2dvi.
+
        * Documentation/user/*.itely: fixes everywhere
 
        * lily/completion-note-heads-engraver.cc: rewrite engraver:

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 46240d2c8e0a1c43b336a809d32d5de4c509dfdd..3d1ea5aa8678d9e4b8dcea304a337716cb469d02 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -64,7 +64,7 @@ In the following example, we see how we start out with a note head
 engraver.
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -94,7 +94,7 @@ engraver.
 Then a @code{Staff_symbol_engraver} adds the staff:
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -123,7 +123,7 @@ Then a @code{Staff_symbol_engraver} adds the staff:
  The @code{Clef_engraver} defines a reference point for the staff:
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -149,7 +149,7 @@ Then a @code{Staff_symbol_engraver} adds the staff:
 And the @code{Stem_engraver} adds stems:
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 
 \score { \topVoice
 \paper {
@@ -179,7 +179,7 @@ time signature, and key signature, we get a complete piece of
 notation.
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 
 \score { \topVoice }
 @end lilypond
@@ -190,7 +190,7 @@ This system works well for monophonic music, but what about
 polyphony? In polyphonic notation, many voices can share a staff.
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 \score { \context Staff << \topVoice \\ \botVoice >> }
 @end lilypond
 
@@ -204,7 +204,7 @@ context.  In polyphonic notation, many voices can share a staff:
 Similarly, more Staff contexts can be put into a single Score context.
 
 @lilypond[notexidoc]
-\include "engraver-example.ly"
+\include "engraver-example.lyinc"
 \score {
 << \new Staff << \topVoice \\ \botVoice >>
 \new Staff << \pah \\ \hoom >>

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 128e1c4d62fa73eb797f208479b1785bc7c4d6c0..6999a845047ec0bc1c71d566d1f9509027b42820 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -107,7 +107,7 @@ web-clean:
        $(MAKE) $(builddir)/share/lilypond-force
 
 
-default: $(config_h) builddir-setup $(outdir)/VERSION
+default: $(config_h) builddir-setup 
 
 builddir-setup: $(builddir)/share/lilypond-force
 

diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile
index 12b60276868ef6dde73548f68e1409d8ec948a40..91ee5588544c85583978e1f7681975beb912ea0e 100644 (file)
--- a/input/test/GNUmakefile
+++ b/input/test/GNUmakefile
@@ -3,7 +3,6 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation texinfo tex
 LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc
-
 LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
 
 ## Hmm, would this work?  No -- if we really want examples, move
@@ -11,7 +10,7 @@ LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-che
 ## examples = font20 ancient-font
 ## LOCALSTEPMAKE_TEMPLATES += ly mutopia 
 
-EXTRA_DISTFILES=features.abc
+EXTRA_DIST_FILES= $(wildcard *.lyinc)
 
 include $(depth)/make/stepmake.make 
 

diff --git a/input/test/engraver-example.ly b/input/test/engraver-example.ly
deleted file mode 100644 (file)
index bc6ceae..0000000
--- a/input/test/engraver-example.ly
+++ /dev/null
@@ -1,48 +0,0 @@
-\header {
-%    texidoc = "Include file for engraver example."
-}
-
-\paper { raggedright = ##t }
-
-topVoice = \notes \relative c'
-{
-       \key d\major
-       es8([ g] a[ fis])
-       b4
-       b16[-. b-. b-. cis-.]
-       d4->
-}
-
-
-
-botVoice = \notes \relative c'
-{
-    \key d\major
-    c8[( f] b[ a)]
-    es4
-    es16[-. es-. es-. fis-.]
-    b4->
-}
-
-
-hoom = \notes \relative c {
-    \key d \major
-    \clef bass
-    
-    g8-. r
-    r4 
-    fis8-.
-    r8
-    r4
-    b'4->
-}
-
-pah = \notes \relative c'
-{
-    r8 b-.
-    r4
-    r8 g8-.
-    r16 g-. r8
-    \clef treble
-    fis'4->
-}

diff --git a/input/test/engraver-example.lyinc b/input/test/engraver-example.lyinc
new file mode 100644 (file)
index 0000000..5e75faa
--- /dev/null
+++ b/input/test/engraver-example.lyinc
@@ -0,0 +1,47 @@
+%    texidoc = "Include file for engraver example."
+
+
+\paper { raggedright = ##t }
+
+topVoice = \notes \relative c'
+{
+       \key d\major
+       es8([ g] a[ fis])
+       b4
+       b16[-. b-. b-. cis-.]
+       d4->
+}
+
+
+
+botVoice = \notes \relative c'
+{
+    \key d\major
+    c8[( f] b[ a)]
+    es4
+    es16[-. es-. es-. fis-.]
+    b4->
+}
+
+
+hoom = \notes \relative c {
+    \key d \major
+    \clef bass
+    
+    g8-. r
+    r4 
+    fis8-.
+    r8
+    r4
+    b'4->
+}
+
+pah = \notes \relative c'
+{
+    r8 b-.
+    r4
+    r8 g8-.
+    r16 g-. r8
+    \clef treble
+    fis'4->
+}

diff --git a/lilypond-mode.el b/lilypond-mode.el
index bc10329dde7ec7043ee55bc58343248d7cc9920d..f0fe8f0d178f2d8f398974c0cd084a81ec8c28a9 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -368,11 +368,11 @@ in LilyPond-include-path."
   ;; Should expand this to include possible keyboard shortcuts which
   ;; could then be mapped to define-key and menu.
   `(
-    ("LilyPond" . ("lilypond %s" . "LaTeX"))
+    ("Raw LilyPond" . ("lilypond-bin %s" . "LaTeX"))
     ("TeX" . ("tex '\\nonstopmode\\input %t'" . "View"))
 
-    ("2Dvi" . ("ly2dvi %s" . "View"))
-    ("2PS" . ("ly2dvi -P %s" . "ViewPS"))
+    ("2Dvi" . ("lilypond %s" . "View"))
+    ("2PS" . ("lilypond -P %s" . "ViewPS"))
     ("2Midi" . ("lilypond -m %s" . "View"))
 
     ("Book" . ("lilypond-book %x" . "LaTeX"))

diff --git a/make/GNUmakefile b/make/GNUmakefile
index a659f398f87f2a6ffe75a33a84fdf22e6958a911..323589032f7cc7835ea92b0e2f7efcdc31e2612a 100644 (file)
--- a/make/GNUmakefile
+++ b/make/GNUmakefile
@@ -7,3 +7,4 @@ INSTALLATION_FILES=$(DIST_FILES)
 include $(depth)/make/stepmake.make 
 
 default: spec
+

diff --git a/mf/feta-nummer.mf b/mf/feta-nummer.mf
index c7c24fdf29dfaaf9e8898d1a7c9c733ec601e0a2..e67465daddad804f1cf1774dd9ecbaa484493706 100644 (file)
--- a/mf/feta-nummer.mf
+++ b/mf/feta-nummer.mf
@@ -9,6 +9,10 @@ input feta-params;
 
 
 
+%%%
+% TODO: make sure font size  for text and
+% font size for music both jibe with the number font.
+%%%
 
 %blot_diameter# = .4pt#;
 

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index c15cb36ec5869d27d0fe16aae375d368ff9864b9..2dc7926fbc5c98dd1e6c41e87703b0e64b01532a 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -14,6 +14,9 @@
       0))
 
 
+;; 
+;; TODO: make into markup.
+;; 
 (define-public (alteration->text-accidental-markup alteration)
   (make-smaller-markup
    (make-raise-markup

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 6b43f6b4c1144dc6862b2ea6770c7618a1930124..cf084881c9eb00e116795b18e831359eea92e4c6 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -120,7 +120,11 @@
        (Y-offset-callbacks . (,Self_alignment_interface::aligned_on_self))
        (direction . 1)
        (font-family . number)
-       (font-relative-size . -3)
+
+       ;; We must do this, other BFs in
+       ;; paper16 become too small.
+       (font-relative-size . -2)
+       (font-magnification . 0.8) 
        (kern . 0.2)
        (meta . ((interfaces . (text-interface                                                  rhythmic-grob-interface
                                                                                                bass-figure-interface item-interface

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index 238dd8e05acda341637979cbe0e4f283094c0364..8b7d8e91c161f9828d8dcace3e755c1e327d30fc 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -188,9 +188,11 @@ A=1 is right, values in between vary alignment accordingly."
 
 (define-public (musicglyph-markup paper props . rest)
   (ly:find-glyph-by-name
-   (ly:paper-get-font paper (cons '((font-name . ()) (font-family . music)) props))
-   (car rest))
-  )
+   (ly:paper-get-font paper (cons '((font-name . ())
+                                   (font-shape . *)
+                                   (font-series . *)
+                                   (font-family . music)) props))
+   (car rest)))
 
 
 (define-public (lookup-markup paper props . rest)

diff --git a/stepmake/stepmake/debian-targets.make b/stepmake/stepmake/debian-targets.make
index c9499e21f1a5834f5086233d8f500340cd959542..73d27e60c5b03eae360855c8e6f1738693ec9c10 100644 (file)
--- a/stepmake/stepmake/debian-targets.make
+++ b/stepmake/stepmake/debian-targets.make
@@ -1,7 +1,5 @@
 
 default: $(OUTCONF_FILES)
 
-$(outdir)/control: $(addprefix $(outdir)/, $(BLURBS))
-
 
 # local-dist: default

diff --git a/stepmake/stepmake/documentation-vars.make b/stepmake/stepmake/documentation-vars.make
index 28169cf8887f72013b3a37122955cf8863856e82..733252a047f09aa906e2d5cf4d95e736b5bd633d 100644 (file)
--- a/stepmake/stepmake/documentation-vars.make
+++ b/stepmake/stepmake/documentation-vars.make
@@ -1,4 +1,3 @@
-AT_FILES = $(BLURBS) # 
 at-dir = $(doc-dir)/
 at-ext = .in
 

diff --git a/stepmake/stepmake/makedir-targets.make b/stepmake/stepmake/makedir-targets.make
index 0a63d9f7ab0c3156062bada9219db31f26f242d1..6059b7adffc3ec3998aa22ecb8c2e9ce3ba1d703 100644 (file)
--- a/stepmake/stepmake/makedir-targets.make
+++ b/stepmake/stepmake/makedir-targets.make
@@ -1,3 +1,4 @@
 
 spec: $(OUTSPEC_FILES)
 
+$(OUTSPEC_FILES): $(config_make)

diff --git a/stepmake/stepmake/makedir-vars.make b/stepmake/stepmake/makedir-vars.make
index 12176831ce04f63908e4276ef5ff38e3b855ac54..3be7d7f87ecd6b77c7f9c340a24d89c8e284acaf 100644 (file)
--- a/stepmake/stepmake/makedir-vars.make
+++ b/stepmake/stepmake/makedir-vars.make
@@ -11,7 +11,6 @@ EXTRA_DIST_FILES += $(MAKE_FILES)
 # these two outdir FILES are distributed, since they make sense to have 
 # without running configure and make.
 
-AT_FILES = $(BLURBS) # 
 at-dir = $(doc-dir)/
 at-ext = .in
 

diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index 45a39890c1868a277454092d49567c2cc381a1cc..ae3ce812b700ca242d57f3a5e7b64c45e000773d 100644 (file)
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -1,5 +1,7 @@
 
-$(outdir)/%: %.in $(builddir)/config.make
+# config_make dep isn't working. Why?  
+$(outdir)/%: %.in $(config_make)
        rm -f $@
        cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
 
+

diff --git a/stepmake/stepmake/substitute-vars.make b/stepmake/stepmake/substitute-vars.make
index 6166c8b5ac6377a9fa6379230ff2d36013c5c1cc..eb45a465fc9b3ea1fe52ab34dc4599d61bfb4bf8 100644 (file)
--- a/stepmake/stepmake/substitute-vars.make
+++ b/stepmake/stepmake/substitute-vars.make
@@ -16,20 +16,3 @@ sed-atfiles = -e '\#' $(foreach i, $(AT_FILES), \
 # substitute occurrences of @VAR@ with $(VAR)
 sed-atvariables = -e '\#' $(foreach i, $(ATVARIABLES), -e 's!@$i@!$($i)!g')
 
-# these are obsolete
-
-# then remove them --hwn
-
-# use ATVARIABLES
-sed-date=sed 's!@DATE@!${date}!g'
-sed-PACKAGE = sed 's!@PACKAGE@!${PACKAGE}!g'
-sed-bash = sed 's!@BASH@!$(BASH)!'
-sed-dir-datadir = sed 's!@DIR_DATADIR@!$(DIR_DATADIR)!'
-sed-package=sed 's!@package@!${package}!g'
-sed-perl = sed 's!@PERL@!$(PERL)!'
-sed-python = sed 's!@PYTHON@!$(PYTHON)!'
-sed-sh = sed 's!@SH@!$(SH)!'
-sed-shell = sed 's!@SH@!$(SHELL)!' | sed 's!@BASH@!$(BASH)!'
-sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-sed-step-bindir = sed 's!@STEP_BINDIR@!$(pwd)/$(step-bindir)!'
-