Merge pull request #211 from patacrep/datadir_organisation

Datadir organisation
9 years ago · 6de27a84d9
19 changed files with 26 additions and 26 deletions
--- a/patacrep/data/templates/songbook/default.tex
+++ b/patacrep/data/templates/songbook/default.tex
--- a/patacrep/data/templates/songbook/layout.tex
+++ b/patacrep/data/templates/songbook/layout.tex
@ -28,7 +28,7 @@
 \makeatletter
 \def\input@path{ %
    (* for dir in _datadir|iter_datadirs *)
-        {(( dir | path2posix ))/latex/} %
+        {(( dir | path2posix ))/templates/styles/} %
    (* endfor *)
 }
 \makeatother
--- a/patacrep/data/templates/songbook/patacrep.tex
+++ b/patacrep/data/templates/songbook/patacrep.tex
--- a/patacrep/data/templates/songbook/songs.tex
+++ b/patacrep/data/templates/songbook/songs.tex
--- a/patacrep/data/templates/styles/chords.sty
+++ b/patacrep/data/templates/styles/chords.sty
--- a/patacrep/data/templates/styles/crepbook.sty
+++ b/patacrep/data/templates/styles/crepbook.sty
--- a/patacrep/data/templates/styles/patacrep.sty
+++ b/patacrep/data/templates/styles/patacrep.sty
--- a/patacrep/data/templates/styles/songs.sty
+++ b/patacrep/data/templates/styles/songs.sty
--- a/patacrep/data/templates/styles/tabs.sty
+++ b/patacrep/data/templates/styles/tabs.sty
--- a/patacrep/templates.py
+++ b/patacrep/templates.py
@ -137,7 +137,7 @@ class TexBookRenderer(Renderer):
        # Load templates in filesystem ...
        loaders = [
            FileSystemLoader(datadir)
-            for datadir in files.iter_datadirs(datadirs, 'templates')
+            for datadir in files.iter_datadirs(datadirs, 'templates', 'songbook')
            ]
        jinjaenv = Environment(
            loader=ChoiceLoader(loaders),
--- a/test/test_songbook/content.tex.control
+++ b/test/test_songbook/content.tex.control
@ -13,9 +13,9 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/content_datadir/latex/} %
+        {@TEST_FOLDER@/content_datadir/templates/styles/} %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/datadir.tex.control
+++ b/test/test_songbook/datadir.tex.control
@ -13,10 +13,10 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/datadir_datadir/latex/} %
+        {@TEST_FOLDER@/datadir_datadir/templates/styles/} %
-        {@TEST_FOLDER@/datadir_datadir2/latex/} %
+        {@TEST_FOLDER@/datadir_datadir2/templates/styles/} %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/lang_default.tex.control
+++ b/test/test_songbook/lang_default.tex.control
@ -13,8 +13,8 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/lang_en.tex.control
+++ b/test/test_songbook/lang_en.tex.control
@ -13,8 +13,8 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/lang_fr.tex.control
+++ b/test/test_songbook/lang_fr.tex.control
@ -13,8 +13,8 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/languages.tex.control
+++ b/test/test_songbook/languages.tex.control
@ -13,9 +13,9 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/languages_datadir/latex/} %
+        {@TEST_FOLDER@/languages_datadir/templates/styles/} %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/onthefly/content.onthefly.tex.control
+++ b/test/test_songbook/onthefly/content.onthefly.tex.control
@ -13,8 +13,8 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/onthefly/../content_datadir/latex/} %
+        {@TEST_FOLDER@/onthefly/../content_datadir/templates/styles/} %
-        {@LOCAL_DATA_FOLDER@/latex/} %
+        {@LOCAL_DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/syntax.tex.control
+++ b/test/test_songbook/syntax.tex.control
@ -13,9 +13,9 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/syntax_datadir/latex/} %
+        {@TEST_FOLDER@/syntax_datadir/templates/styles/} %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother
--- a/test/test_songbook/unicode.tex.control
+++ b/test/test_songbook/unicode.tex.control
@ -13,9 +13,9 @@
 \makeatletter
 \def\input@path{ %
-        {@TEST_FOLDER@/unicode_datadir/latex/} %
+        {@TEST_FOLDER@/unicode_datadir/templates/styles/} %
-        {@TEST_FOLDER@/latex/} %
+        {@TEST_FOLDER@/templates/styles/} %
-        {@DATA_FOLDER@/latex/} %
+        {@DATA_FOLDER@/templates/styles/} %
 }
 \makeatother