CryHavoc
/
dottes
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some empty "" chords may be causing trouble with Jenkins. 

Jenkins builds are stalling when generating PDFs for some morris tunes. I suspect the problem
may be an empty chord "" and abc2abc's attempt to transpose it.

I've been meaning to remove the chords from the horn output, because abc2abc transposes them too,
which renders them not terribly useful. So get on and do it. Also remove "" from the morris
tunes where it occurs.
This commit is contained in:
Jim Hague 2013-08-28 14:57:11 +01:00
parent e049dc77a9
commit 457d17d121
6 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Morris/HasteToTheWedding.abc
View File

@ -8,5 +8,5 @@ P:A
F/2G/2|"D"A2A A2f|"G"ede fdB|"D"A2A AGF|"Em"GFG "A7"EFG|
"D"A2A A2f|"G"ede fdB|"D"A2A "A7"a2g|"D"fdd d2:|
P:B
d/2e/2|"D"fga " ""B7"agf|"Em"gab "A7"bag|"D"fga " ""B7"agf|
d/2e/2|"D"fga "B7" agf | "Em" gab "A7" bag |"D" fga "B7" agf|
"G"gfg "A7"efg|"D"a3 "Bm"f3|"G"ede fdB|"D"A2A "A7"a2g|"D"fdd d2:|

4
Morris/LadsABunchum.abc
View File

@ -9,12 +9,12 @@ P:A.(AB)6B
K:G
I:speed 400
P:A
" " |: A2 | "G" B2 B2 Bcde | "C" c2 A2 "D7" A2 Bc |
A2 | "G" B2 B2 Bcde | "C" c2 A2 "D7" A2 Bc |
w: * Oh dear moth-er, what a fool I be,
w: * Five were blind_ and the other couldn't see,
"G" d2 d2 "D7" dcBA | "G" B2 G2 G2 :|
w: Six young mai-dens come a court-in' me.
w: oh dear moth-er, what a fool I be!
P:B
"" |: gf | "C" e2 d2 "G" d2 GA | "G" B2 B2 B2 gf | e2 d2 c2 B2 |\
gf | "C" e2 d2 "G" d2 GA | "G" B2 B2 B2 gf | e2 d2 c2 B2 |\
"D7" A2 G2 "G" G2 :|

2
Morris/PostmansKnock.abc
View File

@ -9,7 +9,7 @@ L:1/16
K:D
I:speed 500
P:A
"" D3D | "D" D2F2G2 A4 F2 | "Em" G2A2B2 "D" A4 A2 | "D" d2A2G2 "Bm" F2E2D2 |\
D3D | "D" D2F2G2 A4 F2 | "Em" G2A2B2 "D" A4 A2 | "D" d2A2G2 "Bm" F2E2D2 |\
"E7" E6-E4 "A" D2 | "D" D2E2F2 A2A2A2 |
"Em" G2A2B2 "D" A4 F2 | "D" E2d2c2 "E7" B2A2^G2 | "A" A6-A2 A3A |\
"D" A2G2F2 F2d2d2 | "D" d2D2E2 F4 F2 |

4
Morris/Shooting.abc
View File

@ -7,8 +7,8 @@ L: 1/8
P: 6(2A.3B)
K: G
P: A
"" D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\
"G" G2 G BAG B<dD | GDG B2 "D" A "G" G3 :|
D | "G" G2 G BAG B<dD | GDG B2 "D" A A2 D |\
"G" G2 G BAG B<dD | GDG B2 "D" A "G" G3 :|
P: B
"G" d2 c B>AG B/d-d | "D" A2 A A2 "G" B "D" c3 |\
"G" d2 c B>AG B/ d2 | GDG B2 "D" A "G" G3 :|

4
Morris/SweetJennyJones.abc
View File

@ -8,13 +8,13 @@ P:A(AB)6.A
K:D
I:speed 450
P:A
"" A2 | "D" d2 A2 F2 | "D" D3 E F2 | "Em" G2 B2 e2 | "A7" c2 A2
A2 | "D" d2 A2 F2 | "D" D3 E F2 | "Em" G2 B2 e2 | "A7" c2 A2
w: My sweet Jen- ny Jones she's the pride of Lan-gol-len
c2 | "D" d2 A2 F2 | "G" G2>A2 B2 | "A7" A2 d2 c2 | "D" d4 ||
w: My sweet Jen- ny Jones she's the girl I a- dore.
w: My sweet Jen- ny Jones she's the girl I love best.
P:B
"" de | "D" f2 d2 f2 | "A7" e2 c2 A2 | "G" d2 B2 d2 | "A7" c2 A2 \
de | "D" f2 d2 f2 | "A7" e2 c2 A2 | "G" d2 B2 d2 | "A7" c2 A2 \
de | "D" f2 d2 f2 | "A7" e2 c2 A2 | "G" d2 c2 B2 | "A7" A4
Bc | "D" d2 A2 F2 | "D" D3 E F2 | "Em" G2 B2 e2 | "A7" c2 A2 \
Bc | "D" d2 A2 F2 | "G" G3 A B2 | "A7" A2 d2 c2 | "D" d4 z2 ||

8
makeHornInF.sh
View File

@ -39,11 +39,17 @@ find $booke -name "*.abc" | sort |
transpose=-7
fi
# There's no point in having transposed chords. Remove from the
# abc before transposing. Some badly formed chord items can give
# erroneous output from abc2abc (like, strings of binary gibberish).
sed -e "s/\"[^\"]*\"//g" $filename > $outdir/$name.abc.tmp
# Transpose. By default abc2abc will report errors in the output,
# but this messes up output formatting so stop it. Also force all
# output to be in treble clef; some lower tunes with the odd high
# note will otherwise appear in bass clef, which is not what this
# crap horn player wants.
abc2abc $filename -e -t $transpose | \
abc2abc $outdir/$name.abc.tmp -e -t $transpose | \
sed -e "/^ *K:/s/$/ clef=treble/" > $outdir/$name.abc
rm $outdir/$name.abc.tmp
done