CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Jan Nieuwenhuizen <[EMAIL PROTECTED]> 05/04/19 17:18:11
Modified files:
scm : markup.scm define-markup-commands.scm
po : lilypond.pot
mf : feta-nummer-code.mf GNUmakefile
input/test : boxed-stencil.ly
elisp : lilypond-mode.el
buildscripts : mf-to-table.py
Documentation/topdocs: NEWS.tely
. : ChangeLog
Added files:
input/test : compound-time.ly circle.ly
Log message:
* input/test/compound-time.ly: New file.
* input/test/circle.ly: New file.
* Documentation/topdocs/NEWS.tely: Use them.
* input/test/boxed-stencil.ly: Remove \score.
* buildscripts/mf-to-table.py (base): Add .log dependency.
* mf/GNUmakefile: Add PFAemmentaler and PFAaybabtu dependencies on
pfa's. Add .log dependency
* scm/define-markup-commands.scm (lower): New command.
* elisp/lilypond-mode.el (LilyPond-pdf-command): New command,
make it default.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/markup.scm.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-markup-commands.scm.diff?tr1=1.86&tr2=1.87&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/po/lilypond.pot.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/feta-nummer-code.mf.diff?tr1=1.27&tr2=1.28&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/mf/GNUmakefile.diff?tr1=1.156&tr2=1.157&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/compound-time.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/circle.ly?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/boxed-stencil.ly.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/elisp/lilypond-mode.el.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/buildscripts/mf-to-table.py.diff?tr1=1.75&tr2=1.76&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.3476&tr2=1.3477&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.3476 lilypond/ChangeLog:1.3477
--- lilypond/ChangeLog:1.3476 Tue Apr 19 13:22:19 2005
+++ lilypond/ChangeLog Tue Apr 19 17:18:10 2005
@@ -1,3 +1,23 @@
+2005-04-19 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+
+ * input/test/compound-time.ly: New file.
+
+ * input/test/circle.ly: New file.
+
+ * Documentation/topdocs/NEWS.tely: Use them.
+
+ * input/test/boxed-stencil.ly: Remove \score.
+
+ * buildscripts/mf-to-table.py (base): Add .log dependency.
+
+ * mf/GNUmakefile: Add PFAemmentaler and PFAaybabtu dependencies on
+ pfa's. Add .log dependency
+
+ * scm/define-markup-commands.scm (lower): New command.
+
+ * elisp/lilypond-mode.el (LilyPond-pdf-command): New command,
+ make it default.
+
2005-04-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
* lily/dynamic-engraver.cc (acknowledge_grob): add note-column
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.28
lilypond/Documentation/topdocs/NEWS.tely:1.29
--- lilypond/Documentation/topdocs/NEWS.tely:1.28 Mon Apr 18 20:47:15 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Tue Apr 19 17:18:10 2005
@@ -58,24 +58,16 @@
music expression as indented Scheme code.
@item
-A plus sign was added to the number font.
+A plus sign was added to the number font. This enables printing of
+compound time signatures
+
[EMAIL PROTECTED]
@item
A new @code{\circle} markup command allows for all kinds of circled
texts
[EMAIL PROTECTED],relative=2,raggedright,fragment]
-c1
-\set Score.markFormatter
- = #(lambda (mark context)
- (make-circle-markup (format-mark-numbers mark context)))
-\mark \default
-c2 d^\markup{\circle \finger "2"}
-\override Score.BarNumber #'break-visibility = #all-visible
-\override Score.BarNumber #'print-function
- = #(make-stencil-circler 0.1 0.25 Text_interface::print)
[EMAIL PROTECTED] lilypond
-
[EMAIL PROTECTED]
@item
String numbers are now printed on chords as well
@@ -139,7 +131,7 @@
well.
See
@ifhtml
[EMAIL PROTECTED]/../user/out-www/lilypond/Point-and-click.html,Point and click}
[EMAIL PROTECTED]/../user/out-www/lilypond/Point-and-click.html,Point and
click}.
@end ifhtml
@ifnothtml
the section Point and click in he user manual.
@@ -212,10 +204,11 @@
@item
LilyPond now uses FreeType read the Feta font as an OpenType
-font. This is cleaner design and more robust. A recent version of
-FontForge (11122004 or newer) and Freetype is required.
+font. This is cleaner design and more robust. Recent versions of
+FontForge (20041211 or newer) and Freetype are required. As a result,
-As a result, the SVG backend is now a fully functional backend.
[EMAIL PROTECTED]
+the SVG backend is now a fully functional backend.
@item
A new script, @code{\espressivo} has been added, for a combination of
@@ -282,8 +275,7 @@
@noindent
This will set stem directions and put the cue notes in the @code{cue}
[EMAIL PROTECTED]
-
[EMAIL PROTECTED]
@item Stemlets, short stems over beamed rests, have been added.
Index: lilypond/buildscripts/mf-to-table.py
diff -u lilypond/buildscripts/mf-to-table.py:1.75
lilypond/buildscripts/mf-to-table.py:1.76
--- lilypond/buildscripts/mf-to-table.py:1.75 Sat Feb 26 12:29:40 2005
+++ lilypond/buildscripts/mf-to-table.py Tue Apr 19 17:18:10 2005
@@ -321,7 +321,7 @@
write_global_lisp_table (open (global_lisp_nm, 'w'), g)
if depfile_nm:
write_deps (open (depfile_nm, 'wb'), deps,
- [base + '.dvi', base + '.pfa', base + '.pfb',
- texfile_nm])
+ [base + '.log', base + '.dvi', base + '.pfa',
+ base + '.pfb', texfile_nm])
if lyfile_nm:
write_fontlist (open (lyfile_nm, 'w'), g, m)
Index: lilypond/elisp/lilypond-mode.el
diff -u lilypond/elisp/lilypond-mode.el:1.15
lilypond/elisp/lilypond-mode.el:1.16
--- lilypond/elisp/lilypond-mode.el:1.15 Sun Apr 10 09:26:50 2005
+++ lilypond/elisp/lilypond-mode.el Tue Apr 19 17:18:10 2005
@@ -1,15 +1,15 @@
-;;;
-;;; lilypond-mode.el --- Major mode for editing GNU LilyPond music scores
-;;;
-;;; source file of the GNU LilyPond music typesetter
-;;;
-;;; (c) 1999--2005 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
-;;;
-;;; Changed 2001--2003 Heikki Junes <[EMAIL PROTECTED]>
-;;; * Add PS-compilation, PS-viewing and MIDI-play (29th Aug 2001)
-;;; * Keyboard shortcuts (12th Sep 2001)
-;;; * Inserting tags, inspired on sgml-mode (11th Oct 2001)
-;;; * Autocompletion & Info (23rd Nov 2002)
+;;;;
+;;;; lilypond-mode.el --- Major mode for editing GNU LilyPond music scores
+;;;;
+;;;; source file of the GNU LilyPond music typesetter
+;;;;
+;;;; (c) 1999--2005 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
+;;;;
+;;;; Changed 2001--2003 Heikki Junes <[EMAIL PROTECTED]>
+;;;; * Add PS-compilation, PS-viewing and MIDI-play (29th Aug 2001)
+;;;; * Keyboard shortcuts (12th Sep 2001)
+;;;; * Inserting tags, inspired on sgml-mode (11th Oct 2001)
+;;;; * Autocompletion & Info (23rd Nov 2002)
;;; Inspired on auctex
@@ -19,7 +19,7 @@
(require 'easymenu)
(require 'compile)
-(defconst LilyPond-version "2.3.17"
+(defconst LilyPond-version "2.5.20"
"`LilyPond-mode' version number.")
(defconst LilyPond-help-address "[email protected]"
@@ -327,18 +327,24 @@
:group 'LilyPond
:type 'string)
-(defcustom LilyPond-xdvi-command "xdvi"
+(defcustom LilyPond-dvi-command "xdvi"
"Command used to display DVI files."
:group 'LilyPond
:type 'string)
-(defcustom LilyPond-gv-command "gv --watch"
+(defcustom LilyPond-ps-command "gv --watch"
"Command used to display PS files."
:group 'LilyPond
:type 'string)
+(defcustom LilyPond-pdf-command "xpdf"
+ "Command used to display PDF files."
+
+ :group 'LilyPond
+ :type 'string)
+
(defcustom LilyPond-midi-command "timidity"
"Command used to play MIDI files."
@@ -416,23 +422,21 @@
;; Should expand this to include possible keyboard shortcuts which
;; could then be mapped to define-key and menu.
`(
- ("LilyPond" . (,(concat LilyPond-lilypond-command " -ftex %s") "%s" "%l"
"View"))
- ("TeX" . ("tex '\\nonstopmode\\input %t'" "%t" "%d" "View"))
-
- ("2Dvi" . (,(concat LilyPond-lilypond-command " -f tex %s") "%s" "%d"
"LaTeX"))
- ("2PS" . (,(concat LilyPond-lilypond-command " -f ps %s") "%s" "%p"
"ViewPS"))
+ ("LilyPond" . (,(concat LilyPond-lilypond-command " %s") "%s" "%l" "View"))
+ ("TeX" . ("tex '\\nonstopmode\\input %t'" "%t" "%d" "ViewDVI"))
+ ("2Dvi" . (,(concat LilyPond-lilypond-command " -b tex %s") "%s" "%d"
"LaTeX"))
+ ("2PS" . (,(concat LilyPond-lilypond-command "-b ps %s") "%s" "%p"
"ViewPS"))
("2Midi" . (,(concat LilyPond-lilypond-command " -m %s") "%s" "%m" "Midi"))
("2Gnome" . (,(concat LilyPond-lilypond-command " -b gnome %s")))
("Book" . ("lilypond-book %x" "%x" "%l" "LaTeX"))
- ("LaTeX" . ("latex '\\nonstopmode\\input %l'" "%l" "%d" "View"))
-
- ;; point-n-click (arg: exits upop USR1)
- ("SmartView" . ("xdvi %d"))
+ ("LaTeX" . ("latex '\\nonstopmode\\input %l'" "%l" "%d" "ViewDVI"))
;; refreshes when kicked USR1
- ("View" . (,(concat LilyPond-xdvi-command " %d")))
- ("ViewPS" . (,(concat LilyPond-gv-command " %p")))
+ ("View" . (,(concat LilyPond-pdf-command " %f")))
+ ("ViewPDF" . (,(concat LilyPond-pdf-command " %f")))
+ ("ViewDVI" . (,(concat LilyPond-dvi-command " %d")))
+ ("ViewPS" . (,(concat LilyPond-ps-command " %p")))
;; The following are refreshed in LilyPond-command:
;; - current-midi depends on cursor position and
@@ -468,6 +472,7 @@
("%s" . ".ly")
("%t" . ".tex")
("%d" . ".dvi")
+ ("%f" . ".pdf")
("%p" . ".ps")
("%l" . ".tex")
("%x" . ".tely")
@@ -571,26 +576,22 @@
(defun LilyPond-command-formatmidi ()
"Format the midi output of the current document."
(interactive)
- (LilyPond-command (LilyPond-command-menu "2Midi") 'LilyPond-get-master-file)
-)
+ (LilyPond-command (LilyPond-command-menu "2Midi") 'LilyPond-get-master-file))
-(defun LilyPond-command-smartview ()
- "View the dvi output of current document."
+(defun LilyPond-command-view ()
+ "View the output of current document."
(interactive)
- (LilyPond-command (LilyPond-command-menu "SmartView")
'LilyPond-get-master-file)
-)
+ (LilyPond-command-viewpdf))
-(defun LilyPond-command-view ()
- "View the dvi output of current document."
+(defun LilyPond-command-viewpdf ()
+ "View the ps output of current document."
(interactive)
- (LilyPond-command (LilyPond-command-menu "View") 'LilyPond-get-master-file)
-)
+ (LilyPond-command (LilyPond-command-menu "ViewPDF")
'LilyPond-get-master-file))
(defun LilyPond-command-viewps ()
"View the ps output of current document."
(interactive)
- (LilyPond-command (LilyPond-command-menu "ViewPS") 'LilyPond-get-master-file)
-)
+ (LilyPond-command (LilyPond-command-menu "ViewPS")
'LilyPond-get-master-file))
;; FIXME, this is broken
(defun LilyPond-region-file (begin end)
@@ -758,8 +759,7 @@
(define-key LilyPond-mode-map "\C-c\C-d" 'LilyPond-command-formatdvi)
(define-key LilyPond-mode-map "\C-c\C-f" 'LilyPond-command-formatps)
(define-key LilyPond-mode-map "\C-c\C-g" 'LilyPond-command-formatgnome)
- (define-key LilyPond-mode-map "\C-c\C-s" 'LilyPond-command-smartview)
- (define-key LilyPond-mode-map "\C-c\C-v" 'LilyPond-command-view)
+ (define-key LilyPond-mode-map "\C-c\C-s" 'LilyPond-command-view)
(define-key LilyPond-mode-map "\C-c\C-p" 'LilyPond-command-viewps)
(define-key LilyPond-mode-map [(control c) return]
'LilyPond-command-current-midi)
(define-key LilyPond-mode-map [(control c) (control return)]
'LilyPond-command-all-midi)
@@ -983,7 +983,6 @@
'([ "LaTeX" (LilyPond-command (LilyPond-command-menu "LaTeX")
'LilyPond-get-master-file) ])
'([ "Kill jobs" LilyPond-kill-jobs t])
'("-----")
- '([ "SmartView" LilyPond-command-smartview t])
'([ "View" LilyPond-command-view t])
'([ "ViewPS" LilyPond-command-viewps t])
'("-----")
@@ -1099,7 +1098,7 @@
VARIABLES
LilyPond-command-alist\t\talist from name to command
-LilyPond-xdvi-command\t\tcommand to display dvi files -- bit superfluous"
+LilyPond-dvi-command\t\tcommand to display dvi files -- bit superfluous"
(interactive)
;; set up local variables
(kill-all-local-variables)
Index: lilypond/input/test/boxed-stencil.ly
diff -u lilypond/input/test/boxed-stencil.ly:1.10
lilypond/input/test/boxed-stencil.ly:1.11
--- lilypond/input/test/boxed-stencil.ly:1.10 Wed Mar 30 12:22:10 2005
+++ lilypond/input/test/boxed-stencil.ly Tue Apr 19 17:18:10 2005
@@ -1,29 +1,28 @@
\version "2.4.0"
\header {
-texidoc = "@cindex Boxed Stencil
+ texidoc = "@cindex Boxed Stencil
The @code{print-function} can be overridden to draw a box around an arbitrary
grob. " }
- \score { \relative c'' {
+\layout{raggedright = ##t}
+\relative c'' {
- \override TextScript #'print-function =
- #(make-stencil-boxer 0.1 0.3 Text_interface::print)
+ \override TextScript #'print-function =
+ #(make-stencil-boxer 0.1 0.3 Text_interface::print)
- c'4^"foo"
+ c'4^"foo"
-\override Stem #'print-function =
- #(make-stencil-boxer 0.05 0.25 Stem::print)
+ \override Stem #'print-function =
+ #(make-stencil-boxer 0.05 0.25 Stem::print)
-\override Score.RehearsalMark #'print-function =
- #(make-stencil-boxer 0.15 0.3 Text_interface::print)
- b8
-\revert Stem #'print-function
+ \override Score.RehearsalMark #'print-function =
+ #(make-stencil-boxer 0.15 0.3 Text_interface::print)
+ b8
+ \revert Stem #'print-function
- c4. c4 \mark "F" c1
- }
-\layout{raggedright = ##t}
+ c4. c4 \mark "F" c1
}
Index: lilypond/mf/GNUmakefile
diff -u lilypond/mf/GNUmakefile:1.156 lilypond/mf/GNUmakefile:1.157
--- lilypond/mf/GNUmakefile:1.156 Sun Apr 17 21:16:31 2005
+++ lilypond/mf/GNUmakefile Tue Apr 19 17:18:10 2005
@@ -17,11 +17,12 @@
STAFF_SIZES = 11 13 14 16 18 20 23 26
BRACES = a b c d e f g h i
+PFA_PREFIX = PFA
OTF_FILES = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.otf)\
$(outdir)/aybabtu.otf
-PFA_OTF_FILES = $(STAFF_SIZES:%=$(outdir)/PFAemmentaler-%.pfa)\
- $(outdir)/PFAaybabtu.pfa
+PFA_OTF_FILES = $(STAFF_SIZES:%=$(outdir)/$(PFA_PREFIX)emmentaler-%.pfa)\
+ $(outdir)/$(PFA_PREFIX)aybabtu.pfa
PE_SCRIPTS = $(STAFF_SIZES:%=$(outdir)/emmentaler-%.pe)\
$(STAFF_SIZES:%=$(outdir)/emmentaler-%.dep)
OTF_TABLES = $(STAFF_SIZES:%=$(outdir)/feta%.otf-table)\
@@ -57,18 +58,63 @@
# 2. are not included with teTeX
#
-$(outdir)/%.cff.ps $(outdir)/PFA%.pfa $(outdir)/%.cff $(outdir)/%.otf
$(outdir)/%.svg: $(outdir)/%.pe
+$(outdir)/%.cff.ps $(outdir)/$(PFA_PREFIX)%.pfa $(outdir)/%.cff
$(outdir)/%.otf $(outdir)/%.svg: $(outdir)/%.pe
(cd $(outdir) && $(FONTFORGE) -script $(notdir $<))
$(PYTHON) $(buildscript-dir)/ps-embed-cff.py $(basename $<).cff `cat
$(basename $<).fontname` $(basename $<).cff.ps
-rm $(outdir)/*.scale.pfa
+# ugh, this does not work
+$(outdir)/%.pfa: $(outdir)/%.log
+$(outdir)/feta-alphabet%.pfa: $(outdir)/feta-alphabet%.log
+$(outdir)/emmentaler-%.otf $(outdir)/$(PFA_PREFIX)emmentaler-%.pfa
$(outdir)/emmentaler%.cff $(outdir)/emmentaler%.svg: $(outdir)/feta%.pfa
$(outdir)/feta-alphabet%.pfa $(outdir)/parmesan%.pfa
+
+# AARGH?
+
+$(outdir)/feta11.pfa: $(outdir)/feta11.log
+$(outdir)/feta13.pfa: $(outdir)/feta13.log
+$(outdir)/feta14.pfa: $(outdir)/feta14.log
+$(outdir)/feta16.pfa: $(outdir)/feta16.log
+$(outdir)/feta18.pfa: $(outdir)/feta18.log
+$(outdir)/feta20.pfa: $(outdir)/feta20.log
+$(outdir)/feta23.pfa: $(outdir)/feta23.log
+$(outdir)/feta26.pfa: $(outdir)/feta26.log
+
+$(outdir)/feta-alphabet11.pfa: $(outdir)/feta-alphabet11.log
+$(outdir)/feta-alphabet13.pfa: $(outdir)/feta-alphabet13.log
+$(outdir)/feta-alphabet14.pfa: $(outdir)/feta-alphabet14.log
+$(outdir)/feta-alphabet16.pfa: $(outdir)/feta-alphabet16.log
+$(outdir)/feta-alphabet18.pfa: $(outdir)/feta-alphabet18.log
+$(outdir)/feta-alphabet20.pfa: $(outdir)/feta-alphabet20.log
+$(outdir)/feta-alphabet23.pfa: $(outdir)/feta-alphabet23.log
+$(outdir)/feta-alphabet26.pfa: $(outdir)/feta-alphabet26.log
+
+$(outdir)/parmesan11.pfa: $(outdir)/parmesan11.log
+$(outdir)/parmesan13.pfa: $(outdir)/parmesan13.log
+$(outdir)/parmesan14.pfa: $(outdir)/parmesan14.log
+$(outdir)/parmesan16.pfa: $(outdir)/parmesan16.log
+$(outdir)/parmesan18.pfa: $(outdir)/parmesan18.log
+$(outdir)/parmesan20.pfa: $(outdir)/parmesan20.log
+$(outdir)/parmesan23.pfa: $(outdir)/parmesan23.log
+$(outdir)/parmesan26.pfa: $(outdir)/parmesan26.log
+
+$(outdir)/$(PFA_PREFIX)emmentaler-11.otf
$(outdir)/$(PFA_PREFIX)emmentaler-11.pfa: $(outdir)/feta11.pfa
$(outdir)/feta-alphabet11.pfa $(outdir)/parmesan11.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-13.otf
$(outdir)/$(PFA_PREFIX)emmentaler-13.pfa: $(outdir)/feta13.pfa
$(outdir)/feta-alphabet13.pfa $(outdir)/parmesan13.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-14.otf
$(outdir)/$(PFA_PREFIX)emmentaler-14.pfa: $(outdir)/feta14.pfa
$(outdir)/feta-alphabet14.pfa $(outdir)/parmesan14.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-16.otf
$(outdir)/$(PFA_PREFIX)emmentaler-16.pfa: $(outdir)/feta16.pfa
$(outdir)/feta-alphabet16.pfa $(outdir)/parmesan16.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-18.otf
$(outdir)/$(PFA_PREFIX)emmentaler-18.pfa: $(outdir)/feta18.pfa
$(outdir)/feta-alphabet18.pfa $(outdir)/parmesan18.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-20.otf
$(outdir)/$(PFA_PREFIX)emmentaler-20.pfa: $(outdir)/feta20.pfa
$(outdir)/feta-alphabet20.pfa $(outdir)/parmesan20.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-23.otf
$(outdir)/$(PFA_PREFIX)emmentaler-23.pfa: $(outdir)/feta23.pfa
$(outdir)/feta-alphabet23.pfa $(outdir)/parmesan23.pfa
+$(outdir)/$(PFA_PREFIX)emmentaler-26.otf
$(outdir)/$(PFA_PREFIX)emmentaler-26.pfa: $(outdir)/feta26.pfa
$(outdir)/feta-alphabet26.pfa $(outdir)/parmesan26.pfa
+
$(outdir)/%.otf-table: $(outdir)/%.lisp $(if $(findstring brace,$<),,$(subst
feta,parmesan,$<))
cat $< \
$(if $(findstring brace,$<),,$(subst feta,parmesan,$<)) \
$(if $(findstring brace,$<),,$(subst feta,feta-alphabet,$<)) >
$@
-$(outdir)/aybabtu.otf $(outdir)/PFAaybabtu.pfa: $(outdir)/aybabtu.subfonts
$(outdir)/aybabtu.fontname $(outdir)/aybabtu.otf-table
$(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe
+$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa:
$(outdir)/aybabtu.subfonts $(outdir)/aybabtu.fontname
$(outdir)/aybabtu.otf-table $(outdir)/aybabtu.otf-gtable $(outdir)/aybabtu.pe
+
+$(outdir)/aybabtu.otf $(outdir)/$(PFA_PREFIX)aybabtu.pfa $(outdir)/aybabtu.cff
$(outdir)/aybabtu.svg: $(BRACES:%=$(outdir)/feta-braces-%.pfa)
$(outdir)/aybabtu.fontname:
echo -n 'aybabtu' > $@
@@ -186,10 +232,10 @@
for i in $(FETA_FONTS); do echo $$i $$i '<'$$i.pfa; done > $@
for i in $(STAFF_SIZES); do\
echo "Emmentaler-$$i Emmentaler-$$i <emmentaler-$$i.cff.ps";\
- echo "PFAEmmentaler-$$i PFAEmmentaler-$$i
<PFAemmentaler-$$i.pfa";\
+ echo "$(PFA_PREFIX)Emmentaler-$$i $(PFA_PREFIX)Emmentaler-$$i
<$(PFA_PREFIX)emmentaler-$$i.pfa";\
done >> $@
echo "Aybabtu-Regular Aybabtu-Regular <aybabtu.cff.ps" >> $@
- echo "PFAAybabtu-Regular PFAAybabtu-Regular <aybabtu.cff.ps" >> $@
+ echo "$(PFA_PREFIX)Aybabtu-Regular $(PFA_PREFIX)Aybabtu-Regular
<aybabtu.cff.ps" >> $@
#
# FIXME: needed for make web on Debian/unstable -- not in any other .map file
echo "FreeSans FreeSans <FreeSans.ttf" >> $@
@@ -199,10 +245,10 @@
for i in $(FETA_FONTS); do echo "/$$i ($$i.pfa);" ; done > $@
for i in $(STAFF_SIZES); do \
echo "/Emmentaler-$$i (emmentaler-$$i.cff.ps);" ; \
- echo "/PFAEmmentaler-$$i (PFAemmentaler-$$i.pfa);" \
+ echo "/$(PFA_PREFIX)Emmentaler-$$i
($(PFA_PREFIX)emmentaler-$$i.pfa);" \
done >> $@
echo "/Aybabtu (aybabtu.cff.ps);" >> $@
- echo "/PFAAybabtu (PFAaybabtu.pfa);" >> $@
+ echo "/$(PFA_PREFIX)Aybabtu ($(PFA_PREFIX)aybabtu.pfa);" >> $@
local-clean:
rm -f mfplain.mem mfplain.log
Index: lilypond/mf/feta-nummer-code.mf
diff -u lilypond/mf/feta-nummer-code.mf:1.27
lilypond/mf/feta-nummer-code.mf:1.28
--- lilypond/mf/feta-nummer-code.mf:1.27 Fri Apr 8 19:01:31 2005
+++ lilypond/mf/feta-nummer-code.mf Tue Apr 19 17:18:10 2005
@@ -249,9 +249,10 @@
fet_endchar;
-code := 42;
+code := 42; % , 43
+
fet_beginchar ("Plus", "plus");
- set_char_box (0, .5 height#, -0.25 height#, 0.75 height#);
+ set_char_box (0, .5 height#, -0.25 height#, 0.75 height#);
save hthick, vthick, size, outer_hsize, outer_vsize;
@@ -270,11 +271,11 @@
z2 = (centerx + hthick/2, h);
labels(1,2);
draw_rounded_block (z1, z2, hthick);
- draw_rounded_block ((0, centery - vthick/2), (w, (centery +
vthick/2)), vthick);
+ draw_rounded_block ((0, centery - vthick/2),
+ (w, (centery + vthick/2)), vthick);
fet_endchar;
-
code := 43; % , = 44
fet_beginchar ("Numeral comma", "comma");
Index: lilypond/po/lilypond.pot
diff -u lilypond/po/lilypond.pot:1.70 lilypond/po/lilypond.pot:1.71
--- lilypond/po/lilypond.pot:1.70 Mon Apr 18 18:22:35 2005
+++ lilypond/po/lilypond.pot Tue Apr 19 17:18:10 2005
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-18 14:27+0200\n"
+"POT-Creation-Date: 2005-04-18 20:56+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -53,13 +53,13 @@
msgid "It comes with NO WARRANTY."
msgstr ""
-#: lilylib.py:125 warn.cc:44 input.cc:79 lily/input.cc:79
+#: lilylib.py:125 warn.cc:44 input.cc:79 lily/input.cc:79 flower/warn.cc:44
#, c-format, python-format
msgid "warning: %s"
msgstr ""
#: lilylib.py:128 warn.cc:50 input.cc:85 input.cc:93 lily/input.cc:85
-#: lily/input.cc:93
+#: lily/input.cc:93 flower/warn.cc:50
#, c-format, python-format
msgid "error: %s"
msgstr ""
@@ -541,59 +541,62 @@
msgid "Wrote `%s'"
msgstr ""
-#: getopt-long.cc:143
+#: getopt-long.cc:143 flower/getopt-long.cc:143
#, c-format
msgid "option `%s' requires an argument"
msgstr ""
-#: getopt-long.cc:147
+#: getopt-long.cc:147 flower/getopt-long.cc:147
#, c-format
msgid "option `%s' doesn't allow an argument"
msgstr ""
-#: getopt-long.cc:151
+#: getopt-long.cc:151 flower/getopt-long.cc:151
#, c-format
msgid "unrecognized option: `%s'"
msgstr ""
-#: getopt-long.cc:158
+#: getopt-long.cc:158 flower/getopt-long.cc:158
#, c-format
msgid "invalid argument `%s' to option `%s'"
msgstr ""
-#: warn.cc:64 grob.cc:632 lily/grob.cc:632
+#: warn.cc:64 grob.cc:632 lily/grob.cc:632 flower/warn.cc:64
#, c-format
msgid "programming error: %s"
msgstr ""
-#: warn.cc:65
+#: warn.cc:65 flower/warn.cc:65
msgid "continuing, cross fingers"
msgstr ""
#.
#. todo i18n.
#.
-#: kpath.c:142
+#.
+#. todo i18n.
+#.
+#: kpath.c:142 kpath-guile/kpath.c:142
#, c-format
msgid "can't dlopen: %s: %s"
msgstr ""
-#: kpath.c:143
+#: kpath.c:143 kpath-guile/kpath.c:143
#, c-format
msgid "install package: %s or %s"
msgstr ""
-#: kpath.c:156
+#: kpath.c:156 kpath-guile/kpath.c:156
#, c-format
msgid "no such symbol: %s: %s"
msgstr ""
-#: kpath.c:179
+#: kpath.c:179 kpath-guile/kpath.c:179
#, c-format
msgid "error opening kpathsea library"
msgstr ""
-#: kpath.c:180
+#: kpath.c:180 kpath-guile/kpath.c:180
#, c-format
msgid "aborting"
msgstr ""
Index: lilypond/scm/define-markup-commands.scm
diff -u lilypond/scm/define-markup-commands.scm:1.86
lilypond/scm/define-markup-commands.scm:1.87
--- lilypond/scm/define-markup-commands.scm:1.86 Mon Apr 18 13:27:48 2005
+++ lilypond/scm/define-markup-commands.scm Tue Apr 19 17:18:10 2005
@@ -513,10 +513,18 @@
letter 'A'."
(ly:get-glyph (ly:paper-get-font layout props) num))
+(def-markup-command (lower layout props amount arg) (number? markup?)
+ "
+Lower @var{arg}, by the distance @var{amount}.
+A negative @var{amount} indicates raising, see also @code{\raise}.
+"
+ (ly:stencil-translate-axis (interpret-markup layout props arg)
+ (- amount) Y))
+
(def-markup-command (raise layout props amount arg) (number? markup?)
"
-This raises @var{arg}, by the distance @var{amount}.
-A negative @var{amount} indicates lowering:
+Raise @var{arg}, by the distance @var{amount}.
+A negative @var{amount} indicates lowering, see also @code{\lower}.
@c
@lilypond[verbatim,fragment,relative=1]
c1^\\markup { C \\small \\raise #1.0 \\bold { \"9/7+\" }}
@@ -530,8 +538,7 @@
positions it next to the staff cancels any shift made with
@code{\\raise}. For vertical positioning, use the @code{padding}
and/or @code{extra-offset} properties. "
- (ly:stencil-translate-axis (interpret-markup layout props arg)
- amount Y))
+ (ly:stencil-translate-axis (interpret-markup layout props arg) amount Y))
(def-markup-command (fraction layout props arg1 arg2) (markup? markup?)
"Make a fraction of two markups."
Index: lilypond/scm/markup.scm
diff -u lilypond/scm/markup.scm:1.4 lilypond/scm/markup.scm:1.5
--- lilypond/scm/markup.scm:1.4 Wed Apr 13 13:18:09 2005
+++ lilypond/scm/markup.scm Tue Apr 19 17:18:10 2005
@@ -148,13 +148,15 @@
(string->symbol (string-append "make-" (symbol->string (keyword->symbol
key)) "-markup")))
(define (compile-markup-expression expr)
- "Return two values: the first complete canonical markup expression found in
`expr',
-e.g. (make-COMMAND-markup arg1 arg2 ...), and the rest expression."
+ "Return two values: the first complete canonical markup expression
+ found in `expr', e.g. (make-COMMAND-markup arg1 arg2 ...),
+ and the rest expression."
(cond ((and (pair? expr)
(keyword? (car expr)))
;; expr === (#:COMMAND arg1 ...)
(let* ((command (symbol->string (keyword->symbol (car expr))))
- (sig (markup-command-signature (car (lookup-markup-command
command))))
+ (sig (markup-command-signature
+ (car (lookup-markup-command command))))
(sig-len (length sig)))
(do ((i 0 (1+ i))
(args '() args)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
