From cd0e0838f40a2420d6160fd63fa11a9463ef74f7 Mon Sep 17 00:00:00 2001 From: Louis Date: Thu, 29 Oct 2015 14:05:22 +0100 Subject: [PATCH] [test] Renamed `subdir` tests into `datadir` --- .../{subdir.sb => datadir.sb} | 2 +- ...subdir.tex.control => datadir.tex.control} | 25 +++++++++--------- .../img/datadir.png | Bin .../scores/datadir.ly | 0 .../songs/datadir.sg | 0 .../songs/datadir.sgc | 0 .../songs/datadir2.sg | 0 .../songs/datadir2.sgc | 0 .../songs/relative.ly | 0 .../songs/relative.png | Bin .../songs/relative.sg | 0 .../songs/relative.sgc | 0 .../img/datadir2.png | Bin .../scores/datadir2.ly | 0 14 files changed, 14 insertions(+), 13 deletions(-) rename test/test_compilation/{subdir.sb => datadir.sb} (51%) rename test/test_compilation/{subdir.tex.control => datadir.tex.control} (80%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/img/datadir.png (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/scores/datadir.ly (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/datadir.sg (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/datadir.sgc (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/datadir2.sg (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/datadir2.sgc (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/relative.ly (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/relative.png (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/relative.sg (100%) rename test/test_compilation/{subdir_datadir => datadir_datadir}/songs/relative.sgc (100%) rename test/test_compilation/{subdir_datadir2 => datadir_datadir2}/img/datadir2.png (100%) rename test/test_compilation/{subdir_datadir2 => datadir_datadir2}/scores/datadir2.ly (100%) diff --git a/test/test_compilation/subdir.sb b/test/test_compilation/datadir.sb similarity index 51% rename from test/test_compilation/subdir.sb rename to test/test_compilation/datadir.sb index 28132138..357c28d7 100644 --- a/test/test_compilation/subdir.sb +++ b/test/test_compilation/datadir.sb @@ -2,6 +2,6 @@ "bookoptions" : [ "pictures" ], -"datadir": ["subdir_datadir", "subdir_datadir2"], +"datadir": ["datadir_datadir", "datadir_datadir2"], "lang": "en" } diff --git a/test/test_compilation/subdir.tex.control b/test/test_compilation/datadir.tex.control similarity index 80% rename from test/test_compilation/subdir.tex.control rename to test/test_compilation/datadir.tex.control index 87ae4e77..35791783 100644 --- a/test/test_compilation/subdir.tex.control +++ b/test/test_compilation/datadir.tex.control @@ -13,8 +13,8 @@ \makeatletter \def\input@path{ % - {@TEST_FOLDER@/subdir_datadir/latex/} % - {@TEST_FOLDER@/subdir_datadir2/latex/} % + {@TEST_FOLDER@/datadir_datadir/latex/} % + {@TEST_FOLDER@/datadir_datadir2/latex/} % {@TEST_FOLDER@/latex/} % {@DATA_FOLDER@/latex/} % } @@ -32,14 +32,15 @@ guitar, \usepackage{lmodern} +\PassOptionsToPackage{english}{babel} \PassOptionsToPackage{english}{babel} \usepackage[english]{babel} \lang{english} \usepackage{graphicx} \graphicspath{ % - {@TEST_FOLDER@/subdir_datadir/} % - {@TEST_FOLDER@/subdir_datadir2/} % + {@TEST_FOLDER@/datadir_datadir/} % + {@TEST_FOLDER@/datadir_datadir2/} % {@TEST_FOLDER@/} % {@DATA_FOLDER@/} % } @@ -60,8 +61,8 @@ guitar, \title{Guitar songbook} \author{The Patacrep Team} -\newindex{titleidx}{subdir_title} -\newauthorindex{authidx}{subdir_auth} +\newindex{titleidx}{datadir_title} +\newauthorindex{authidx}{datadir_auth} \notenamesout{A}{B}{C}{D}{E}{F}{G} @@ -91,7 +92,7 @@ guitar, %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./datadir.sg -\import{subdir_datadir/songs/}{datadir.sg} +\import{datadir_datadir/songs/}{datadir.sg} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./datadir.sgc @@ -118,7 +119,7 @@ Chordpro}[ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./datadir2.sg -\import{subdir_datadir/songs/}{datadir2.sg} +\import{datadir_datadir/songs/}{datadir2.sg} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./datadir2.sgc @@ -145,7 +146,7 @@ Chordpro}[ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./relative.sg -\import{subdir_datadir/songs/}{relative.sg} +\import{datadir_datadir/songs/}{relative.sg} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./relative.sgc @@ -156,15 +157,15 @@ Chordpro}[ Chordpro}[ by={ }, - cov={@TEST_FOLDER@/subdir_datadir/songs/./relative.png}, + cov={@TEST_FOLDER@/datadir_datadir/songs/./relative.png}, ] \cover -\lilypond{@TEST_FOLDER@/subdir_datadir/songs/./relative.ly} -\image{@TEST_FOLDER@/subdir_datadir/songs/./relative.png} +\lilypond{@TEST_FOLDER@/datadir_datadir/songs/./relative.ly} +\image{@TEST_FOLDER@/datadir_datadir/songs/./relative.png} \endsong diff --git a/test/test_compilation/subdir_datadir/img/datadir.png b/test/test_compilation/datadir_datadir/img/datadir.png similarity index 100% rename from test/test_compilation/subdir_datadir/img/datadir.png rename to test/test_compilation/datadir_datadir/img/datadir.png diff --git a/test/test_compilation/subdir_datadir/scores/datadir.ly b/test/test_compilation/datadir_datadir/scores/datadir.ly similarity index 100% rename from test/test_compilation/subdir_datadir/scores/datadir.ly rename to test/test_compilation/datadir_datadir/scores/datadir.ly diff --git a/test/test_compilation/subdir_datadir/songs/datadir.sg b/test/test_compilation/datadir_datadir/songs/datadir.sg similarity index 100% rename from test/test_compilation/subdir_datadir/songs/datadir.sg rename to test/test_compilation/datadir_datadir/songs/datadir.sg diff --git a/test/test_compilation/subdir_datadir/songs/datadir.sgc b/test/test_compilation/datadir_datadir/songs/datadir.sgc similarity index 100% rename from test/test_compilation/subdir_datadir/songs/datadir.sgc rename to test/test_compilation/datadir_datadir/songs/datadir.sgc diff --git a/test/test_compilation/subdir_datadir/songs/datadir2.sg b/test/test_compilation/datadir_datadir/songs/datadir2.sg similarity index 100% rename from test/test_compilation/subdir_datadir/songs/datadir2.sg rename to test/test_compilation/datadir_datadir/songs/datadir2.sg diff --git a/test/test_compilation/subdir_datadir/songs/datadir2.sgc b/test/test_compilation/datadir_datadir/songs/datadir2.sgc similarity index 100% rename from test/test_compilation/subdir_datadir/songs/datadir2.sgc rename to test/test_compilation/datadir_datadir/songs/datadir2.sgc diff --git a/test/test_compilation/subdir_datadir/songs/relative.ly b/test/test_compilation/datadir_datadir/songs/relative.ly similarity index 100% rename from test/test_compilation/subdir_datadir/songs/relative.ly rename to test/test_compilation/datadir_datadir/songs/relative.ly diff --git a/test/test_compilation/subdir_datadir/songs/relative.png b/test/test_compilation/datadir_datadir/songs/relative.png similarity index 100% rename from test/test_compilation/subdir_datadir/songs/relative.png rename to test/test_compilation/datadir_datadir/songs/relative.png diff --git a/test/test_compilation/subdir_datadir/songs/relative.sg b/test/test_compilation/datadir_datadir/songs/relative.sg similarity index 100% rename from test/test_compilation/subdir_datadir/songs/relative.sg rename to test/test_compilation/datadir_datadir/songs/relative.sg diff --git a/test/test_compilation/subdir_datadir/songs/relative.sgc b/test/test_compilation/datadir_datadir/songs/relative.sgc similarity index 100% rename from test/test_compilation/subdir_datadir/songs/relative.sgc rename to test/test_compilation/datadir_datadir/songs/relative.sgc diff --git a/test/test_compilation/subdir_datadir2/img/datadir2.png b/test/test_compilation/datadir_datadir2/img/datadir2.png similarity index 100% rename from test/test_compilation/subdir_datadir2/img/datadir2.png rename to test/test_compilation/datadir_datadir2/img/datadir2.png diff --git a/test/test_compilation/subdir_datadir2/scores/datadir2.ly b/test/test_compilation/datadir_datadir2/scores/datadir2.ly similarity index 100% rename from test/test_compilation/subdir_datadir2/scores/datadir2.ly rename to test/test_compilation/datadir_datadir2/scores/datadir2.ly