Mercurial > dottes
changeset 1026:e4d31e094d24
Changes to get Beginners booke building.
The web pages include prev and next links, so to get those right we
have to make the tune filenames distinct from the main booke names.
So fall back to taking the easy way, and just prefix all tune names with
@ or _.
author | Jim Hague <jim.hague@acm.org> |
---|---|
date | Tue, 18 Feb 2020 15:13:38 +0000 (2020-02-18) |
parents | 796ef7213ef7 |
children | 9a0a842a989e |
files | Beginners/AllInAGardenGreen.abc Beginners/ButteredPeas.abc Beginners/CaptainLanoesQuickMarch.abc Beginners/ElizabethClare.abc Beginners/EmmaFromFinland.abc Beginners/GatheringPeascods.abc Beginners/HerbertTheSherbert.abc Beginners/JustAsTheTideWasFlowing.abc Beginners/MazurkaAuvergne.abc Beginners/MazurkaDeLapleau.abc Beginners/MichaelTurnersWaltz.abc Beginners/OrangeInBloom.abc Beginners/PlaneTree.abc Beginners/RochdaleCoconutDance.abc Beginners/RoguesMarch.abc Beginners/RuftyTufty.abc Beginners/SalmonTails.abc Beginners/ThreeAroundThree.abc Beginners/WinsterGallop.abc Beginners/_AllInAGardenGreen.abc Beginners/_ButteredPeas.abc Beginners/_CaptainLanoesQuickMarch.abc Beginners/_ElizabethClare.abc Beginners/_EmmaFromFinland.abc Beginners/_GatheringPeascods.abc Beginners/_HerbertTheSherbert.abc Beginners/_JustAsTheTideWasFlowing.abc Beginners/_MazurkaAuvergne.abc Beginners/_MazurkaDeLapleau.abc Beginners/_MichaelTurnersWaltz.abc Beginners/_OrangeInBloom.abc Beginners/_PlaneTree.abc Beginners/_RochdaleCoconutDance.abc Beginners/_RoguesMarch.abc Beginners/_RuftyTufty.abc Beginners/_SalmonTails.abc Beginners/_ThreeAroundThree.abc Beginners/_WinsterGallop.abc abcfield.py makeGraphics.sh makeWebAudio.sh makeWebGraphics.sh |
diffstat | 42 files changed, 45 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/Beginners/AllInAGardenGreen.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/AllInAGardenGreen.abc \ No newline at end of file
--- a/Beginners/ButteredPeas.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/ButteredPeas.abc \ No newline at end of file
--- a/Beginners/CaptainLanoesQuickMarch.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/CaptainLanoesQuickMarch.abc \ No newline at end of file
--- a/Beginners/ElizabethClare.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/ElizabethClare.abc \ No newline at end of file
--- a/Beginners/EmmaFromFinland.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/EmmaFromFinland.abc \ No newline at end of file
--- a/Beginners/GatheringPeascods.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/GatheringPeascods.abc \ No newline at end of file
--- a/Beginners/HerbertTheSherbert.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/HerbertTheSherbert.abc \ No newline at end of file
--- a/Beginners/JustAsTheTideWasFlowing.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/JustAsTheTideWasFlowing.abc \ No newline at end of file
--- a/Beginners/MazurkaAuvergne.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/MazurkaAuvergne.abc \ No newline at end of file
--- a/Beginners/MazurkaDeLapleau.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/MazurkaDeLapleau.abc \ No newline at end of file
--- a/Beginners/MichaelTurnersWaltz.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/MichaelTurnersWaltz.abc \ No newline at end of file
--- a/Beginners/OrangeInBloom.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/OrangeInBloom.abc \ No newline at end of file
--- a/Beginners/PlaneTree.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/PlaneTree.abc \ No newline at end of file
--- a/Beginners/RochdaleCoconutDance.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/RochdaleCoconutDance.abc \ No newline at end of file
--- a/Beginners/RoguesMarch.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/RoguesMarch.abc \ No newline at end of file
--- a/Beginners/RuftyTufty.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/RuftyTufty.abc \ No newline at end of file
--- a/Beginners/SalmonTails.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/SalmonTails.abc \ No newline at end of file
--- a/Beginners/ThreeAroundThree.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/ThreeAroundThree.abc \ No newline at end of file
--- a/Beginners/WinsterGallop.abc Tue Feb 18 15:12:06 2020 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../Session/WinsterGallop.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_AllInAGardenGreen.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/AllInAGardenGreen.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_ButteredPeas.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/ButteredPeas.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_CaptainLanoesQuickMarch.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/CaptainLanoesQuickMarch.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_ElizabethClare.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/ElizabethClare.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_EmmaFromFinland.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/EmmaFromFinland.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_GatheringPeascods.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/GatheringPeascods.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_HerbertTheSherbert.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/HerbertTheSherbert.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_JustAsTheTideWasFlowing.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/JustAsTheTideWasFlowing.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_MazurkaAuvergne.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/MazurkaAuvergne.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_MazurkaDeLapleau.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/MazurkaDeLapleau.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_MichaelTurnersWaltz.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/MichaelTurnersWaltz.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_OrangeInBloom.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/OrangeInBloom.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_PlaneTree.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/PlaneTree.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_RochdaleCoconutDance.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/RochdaleCoconutDance.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_RoguesMarch.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/RoguesMarch.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_RuftyTufty.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/RuftyTufty.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_SalmonTails.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/SalmonTails.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_ThreeAroundThree.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/ThreeAroundThree.abc \ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Beginners/_WinsterGallop.abc Tue Feb 18 15:13:38 2020 +0000 @@ -0,0 +1,1 @@ +../Session/WinsterGallop.abc \ No newline at end of file
--- a/abcfield.py Tue Feb 18 15:12:06 2020 +0000 +++ b/abcfield.py Tue Feb 18 15:13:38 2020 +0000 @@ -189,6 +189,10 @@ def getTitleLink(m): fname = m.group(1) + ".abc" path = pathlib.Path(dir, fname) + if not path.exists(): + path = pathlib.Path(dir, '@' + fname) + if not path.exists(): + path = pathlib.Path(dir, '_' + fname) with path.open() as f: lines = f.readlines() return "[" + getFullTitle(lines, dir) + "](" + fname + ")"
--- a/makeGraphics.sh Tue Feb 18 15:12:06 2020 +0000 +++ b/makeGraphics.sh Tue Feb 18 15:13:38 2020 +0000 @@ -22,6 +22,11 @@ do name=`basename $filename .abc` + # Already generated? + if [ -f $graphicsdir/${name}.pdf ]; then + continue + fi + # Make the tune graphic. abcm2ps -E -F singletune -O $graphicsdir/$name.eps $filename # Make $name.eps so we can build with LaTeX. @@ -53,6 +58,11 @@ do name=`basename $filename .abc` + # Already generated? + if [ -f $graphicsdir/compact-${name}.pdf ]; then + continue + fi + # Make the tune graphic. abcm2ps -E -F singletune -O $graphicsdir/compact-${name}.eps $filename # Make $name.eps so we can build with LaTeX.
--- a/makeWebAudio.sh Tue Feb 18 15:12:06 2020 +0000 +++ b/makeWebAudio.sh Tue Feb 18 15:13:38 2020 +0000 @@ -78,6 +78,12 @@ do name=`basename $filename .abc` tunedir=$basetunedir/$name + + # Already generated? + if [ -f $tunedir/${name}.mp3 ]; then + continue + fi + mkdir -p $tunedir makeaudiofiles $filename $tunedir
--- a/makeWebGraphics.sh Tue Feb 18 15:12:06 2020 +0000 +++ b/makeWebGraphics.sh Tue Feb 18 15:13:38 2020 +0000 @@ -29,6 +29,12 @@ do name=`basename $filename .abc` tunedir=$basetunedir/$name + + # Already generated? + if [ -f $tunedir/${name}.pdf ]; then + continue + fi + mkdir -p $tunedir tmpname=${name}.tmp