From a5d5b002db3952910ebd4c04352a91d15076efe7 Mon Sep 17 00:00:00 2001 From: Romain Goffe Date: Wed, 2 May 2012 20:19:09 +0200 Subject: [PATCH] don't use {\shrp} macros with gtab/utab - only use this within nolyrics environments since it is actually a workaround - ensure compatibility with the next songbook-client --- songs/Anis/Dans_tes_yeux.sg | 4 ++-- .../Au_mariage_de_Kevin_et_de_ma_soeur.sg | 4 ++-- songs/Thomas_Fersen/Croque.sg | 12 ++++++------ songs/Thomas_Fersen/Irene.sg | 8 ++++---- songs/Thomas_Fersen/L_histoire_d_une_heure.sg | 4 ++-- songs/Thomas_Fersen/Le_bouton.sg | 8 ++++---- songs/Thomas_Fersen/Les_cravates.sg | 8 ++++---- songs/Thomas_Fersen/Les_malheurs_du_lion.sg | 4 ++-- songs/Thomas_Fersen/Monsieur.sg | 4 ++-- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/songs/Anis/Dans_tes_yeux.sg b/songs/Anis/Dans_tes_yeux.sg index 1b38c44f..cdba033c 100644 --- a/songs/Anis/Dans_tes_yeux.sg +++ b/songs/Anis/Dans_tes_yeux.sg @@ -5,12 +5,12 @@ \cover \gtab{Dm6}{5:X02210} - \gtab{A{\shrp}}{6:022100} + \gtab{A#}{6:022100} \gtab{C7}{9:020100} \gtab{A}{5:022100} \gtab{Gm6}{7:X0101X} \utab{Dm6}{2212} - \utab{A{\shrp}}{1:2100} + \utab{A#}{1:2100} \utab{C7}{0001} \utab{A}{2100} \utab{Gm6}{0201} diff --git a/songs/Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg b/songs/Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg index 9b7e312f..5a3f6059 100644 --- a/songs/Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg +++ b/songs/Les_Fatals_Picards/Au_mariage_de_Kevin_et_de_ma_soeur.sg @@ -6,7 +6,7 @@ \cover \gtab{Gm}{3:022000} \gtab{Dm}{XX0231} - \gtab{A{\shrp}}{1:X02220} + \gtab{A#}{1:X02220} \gtab{Cm}{3:X02210} \gtab{F}{1:022100} \gtab{G}{320003} @@ -16,7 +16,7 @@ \gtab{C}{X32010} \utab{Gm}{0231} \utab{Dm}{2210} - \utab{A{\shrp}}{1:2100} + \utab{A#}{1:2100} \utab{Cm}{0333} \utab{F}{2010} \utab{G}{0232} diff --git a/songs/Thomas_Fersen/Croque.sg b/songs/Thomas_Fersen/Croque.sg index 58445ccf..23b1b7fe 100644 --- a/songs/Thomas_Fersen/Croque.sg +++ b/songs/Thomas_Fersen/Croque.sg @@ -4,14 +4,14 @@ [by=Thomas Fersen,cov=piece-montee-des-grands-jours,album=Pièce montée des grands jours] \cover - \gtab{C{\shrp}m}{4:X02210} - \gtab{F{\shrp}m}{2:022000} - \gtab{G{\shrp}}{320003} + \gtab{C#m}{4:X02210} + \gtab{F#m}{2:022000} + \gtab{G#}{320003} \gtab{E}{022100} \gtab{A}{X02220} - \utab{C{\shrp}m}{1:0333} - \utab{F{\shrp}m}{2120} - \utab{G{\shrp}}{3:2010} + \utab{C#m}{1:0333} + \utab{F#m}{2120} + \utab{G#}{3:2010} \utab{E}{2:2220} \utab{A}{2100} diff --git a/songs/Thomas_Fersen/Irene.sg b/songs/Thomas_Fersen/Irene.sg index 024e4503..c2bb7745 100644 --- a/songs/Thomas_Fersen/Irene.sg +++ b/songs/Thomas_Fersen/Irene.sg @@ -5,13 +5,13 @@ \cover \gtab{B}{2:X02220} - \gtab{G{\shrp}m}{4:022000} + \gtab{G#m}{4:022000} \gtab{E}{022100} - \gtab{C{\shrp}m}{4:X02210} + \gtab{C#m}{4:X02210} \utab{B}{2:2100} - \utab{G{\shrp}m}{1:0231} + \utab{G#m}{1:0231} \utab{E}{2:2220} - \utab{C{\shrp}m}{1:0333} + \utab{C#m}{1:0333} \begin{verse*} \musicnote {\Intro : \nolyrics \[B G{\shrp}m E B] \rep{2}} diff --git a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg index 463300eb..d482d30a 100644 --- a/songs/Thomas_Fersen/L_histoire_d_une_heure.sg +++ b/songs/Thomas_Fersen/L_histoire_d_une_heure.sg @@ -8,13 +8,13 @@ \gtab{E}{022100} \gtab{A}{X02220} \gtab{Edim}{2:XX0131} - \gtab{F{\shrp}dim}{XX4212} + \gtab{F#dim}{XX4212} \utab{B7}{2:0100} \utab{E}{2:2220} \utab{A}{2100} \utab{Edim}{0101} - \utab{F{\shrp}dim}{2:0101} + \utab{F#dim}{2:0101} \begin{verse*} \musicnote {\Intro :} diff --git a/songs/Thomas_Fersen/Le_bouton.sg b/songs/Thomas_Fersen/Le_bouton.sg index f558eed6..2ec182d9 100644 --- a/songs/Thomas_Fersen/Le_bouton.sg +++ b/songs/Thomas_Fersen/Le_bouton.sg @@ -8,14 +8,14 @@ \gtab{D}{XX0232} \gtab{A}{X02220} \gtab{B}{2:X02220} - \gtab{G{\shrp}}{4:022100} - \gtab{A{\shrp}}{1:X02220} + \gtab{G#}{4:022100} + \gtab{A#}{1:X02220} \utab{C}{0003} \utab{D}{2220} \utab{A}{2100} \utab{B}{2:2100} - \utab{G{\shrp}}{3:2010} - \utab{A{\shrp}}{1:2100} + \utab{G#}{3:2010} + \utab{A#}{1:2100} \begin{verse} \[C] Ce matin, au \[D]saut du lit diff --git a/songs/Thomas_Fersen/Les_cravates.sg b/songs/Thomas_Fersen/Les_cravates.sg index 937ed400..e623359c 100644 --- a/songs/Thomas_Fersen/Les_cravates.sg +++ b/songs/Thomas_Fersen/Les_cravates.sg @@ -4,13 +4,13 @@ [by=Thomas Fersen,cov=piece-montee-des-grands-jours,album=Pièce montée des grands jours] \cover - \gtab{C{\shrp}m}{4:X02210} - \gtab{F{\shrp}m}{2:022000} + \gtab{C#m}{4:X02210} + \gtab{F#m}{2:022000} \gtab{Bm}{2:X02210} \gtab{E}{022100} \gtab{B7}{2:X02020} - \utab{C{\shrp}m}{1:0333} - \utab{F{\shrp}m}{2120} + \utab{C#m}{1:0333} + \utab{F#m}{2120} \utab{Bm}{2:2000} \utab{E}{2:2220} \utab{B7}{2:0100} diff --git a/songs/Thomas_Fersen/Les_malheurs_du_lion.sg b/songs/Thomas_Fersen/Les_malheurs_du_lion.sg index 0c27ee35..2acbf517 100644 --- a/songs/Thomas_Fersen/Les_malheurs_du_lion.sg +++ b/songs/Thomas_Fersen/Les_malheurs_du_lion.sg @@ -6,8 +6,8 @@ \cover \gtab{Cm}{3:X02210} \gtab{G}{320003} - \gtab{A{\shrp}}{1:X02220} - \gtab{D{\shrp}}{XX1343} + \gtab{A#}{1:X02220} + \gtab{D#}{XX1343} \gtab{Fm}{1:022000} \begin{chorus} diff --git a/songs/Thomas_Fersen/Monsieur.sg b/songs/Thomas_Fersen/Monsieur.sg index 399d329f..c4c876e4 100644 --- a/songs/Thomas_Fersen/Monsieur.sg +++ b/songs/Thomas_Fersen/Monsieur.sg @@ -5,8 +5,8 @@ \cover \gtab{Cm}{3:X02210} - \gtab{A{\shrp}}{1:X02220} - \gtab{D{\shrp}}{XX1343} + \gtab{A#}{1:X02220} + \gtab{D#}{XX1343} \gtab{G}{320003} \gtab{Fm}{1:022000} \gtab{B}{2:X02220}