Update to yaml songbooks and correct templates

books/lyricbook_en.sb

@@ -1,14 +0,0 @@
-{
-"template" : "data.tex",
-"lang" : "english",
-"bookoptions" : [],
-"booktype" : "lyric",
-"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)",
-"subtitle" : "lyrics",
-"content" : [["sorted"]],
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : "..",
- "encoding" : "utf8"
-}

books/lyricbook_en.yaml

@@ -0,0 +1,17 @@
+book:
+  lang: en
+  encoding: utf8
+  datadir: ".."
+  pictures: no
+  template: data.tex
+chords:
+  show: no
+
+content:
+    sort:
+
+template:
+  default.tex:
+    author: "Crep (R.Goffe) \\and Lohrun (A.Dupas)"
+  patacrep.tex:
+    subtitle: "lyrics"

books/lyricbook_fr.sb

@@ -1,14 +0,0 @@
-{
-"template" : "data.tex",
-"lang" : "french",
-"bookoptions" : [],
-"booktype" : "lyric",
-"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)",
-"subtitle" : "parolier",
-"content" : [["sorted"]],
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : "..",
- "encoding" : "utf8"
-}

books/lyricbook_fr.yaml

@@ -0,0 +1,18 @@
+book:
+  lang: fr
+  encoding: utf8
+  datadir: ".."
+  pictures: no
+  template: data.tex
+chords:
+  show: no
+
+content:
+    sort:
+
+template:
+  default.tex:
+    title: "Recueil de chansons"
+    author: "Crep (R.Goffe) \\and Lohrun (A.Dupas)"
+  patacrep.tex:
+    subtitle: "parolier"

books/naheulbeuk.sb

