Browse Source

Merge branch 'master' into cmake

remotes/origin/cmake
Romain Goffe 13 years ago
parent
commit
f4e3e015e6
  1. 2
      songs/Daniel_Guichard/Mon_vieux.sg
  2. 2
      utils/release.sh
  3. 2
      windows/cleanall.bat
  4. 6
      windows/make.bat

2
songs/Daniel_Guichard/Mon_vieux.sg

@ -10,7 +10,7 @@
\gtab{F}{1:022100} \gtab{F}{1:022100}
\gtab{G}{320003} \gtab{G}{320003}
\gtab{C7}{X32310} \gtab{C7}{X32310}
\gtab{F}{1:020100} \gtab{F7}{1:020100}
\gtab{Dm}{XX0231} \gtab{Dm}{XX0231}
\beginverse \beginverse

2
utils/release.sh

@ -79,4 +79,6 @@ then
git tag "patacrep_$MAIN.$MAJOR.$MINOR" git tag "patacrep_$MAIN.$MAJOR.$MINOR"
fi fi
notify-send "Patacrep!" "Release $MAIN.$MAJOR.$MINOR generated" --icon=songbook-client
export GREP_OPTIONS="$GREP" export GREP_OPTIONS="$GREP"

2
windows/cleanall.bat

@ -1,3 +1,3 @@
Rem manually performs "make cleanall" Rem manually performs "make cleanall"
clean.bat windows\\clean.bat
del *.pdf del *.pdf

6
windows/make.bat

@ -1,12 +1,12 @@
Rem build tex file from songbook file Rem build tex file from songbook file
songbook.py --songbook=books\%1.sb --output=%1.tex python songbook.py --songbook=books\%1.sb --output=%1.tex
Rem 1st pdf compilation Rem 1st pdf compilation
pdflatex %1.tex pdflatex %1.tex
Rem build indexes Rem build indexes
songbook-makeindex.py %1_title.sxd > %1_title.sbx python songbook-makeindex.py %1_title.sxd > %1_title.sbx
songbook-makeindex.py %1_auth.sxd > %1_auth.sbx python songbook-makeindex.py %1_auth.sxd > %1_auth.sbx
Rem 2nd compilation to include indexes Rem 2nd compilation to include indexes
pdflatex %1.tex pdflatex %1.tex

Loading…
Cancel
Save