diff --git a/songbook_core/data/templates/layout.tex b/songbook_core/data/templates/layout.tex index b7897ceb..9a17feab 100644 --- a/songbook_core/data/templates/layout.tex +++ b/songbook_core/data/templates/layout.tex @@ -28,44 +28,10 @@ (* variables *) { -"instruments": {"description": {"english": "Instruments", "french": "Instruments"}, - "type": "flag", - "values": {"guitar": {"english": "Guitare", "french": "Guitare"}, - "ukulele": {"english": "Ukulele", "french": "Ukulele"} - }, - "join": ",", - "mandatory": true, - "default": {"default":["guitar"]} - }, -"bookoptions": {"description": {"english": "Options", "french": "Options"}, - "type": "flag", - "values": {"diagram": {"english": "Chords diagrams", "french": "Diagrammes d'accords"}, - "importantdiagramonly": {"english": "Only importants diagrames", "french": "Diagrammes importants uniquement"}, - "lilypond": {"english": "Lilypond music sheets", "french": "Partitions lilypond"}, - "pictures": {"english": "Cover pictures", "french": "Couvertures d'albums"}, - "tabs": {"english": "Tablatures", "french": "Tablatures"}, - "repeatchords": {"english": "Repeat chords", "french": "Répéter les accords"}, - "onesongperpage": {"english": "One song per page", "french": "Une chanson par page"} - }, - "join": ",", - "mandatory": true, - "default": {"default":["diagram","pictures"]} - }, -"booktype": {"description": {"english": "Type", "french": "Type"}, - "type": "enum", - "values": {"chorded": {"english": "With guitar chords", "french": "Avec accords de guitare" }, - "lyric": {"english": "Lyrics only", "french": "Paroles uniquement"} - }, - "default": {"default":"chorded"}, - "mandatory": true - }, "mainfontsize": {"description": {"english": "Font Size", "french": "Taille de police"}, "type":"font", "default":{"default": "10"} - }, -"lang": {"description": {"english": "Language", "french": "Langue"}, - "default": {"english": "english", "french": "french"} - } + } } (* endvariables *) diff --git a/songbook_core/data/templates/patacrep.tex b/songbook_core/data/templates/patacrep.tex index 573e7051..2569865f 100644 --- a/songbook_core/data/templates/patacrep.tex +++ b/songbook_core/data/templates/patacrep.tex @@ -44,6 +44,7 @@ (* extends "default.tex" *) (* block songbookpackages *) +%! booktype, bookoptions and instruments are defined in "songs.tex" \usepackage[((booktype)), (* for option in bookoptions *)((option)), (* endfor *) diff --git a/songbook_core/data/templates/songs.tex b/songbook_core/data/templates/songs.tex index a2b5ba7f..e7f247d8 100644 --- a/songbook_core/data/templates/songs.tex +++ b/songbook_core/data/templates/songs.tex @@ -18,6 +18,44 @@ %! The latest version of this program can be obtained from %! https://github.com/patacrep/ +(* variables *) +{ +"instruments": {"description": {"english": "Instruments", "french": "Instruments"}, + "type": "flag", + "values": {"guitar": {"english": "Guitare", "french": "Guitare"}, + "ukulele": {"english": "Ukulele", "french": "Ukulele"} + }, + "join": ",", + "mandatory": true, + "default": {"default":["guitar"]} + }, +"bookoptions": {"description": {"english": "Options", "french": "Options"}, + "type": "flag", + "values": {"diagram": {"english": "Chords diagrams", "french": "Diagrammes d'accords"}, + "importantdiagramonly": {"english": "Only importants diagrames", "french": "Diagrammes importants uniquement"}, + "lilypond": {"english": "Lilypond music sheets", "french": "Partitions lilypond"}, + "pictures": {"english": "Cover pictures", "french": "Couvertures d'albums"}, + "tabs": {"english": "Tablatures", "french": "Tablatures"}, + "repeatchords": {"english": "Repeat chords", "french": "Répéter les accords"}, + "onesongperpage": {"english": "One song per page", "french": "Une chanson par page"} + }, + "join": ",", + "mandatory": true, + "default": {"default":["diagram","pictures"]} + }, +"booktype": {"description": {"english": "Type", "french": "Type"}, + "type": "enum", + "values": {"chorded": {"english": "With guitar chords", "french": "Avec accords de guitare" }, + "lyric": {"english": "Lyrics only", "french": "Paroles uniquement"} + }, + "default": {"default":"chorded"}, + "mandatory": true + }, +"lang": {"description": {"english": "Language", "french": "Langue"}, + "default": {"english": "english", "french": "french"} + } +} +(* endvariables *) (* extends "layout.tex" *)