@@ -1,26 +0,0 @@
-{
-"template" : "naheulbeuk.tex",
-"lang" : "french",
-"bookoptions" : [
-    "diagram",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"footer" : "Musique du Naheulband: \\url{http://www.penofchaos.com/warham/donjon-groupe.htm}",
-"picture" : "img/nb_cover",
-"picturecopyright" : "Personnages par \\emph{Pen Of Chaos} / Illustrations par \\emph{Marion Poinsot}",
-"subtitle" : "Recueil de chansons non-officiel",
-"title" : "Le Donjon de Naheulbeuk",
-"version" : "0.5",
-"content" : [["sorted",
-    "belyscendre/*.sg",
-    "le_donjon_de_naheulbeuk/*.sg"
-  ]],
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : "..",
- "notebgcolor" : "FFFDB3",
- "encoding" : "utf8"
-}

books/naheulbeuk.yaml

@@ -0,0 +1,32 @@
+book:
+  lang: fr
+  datadir: ".."
+  pictures: yes
+  template: naheulbeuk.tex
+  encoding: utf8
+chords:
+  show: yes
+  diagramreminder: all
+  repeatchords: yes
+  lilypond: yes
+
+content:
+    sort:
+      content:
+      - "belyscendre/*.sg"
+      - "le_donjon_de_naheulbeuk/*.sg"
+
+template:
+  patacrep.tex:
+    footer: "Musique du Naheulband: \\url{http://www.penofchaos.com/warham/donjon-groupe.htm}"
+    picture: "img/nb_cover"
+    picturecopyright: "Personnages par \\emph{Pen Of Chaos} / Illustrations par \\emph{Marion Poinsot}"
+    subtitle: "Recueil de chansons non-officiel"
+    version: "0.5"
+    bgcolor:
+      note: "FFFDB3"
+
+  default.tex:
+    title: "Le Donjon de Naheulbeuk"
+authors:
+  separators: ["and", "et"]

books/songbook.sb

@@ -1,10 +0,0 @@
-{
-"template" : "data.tex",
-"lang" : "french",
-"content" : [["sorted"]],
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : "..",
- "encoding" : "utf8"
-}

books/songbook.yaml

@@ -0,0 +1,14 @@
+book:
+  lang: en
+  encoding: utf8
+  datadir: ".."
+  pictures: yes
+  template: data.tex
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: no
+
+content:
+    sort:

books/songbook_en.sb

@@ -1,15 +0,0 @@
-{
-"template" : "data.tex",
-"lang" : "english",
-"bookoptions" : [
-    "diagram",
-    "lilypond",
-    "pictures"
-  ],
-"content" : [["sorted"]],
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : "..",
- "encoding" : "utf8"
-}

books/songbook_en.yaml

@@ -0,0 +1,14 @@
+book:
+  lang: en
+  encoding: utf8
+  datadir: ".."
+  pictures: yes
+  template: data.tex
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+content:
+    sort:

books/songbook_fr.sb

@@ -1,15 +0,0 @@
-{
-"template" : "data.tex",
-"lang" : "french",
-"bookoptions" : [
-    "diagram",
-    "lilypond",
-    "pictures"
-  ],
-"content" : [["sorted"]],
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : "..",
- "encoding" : "utf8"
-}

books/songbook_fr.yaml

@@ -0,0 +1,14 @@
+book:
+  lang: fr
+  encoding: utf8
+  datadir: ".."
+  pictures: yes
+  template: data.tex
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+content:
+    sort:

templates/data.tex

@@ -18,52 +18,61 @@
 % MA  02110-1301, USA.
 
 (* variables *)
-{
+schema:
-"version":{ "description": {"english": "Version", "french": "Version"},
+  type: //rec
-            "default": {"default": "3.7.2"}
+  optional:
-         },
+    chordfont: //str
-"chordfont":{ "description": {"english": "Chord font",
+    chordcolor: //str
-                          "french": "Police des accords"},
+    versefont: //str
-            "default": {"default": "i"}
+    chorusfont: //str
-         },
+    geometry: //str
-"chordcolor":{ "description": {"english": "Chord color, HTML notation",
+    column_adjustment:
-                          "french": "Couleur des accords en notation HTML"},
+      type: //any
-            "default": {"default": "000000"}
+      of:
-         },
+        - type: //str
-"versefont":{ "description": {"english": "Verse font",
+          value: "only_one"
-                          "french": "Police des couplets"},
+        - type: //str
-            "default": {"default": ""}
+          value: "one_more"
-         },
+        - type: //str
-"chorusfont":{ "description": {"english": "Chorus font",
+          value: "none"
-                          "french": "Police des refrains"},
+default:
-            "default": {"default": "i"}
+  en:
-         },
+    chordfont: "i"
-"geometry":{ "description": {"english": "Paper geometry (size, margin, orientation...), as options of the LaTeX geometry package.",
+    chordcolor: "000000"
-                          "french": "Format du papier (taille, marges, orientation...), avec le même format que les options du paquet LaTeX geometry."},
+    versefont: ""
-            "default": {"default":"a4paper"}
+    chorusfont: "i"
-         },
+    geometry: "a4paper"
-"column_adjustment":{ "description": {"english": "Column adjsutment.",
+    column_adjustment: none
-                          "french": "Ajustement des colonnes."},
+description:
-            "type": "enum",
+  en:
-            "values": {"none": {"default": "none"},
+    chordfont: "Chord font (i, b, n)"
-                       "only_one": {"default": "only_one"},
+    chordcolor: "Chord color, hexadecimal notation"
-                       "one_more": {"default": "one_more"}
+    versefont: "Verse font (i, b, n)"
-                     },
+    chorusfont: "Chorus font (i, b, n)"
-            "default": {"default":"none"}
+    geometry: "Paper geometry (size, margin, orientation...), as options of the LaTeX geometry package."
-         }
+    column_adjustment: "Column adjsutment."
-}
+  fr:
+    chordfont: "Police des accords"
+    chordcolor: "Couleur des accords en notation hexadécimale"
+    versefont: "Police des couplets"
+    chorusfont: "Police des refrains"
+    geometry: "Format du papier (taille, marges, orientation...), avec le même format que les options du paquet LaTeX geometry."
+    column_adjustment: "Ajustement des colonnes."
+
+
 (* endvariables *)
 
 % begin document
 (* extends "patacrep.tex" *)
 
 (* block preambule *)
+(*- set template_var = _template["data.tex"] -*)
 \usepackage{licence}
 
 %! Font management
 \makeatletter
 \renewcommand{\chorusfont}{%
-   (* for letter in chorusfont *)
+   (* for letter in template_var.chorusfont *)
    (* if letter=="i" *)   \it %
    (* elif letter=='b' *)   \bf %
    (* elif letter=='n' *)   \normalfont %
@@ -72,18 +81,18 @@
 }
 
 \def\@chordfont{%
-   (* for letter in chordfont *)
+   (* for letter in template_var.chordfont *)
    (* if letter=="i" *)   \it %
    (* elif letter=='b' *)   \bf %
    (* elif letter=='n' *)   \normalfont %
    (* endif *)
    (* endfor *)
 }
-\definecolor{ChordColor}{HTML}{(( chordcolor ))}
+\definecolor{ChordColor}{HTML}{(( template_var.chordcolor ))}
 \renewcommand{\printchord}[1]{\@chordfont\textcolor{ChordColor}{#1}}
 
 \renewcommand{\lyricfont}{%
-   (* for letter in versefont *)
+   (* for letter in template_var.versefont *)
    (* if letter=="i" *)   \it %
    (* elif letter=='b' *)   \bf %
    (* elif letter=='n' *)   \normalfont %
@@ -94,15 +103,15 @@
 %! End of font management
 
 \geometry{
- ((geometry))
+ ((template_var.geometry))
 }
 
 %! Temporary hack for columns management
 \let\OldSongColumns=\songcolumns
 \def\songcolumns#1{%
-(* if column_adjustment=="only_one" *)
+(* if template_var.column_adjustment=="only_one" *)
     \OldSongColumns{1}
-(* elif column_adjustment=="one_more" *)
+(* elif template_var.column_adjustment=="one_more" *)
     \count0=#1\relax\advance\count0 by 1\relax%
     \OldSongColumns{\count0}
 (* else *)