Skip to content

Commit 3bd8309

Browse files
miiizenmiiizen
committed
Update tests
1 parent eccd114 commit 3bd8309

20 files changed

+36
-27
lines changed

‎src/engraving/rw/write/twrite.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -570,12 +570,16 @@ void TWrite::writeItemProperties(const EngravingItem* item, XmlWriter& xml, Writ
570570
xml.tag("track", t);
571571
}
572572

573-
for (Pid pid : { Pid::OFFSET, Pid::COLOR, Pid::VISIBLE, Pid::Z }) {
573+
for (Pid pid : { Pid::COLOR, Pid::VISIBLE, Pid::Z }) {
574574
if (item->propertyFlags(pid) == PropertyFlags::NOSTYLE) {
575575
writeProperty(item, xml, pid);
576576
}
577577
}
578578

579+
if (!item->offset().isNull()) {
580+
writeProperty(item, xml, Pid::OFFSET);
581+
}
582+
579583
if (!item->hasVoiceAssignmentProperties() && item->propertyFlags(Pid::PLACEMENT) == PropertyFlags::NOSTYLE) {
580584
writeProperty(item, xml, Pid::PLACEMENT);
581585
}
@@ -1360,9 +1364,6 @@ void TWrite::write(const Fermata* item, XmlWriter& xml, WriteContext& ctx)
13601364
writeProperty(item, xml, Pid::TIME_STRETCH);
13611365
writeProperty(item, xml, Pid::PLAY);
13621366
writeProperty(item, xml, Pid::MIN_DISTANCE);
1363-
if (!item->offset().isNull()) {
1364-
writeProperty(item, xml, Pid::OFFSET);
1365-
}
13661367
writeItemProperties(item, xml, ctx);
13671368
xml.endElement();
13681369
}

‎src/engraving/tests/chordsymbol_data/realize-concert-pitch-ref.mscx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@
157157
<root>14</root>
158158
</harmonyInfo>
159159
<eid>O_O</eid>
160-
<offset x="1.66488" y="-2.29189"/>
160+
<offset x="1.66488" y="0.20811"/>
161161
</Harmony>
162162
<Chord>
163163
<eid>P_P</eid>
@@ -396,7 +396,7 @@
396396
<root>16</root>
397397
</harmonyInfo>
398398
<eid>4_4</eid>
399-
<offset x="-1.66488" y="-2.5"/>
399+
<offset x="-1.66488" y="0"/>
400400
</Harmony>
401401
<Chord>
402402
<eid>5_5</eid>
@@ -844,7 +844,7 @@
844844
<root>17</root>
845845
</harmonyInfo>
846846
<eid>JC_JC</eid>
847-
<offset x="-2.70543" y="-2.60405"/>
847+
<offset x="-2.70543" y="-0.10405"/>
848848
</Harmony>
849849
<Chord>
850850
<eid>KC_KC</eid>

‎src/engraving/tests/chordsymbol_data/realize-jazz-ref.mscx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,9 @@
171171
<root>12</root>
172172
</harmonyInfo>
173173
<eid>Q_Q</eid>
174+
<offset x="1.66488" y="0.20811"/>
174175
<harmonyVoiceLiteral>0</harmonyVoiceLiteral>
175176
<harmonyVoicing>3</harmonyVoicing>
176-
<offset x="1.66488" y="-2.29189"/>
177177
</Harmony>
178178
<Chord>
179179
<eid>R_R</eid>
@@ -468,9 +468,9 @@
468468
<root>14</root>
469469
</harmonyInfo>
470470
<eid>GB_GB</eid>
471+
<offset x="-1.66488" y="0"/>
471472
<harmonyVoiceLiteral>0</harmonyVoiceLiteral>
472473
<harmonyVoicing>3</harmonyVoicing>
473-
<offset x="-1.66488" y="-2.5"/>
474474
</Harmony>
475475
<Chord>
476476
<eid>HB_HB</eid>
@@ -956,9 +956,9 @@
956956
<root>15</root>
957957
</harmonyInfo>
958958
<eid>cC_cC</eid>
959+
<offset x="-2.70543" y="-0.10405"/>
959960
<harmonyVoiceLiteral>0</harmonyVoiceLiteral>
960961
<harmonyVoicing>3</harmonyVoicing>
961-
<offset x="-2.70543" y="-2.60405"/>
962962
</Harmony>
963963
<Chord>
964964
<eid>dC_dC</eid>

‎src/engraving/tests/compat206_data/fermata-ref.mscx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@
146146
<Fermata>
147147
<subtype>fermataAbove</subtype>
148148
<timeStretch>3</timeStretch>
149-
<offset x="-2.05234" y="-4.89487"/>
150149
<eid>N_N</eid>
150+
<offset x="-2.05234" y="-4.89487"/>
151151
</Fermata>
152152
<Chord>
153153
<eid>O_O</eid>

