Skip to content

Commit

Permalink
Sym() cleanup; use Sym names in TextLine()
Browse files Browse the repository at this point in the history
  • Loading branch information
@wschweer
wschweer committed Sep 8, 2012
1 parent 082c9b6 commit a345f39
Show file tree
Hide file tree
Showing 19 changed files with 221 additions and 317 deletions.
4 changes: 2 additions & 2 deletions libmscore/dynamic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ void Dynamic::setSubtype(const QString& tag)
for (int i = 1; i < n; ++i) {
if (dynList[i].tag == tag) {
_subtype = i;
// setTextStyleType(TEXT_STYLE_DYNAMICS2);
setTextStyleType(TEXT_STYLE_DYNAMICS2);
setText(dynList[i].tag);
return;
}
}
_subtype = 0;
// setTextStyleType(TEXT_STYLE_DYNAMICS);
setTextStyleType(TEXT_STYLE_DYNAMICS);
setText(tag);
}

Expand Down
7 changes: 2 additions & 5 deletions libmscore/mscore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ extern void initDrumset();

void MScore::init()
{
Sym::init();

#ifdef SCRIPT_INTERFACE
qRegisterMetaType<MScore::ElementType>("ElementType");
qRegisterMetaType<MScore::ValueType>("ValueType");
Expand Down Expand Up @@ -133,12 +135,7 @@ void MScore::init()
"FreeSerifMscore.ttf",
"FreeSerifBold.ttf",
"gonville-20.otf",
// "mscore_tab_baroque.ttf",
// "mscore_tab_modern.ttf",
// "mscore_tab_renaiss.ttf",
// "mscore_tab_renaiss2.ttf",
"mscoreTab.ttf",
// "FiguredBassMHGPL.otf",
"mscore-BC.ttf"
};

Expand Down
5 changes: 3 additions & 2 deletions libmscore/mscore.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#ifndef __MSCORE_H__
#define __MSCORE_H__

#define MSC_VERSION "1.24"
static const int MSCVERSION = 124;
#define MSC_VERSION "1.25"
static const int MSCVERSION = 125;

// History:
// 1.3 added staff->_barLineSpan
Expand All @@ -42,6 +42,7 @@ static const int MSCVERSION = 124;
// 1.22 timesig changed
// 1.23 measure property for actual length
// 1.24 default image size is spatium dependent
// 1.25 symbol numbers in TextLine() replaced by symbol names


class MStyle;
Expand Down
36 changes: 18 additions & 18 deletions libmscore/note.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,37 +59,37 @@
// note head groups
//---------------------------------------------------------

