From f876db21295cb864683378ed57270a440226cdd3 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Wed, 2 Mar 2016 07:44:24 +0100 Subject: [PATCH 1/5] Update to yaml songbooks and correct templates --- books/lyricbook_en.sb | 14 ------- books/lyricbook_en.yaml | 17 ++++++++ books/lyricbook_fr.sb | 14 ------- books/lyricbook_fr.yaml | 18 ++++++++ books/naheulbeuk.sb | 26 ------------ books/naheulbeuk.yaml | 32 +++++++++++++++ books/songbook.sb | 10 ----- books/songbook.yaml | 14 +++++++ books/songbook_en.sb | 15 ------- books/songbook_en.yaml | 14 +++++++ books/songbook_fr.sb | 15 ------- books/songbook_fr.yaml | 14 +++++++ templates/data.tex | 91 ++++++++++++++++++++++------------------- 13 files changed, 159 insertions(+), 135 deletions(-) delete mode 100644 books/lyricbook_en.sb create mode 100644 books/lyricbook_en.yaml delete mode 100644 books/lyricbook_fr.sb create mode 100644 books/lyricbook_fr.yaml delete mode 100644 books/naheulbeuk.sb create mode 100644 books/naheulbeuk.yaml delete mode 100644 books/songbook.sb create mode 100644 books/songbook.yaml delete mode 100644 books/songbook_en.sb create mode 100644 books/songbook_en.yaml delete mode 100644 books/songbook_fr.sb create mode 100644 books/songbook_fr.yaml diff --git a/books/lyricbook_en.sb b/books/lyricbook_en.sb deleted file mode 100644 index 139814c2..00000000 --- a/books/lyricbook_en.sb +++ /dev/null @@ -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" -} diff --git a/books/lyricbook_en.yaml b/books/lyricbook_en.yaml new file mode 100644 index 00000000..bdd20f5a --- /dev/null +++ b/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" diff --git a/books/lyricbook_fr.sb b/books/lyricbook_fr.sb deleted file mode 100644 index ecf5e60c..00000000 --- a/books/lyricbook_fr.sb +++ /dev/null @@ -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" -} diff --git a/books/lyricbook_fr.yaml b/books/lyricbook_fr.yaml new file mode 100644 index 00000000..529fe85f --- /dev/null +++ b/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" \ No newline at end of file diff --git a/books/naheulbeuk.sb b/books/naheulbeuk.sb deleted file mode 100644 index d3d0c6c2..00000000 --- a/books/naheulbeuk.sb +++ /dev/null @@ -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" -} diff --git a/books/naheulbeuk.yaml b/books/naheulbeuk.yaml new file mode 100644 index 00000000..3bec30a5 --- /dev/null +++ b/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"] diff --git a/books/songbook.sb b/books/songbook.sb deleted file mode 100644 index c5a79473..00000000 --- a/books/songbook.sb +++ /dev/null @@ -1,10 +0,0 @@ -{ -"template" : "data.tex", -"lang" : "french", -"content" : [["sorted"]], -"authwords" : { - "sep" : ["and", "et"] - }, - "datadir" : "..", - "encoding" : "utf8" -} diff --git a/books/songbook.yaml b/books/songbook.yaml new file mode 100644 index 00000000..4c131ba2 --- /dev/null +++ b/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: diff --git a/books/songbook_en.sb b/books/songbook_en.sb deleted file mode 100644 index 36baea0c..00000000 --- a/books/songbook_en.sb +++ /dev/null @@ -1,15 +0,0 @@ -{ -"template" : "data.tex", -"lang" : "english", -"bookoptions" : [ - "diagram", - "lilypond", - "pictures" - ], -"content" : [["sorted"]], -"authwords" : { - "sep" : ["and", "et"] - }, - "datadir" : "..", - "encoding" : "utf8" -} diff --git a/books/songbook_en.yaml b/books/songbook_en.yaml new file mode 100644 index 00000000..9d8564e4 --- /dev/null +++ b/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: \ No newline at end of file diff --git a/books/songbook_fr.sb b/books/songbook_fr.sb deleted file mode 100644 index 703f177a..00000000 --- a/books/songbook_fr.sb +++ /dev/null @@ -1,15 +0,0 @@ -{ -"template" : "data.tex", -"lang" : "french", -"bookoptions" : [ - "diagram", - "lilypond", - "pictures" - ], -"content" : [["sorted"]], -"authwords" : { - "sep" : ["and", "et"] - }, - "datadir" : "..", - "encoding" : "utf8" -} diff --git a/books/songbook_fr.yaml b/books/songbook_fr.yaml new file mode 100644 index 00000000..2e2eb896 --- /dev/null +++ b/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: \ No newline at end of file diff --git a/templates/data.tex b/templates/data.tex index a0afa244..593bce36 100644 --- a/templates/data.tex +++ b/templates/data.tex @@ -18,52 +18,61 @@ % MA 02110-1301, USA. (* variables *) -{ -"version":{ "description": {"english": "Version", "french": "Version"}, - "default": {"default": "3.7.2"} - }, -"chordfont":{ "description": {"english": "Chord font", - "french": "Police des accords"}, - "default": {"default": "i"} - }, -"chordcolor":{ "description": {"english": "Chord color, HTML notation", - "french": "Couleur des accords en notation HTML"}, - "default": {"default": "000000"} - }, -"versefont":{ "description": {"english": "Verse font", - "french": "Police des couplets"}, - "default": {"default": ""} - }, -"chorusfont":{ "description": {"english": "Chorus font", - "french": "Police des refrains"}, - "default": {"default": "i"} - }, -"geometry":{ "description": {"english": "Paper geometry (size, margin, orientation...), as options of the LaTeX geometry package.", - "french": "Format du papier (taille, marges, orientation...), avec le même format que les options du paquet LaTeX geometry."}, - "default": {"default":"a4paper"} - }, -"column_adjustment":{ "description": {"english": "Column adjsutment.", - "french": "Ajustement des colonnes."}, - "type": "enum", - "values": {"none": {"default": "none"}, - "only_one": {"default": "only_one"}, - "one_more": {"default": "one_more"} - }, - "default": {"default":"none"} - } -} +schema: + type: //rec + optional: + chordfont: //str + chordcolor: //str + versefont: //str + chorusfont: //str + geometry: //str + column_adjustment: + type: //any + of: + - type: //str + value: "only_one" + - type: //str + value: "one_more" + - type: //str + value: "none" +default: + en: + chordfont: "i" + chordcolor: "000000" + versefont: "" + chorusfont: "i" + geometry: "a4paper" + column_adjustment: none +description: + en: + chordfont: "Chord font (i, b, n)" + chordcolor: "Chord color, hexadecimal notation" + versefont: "Verse font (i, b, n)" + chorusfont: "Chorus font (i, b, n)" + 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 *) From 46839ebfbec060545b4bb5e0d519e4f3bce9b1a2 Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Wed, 2 Mar 2016 07:47:58 +0100 Subject: [PATCH 2/5] Remove duplicate --- books/lyricbook.sb | 15 --------------- books/songbook.yaml | 14 -------------- 2 files changed, 29 deletions(-) delete mode 100644 books/lyricbook.sb delete mode 100644 books/songbook.yaml diff --git a/books/lyricbook.sb b/books/lyricbook.sb deleted file mode 100644 index 0b5d1f90..00000000 --- a/books/lyricbook.sb +++ /dev/null @@ -1,15 +0,0 @@ -{ -"template" : "data.tex", -"lang" : "french", -"bookoptions" : [], -"booktype" : "lyric", -"author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", -"subtitle" : "parolier", -"title" : "Recueil de chansons", -"content" : [["sorted"]], -"authwords" : { - "sep" : ["and", "et"] - }, - "datadir" : "..", - "encoding" : "utf8" -} diff --git a/books/songbook.yaml b/books/songbook.yaml deleted file mode 100644 index 4c131ba2..00000000 --- a/books/songbook.yaml +++ /dev/null @@ -1,14 +0,0 @@ -book: - lang: en - encoding: utf8 - datadir: ".." - pictures: yes - template: data.tex -chords: - show: yes - diagramreminder: important - repeatchords: yes - lilypond: no - -content: - sort: From f9294541b40be46b401a7625c1bec258daf169ab Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Wed, 2 Mar 2016 09:30:54 +0100 Subject: [PATCH 3/5] Deactivate lilypond for AppVeyor compilation --- books/songbook_en.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/books/songbook_en.yaml b/books/songbook_en.yaml index 9d8564e4..2bab5c7f 100644 --- a/books/songbook_en.yaml +++ b/books/songbook_en.yaml @@ -8,7 +8,7 @@ chords: show: yes diagramreminder: important repeatchords: yes - lilypond: yes + lilypond: no content: sort: \ No newline at end of file From fae9aaf66409af289259058a69686627b40af1ed Mon Sep 17 00:00:00 2001 From: Oliverpool Date: Thu, 10 Mar 2016 16:36:25 +0100 Subject: [PATCH 4/5] Adopt new folder organization --- templates/{ => songbook}/data.tex | 0 templates/{ => songbook}/naheulbeuk.tex | 0 {latex => templates/styles}/licence.sty | 0 {latex => templates/styles}/license-nb.tex | 0 {latex => templates/styles}/license.tex | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename templates/{ => songbook}/data.tex (100%) rename templates/{ => songbook}/naheulbeuk.tex (100%) rename {latex => templates/styles}/licence.sty (100%) rename {latex => templates/styles}/license-nb.tex (100%) rename {latex => templates/styles}/license.tex (100%) diff --git a/templates/data.tex b/templates/songbook/data.tex similarity index 100% rename from templates/data.tex rename to templates/songbook/data.tex diff --git a/templates/naheulbeuk.tex b/templates/songbook/naheulbeuk.tex similarity index 100% rename from templates/naheulbeuk.tex rename to templates/songbook/naheulbeuk.tex diff --git a/latex/licence.sty b/templates/styles/licence.sty similarity index 100% rename from latex/licence.sty rename to templates/styles/licence.sty diff --git a/latex/license-nb.tex b/templates/styles/license-nb.tex similarity index 100% rename from latex/license-nb.tex rename to templates/styles/license-nb.tex diff --git a/latex/license.tex b/templates/styles/license.tex similarity index 100% rename from latex/license.tex rename to templates/styles/license.tex From 49139f9904396eee10f3851a540046128de9aea8 Mon Sep 17 00:00:00 2001 From: Louis Date: Sun, 17 Apr 2016 12:49:37 +0200 Subject: [PATCH 5/5] Move image to patacrep --- img/internet.png | Bin 1690 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 img/internet.png diff --git a/img/internet.png b/img/internet.png deleted file mode 100644 index 43299f171a2a6e92b9580c6f2f6eb86394022faa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1690 zcmV;L24(q)P)eiku)l}3_WJhP`h-%7=hfk3$2MEK_0?F0{jpSE3Zt+mj3N~U z;mwL)y|h-T=9NxVA}RmYRNv6NzkjclPNylC%Xps0mMvR( zvA2i2V`Fr6b}=$C%-yju{{H?4{wJRfj-%q^*RNf>@mzs#9e(BKxm@c=K0={qv*PUQZaEH^UizksXzYtY>47#Hwst(@RYzS zN007LCX$y2`uCcfnwn5bF+V?tVHlXE#kRI>?ArAL<<&B|Yzu~AVi-D7O2RNe2*C#* ze#md${9T}8Ik4_TD5dD@>oeOrI)*#ix3_KI)~d-!l1wJCY#T$@>FDTWXV*@IP;8v2 zuIrelNu{zz6h$bd_~-cx>Q`^PIjYO3w^%HO8i1Ls`K4uAxu(VjO)16h-Mf)eGC6Ud z9Xr}-X~|J2T;<%`=NK6oX6)V==o%r$>`^~0?M$+jz9LHto&JY4Pc<>;JM1t}0apG7pJ3GUww~B4rw6(R--rml> zeSHK$@W_{9XlRHZpZIAgHL=wYk^{DF2g!tMJ}9qHtyZvY2jBNeC6lynZKbufmAzls z3qYw<;`V2^$zyCHN6$8l)g+Dc<%6YcHo)YaCJzxpv99i2pxzaN@i&ebG&~-e|BM1UyED1uNjvYHtNsg$w7= zG>y^EM>zY|UrD$wv5NO->*nJ)CJaNOFd~X1|GIqniAb*Bd?WGW&m;r`2L_0wn5J+X_`h$u7%-|VG6}-OwTM< zK%5@T=VuK7BaTijE|rcqHq`HEZq8~C9;^_CA+@!2luAoakgdBELLh{O5OD78b5yET zJkMicX(bM$Xu^o2Qve!3u~-bFFgSMWvpdn!Qi;aKCOSI1*x$dOTrNjlZ5^3(hUQJp z+@F{rilWEv=H}+PGdxUPZ5@NRZn3bm9HHXl>)Y*#g|nxB;3o*qG&N+5)-5@$zP_GR zBE?#@LJ$OmVL%v!9654?{=R-5l*^nw`xhL?Wqfiv&R;7=&s{h|2pe$QJ3ISo(wRS5 zrkQKWHaIn@6t->Sc^* zp#e$21rnBJ)okzTKH<2|4@|=dlL^;y97{JJ<=+nis?|Wou?j*d&6VYqx9*MH`F#)s zWnc}c0G?7R-snIB5`gmvcBZMRrLL}ipY2#LS(dX`(?lmg9IMeFsD9#CgPSWWOaCs- k&rbtBP<@0orBn>?U%}=R$B%^+O#lD@07*qoM6N<$f{L6u^8f$<