‎src/engraving/tests/compat206_data/frame_text2-ref.mscx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@
143143
<copyrightFramePadding>0</copyrightFramePadding>
144144
<copyrightFrameWidth>0</copyrightFrameWidth>
145145
<pageNumberFontSize>11</pageNumberFontSize>
146-
<pageNumberOffset x="0" y="0"/>
147146
<pageNumberFramePadding>0</pageNumberFramePadding>
148147
<pageNumberFrameWidth>0</pageNumberFrameWidth>
149148
<instrumentChangeAlign>left,bottom</instrumentChangeAlign>
@@ -208,8 +207,8 @@
208207
</Text>
209208
<Text>
210209
<eid>F_F</eid>
211-
<style>frame</style>
212210
<offset x="55" y="0.5"/>
211+
<style>frame</style>
213212
<text>éééàè</text>
214213
</Text>
215214
</VBox>
@@ -225,8 +224,8 @@
225224
</Text>
226225
<Text>
227226
<eid>I_I</eid>
228-
<style>frame</style>
229227
<offset x="55" y="0.5"/>
228+
<style>frame</style>
230229
<text>àéùééé</text>
231230
</Text>
232231
</VBox>

‎src/engraving/tests/compat206_data/textstyles-ref.mscx‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,8 +440,8 @@
440440
<eid>s_s</eid>
441441
<Fingering>
442442
<eid>t_t</eid>
443-
<style>guitar_fingering_rh</style>
444443
<offset x="0.658281" y="-1.50188"/>
444+
<style>guitar_fingering_rh</style>
445445
<text>p</text>
446446
</Fingering>
447447
<pitch>72</pitch>
@@ -463,8 +463,6 @@
463463
<voice>
464464
<Expression>
465465
<eid>x_x</eid>
466-
<snapToDynamics>0</snapToDynamics>
467-
<offset x="0" y="3.5"/>
468466
<text>technique</text>
469467
</Expression>
470468
<Rest>
@@ -484,8 +482,8 @@
484482
<eid>1_1</eid>
485483
<Fingering>
486484
<eid>2_2</eid>
487-
<style>string_number</style>
488485
<offset x="0.658281" y="-6.50188"/>
486+
<style>string_number</style>
489487
<text>0</text>
490488
</Fingering>
491489
<Fingering>

‎src/engraving/tests/expression_data/expression-1-ref.mscx‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@
126126
<voice>
127127
<Expression>
128128
<eid>K_K</eid>
129-
<snapToDynamics>0</snapToDynamics>
130129
<text>expr text</text>
131130
</Expression>
132131
<Chord>
@@ -145,8 +144,8 @@
145144
<voice>
146145
<Expression>
147146
<eid>O_O</eid>
147+
<offset x="0" y="2.61718"/>
148148
<snapToDynamics>0</snapToDynamics>
149-
<offset x="0" y="5.11718"/>
150149
<text>expr <b>text</b></text>
151150
</Expression>
152151
<Chord>
@@ -165,8 +164,8 @@
165164
<voice>
166165
<Expression>
167166
<eid>S_S</eid>
167+
<offset x="0" y="-3.22943"/>
168168
<snapToDynamics>0</snapToDynamics>
169-
<offset x="0" y="-4.72943"/>
170169
<text><i>expr </i><u>text</u></text>
171170
</Expression>
172171
<Chord>

‎src/engraving/tests/measure_data/mmrest-ref.mscx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
<eid>N_N</eid>
160160
<Segment>
161161
<subtype>0</subtype>
162-
<offset x="0" y="-1"/>
162+
<offset x="0" y="0"/>
163163
<off2 x="0.106397" y="0"/>
164164
<eid>O_O</eid>
165165
</Segment>

‎src/engraving/tests/parts_data/part-all-appendmeasures.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1354,6 +1354,7 @@
13541354
</harmonyInfo>
13551355
<eid>QD_QD</eid>
13561356
<linkedTo>f_f</linkedTo>
1357+
<offset x="0" y="-3.22581"/>
13571358
</Harmony>
13581359
<Chord>
13591360
<eid>RD_RD</eid>

‎src/engraving/tests/parts_data/part-all-insertmeasures.mscx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,6 +1363,7 @@
13631363
</harmonyInfo>
13641364
<eid>WD_WD</eid>
13651365
<linkedTo>f_f</linkedTo>
1366+
<offset x="0" y="-3.22581"/>
13661367
</Harmony>
13671368
<Chord>
13681369
<eid>XD_XD</eid>

0 commit comments

Comments
 (0)