From 83b0c1693a1995b6af5c613f0b28b5a72f750f42 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 19 Nov 2015 17:36:49 +0100 Subject: [PATCH] [Bug] Add a datadir with a space --- test/test_songbook/datadir.tex.control | 27 ++++++++++++++++++ .../songs/subdir with space/subdir.csg | 7 +++++ .../songs/subdir with space/subdir.ly | 19 ++++++++++++ .../songs/subdir with space/subdir.png | Bin 0 -> 4366 bytes .../songs/subdir with space/subdir.tsg | 10 +++++++ 5 files changed, 63 insertions(+) create mode 100644 test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg create mode 100644 test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly create mode 100644 test/test_songbook/datadir_datadir/songs/subdir with space/subdir.png create mode 100644 test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg diff --git a/test/test_songbook/datadir.tex.control b/test/test_songbook/datadir.tex.control index afc99160..73e5ac31 100644 --- a/test/test_songbook/datadir.tex.control +++ b/test/test_songbook/datadir.tex.control @@ -170,6 +170,33 @@ Chordpro}[ \import{@TEST_FOLDER@/datadir_datadir/songs/}{relative.tsg} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% songs/./subdir with space/subdir.csg + +\selectlanguage{english} + +\beginsong{Image included from a nested song directory with a space\\ +Chordpro}[ + by={ + }, + cover={/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/./subdir with space/subdir.png}, +] + +\cover + + + +\lilypond{/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/./subdir with space/subdir.ly} +\image{/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/./subdir with space/subdir.png} + + +\endsong + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% songs/./subdir with space/subdir.tsg + +\import{/home/olivier/Home/Projects/patacrep/patacrep/test/test_songbook/datadir_datadir/songs/subdir with space/}{subdir.tsg} + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% songs/./subdir/subdir.csg diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg new file mode 100644 index 00000000..6bfdefae --- /dev/null +++ b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.csg @@ -0,0 +1,7 @@ +{title : Image included from a nested song directory with a space} +{subtitle: Chordpro} +{cover: subdir.png} +{lang: en} + +{partition: subdir.ly} +{image: subdir.png} diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly new file mode 100644 index 00000000..1fd2bccb --- /dev/null +++ b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.ly @@ -0,0 +1,19 @@ +\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/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.png b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.png new file mode 100644 index 0000000000000000000000000000000000000000..2e134e8f932036837347aa3acc4d640cca81d571 GIT binary patch literal 4366 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 literal 0 HcmV?d00001 diff --git a/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg new file mode 100644 index 00000000..b2199460 --- /dev/null +++ b/test/test_songbook/datadir_datadir/songs/subdir with space/subdir.tsg @@ -0,0 +1,10 @@ +\beginsong{Image included from a nested song directory\\\LaTeX} + [cover={subdir}] + + \cover + + \lilypond{subdir.ly} + + \image{subdir} + +\endsong