From cdf22745704fab09184fb6dc6fd4159406d9bba3 Mon Sep 17 00:00:00 2001 From: Louis Date: Sat, 14 Jun 2014 18:08:58 +0200 Subject: [PATCH 1/4] =?UTF-8?q?Tri=20de=20tous=20les=20recueils=20en=20uti?= =?UTF-8?q?lisant=20le=20tri=20par=20d=C3=A9faut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- books/lyricbook.sb | 1 + books/lyricbook_en.sb | 1 + books/lyricbook_fr.sb | 1 + books/naheulbeuk.sb | 4 ++-- books/songbook.sb | 1 + books/songbook_en.sb | 1 + books/songbook_fr.sb | 1 + books/volume-1.sb | 4 ++-- books/volume-2.sb | 4 ++-- books/volume-3.sb | 4 ++-- books/volume-4.sb | 5 +++-- books/volume-5.sb | 5 +++-- 12 files changed, 20 insertions(+), 12 deletions(-) diff --git a/books/lyricbook.sb b/books/lyricbook.sb index fea74e3e..4e2f8cb8 100644 --- a/books/lyricbook.sb +++ b/books/lyricbook.sb @@ -6,6 +6,7 @@ "author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", "subtitle" : "parolier", "title" : "Recueil de chansons", +"content" : [["sorted"]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/lyricbook_en.sb b/books/lyricbook_en.sb index 853d5e67..9a20fdff 100644 --- a/books/lyricbook_en.sb +++ b/books/lyricbook_en.sb @@ -5,6 +5,7 @@ "booktype" : "lyric", "author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", "subtitle" : "lyrics", +"content" : [["sorted"]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/lyricbook_fr.sb b/books/lyricbook_fr.sb index 871b1493..bfd0ce33 100644 --- a/books/lyricbook_fr.sb +++ b/books/lyricbook_fr.sb @@ -5,6 +5,7 @@ "booktype" : "lyric", "author" : "Crep (R.Goffe) \\and Lohrun (A.Dupas)", "subtitle" : "parolier", +"content" : [["sorted"]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/naheulbeuk.sb b/books/naheulbeuk.sb index f27f33ff..131135c2 100644 --- a/books/naheulbeuk.sb +++ b/books/naheulbeuk.sb @@ -13,10 +13,10 @@ "subtitle" : "Recueil de chansons non-officiel", "title" : "Le Donjon de Naheulbeuk", "version" : "0.5", -"content" : [ +"content" : [["sorted", "belyscendre/*.sg", "le_donjon_de_naheulbeuk/*.sg" - ], + ]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/songbook.sb b/books/songbook.sb index 9fce6fc6..3c2e569d 100644 --- a/books/songbook.sb +++ b/books/songbook.sb @@ -1,6 +1,7 @@ { "template" : "data.tex", "lang" : "french", +"content" : [["sorted"]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/songbook_en.sb b/books/songbook_en.sb index 9c67e87d..75b82dd0 100644 --- a/books/songbook_en.sb +++ b/books/songbook_en.sb @@ -6,6 +6,7 @@ "lilypond", "pictures" ], +"content" : [["sorted"]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/songbook_fr.sb b/books/songbook_fr.sb index 615db5f8..31adc694 100644 --- a/books/songbook_fr.sb +++ b/books/songbook_fr.sb @@ -6,6 +6,7 @@ "lilypond", "pictures" ], +"content" : [["sorted"]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/volume-1.sb b/books/volume-1.sb index edac15d8..ae43dbbc 100644 --- a/books/volume-1.sb +++ b/books/volume-1.sb @@ -10,7 +10,7 @@ "picture" : "feel-the-music", "picturecopyright" : "foxygamergirl @ deviantart.com", "subtitle" : "Tome 1", -"content" : [ +"content" : [["sorted", "alain_bashung/gaby_oh_gaby.sg", "amy_macdonald/mr._rock_n_roll.sg", "amy_macdonald/this_is_the_life.sg", @@ -181,7 +181,7 @@ "yves_jamait/et_je_bois.sg", "yvon_etienne/chemise_rouge.sg", "yvon_etienne/y_a_des_nouilles_et_du_nougat.sg" - ], + ]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/volume-2.sb b/books/volume-2.sb index 418c27df..1329a635 100644 --- a/books/volume-2.sb +++ b/books/volume-2.sb @@ -10,7 +10,7 @@ "picture" : "sound", "picturecopyright" : "ellesh @ deviantart.com", "subtitle" : "Tome 2", -"content" : [ +"content" : [["sorted", "aaron/u_turn_lili.sg", "alain_souchon/foule_sentimentale.sg", "alex_beaupain/je_n_aime_que_toi.sg", @@ -188,7 +188,7 @@ "yuki_kajiura/jr.sg", "yuki_kajiura/vanity.sg", "edith_piaf/l_homme_a_la_moto.sg" - ], + ]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/volume-3.sb b/books/volume-3.sb index cc4e7696..efdfe670 100644 --- a/books/volume-3.sb +++ b/books/volume-3.sb @@ -10,7 +10,7 @@ "picture" : "Mousey_Band_by_Duffzilla", "picturecopyright" : "duffzilla @ deviantart.com", "subtitle" : "Tome 3", -"content" : [ +"content" : [["sorted", "alain_souchon/l_amour_a_la_machine.sg", "alanis_morissette/ironic.sg", "alex_beaupain/as_tu_deja_aime.sg", @@ -176,7 +176,7 @@ "traditionnel/l_homme_de_cromagnon.sg", "tri_yann/kiss_the_cildren_for_me_mary.sg", "tri_yann/les_filles_de_redon.sg" - ], + ]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/volume-4.sb b/books/volume-4.sb index dd85bef9..1e18fce2 100644 --- a/books/volume-4.sb +++ b/books/volume-4.sb @@ -10,7 +10,7 @@ "picture" : "music_by_lauratheartist", "picturecopyright" : "LauraTheArtist @ deviantart.com", "subtitle" : "Tome 4", -"content" : [ +"content" : [["sorted", "alain_souchon/bidon.sg", "ben_e_king/stand_by_me.sg", "bill_withers/just_two_of_us.sg", @@ -170,7 +170,8 @@ "vincent_delerm/la_natation_synchronisee.sg", "william_balde/rayon_de_soleil.sg", "yves_duteil/le_petit_pont_de_bois.sg", - "yves_simon/les_bateaux_du_metro.sg"], + "yves_simon/les_bateaux_du_metro.sg" + ]], "authwords" : { "sep" : ["and", "et"] }, diff --git a/books/volume-5.sb b/books/volume-5.sb index fae7f97e..c63bbf90 100644 --- a/books/volume-5.sb +++ b/books/volume-5.sb @@ -10,7 +10,7 @@ "picture" : "The_Music_Machine_by_hit_squad", "picturecopyright" : "hit-squad @ deviantart.com", "subtitle" : "Tome 5", -"content" : [ +"content" : [["sorted", "3_doors_down/here_without_you.sg", "adele/rolling_in_the_deep.sg", "alain_souchon/la_ballade_de_jim.sg", @@ -191,7 +191,8 @@ "yves_jamait/etc.sg", "yves_jamait/jean-louis.sg", "yves_simon/diabolo_menthe.sg", - "yves_simon/les_bateaux_du_metro.sg"], + "yves_simon/les_bateaux_du_metro.sg" + ]], "authwords" : { "sep" : ["and", "et"] }, From ad374a34c49a0b154891f7e19d71c26766130090 Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 18 Jun 2014 16:11:59 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Marquage=20du=20script=20comme=20obsol?= =?UTF-8?q?=C3=A8te?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/release.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/utils/release.sh b/utils/release.sh index 9f6e9d98..968cb758 100755 --- a/utils/release.sh +++ b/utils/release.sh @@ -1,5 +1,8 @@ #!/bin/sh +echo "It is very unlikely that this script is up-to-date. Check it before running it." +exit 1 + #Author: Romain Goffe #Date: 13/10/2011 #Description: Build all the pdf on www.patacrep.com, increase their From 79615ade015b7aca48642f85fb2be51e72c1c029 Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 18 Jun 2014 16:17:06 +0200 Subject: [PATCH 3/4] =?UTF-8?q?Pr=C3=A9paration=20du=20changement=20de=20n?= =?UTF-8?q?om?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Voir patacrep/songbook-core#39 --- README.md | 10 +++++----- templates/data.tex | 2 +- templates/naheulbeuk.tex | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d5db7bfb..fef54431 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ -songbook-data -============= +Patadata +======== Songs data for LaTeX songbooks. This data is meant to be processed by the songbook toolkit: -- [command line client](https://github.com/patacrep/songbook-core/tree/next) -- [gui client](https://github.com/patacrep/songbook-gui/tree/next) (not up-to-date with this data) -- [web client](https://github.com/patacrep/songbook-web) work in progress. +- [command line client](https://github.com/patacrep/patacrep) +- [gui client](https://github.com/patacrep/patagui) (not up-to-date with this data) +- [web client](https://github.com/patacrep/patawebTODO) work in progress. diff --git a/templates/data.tex b/templates/data.tex index d79bdfc1..832ebcf4 100644 --- a/templates/data.tex +++ b/templates/data.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2014 The Songbook Team +% Copyright (C) 2014 The Patacrep Team % Copyright (C) 2009-2010 Romain Goffe, Alexandre Dupas % Copyright (C) 2008 Kevin W. Hamlen % diff --git a/templates/naheulbeuk.tex b/templates/naheulbeuk.tex index 53161b20..81aefc0e 100644 --- a/templates/naheulbeuk.tex +++ b/templates/naheulbeuk.tex @@ -1,4 +1,4 @@ -% Copyright (C) 2014 The Songbook Team +% Copyright (C) 2014 The Patacrep Team % Copyright (C) 2009-2010 Romain Goffe, Alexandre Dupas % Copyright (C) 2008 Kevin W. Hamlen % From b2d49ba3d313c7ceb08fb6f80100d33f975f39f6 Mon Sep 17 00:00:00 2001 From: Louis Date: Wed, 18 Jun 2014 17:51:09 +0200 Subject: [PATCH 4/4] Changement de nom de pataweb --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fef54431..b2f099d6 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ Songs data for LaTeX songbooks. This data is meant to be processed by the songbook toolkit: - [command line client](https://github.com/patacrep/patacrep) - [gui client](https://github.com/patacrep/patagui) (not up-to-date with this data) -- [web client](https://github.com/patacrep/patawebTODO) work in progress. +- [web client](https://github.com/patacrep/patanet) work in progress.