diff --git a/Beginners/AllInAGardenGreen.abc b/Beginners/_AllInAGardenGreen.abc similarity index 100% rename from Beginners/AllInAGardenGreen.abc rename to Beginners/_AllInAGardenGreen.abc diff --git a/Beginners/ButteredPeas.abc b/Beginners/_ButteredPeas.abc similarity index 100% rename from Beginners/ButteredPeas.abc rename to Beginners/_ButteredPeas.abc diff --git a/Beginners/CaptainLanoesQuickMarch.abc b/Beginners/_CaptainLanoesQuickMarch.abc similarity index 100% rename from Beginners/CaptainLanoesQuickMarch.abc rename to Beginners/_CaptainLanoesQuickMarch.abc diff --git a/Beginners/ElizabethClare.abc b/Beginners/_ElizabethClare.abc similarity index 100% rename from Beginners/ElizabethClare.abc rename to Beginners/_ElizabethClare.abc diff --git a/Beginners/EmmaFromFinland.abc b/Beginners/_EmmaFromFinland.abc similarity index 100% rename from Beginners/EmmaFromFinland.abc rename to Beginners/_EmmaFromFinland.abc diff --git a/Beginners/GatheringPeascods.abc b/Beginners/_GatheringPeascods.abc similarity index 100% rename from Beginners/GatheringPeascods.abc rename to Beginners/_GatheringPeascods.abc diff --git a/Beginners/HerbertTheSherbert.abc b/Beginners/_HerbertTheSherbert.abc similarity index 100% rename from Beginners/HerbertTheSherbert.abc rename to Beginners/_HerbertTheSherbert.abc diff --git a/Beginners/JustAsTheTideWasFlowing.abc b/Beginners/_JustAsTheTideWasFlowing.abc similarity index 100% rename from Beginners/JustAsTheTideWasFlowing.abc rename to Beginners/_JustAsTheTideWasFlowing.abc diff --git a/Beginners/MazurkaAuvergne.abc b/Beginners/_MazurkaAuvergne.abc similarity index 100% rename from Beginners/MazurkaAuvergne.abc rename to Beginners/_MazurkaAuvergne.abc diff --git a/Beginners/MazurkaDeLapleau.abc b/Beginners/_MazurkaDeLapleau.abc similarity index 100% rename from Beginners/MazurkaDeLapleau.abc rename to Beginners/_MazurkaDeLapleau.abc diff --git a/Beginners/MichaelTurnersWaltz.abc b/Beginners/_MichaelTurnersWaltz.abc similarity index 100% rename from Beginners/MichaelTurnersWaltz.abc rename to Beginners/_MichaelTurnersWaltz.abc diff --git a/Beginners/OrangeInBloom.abc b/Beginners/_OrangeInBloom.abc similarity index 100% rename from Beginners/OrangeInBloom.abc rename to Beginners/_OrangeInBloom.abc diff --git a/Beginners/PlaneTree.abc b/Beginners/_PlaneTree.abc similarity index 100% rename from Beginners/PlaneTree.abc rename to Beginners/_PlaneTree.abc diff --git a/Beginners/RochdaleCoconutDance.abc b/Beginners/_RochdaleCoconutDance.abc similarity index 100% rename from Beginners/RochdaleCoconutDance.abc rename to Beginners/_RochdaleCoconutDance.abc diff --git a/Beginners/RoguesMarch.abc b/Beginners/_RoguesMarch.abc similarity index 100% rename from Beginners/RoguesMarch.abc rename to Beginners/_RoguesMarch.abc diff --git a/Beginners/RuftyTufty.abc b/Beginners/_RuftyTufty.abc similarity index 100% rename from Beginners/RuftyTufty.abc rename to Beginners/_RuftyTufty.abc diff --git a/Beginners/SalmonTails.abc b/Beginners/_SalmonTails.abc similarity index 100% rename from Beginners/SalmonTails.abc rename to Beginners/_SalmonTails.abc diff --git a/Beginners/ThreeAroundThree.abc b/Beginners/_ThreeAroundThree.abc similarity index 100% rename from Beginners/ThreeAroundThree.abc rename to Beginners/_ThreeAroundThree.abc diff --git a/Beginners/WinsterGallop.abc b/Beginners/_WinsterGallop.abc similarity index 100% rename from Beginners/WinsterGallop.abc rename to Beginners/_WinsterGallop.abc diff --git a/abcfield.py b/abcfield.py index a970b03..c3d04e8 100755 --- a/abcfield.py +++ b/abcfield.py @@ -189,6 +189,10 @@ def expandCustomMarkdown(t, dir): 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 --git a/makeGraphics.sh b/makeGraphics.sh index ed77ef3..ca94c3d 100755 --- a/makeGraphics.sh +++ b/makeGraphics.sh @@ -22,6 +22,11 @@ find $booke -maxdepth 1 -name "*.abc" | 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 @@ find ${booke}/Compact -maxdepth 1 -name "*.abc" | 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 --git a/makeWebAudio.sh b/makeWebAudio.sh index f696d1f..b7785da 100755 --- a/makeWebAudio.sh +++ b/makeWebAudio.sh @@ -78,6 +78,12 @@ find $booke -maxdepth 1 -name "*.abc" | sort | 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 --git a/makeWebGraphics.sh b/makeWebGraphics.sh index c1f1362..6bdc1f1 100755 --- a/makeWebGraphics.sh +++ b/makeWebGraphics.sh @@ -29,6 +29,12 @@ find $booke -maxdepth 1 -name "*.abc" | sort | do name=`basename $filename .abc` tunedir=$basetunedir/$name + + # Already generated? + if [ -f $tunedir/${name}.pdf ]; then + continue + fi + mkdir -p $tunedir tmpname=${name}.tmp