From af1a36b16ff71ab463cd145e0ffa35eecac97c92 Mon Sep 17 00:00:00 2001
From: Alexandre Dupas <alexandre.dupas@gmail.com>
Date: Wed, 12 Aug 2009 23:14:01 +0200
Subject: [PATCH] (import v2.9) Fixed a compatibility issue with Babel that
 caused \gtab to malfunction when French was the active language. Removed
 current workaround from chordbook.tex and volume-1.tex.

---
 chordbook.tex |  3 ---
 songs.sty     | 12 +++++++++---
 volume-1.tex  |  3 ---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/chordbook.tex b/chordbook.tex
index 40fc0f2d..39f5841f 100644
--- a/chordbook.tex
+++ b/chordbook.tex
@@ -57,9 +57,6 @@
 \showindex{Index des chansons}{titleidx}
 \showindex{Index des auteurs}{authidx}
 
-% desactivate ':' as an active character from babel[french]
-\shorthandoff{:} 
-
 \songsection{Chansons}
 \begin{songs}{titleidx,authidx}
   \input{songs.sbd}
diff --git a/songs.sty b/songs.sty
index 7e7ac682..8cccf39d 100644
--- a/songs.sty
+++ b/songs.sty
@@ -22,7 +22,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{songs}
-  [2009/03/14 v2.8 Songs package]
+  [2009/08/12 v2.8.1 Songs package]
 \newif\ifSB@etex
 \ifx\eTeXversion\undefined\else
   \ifx\eTeXversion\relax\else
@@ -2559,8 +2559,14 @@
 \newcommand\SB@targstr{}
 \newcommand\SB@targfing{}
 \newcommand\gtab{\SB@begincname\SB@gtab}
-\newcommand\SB@gtab[1]{\SB@endcname\SB@@gtab{#1}}
-\newcommand\SB@@gtab[2]{%
+\newcommand*\SB@gtab[1]{%
+  \SB@endcname%
+  \begingroup%
+    \catcode`:12\relax%
+    \SB@@gtab{#1}%
+}
+\newcommand*\SB@@gtab[2]{%
+  \endgroup%
   \SB@tabargs#2\relax\relax\relax\relax\relax\relax\relax\fi%
   \ifvmode\leavevmode\fi%
   \vbox{%
diff --git a/volume-1.tex b/volume-1.tex
index b4e411aa..d6e75009 100644
--- a/volume-1.tex
+++ b/volume-1.tex
@@ -57,9 +57,6 @@
 \showindex{Index des chansons}{titleidx}
 \showindex{Index des auteurs}{authidx}
 
-% desactivate ':' as an active character from babel[french]
-\shorthandoff{:} 
-
 \songsection{Chansons}
 \begin{songs}{titleidx,authidx}
   \input{volume-1.sbd}