diff --git a/plugins/musicsheets/config/ShortcutInfo/ShortcutInfo.multids b/plugins/musicsheets/config/ShortcutInfo/ShortcutInfo.multids index 199a90a..2254587 100644 --- a/plugins/musicsheets/config/ShortcutInfo/ShortcutInfo.multids +++ b/plugins/musicsheets/config/ShortcutInfo/ShortcutInfo.multids @@ -13,4 +13,5 @@ musicsheets-note-heads: Show the note heads musicsheets-note-values: Show the note values (lengths) musicsheets-rests: Insert a rest musicsheets-symbols: Show the musical symbols +musicsheets-tune-body: Show the tune body dropdown musicsheets-tune-header: Show the tune header dropdown \ No newline at end of file diff --git a/plugins/musicsheets/config/tune-body-shortcut.tid b/plugins/musicsheets/config/tune-body-shortcut.tid new file mode 100644 index 0000000..48f21d5 --- /dev/null +++ b/plugins/musicsheets/config/tune-body-shortcut.tid @@ -0,0 +1,3 @@ +title: $:/config/shortcuts/musicsheets-tune-body + +alt-shift-B \ No newline at end of file diff --git a/plugins/musicsheets/images/tune-body.tid b/plugins/musicsheets/images/tune-body.tid new file mode 100644 index 0000000..c39792f --- /dev/null +++ b/plugins/musicsheets/images/tune-body.tid @@ -0,0 +1,3 @@ +title: $:/plugins/BTC/musicsheets/images/tune-body + +Tune Body \ No newline at end of file diff --git a/plugins/musicsheets/ui/Buttons/Dropdowns/editor-button-tune-body-dropdown.tid b/plugins/musicsheets/ui/Buttons/Dropdowns/editor-button-tune-body-dropdown.tid new file mode 100644 index 0000000..94a1745 --- /dev/null +++ b/plugins/musicsheets/ui/Buttons/Dropdowns/editor-button-tune-body-dropdown.tid @@ -0,0 +1,35 @@ +title: $:/plugins/BTC/musicsheets/ui/EditorToolbar/dropdown/tune-body + +<$list filter="[all[shadows+tiddlers]tag[$:/tags/MusicSheets/TuneBody]!is[draft]each[category]]"> + +
+<$text text={{!!category}}/> +
+ +<$macrocall $name="list-tagged-draggable" tag="$:/tags/MusicSheets/TuneBody" subFilter="!is[draft]category{!!category}" itemTemplate="$:/plugins/BTC/musicsheets/ui/Templates/toolbar-item-template-symbols"/> + + + +---- + +<$button tag="a"> + +<$action-sendmessage + $message="tm-new-tiddler" + tags="$:/tags/MusicSheets/TuneBody" + caption="this is shown in the menu" + text="this is inserted when clicking the button" + category="'Tune Body' or a category you like" +/> + +<$action-deletetiddler + $tiddler=<> +/> + + + +<$text text="new entry"/> + + + + \ No newline at end of file diff --git a/plugins/musicsheets/ui/Buttons/editor-button-tune-body.tid b/plugins/musicsheets/ui/Buttons/editor-button-tune-body.tid new file mode 100644 index 0000000..7369593 --- /dev/null +++ b/plugins/musicsheets/ui/Buttons/editor-button-tune-body.tid @@ -0,0 +1,9 @@ +title: $:/plugins/BTC/musicsheets/ui/EditorToolbar/tune-body +tags: $:/tags/EditorToolbar +icon: $:/plugins/BTC/musicsheets/images/tune-body +condition: [type[]] [get[type]match[text/vnd.tiddlywiki]] +[first[]] +dropdown: $:/plugins/BTC/musicsheets/ui/EditorToolbar/dropdown/tune-body +description: tune body +shortcuts: ((musicsheets-tune-body)) +caption: Tune Body +button-classes: tc-musicsheets-toolbar-button \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneBody/macro.tid b/plugins/musicsheets/ui/Symbols/TuneBody/macro.tid new file mode 100644 index 0000000..55e07ea --- /dev/null +++ b/plugins/musicsheets/ui/Symbols/TuneBody/macro.tid @@ -0,0 +1,7 @@ +title: $:/plugins/BTC/musicsheets/ui/Symbols/macro +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody +caption: m: Macro +category: Tune Header and Body +description: + +m: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneBody/remark.tid b/plugins/musicsheets/ui/Symbols/TuneBody/remark.tid new file mode 100644 index 0000000..12fe7c4 --- /dev/null +++ b/plugins/musicsheets/ui/Symbols/TuneBody/remark.tid @@ -0,0 +1,8 @@ +title: $:/plugins/BTC/musicsheets/ui/Symbols/remark +tags: $:/tags/MusicSheets/TuneBody +caption: [r: remark] - (wrap selection) +category: Tune Body +wrap-selection: true +description: you can use the syntax [r:remark] to write a remark in the middle of a line of music. +prefix: [r: +suffix: ] \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneBody/symbol-line.tid b/plugins/musicsheets/ui/Symbols/TuneBody/symbol-line.tid new file mode 100644 index 0000000..e119a11 --- /dev/null +++ b/plugins/musicsheets/ui/Symbols/TuneBody/symbol-line.tid @@ -0,0 +1,7 @@ +title: $:/plugins/BTC/musicsheets/ui/Symbols/symbolline +tags: $:/tags/MusicSheets/TuneBody +caption: s: Symbol line +category: Tune Body +description: Adding many symbols to a line of music can make a tune difficult to read. In such cases, a symbol line (a line that contains only !…! decorations, "…" chord symbols or annotations) can be used, analogous to a line of lyrics. + +s: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneBody/words.tid b/plugins/musicsheets/ui/Symbols/TuneBody/words.tid new file mode 100644 index 0000000..84a6638 --- /dev/null +++ b/plugins/musicsheets/ui/Symbols/TuneBody/words.tid @@ -0,0 +1,7 @@ +title: $:/plugins/BTC/musicsheets/ui/Symbols/words +tags: $:/tags/MusicSheets/TuneBody +caption: w: Words +category: Tune Body +description: supplies lyrics to be aligned syllable by syllable with previous notes of the current voice. + +w: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/default-note-length.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/default-note-length.tid index 7d6c844..ff915c8 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/default-note-length.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/default-note-length.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/NoteLength -tags: $:/tags/MusicSheets/TuneHeader -caption: L: Default Note Length -category: Tune Header +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody +caption: L: (Default) Note Length +category: Tune Header and Body description: The L: field specifies the unit note length - the length of a note as represented by a single letter in abc L: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/information.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/information.tid index 08fefb3..3a9c853 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/information.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/information.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Information -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: I: Information -category: Tune Header +category: Tune Header and Body description: The I:(instruction) field is used for an extended set of instruction directives concerned with how the abc code is to be interpreted. I: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/key.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/key.tid index 0e9a093..8eec0e0 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/key.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/key.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Key -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: K: Key -category: Tune Header -description: The key signature should be specified with a capital letter (A-G) which may be followed by a # or b for sharp or flat respectively. In addition the mode should be specified (when no mode is indicated, major is assumed). +category: Tune Header and Body +description: Note that the first occurrence of the K: field, which must appear in every tune, finishes the tune header. All following lines are considered to be part of the tune body. The key signature should be specified with a capital letter (A-G) which may be followed by a # or b for sharp or flat respectively. In addition the mode should be specified (when no mode is indicated, major is assumed). K: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/meter.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/meter.tid index 52b275c..ee3bf1b 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/meter.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/meter.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Meter -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: M: Meter -category: Tune Header +category: Tune Header and Body description: The M: field indicates the meter. Apart from standard meters, e.g. M:6/8 or M:4/4, the symbols M:C and M:C| give common time (4/4) and cut time (2/2) respectively. The symbol M:none omits the meter entirely (free meter). It is also possible to specify a complex meter, e.g. M:(2+3+2)/8, to make explicit which beats should be accented. The parentheses around the numerator are optional. M: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/notes.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/notes.tid index be2be93..36f0b88 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/notes.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/notes.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Notes -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: N: Notes -category: Tune Header +category: Tune Header and Body description: Contains general annotations, such as references to other tunes which are similar, details on how the original notation of the tune was converted to abc, etc. N: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/parts.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/parts.tid index 7e236ef..c739230 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/parts.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/parts.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Parts -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: P: Parts -category: Tune Header +category: Tune Header and Body description: The P: field can be used in the tune header to state the order in which the tune parts are played, i.e. P:ABABCDCD, and then inside the tune body to mark each part, i.e. P:A or P:B. (In this context part refers to a section of the tune, rather than a voice in multi-voice music.) P: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/rhythm.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/rhythm.tid index b7648d6..2467422 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/rhythm.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/rhythm.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Rhythm -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: R: Rhythm -category: Tune Header +category: Tune Header and Body description: Contains an indication of the type of tune (e.g. hornpipe, double jig, single jig, 48-bar polka, etc). This gives the musician some indication of how a tune should be interpreted as well as being useful for database applications. R: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/tempo.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/tempo.tid index 352e461..e81c2dc 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/tempo.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/tempo.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Tempo -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: Q: Tempo -category: Tune Header +category: Tune Header and Body description: The Q: field defines the tempo in terms of a number of beats per minute, e.g. Q:1/2=120 means 120 half-note beats per minute. Q: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/title.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/title.tid index 7c5843e..ca32d4f 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/title.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/title.tid @@ -1,7 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Title -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: T: Title -category: Tune Header +category: Tune Header and Body description: A T: (title) field must follow immediately after the X: field; it is the human identifier for the tune (although it may be empty). T: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/user-defined.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/user-defined.tid index d422c35..850e717 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/user-defined.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/user-defined.tid @@ -1,6 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/UserDefined -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: U: User defined -category: Tune Header +category: Tune Header and Body +description: As a short cut to writing symbols which avoids the !symbol! syntax, the letters H-W and h-w and the symbol ~ can be assigned with the U: field. U: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/voices.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/voices.tid new file mode 100644 index 0000000..77707a0 --- /dev/null +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/voices.tid @@ -0,0 +1,7 @@ +title: $:/plugins/BTC/musicsheets/ui/Symbols/Voices +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody +caption: V: Voices +category: Tune Header and Body +description: The V: field allows the writing of multi-voice music. In multi-voice abc tunes, the tune body is divided into several voices, each beginning with a V: field. All the notes following such a V: field, up to the next V: field or the end of the tune body, belong to the voice. + +V: \ No newline at end of file diff --git a/plugins/musicsheets/ui/Symbols/TuneHeader/words.tid b/plugins/musicsheets/ui/Symbols/TuneHeader/words.tid index 4740f14..df3f9c1 100644 --- a/plugins/musicsheets/ui/Symbols/TuneHeader/words.tid +++ b/plugins/musicsheets/ui/Symbols/TuneHeader/words.tid @@ -1,6 +1,7 @@ title: $:/plugins/BTC/musicsheets/ui/Symbols/Words -tags: $:/tags/MusicSheets/TuneHeader +tags: $:/tags/MusicSheets/TuneHeader $:/tags/MusicSheets/TuneBody caption: W: Words -category: Tune Header +category: Tune Header and Body +description: can be used for lyrics to be printed separately below the tune. W: \ No newline at end of file