From 4b801c6b90a2c225668ead4b47442f344f94ab80 Mon Sep 17 00:00:00 2001
From: Oliverpool <oliverpool@hotmail.fr>
Date: Tue, 9 Feb 2016 23:25:41 +0100
Subject: [PATCH] All examples now use yaml

---
 examples/example-all.yaml      | 44 +++++++++++++++-----------
 examples/example-all.yaml.yaml | 26 ----------------
 examples/example-crepbook.yaml | 46 +++++++++++++++-------------
 examples/example-layout.yaml   | 46 +++++++++++++++-------------
 examples/example-songs.yaml    | 46 +++++++++++++++-------------
 examples/example-test.yaml     | 26 ++++++++--------
 examples/example.yaml          | 44 +++++++++++++-------------
 examples/example_encoding.yaml | 56 +++++++++++++++++++---------------
 8 files changed, 166 insertions(+), 168 deletions(-)
 delete mode 100644 examples/example-all.yaml.yaml

diff --git a/examples/example-all.yaml b/examples/example-all.yaml
index 8c0639d4..fef92308 100644
--- a/examples/example-all.yaml
+++ b/examples/example-all.yaml
@@ -1,19 +1,27 @@
-{
-"bookoptions" : [
-    "diagram",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"datadir": ["datadir2"],
-"template" : "patacrep.tex",
-"lang" : "fr",
-"encoding": "utf8",
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : ".",
- "content": [["sort"]]
+book:
+  lang: fr
+  encoding: utf8
+  template: patacrep.tex
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: all
+  repeatchords: yes
 
-}
+authors:
+  separators:
+    - "and"
+    - "et"
+content:
+    - sort:
+
+template:
+  patacrep.tex:
+    color:
+      songlink: FF0000
+      hyperlink: 0000FF
+    bgcolor:
+      note: D1E4AE
+      songnumber: AED1E4
+      index: E4AED1 #not enough songs to see it
diff --git a/examples/example-all.yaml.yaml b/examples/example-all.yaml.yaml
deleted file mode 100644
index 814e8875..00000000
--- a/examples/example-all.yaml.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-book:
-  lang: fr
-  encoding: utf8
-  template: patacrep.tex
-  datadir: "."
-  pictures: yes
-chords:
-  show: yes
-  diagramreminder: all
-  repeatchords: yes
-
-authors:
-  separators:
-    - "and"
-    - "et"
-content: {"sort"}
-
-template:
-  patacrep.tex:
-    color:
-      songlink: FF0000
-      hyperlink: 0000FF
-    bgcolor:
-      note: D1E4AE
-      songnumber: AED1E4
-      index: E4AED1 #not enough songs to see it
diff --git a/examples/example-crepbook.yaml b/examples/example-crepbook.yaml
index 9c2a636c..a634a07b 100644
--- a/examples/example-crepbook.yaml
+++ b/examples/example-crepbook.yaml
@@ -1,22 +1,24 @@
-{
-"template" : "patacrep.tex",
-"bookoptions" : [
-    "importantdiagramonly",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"lang" : "fr",
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : ".",
- "content" : [["section", "Traditional"],
-                "chevaliers_de_la_table_ronde.sg",
-                "greensleeves.sg",
-                "vent_frais.sg",
-                ["section", "Example"],
-                "example-fr.sg",
-                "example-en.sg"]
-}
+book:
+  lang: fr
+  encoding: utf8
+  template: patacrep.tex
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+authors:
+  separators:
+    - "and"
+    - "et"
+content:
+  - section: "Traditional"
+  - "chevaliers_de_la_table_ronde.tsg"
+  - "greensleeves.csg"
+  - "vent_frais.tsg"
+  - section: Example
+  - "example-fr.tsg"
+  - "example-en.tsg"
diff --git a/examples/example-layout.yaml b/examples/example-layout.yaml
index 4c486924..f2259b7f 100644
--- a/examples/example-layout.yaml
+++ b/examples/example-layout.yaml
@@ -1,22 +1,24 @@
-{
-"template" : "layout.tex",
-"bookoptions" : [
-    "importantdiagramonly",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"lang" : "fr",
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : ".",
- "content" : [["section", "Traditional"],
-                "chevaliers_de_la_table_ronde.sg",
-                "greensleeves.sg",
-                "vent_frais.sg",
-                ["section", "Example"],
-                "example-fr.sg",
-                "example-en.sg"]
-}
+book:
+  lang: fr
+  encoding: utf8
+  template: layout.tex
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+authors:
+  separators:
+    - "and"
+    - "et"
+content:
+  - section: "Traditional"
+  - "chevaliers_de_la_table_ronde.tsg"
+  - "greensleeves.csg"
+  - "vent_frais.tsg"
+  - section: Example
+  - "example-fr.tsg"
+  - "example-en.tsg"
diff --git a/examples/example-songs.yaml b/examples/example-songs.yaml
index 3a46716c..6a3cb6de 100644
--- a/examples/example-songs.yaml
+++ b/examples/example-songs.yaml
@@ -1,22 +1,24 @@
-{
-"template" : "songs.tex",
-"bookoptions" : [
-    "importantdiagramonly",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"lang" : "fr",
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : ".",
- "content" : [["section", "Traditional"],
-                "chevaliers_de_la_table_ronde.sg",
-                "greensleeves.sg",
-                "vent_frais.sg",
-                ["section", "Example"],
-                "example-fr.sg",
-                "example-en.sg"]
-}
+book:
+  lang: fr
+  encoding: utf8
+  template: songs.tex
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+authors:
+  separators:
+    - "and"
+    - "et"
+content:
+  - section: "Traditional"
+  - "chevaliers_de_la_table_ronde.tsg"
+  - "greensleeves.csg"
+  - "vent_frais.tsg"
+  - section: Example
+  - "example-fr.tsg"
+  - "example-en.tsg"
diff --git a/examples/example-test.yaml b/examples/example-test.yaml
index 81b7420b..19b3d258 100644
--- a/examples/example-test.yaml
+++ b/examples/example-test.yaml
@@ -1,14 +1,14 @@
-{
-"bookoptions" : [
-    "diagram",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"lang": "ERROR",
-"booktype" : "chorded",
-"template" : "patacrep.tex",
-"encoding": "utf8",
- "content": ["tests/*.csg", "tests/*.tsg"]
+book:
+  lang: ERROR
+  encoding: utf8
+  template: patacrep.tex
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: all
+  repeatchords: yes
 
-}
+content:
+  - "tests/*.csg"
+  - "tests/*.tsg"
diff --git a/examples/example.yaml b/examples/example.yaml
index 55b489ad..6dc76ee5 100644
--- a/examples/example.yaml
+++ b/examples/example.yaml
@@ -1,21 +1,23 @@
-{
-"bookoptions" : [
-    "importantdiagramonly",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"lang" : "fr",
-"authwords" : {
-  "sep" : ["and", "et"]
-  },
- "datadir" : ".",
- "content" : [["section", "Traditional"],
-                "chevaliers_de_la_table_ronde.sg",
-                "greensleeves.sg",
-                "vent_frais.sg",
-                ["section", "Example"],
-                "example-fr.sg",
-                "example-en.sg"]
-}               
\ No newline at end of file
+book:
+  lang: fr
+  encoding: utf8
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+authors:
+  separators:
+    - "and"
+    - "et"
+content:
+  - section: "Traditional"
+  - "chevaliers_de_la_table_ronde.tsg"
+  - "greensleeves.csg"
+  - "vent_frais.tsg"
+  - section: Example
+  - "example-fr.tsg"
+  - "example-en.tsg"
diff --git a/examples/example_encoding.yaml b/examples/example_encoding.yaml
index bd3a63d9..3167bf90 100644
--- a/examples/example_encoding.yaml
+++ b/examples/example_encoding.yaml
@@ -1,24 +1,32 @@
-{
-"bookoptions" : [
-    "importantdiagramonly",
-    "repeatchords",
-    "lilypond",
-    "pictures"
-  ],
-"booktype" : "chorded",
-"lang" : "fr",
-"authwords" : {
-  "sep" : ["and", "et", "À"],
-  "ignore" : ["À"],
-  "after" : ["À"]
-  },
-  "titleprefixwords": ["À"],
- "datadir" : ".",
- "content" : [["section", "Traditional"],
-                "chevaliers_de_la_table_ronde.sg",
-                "greensleeves.sg",
-                "vent_frais.sg",
-                ["section", "Example"],
-                "example-fr.sg",
-                "example-en.sg"]
-}               
+book:
+  lang: fr
+  encoding: utf8
+  datadir: "."
+  pictures: yes
+chords:
+  show: yes
+  diagramreminder: important
+  repeatchords: yes
+  lilypond: yes
+
+authors:
+  separators:
+    - "and"
+    - "et"
+    - "À"
+  ignore:
+    - "À"
+  after:
+    - "À"
+
+titles: # Comment sont analysés les titres
+  prefix:
+    - "À"
+content:
+  - section: "Traditionàl"
+  - "chevaliers_de_la_table_ronde.tsg"
+  - "greensleeves.csg"
+  - "vent_frais.tsg"
+  - section: Exâmple
+  - "example-fr.tsg"
+  - "example-en.tsg"