# HG changeset patch # User Jim Hague # Date 1582038818 0 # Node ID e4d31e094d24ddbdfac8ccc70428653439716133 # Parent 796ef7213ef771632e22298f8fef4c634ec2b014 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 _. diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/AllInAGardenGreen.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/ButteredPeas.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/CaptainLanoesQuickMarch.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/ElizabethClare.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/EmmaFromFinland.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/GatheringPeascods.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/HerbertTheSherbert.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/JustAsTheTideWasFlowing.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/MazurkaAuvergne.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/MazurkaDeLapleau.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/MichaelTurnersWaltz.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/OrangeInBloom.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/PlaneTree.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/RochdaleCoconutDance.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/RoguesMarch.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/RuftyTufty.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/SalmonTails.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/ThreeAroundThree.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/WinsterGallop.abc --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_AllInAGardenGreen.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_ButteredPeas.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_CaptainLanoesQuickMarch.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_ElizabethClare.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_EmmaFromFinland.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_GatheringPeascods.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_HerbertTheSherbert.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_JustAsTheTideWasFlowing.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_MazurkaAuvergne.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_MazurkaDeLapleau.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_MichaelTurnersWaltz.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_OrangeInBloom.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_PlaneTree.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_RochdaleCoconutDance.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_RoguesMarch.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_RuftyTufty.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_SalmonTails.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_ThreeAroundThree.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 Beginners/_WinsterGallop.abc --- /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 diff -r 796ef7213ef7 -r e4d31e094d24 abcfield.py --- 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 + ")" diff -r 796ef7213ef7 -r e4d31e094d24 makeGraphics.sh --- 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. diff -r 796ef7213ef7 -r e4d31e094d24 makeWebAudio.sh --- 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 diff -r 796ef7213ef7 -r e4d31e094d24 makeWebGraphics.sh --- 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