OLD | NEW |
1 ;;;; This file is part of LilyPond, the GNU music typesetter. | 1 ;;;; This file is part of LilyPond, the GNU music typesetter. |
2 ;;;; | 2 ;;;; |
3 ;;;; Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org> | 3 ;;;; Copyright (C) 1998--2015 Jan Nieuwenhuizen <janneke@gnu.org> |
4 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl> | 4 ;;;; Han-Wen Nienhuys <hanwen@xs4all.nl> |
5 ;;;; | 5 ;;;; |
6 ;;;; LilyPond is free software: you can redistribute it and/or modify | 6 ;;;; LilyPond is free software: you can redistribute it and/or modify |
7 ;;;; it under the terms of the GNU General Public License as published by | 7 ;;;; it under the terms of the GNU General Public License as published by |
8 ;;;; the Free Software Foundation, either version 3 of the License, or | 8 ;;;; the Free Software Foundation, either version 3 of the License, or |
9 ;;;; (at your option) any later version. | 9 ;;;; (at your option) any later version. |
10 ;;;; | 10 ;;;; |
(...skipping 1824 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1835 GrandStaff) | 1835 GrandStaff) |
1836 (piano-cautionary #f | 1836 (piano-cautionary #f |
1837 (Staff ,(make-accidental-rule 'same-octave 0)) | 1837 (Staff ,(make-accidental-rule 'same-octave 0)) |
1838 (Staff ,(make-accidental-rule 'any-octave 0) | 1838 (Staff ,(make-accidental-rule 'any-octave 0) |
1839 ,(make-accidental-rule 'same-octave 1) | 1839 ,(make-accidental-rule 'same-octave 1) |
1840 GrandStaff | 1840 GrandStaff |
1841 ,(make-accidental-rule 'any-octave 0) | 1841 ,(make-accidental-rule 'any-octave 0) |
1842 ,(make-accidental-rule 'same-octave 1)) | 1842 ,(make-accidental-rule 'same-octave 1)) |
1843 GrandStaff) | 1843 GrandStaff) |
1844 | 1844 |
| 1845 ;; Accidentals on a choir staff for simultaneous reading of the |
| 1846 ;; own voice and the surrounding choir. Similar to piano, except |
| 1847 ;; that the first alteration within a voice (as opposed to on the |
| 1848 ;; same staff) is always printed. |
| 1849 (choral #f |
| 1850 (Voice ,(make-accidental-rule 'same-octave 0) |
| 1851 Staff |
| 1852 ,(make-accidental-rule 'same-octave 1) |
| 1853 ,(make-accidental-rule 'any-octave 0) |
| 1854 ,(make-accidental-rule 'same-octave 1) |
| 1855 ChoirStaff |
| 1856 ,(make-accidental-rule 'any-octave 0) |
| 1857 ,(make-accidental-rule 'same-octave 1)) |
| 1858 () |
| 1859 ChoirStaff) |
| 1860 (choral-cautionary #f |
| 1861 (Voice ,(make-accidental-rule 'same-octave 0) |
| 1862 Staff |
| 1863 ,(make-accidental-rule 'same-octave 0)) |
| 1864 (Staff ,(make-accidental-rule 'any-octave 0) |
| 1865 ,(make-accidental-rule 'same-octave 1) |
| 1866 ChoirStaff |
| 1867 ,(make-accidental-rule 'any-octave 0) |
| 1868 ,(make-accidental-rule 'same-octave 1)) |
| 1869 ChoirStaff) |
| 1870 |
1845 ;; same as modern, but cautionary accidentals are printed for all | 1871 ;; same as modern, but cautionary accidentals are printed for all |
1846 ;; non-natural tones specified by the key signature. | 1872 ;; non-natural tones specified by the key signature. |
1847 (teaching #f | 1873 (teaching #f |
1848 (Staff ,(make-accidental-rule 'same-octave 0)) | 1874 (Staff ,(make-accidental-rule 'same-octave 0)) |
1849 (Staff ,(make-accidental-rule 'same-octave 1) | 1875 (Staff ,(make-accidental-rule 'same-octave 1) |
1850 ,teaching-accidental-rule)) | 1876 ,teaching-accidental-rule)) |
1851 | 1877 |
1852 ;; do not set localAlterations when a note alterated differently from | 1878 ;; do not set localAlterations when a note alterated differently from |
1853 ;; localAlterations is found. | 1879 ;; localAlterations is found. |
1854 ;; Causes accidentals to be printed at every note instead of | 1880 ;; Causes accidentals to be printed at every note instead of |
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2676 (memq tags music-tags) | 2702 (memq tags music-tags) |
2677 (not (any (lambda (t) (eq? (tag-group-get t) group)) music-tags))))
)) | 2703 (not (any (lambda (t) (eq? (tag-group-get t) group)) music-tags))))
)) |
2678 (let ((groups (delete-duplicates (map tag-group-get tags) eq?))) | 2704 (let ((groups (delete-duplicates (map tag-group-get tags) eq?))) |
2679 (lambda (m) | 2705 (lambda (m) |
2680 (let ((music-tags (ly:music-property m 'tags))) | 2706 (let ((music-tags (ly:music-property m 'tags))) |
2681 (or | 2707 (or |
2682 (null? music-tags) ; redundant but very frequent | 2708 (null? music-tags) ; redundant but very frequent |
2683 (any (lambda (t) (memq t tags)) music-tags) | 2709 (any (lambda (t) (memq t tags)) music-tags) |
2684 ;; if no tag matches, no tag group should match either | 2710 ;; if no tag matches, no tag group should match either |
2685 (not (any (lambda (t) (memq (tag-group-get t) groups)) music-tags))
)))))) | 2711 (not (any (lambda (t) (memq (tag-group-get t) groups)) music-tags))
)))))) |
OLD | NEW |