const int noteHeads[2][Note::HEAD_GROUPS][HEAD_TYPES] = {
const SymId noteHeads[2][Note::HEAD_GROUPS][HEAD_TYPES] = {
{ // down stem
{ wholeheadSym, halfheadSym, quartheadSym, brevisheadSym },
{ wholecrossedheadSym, halfcrossedheadSym, crossedheadSym, wholecrossedheadSym },
{ wholediamondheadSym, halfdiamondheadSym, diamondheadSym, wholediamondheadSym },
{ s0triangleHeadSym, d1triangleHeadSym, d2triangleHeadSym, s0triangleHeadSym },
{ s0miHeadSym, s1miHeadSym, s2miHeadSym, -1 },
{ s0miHeadSym, s1miHeadSym, s2miHeadSym, noSym },
{ wholeslashheadSym, halfslashheadSym, quartslashheadSym, wholeslashheadSym },
{ xcircledheadSym, xcircledheadSym, xcircledheadSym, xcircledheadSym },
{ s0doHeadSym, d1doHeadSym, d2doHeadSym, -1 },
{ s0reHeadSym, d1reHeadSym, d2reHeadSym, -1 },
{ d0faHeadSym, d1faHeadSym, d2faHeadSym, -1 },
{ s0laHeadSym, s1laHeadSym, s2laHeadSym, -1 },
{ s0tiHeadSym, d1tiHeadSym, d2tiHeadSym, -1 },
{ s0solHeadSym, s1solHeadSym, s2solHeadSym, -1 },
{ s0doHeadSym, d1doHeadSym, d2doHeadSym, noSym },
{ s0reHeadSym, d1reHeadSym, d2reHeadSym, noSym },
{ d0faHeadSym, d1faHeadSym, d2faHeadSym, noSym },
{ s0laHeadSym, s1laHeadSym, s2laHeadSym, noSym },
{ s0tiHeadSym, d1tiHeadSym, d2tiHeadSym, noSym },
{ s0solHeadSym, s1solHeadSym, s2solHeadSym, noSym },
{ wholeheadSym, halfheadSym, quartheadSym, brevisheadaltSym },
},
{ // up stem
{ wholeheadSym, halfheadSym, quartheadSym, brevisheadSym },
{ wholecrossedheadSym, halfcrossedheadSym, crossedheadSym, wholecrossedheadSym },
{ wholediamondheadSym, halfdiamondheadSym, diamondheadSym, wholediamondheadSym },
{ s0triangleHeadSym, u1triangleHeadSym, u2triangleHeadSym, s0triangleHeadSym },
{ s0miHeadSym, s1miHeadSym, s2miHeadSym, -1 },
{ s0miHeadSym, s1miHeadSym, s2miHeadSym, noSym },
{ wholeslashheadSym, halfslashheadSym, quartslashheadSym, wholeslashheadSym },
{ xcircledheadSym, xcircledheadSym, xcircledheadSym, xcircledheadSym },
{ s0doHeadSym, u1doHeadSym, u2doHeadSym, -1 },
{ s0reHeadSym, u1reHeadSym, u2reHeadSym, -1 },
{ u0faHeadSym, u1faHeadSym, u2faHeadSym, -1 },
{ s0laHeadSym, s1laHeadSym, s2laHeadSym, -1 },
{ s0tiHeadSym, u1tiHeadSym, u2tiHeadSym, -1 },
{ s0solHeadSym, s1solHeadSym, s2solHeadSym, -1 },
{ s0doHeadSym, u1doHeadSym, u2doHeadSym, noSym },
{ s0reHeadSym, u1reHeadSym, u2reHeadSym, noSym },
{ u0faHeadSym, u1faHeadSym, u2faHeadSym, noSym },
{ s0laHeadSym, s1laHeadSym, s2laHeadSym, noSym },
{ s0tiHeadSym, u1tiHeadSym, u2tiHeadSym, noSym },
{ s0solHeadSym, s1solHeadSym, s2solHeadSym, noSym },
{ wholeheadSym, halfheadSym, quartheadSym, brevisheadaltSym },
}
};
Expand Down Expand Up @@ -123,7 +123,7 @@ Sym* noteHeadSym(bool up, int group, int type)
void NoteHead::write(Xml& xml) const
{
xml.stag("NoteHead");
xml.tag("name", symbols[0][_sym].name());
xml.tag("name", Sym::id2name(_sym));
Element::writeProperties(xml);
xml.etag();
}
Expand Down Expand Up @@ -1585,7 +1585,7 @@ void Note::updateAccidental(AccidentalState* as)
newUserAcc = ACC_SHARP;
else
newUserAcc = ACC_SHARP2;

if (_accidental->subtype() != newUserAcc)
acci = ACC_NONE; // don't use this any more
else {
Expand All @@ -1594,7 +1594,7 @@ void Note::updateAccidental(AccidentalState* as)
AccidentalVal accVal = tpc2alter(_tpc);
if ((accVal != as->accidentalVal(int(_line)))
|| hidden() || as->tieContext(int(_line)))
as->setAccidentalVal(int(_line),
as->setAccidentalVal(int(_line),
accVal, _tieBack != 0);
}
break;
Expand Down
2 changes: 1 addition & 1 deletion libmscore/note.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ Q_DECLARE_METATYPE(Note::NoteHeadGroup)
Q_DECLARE_METATYPE(Note::NoteHeadType)

extern Sym* noteHeadSym(bool up, int group, int n);
extern const int noteHeads[2][Note::HEAD_GROUPS][HEAD_TYPES];
extern const SymId noteHeads[2][Note::HEAD_GROUPS][HEAD_TYPES];

#endif

2 changes: 1 addition & 1 deletion libmscore/pedal.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Pedal::Pedal(Score* s)
void Pedal::read(const QDomElement& e)
{
if (score()->mscVersion() >= 110) {
setBeginSymbol(-1);
setBeginSymbol(noSym);
setEndHook(false);
}
TextLine::read(e);
Expand Down
Loading

0 comments on commit a345f39

Please sign in to comment.