Commit graph

74 commits

Author SHA1 Message Date
lasconic
ad752de269 fix #24718 again 2014-03-03 17:04:20 +01:00
lasconic
9a054060eb fix default layout of chordnames and fretboard 2014-02-27 20:05:52 +01:00
Nicolas Froment
ca2f3d0ba6 Merge pull request #684 from Jojo-Schmitz/fretboard
Fretboard Diagrams: adding/fixing style settings
2014-02-24 11:22:54 +01:00
lasconic
f6b9f563fa fix #24742 and #24718 2014-02-22 18:24:55 +01:00
ws
d796ea407d rework text implementation 2014-02-11 14:27:44 +01:00
Joachim Schmitz
b6ebfa7bf8 fix chord symbol to fretboard diagram distance 2014-02-09 19:52:46 +01:00
Tony Mountifield
d316a4d9c8 Add rendering of capo chords, and capo setting.
For now, the capo position is a ChordName style setting. In the
future, it can be enhanced to allow capo position to be changed
within a score, using something like TempoMap or TimeSigMap.
If capo position is non-zero, the chord to be played with capo
applied is shown in brackets after the standard chord.

Signed-off-by: lasconic <lasconic@gmail.com>
2013-12-10 16:20:06 +01:00
Nicolas Froment
f4aff9b5ea Merge pull request #577 from MarcSabatella/23785-chord-symbol-text-style-reload
23785 chord symbol text style change doesn't take effect until reload
2013-12-05 17:02:45 -08:00
Marc Sabatella
e76bb895ef fix #23783: chord symbol text style properties
Adds support for X, Y, horizontal alignment, and vertical alignment.
Improves compatibility for 1.3 scores, which relies on text style Y to
set chord height, also allows for chord symbols centered over notes (see
#10355).
2013-12-03 16:48:33 -07:00
Marc Sabatella
9353085fd0 fix #23785: chord symbol text style changes
Changes to chord symbol text style were not taking effect until reload.
This change forces a render() call on all chord symbols if the text
style changes.
2013-12-03 08:50:34 -07:00
Joachim Schmitz
a9afd48d2a fix #23366
Yet another and probably still not the last...
2013-11-11 11:31:25 +01:00
Nicolas Froment
e03ddb3a1b Merge pull request #525 from Jojo-Schmitz/fix.orig.texts
fix #23366 2nd batch
2013-11-01 04:49:58 -07:00
Joachim Schmitz
0712881919 fix #23366 2nd batch
Almost certainly a 3rd batch to follow, for many of the CamelCase
strings
2013-11-01 11:24:33 +01:00
Marc Sabatella
bd623a9475 fix #23369
Adds support for "/" within chordnames if the portion after the "/" is
not convertible to tpc and hence not a valid bass note.  This allows for
C6/9 to be rendered as such.  I look at the *last* slash when deciding
how to proceed, so C6/9/E is handled correctly.
2013-10-31 17:24:11 -06:00
lasconic
e4b7e2fdba fix chordnames sync between score and parts 2013-10-14 12:29:23 +02:00
lasconic
cc016f8bb1 fix #23129: chordnames not propagated to parts if parts generated after score load 2013-10-11 22:58:05 +02:00
lasconic
e9318aaa5c fix #22571: Initial height for chordname entry too low 2013-09-07 12:23:15 +02:00
ws
3cb729bef4 fix textpalette crash; update ottava types in inspector 2013-09-04 13:58:50 +02:00
ws
85f9416dee fix #22493 2013-09-03 14:00:27 +02:00
ws
4c2e2e971b more fixes for line editing 2013-08-30 12:46:34 +02:00
lasconic
3aebe10211 fix #20855: [MusicXML] Export of chordnames not over a ChordRest doesn't work 2013-08-09 23:28:45 +02:00
Marc Sabatella
55ed042ec0 fix #14148: export of nonsense chords
improved handling of "N.C." and other unparseable chords
2013-07-11 17:45:02 -06:00
Marc Sabatella
8e92462f42 Gernan chords use As and Es, not Aes and Ees
Also add hooks for French spelling of Re
2013-06-28 17:35:38 -06:00
Marc Sabatella
a90d21f8c7 fix #11115: support solfeggio note names
Actual support was added in previous commits; this is really just
cleanup and renaming the option from "Italian" to "Solfeggio".
2013-06-28 17:35:37 -06:00
Marc Sabatella
8864567934 more flexible root handling
Allow "sym" declarations in chord description file to take string
values, support class="note" to differentiate "b" used as note name from
"b" used as flat (also "mi" for note name versus minor), allow lower
case letter on its own to imply minor if lowerCaseMinorChords is set by
using "=" as a special hidden abbreviation.
2013-06-28 17:35:35 -06:00
Marc Sabatella
30d7afb2ed fix #7282 - support additional root/bass styles
German, Italian, lower case minor
2013-06-28 17:35:33 -06:00
ws
2faaa67803 change ChordList* in StyleData to ChordList 2013-06-24 11:03:48 +02:00
Nicolas Froment
1adfea20f4 Merge pull request #382 from MarcSabatella/wytiwyg-chords
WYTIWYG chord symbols
2013-06-19 00:19:43 -07:00
Marc Sabatella
a42517ed76 fix crash when copying chordnames between scores
Problem had to do with determining correct transposition.  Fix is to
always represent Harmony objects as concert pitch in clipboard.  Convert
to on copy, convert from on paste.  This is the same strategy used for
Chord/Note objects.
2013-06-18 11:11:27 -06:00
Marc Sabatella
3cc387f1db generate HChord for unrecognized chords
also fixes write of voicing tag to score when custom chord list exists
2013-06-15 16:59:00 -06:00
Marc Sabatella
d347d1f2f0 fixes 2013-06-09 23:03:57 -06:00
Marc Sabatella
0cd63cfe6f MusicXML import of unrecognized chords
A new method is provided generate a chordname directly from a MusicXML
harmony object.  This chordname is then parsed and rendered just as for a
chordname typed directly into the score.
2013-06-02 22:56:24 -06:00
Marc Sabatella
07962f4a5a MusicXML export of unrecognized chords
A chord description object is now generated for each (unique) unrecognized
chord, and MusicXML tags are generated during parsing for inclusion in the
chord description.  This allows unrecognized chords to be exported to
MusicXML using the same mechanisms as recognized chords.
2013-06-02 22:52:21 -06:00
Tony Mountifield
ab02829d35 Remove obsolete assignment to _userName 2013-05-24 22:12:42 +01:00
Tony Mountifield
688495bc27 Add support for parentheses before/after chords.
This allows a chord or sequence of chords to be indicated as optional
or alternative, and avoids the need to add the parentheses as text
or extra chords.
2013-05-24 22:12:41 +01:00
Nicolas Froment
c5844d14e1 Merge pull request #369 from softins/render-qstring
Add Harmony::render() for a QString
2013-05-21 08:29:40 -07:00
Tony Mountifield
972dc6b7cb Add Harmony::render() for a QString 2013-05-20 23:41:47 +01:00
Marc Sabatella
befaee43e8 fix biab import and test
Scores created via bb import were saving empty <name> tags, which was
not ideal.  They now create valid <name> tags.  Test was not expecting
any <name> tags at all, so it has been updated.
2013-05-18 20:59:21 -06:00
Marc Sabatella
0fc772c3f5 nullptr => 0 2013-05-17 12:40:30 -06:00
Marc Sabatella
9870cd2772 fixes, and change NULL to nullptr for now 2013-05-17 12:32:17 -06:00
Marc Sabatella
055d24adbc fix for scores that change from old-style chord description to wysiwyg 2013-05-16 14:46:12 -06:00
Marc Sabatella
ba93f40fb9 save token definitions as part of chord list 2013-05-15 15:30:10 -06:00
Marc Sabatella
c0df3af6c0 add facility to define rendering by token in chord description file 2013-05-15 15:30:07 -06:00
Marc Sabatella
d569d801cc token-based rendering & other improvements 2013-05-15 15:30:02 -06:00
Marc Sabatella
192a36fb86 transpose & render unrecognized chords 2013-05-15 15:30:00 -06:00
Werner Schweer
ca4cf5967f Merge pull request #349 from softins/layout-unparsed-chords
Set the tightbbox for unparsed chords.
2013-05-15 00:40:01 -07:00
ws
9ebabcc2e5 add namespace Ms 2013-05-13 19:43:59 +02:00
Tony Mountifield
f23dbd27ce Set the tightbbox for unparsed chords.
... to ensure that they get spaced correctly.
2013-05-13 18:17:06 +01:00
Marc Sabatella
64f191e248 allow trailing ctrl-space in chordname to suppress parsing 2013-05-06 09:19:47 -06:00
Marc Sabatella
59e80712bd fix #4443: implement flexible chord entry system 2013-05-05 08:21:06 -06:00