From 83ba7ce62c9d579c1697ed8f3cf1b0ec752ec948 Mon Sep 17 00:00:00 2001
From: Louis <spalax@gresille.org>
Date: Sun, 11 Oct 2015 10:59:05 +0200
Subject: [PATCH] [examples] Add an example with a second datadir

---
 .../data/examples/datadir2/img/datadir2.ly    |  19 ++++++++++++++++++
 .../data/examples/datadir2/img/datadir2.png   | Bin 0 -> 4032 bytes
 patacrep/data/examples/example-subdir.sb      |   1 +
 .../data/examples/songs/subdir/datadir2.sg    |  10 +++++++++
 .../data/examples/songs/subdir/datadir2.sgc   |   6 ++++++
 5 files changed, 36 insertions(+)
 create mode 100644 patacrep/data/examples/datadir2/img/datadir2.ly
 create mode 100644 patacrep/data/examples/datadir2/img/datadir2.png
 create mode 100644 patacrep/data/examples/songs/subdir/datadir2.sg
 create mode 100644 patacrep/data/examples/songs/subdir/datadir2.sgc

diff --git a/patacrep/data/examples/datadir2/img/datadir2.ly b/patacrep/data/examples/datadir2/img/datadir2.ly
new file mode 100644
index 00000000..1fd2bccb
--- /dev/null
+++ b/patacrep/data/examples/datadir2/img/datadir2.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/patacrep/data/examples/datadir2/img/datadir2.png b/patacrep/data/examples/datadir2/img/datadir2.png
new file mode 100644
index 0000000000000000000000000000000000000000..90a75c1dffaad630090ccc70ca0e578ba5a648d4
GIT binary patch
literal 4032
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

literal 0
HcmV?d00001

diff --git a/patacrep/data/examples/example-subdir.sb b/patacrep/data/examples/example-subdir.sb
index c7d23631..b1c93e9f 100644
--- a/patacrep/data/examples/example-subdir.sb
+++ b/patacrep/data/examples/example-subdir.sb
@@ -5,6 +5,7 @@
     "lilypond",
     "pictures"
   ],
+"datadir": ["datadir2"],
 "booktype" : "chorded",
 "template" : "patacrep.tex",
 "lang" : "french",
diff --git a/patacrep/data/examples/songs/subdir/datadir2.sg b/patacrep/data/examples/songs/subdir/datadir2.sg
new file mode 100644
index 00000000..f5bad860
--- /dev/null
+++ b/patacrep/data/examples/songs/subdir/datadir2.sg
@@ -0,0 +1,10 @@
+\beginsong{Image included from a different datadir\\\LaTeX}
+  [cov={datadir2}]
+
+  \cover
+
+  \lilypond{datadir2.ly}
+
+  \image{datadir2}
+
+\endsong
diff --git a/patacrep/data/examples/songs/subdir/datadir2.sgc b/patacrep/data/examples/songs/subdir/datadir2.sgc
new file mode 100644
index 00000000..b83122d4
--- /dev/null
+++ b/patacrep/data/examples/songs/subdir/datadir2.sgc
@@ -0,0 +1,6 @@
+{title : Image included from a different datadir}
+{subtitle: Chordpro}
+{cover: datadir2.png}
+
+{partition: datadir2.ly}
+{image: datadir2.png}