diff --git a/examples/example-subdir.sb b/examples/example-subdir.sb deleted file mode 100644 index b1c93e9f..00000000 --- a/examples/example-subdir.sb +++ /dev/null @@ -1,18 +0,0 @@ -{ -"bookoptions" : [ - "diagram", - "repeatchords", - "lilypond", - "pictures" - ], -"datadir": ["datadir2"], -"booktype" : "chorded", -"template" : "patacrep.tex", -"lang" : "french", -"encoding": "utf8", -"authwords" : { - "sep" : ["and", "et"] - }, - "content": [["sorted", "subdir/*.sg", "subdir/*.sgc"]] - -} diff --git a/examples/img/datadir.png b/examples/img/datadir.png deleted file mode 100644 index e2efe409..00000000 Binary files a/examples/img/datadir.png and /dev/null differ diff --git a/examples/root.ly b/examples/root.ly deleted file mode 100644 index 1fd2bccb..00000000 --- a/examples/root.ly +++ /dev/null @@ -1,19 +0,0 @@ -\include "_lilypond/header" -\paper{paper-height = 6.5\cm} - -{ - \key a \minor - \time 6/8 - \partial 8 a'8 - \relative c''{ - c4 d8 e8. (f16) e8 d4 b8 g8. (a16) b8 - c4 a8 a8. (gis16) a8 b4 gis8 e4 a8 - c4 d8 e8. (f16 e8) d4 b8 g8. (a16) b8 - c8. (b16) a8 gis8. (fis16) gis8 a4 a8 a4. - - g'4. g8. (fis16) e8 d4 b8 g8. (a16) b8 - c4 (a8) a8. (gis16) a8 b4 gis8 e4. - g'4. g8. (fis16) e8 d4 b8 g8. (a16) b8 - c8. (b16) a8 gis8. (fis16) gis8 a4. a4. - } -} diff --git a/examples/root.png b/examples/root.png deleted file mode 100644 index 70ea3b7c..00000000 Binary files a/examples/root.png and /dev/null differ diff --git a/examples/songs/subdir/relative.png b/examples/songs/subdir/relative.png deleted file mode 100644 index ff1b083e..00000000 Binary files a/examples/songs/subdir/relative.png and /dev/null differ diff --git a/examples/songs/subdir/root.sg b/examples/songs/subdir/root.sg deleted file mode 100644 index 2e4a11b0..00000000 --- a/examples/songs/subdir/root.sg +++ /dev/null @@ -1,10 +0,0 @@ -\beginsong{Image included from root directory\\\LaTeX} - [cov={root}] - - \cover - - \lilypond{root.ly} - - \image{root} - -\endsong diff --git a/examples/songs/subdir/root.sgc b/examples/songs/subdir/root.sgc deleted file mode 100644 index 0aa21297..00000000 --- a/examples/songs/subdir/root.sgc +++ /dev/null @@ -1,6 +0,0 @@ -{title : Image included from root directory} -{subtitle: Chordpro} -{cover: root.png} - -{partition: root.ly} -{image: root.png} diff --git a/examples/img/treble_a.png b/patacrep/data/img/treble_a.png similarity index 100% rename from examples/img/treble_a.png rename to patacrep/data/img/treble_a.png diff --git a/test/test_compilation/.gitignore b/test/test_compilation/.gitignore new file mode 100644 index 00000000..3f49c007 --- /dev/null +++ b/test/test_compilation/.gitignore @@ -0,0 +1,2 @@ +/*tex +.cache diff --git a/test/test_compilation/subdir.sb b/test/test_compilation/subdir.sb new file mode 100644 index 00000000..2e4acc69 --- /dev/null +++ b/test/test_compilation/subdir.sb @@ -0,0 +1,7 @@ +{ +"bookoptions" : [ + "lilypond", + "pictures" + ], +"datadir": ["subdir_datadir", "subdir_datadir2"] +} diff --git a/examples/img/datadir.ly b/test/test_compilation/subdir_datadir/img/datadir.ly similarity index 100% rename from examples/img/datadir.ly rename to test/test_compilation/subdir_datadir/img/datadir.ly diff --git a/test/test_compilation/subdir_datadir/img/datadir.png b/test/test_compilation/subdir_datadir/img/datadir.png new file mode 100644 index 00000000..044367ec Binary files /dev/null and b/test/test_compilation/subdir_datadir/img/datadir.png differ diff --git a/examples/songs/subdir/datadir.sg b/test/test_compilation/subdir_datadir/songs/datadir.sg similarity index 100% rename from examples/songs/subdir/datadir.sg rename to test/test_compilation/subdir_datadir/songs/datadir.sg diff --git a/examples/songs/subdir/datadir.sgc b/test/test_compilation/subdir_datadir/songs/datadir.sgc similarity index 100% rename from examples/songs/subdir/datadir.sgc rename to test/test_compilation/subdir_datadir/songs/datadir.sgc diff --git a/examples/songs/subdir/datadir2.sg b/test/test_compilation/subdir_datadir/songs/datadir2.sg similarity index 100% rename from examples/songs/subdir/datadir2.sg rename to test/test_compilation/subdir_datadir/songs/datadir2.sg diff --git a/examples/songs/subdir/datadir2.sgc b/test/test_compilation/subdir_datadir/songs/datadir2.sgc similarity index 100% rename from examples/songs/subdir/datadir2.sgc rename to test/test_compilation/subdir_datadir/songs/datadir2.sgc diff --git a/examples/songs/subdir/relative.ly b/test/test_compilation/subdir_datadir/songs/relative.ly similarity index 100% rename from examples/songs/subdir/relative.ly rename to test/test_compilation/subdir_datadir/songs/relative.ly diff --git a/test/test_compilation/subdir_datadir/songs/relative.png b/test/test_compilation/subdir_datadir/songs/relative.png new file mode 100644 index 00000000..7c1aecc3 Binary files /dev/null and b/test/test_compilation/subdir_datadir/songs/relative.png differ diff --git a/examples/songs/subdir/relative.sg b/test/test_compilation/subdir_datadir/songs/relative.sg similarity index 100% rename from examples/songs/subdir/relative.sg rename to test/test_compilation/subdir_datadir/songs/relative.sg diff --git a/examples/songs/subdir/relative.sgc b/test/test_compilation/subdir_datadir/songs/relative.sgc similarity index 100% rename from examples/songs/subdir/relative.sgc rename to test/test_compilation/subdir_datadir/songs/relative.sgc diff --git a/examples/datadir2/img/datadir2.ly b/test/test_compilation/subdir_datadir2/img/datadir2.ly similarity index 100% rename from examples/datadir2/img/datadir2.ly rename to test/test_compilation/subdir_datadir2/img/datadir2.ly diff --git a/examples/datadir2/img/datadir2.png b/test/test_compilation/subdir_datadir2/img/datadir2.png similarity index 100% rename from examples/datadir2/img/datadir2.png rename to test/test_compilation/subdir_datadir2/img/datadir2.png