From: hanwen <hanwen>
Date: Tue, 28 May 2002 23:10:42 +0000 (+0000)
Subject: ''
X-Git-Tag: release/1.5.59~11
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=6ace4facdc2f7be047698e6ca1896de637d045e2;p=lilypond.git
''
---
diff --git a/ChangeLog b/ChangeLog
index 78e5a84452..b174b98a45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@
2002-05-25 Heikki Junes <heikki.junes@hut.fi>
+ * lilypond-mode.el: Added Deutsch notes and fixed "Quick notes".
+
* lilypond-mode.el: Write notes with fewer keystrokes trough a
"Quick notes"-interface.
diff --git a/lily/stem.cc b/lily/stem.cc
index 9d38d54d7d..a3255a0da1 100644
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -890,5 +890,5 @@ Stem::calc_stem_info (Grob*me)
ADD_INTERFACE (Stem,"stem-interface",
"A stem",
- "adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style dir-forced");
+ "avoid-note-head adjust-if-on-staffline thickness stem-info beamed-lengths beamed-minimum-lengths lengths beam stem-shorten duration-log beaming neutral-direction stem-end-position support-head note-heads direction length style no-stem-extend flag-style dir-forced");
diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 3d426a0d08..06690d1fc5 100644
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -25,9 +25,7 @@ class Tab_note_heads_engraver : public Engraver
Link_array<Item> dot_p_arr_;
Link_array<Note_req> note_req_l_arr_;
-
Link_array<Text_script_req> tabstring_req_arr_;
-
public:
TRANSLATOR_DECLARATIONS(Tab_note_heads_engraver);
diff --git a/lilypond-mode.el b/lilypond-mode.el
index f482975c78..eb53cb48f8 100644
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -531,8 +531,8 @@ command."
(setq dutch-note-ends '("eses" "es" "" "is" "isis"))
(setq dutch-note-replacements '("" ""))
(setq finnish-note-replacements
- '(("eeses" "eses") ("ees" "es") ("aeses" "asas") ("aes" "as")
- ("beses" "bb") ("bes" "b") ("b" "h") ("bis" "his") ("bisis" "hisis")))
+ '(("eeses" "eses") ("ees" "es") ("aeses" "asas") ("aes" "as") ("b" "h")
+ ("beses" "heses") ("bes" "b") ("bis" "his") ("bisis" "hisis")))
; add more translations of the note names
(setq other-keys "()<>~")
(setq accid 0) (setq octav 0) (setq durat "") (setq dots 0)
@@ -542,7 +542,9 @@ command."
(setq note-replacements dutch-note-replacements)
(while (not (= 27 ; esc to quit
(setq x (read-char
- (format " | a[_]s[_]d | f[_]j[_]k[_]l | r with ie ,' 12345678 . 0 (<~>)\\b\\n Esc \n | c | d | e | f | g | a | b | r with %s%s%s%s"
+ (format " | a[_]s[_]d | f[_]j[_]k[_]l | r with ie ,' 12345678 . 0 (<~>)\\b\\n Esc \n | c | d | e | f | g | a | %s | r with %s%s%s%s"
+ (if (string= (car(cdr(assoc "b" note-replacements))) "h")
+ "h" "b")
(nth (+ accid 2) dutch-note-ends)
(make-string (abs octav) (if (> octav 0) ?' ?,))
durat
@@ -555,7 +557,7 @@ command."
(setq x (char-to-string x))
(cond
((and (string< x "9") (string< "0" x))
- (progn (setq durat (int-to-string (expt 2 (string-to-int x))))
+ (progn (setq durat (int-to-string (expt 2 (- (string-to-int x) 1))))
(setq dots 0)))
((string= x " ") (insert " "))
((string= x "0") (progn (setq accid 0) (setq octav 0)
@@ -582,11 +584,15 @@ command."
durat
(if (string= durat "") "" (make-string dots ?.))))
(setq accid 0) (setq octav 0) (setq durat "") (setq dots 0)))
- ((string= x "t") (setq note-replacements dutch-note-replacements)) ; t
- ((string= x "n") (setq note-replacements finnish-note-replacements)) ; n
+ ((string= x "t") (progn (setq note-replacements dutch-note-replacements)
+ (message "Selected Dutch notes")
+ (sit-for 0 750 1))) ; t
+ ((string= x "n") (progn (setq note-replacements finnish-note-replacements)
+ (message "Selected Finnish/Deutsch notes")
+ (sit-for 0 750 1))) ; n
; add more translations of the note names
((string= x "h")
- (progn (message "Insert notes with fewer key strokes. For example \"i,5.f\" produces \"fis,32. \".") (sit-for 5 0 1) (message "Add also \"a ~ a\"-ties, \"a ( ) b\"-slurs and \"< a b >\"-chords.") (sit-for 5 0 1) (message "Note names are in Du(t)ch by default. Hit 'n' for Fin(n)ish note names.") (sit-for 5 0 1) (message "Backspace deletes last note, return starts a new indented line and Esc quits.") (sit-for 5 0 1) (message "Backspace deletes last note, return starts a new indented line and Esc quits.") (sit-for 5 0 1) (message "Remember to add all more other details as well.") (sit-for 5 0 1)))
+ (progn (message "Insert notes with fewer key strokes. For example \"i,5.f\" produces \"fis,32. \".") (sit-for 5 0 1) (message "Add also \"a ~ a\"-ties, \"a ( ) b\"-slurs and \"< a b >\"-chords.") (sit-for 5 0 1) (message "Note names are in Du(t)ch by default. Hit 'n' for Fin(n)ish/Deutsch note names.") (sit-for 5 0 1) (message "Backspace deletes last note, return starts a new indented line and Esc quits.") (sit-for 5 0 1) (message "Backspace deletes last note, return starts a new indented line and Esc quits.") (sit-for 5 0 1) (message "Remember to add all other details as well.") (sit-for 5 0 1)))
)))
(define-skeleton LilyPond-insert-tag-notes
diff --git a/scm/interface-description.scm b/scm/interface-description.scm
index 258d15273d..767de6a6ef 100644
--- a/scm/interface-description.scm
+++ b/scm/interface-description.scm
@@ -36,3 +36,9 @@
"a rehearsal mark"
'(
))
+
+;;; todo: this is not typesetting info. Move to interpretation.
+(ly-add-interface
+ 'tablature-interface
+ "tablature notes"
+ '(string-tunings tab-string))