Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / buildscripts / makelsr.py

diff --git a/buildscripts/makelsr.py b/buildscripts/makelsr.py
index 44da48c9dd0d4bdcee54f711519263c43971cbac..2206e61eeb38f00084f4d87cdcf45fe38c57b620 100755 (executable)
--- a/buildscripts/makelsr.py
+++ b/buildscripts/makelsr.py
@@ -4,7 +4,7 @@ import os
 import os.path
 import shutil
 
-dirs = ['ancient','chords','connecting','contemporary','expressive','guitar','parts','repeats','scheme','spacing','staff','text','vocal']
+dirs = ['ancient','chords','connecting','contemporary','expressive','education','guitar','parts','pitches','repeats','scheme','spacing','staff','text','vocal','other']
 notsafe=[]
 
 try:
@@ -27,8 +27,8 @@ def copy_dir_with_test(srcdir, destdir):
                        src = os.path.join (srcdir, file)
                        dest = os.path.join (destdir, file)
                        copy_with_warning(src, dest)
-                       os.system('convert-ly -e ' + src)
-                       s = os.system('lilypond -dsafe -dbackend=svg -o /tmp/lsrtest ' + dest)
+                       os.system('convert-ly -e ' + dest)
+                       s = os.system('lilypond -dno-print-pages -dsafe -o /tmp/lsrtest ' + dest)
                        if s:
                                notsafe.append(dest)
 
@@ -50,7 +50,7 @@ for dir in dirs:
        ## copy in new files from LSR download
        copy_dir_with_test( srcdir, destdir )
        ## copy in new files in source tree
-       copy_dir_with_test( os.path.join ('input', 'tolsr', dir), destdir )
+       copy_dir_with_test( os.path.join ('input', 'new', dir), destdir )
 
 
 file=open("lsr-unsafe.txt", 'w')