From 70d197c9356247d1c9e35cf731196f6ff6eed90d Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 16 Sep 2003 15:17:59 +0000 Subject: [PATCH] (LilyPond-command-alist): invoke lilypond iso. ly2dvi. --- ChangeLog | 3 +++ Documentation/user/introduction.itely | 14 +++++++------- GNUmakefile.in | 2 +- input/test/GNUmakefile | 3 +-- ...graver-example.ly => engraver-example.lyinc} | 3 +-- lilypond-mode.el | 6 +++--- make/GNUmakefile | 1 + mf/feta-nummer.mf | 4 ++++ scm/chord-name.scm | 3 +++ scm/define-grobs.scm | 6 +++++- scm/new-markup.scm | 8 +++++--- stepmake/stepmake/debian-targets.make | 2 -- stepmake/stepmake/documentation-vars.make | 1 - stepmake/stepmake/makedir-targets.make | 1 + stepmake/stepmake/makedir-vars.make | 1 - stepmake/stepmake/substitute-rules.make | 4 +++- stepmake/stepmake/substitute-vars.make | 17 ----------------- 17 files changed, 38 insertions(+), 41 deletions(-) rename input/test/{engraver-example.ly => engraver-example.lyinc} (97%) diff --git a/ChangeLog b/ChangeLog index 828c3b1264..ac2da4f032 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2003-09-16 Han-Wen Nienhuys + * 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 46240d2c8e..3d1ea5aa86 100644 --- 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 128e1c4d62..6999a84504 100644 --- 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 12b6027686..91ee558854 100644 --- 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.lyinc similarity index 97% rename from input/test/engraver-example.ly rename to input/test/engraver-example.lyinc index bc6ceaefec..5e75faa63b 100644 --- a/input/test/engraver-example.ly +++ b/input/test/engraver-example.lyinc @@ -1,6 +1,5 @@ -\header { % texidoc = "Include file for engraver example." -} + \paper { raggedright = ##t } diff --git a/lilypond-mode.el b/lilypond-mode.el index bc10329dde..f0fe8f0d17 100644 --- 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 a659f398f8..323589032f 100644 --- 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 c7c24fdf29..e67465dadd 100644 --- 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 c15cb36ec5..2dc7926fbc 100644 --- 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 6b43f6b4c1..cf084881c9 100644 --- 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 238dd8e05a..8b7d8e91c1 100644 --- 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 c9499e21f1..73d27e60c5 100644 --- 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 28169cf888..733252a047 100644 --- 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 0a63d9f7ab..6059b7adff 100644 --- 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 12176831ce..3be7d7f87e 100644 --- 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 45a39890c1..ae3ce812b7 100644 --- 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 6166c8b5ac..eb45a465fc 100644 --- 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)!' - -- 2.39.2