Browse Source

(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.
remotes/origin/split-songs
Alexandre Dupas 16 years ago
parent
commit
af4103c1ea
  1. 3
      chordbook.tex
  2. 12
      songs.sty
  3. 3
      volume-1.tex

3
chordbook.tex

@ -57,9 +57,6 @@
\showindex{Index des chansons}{titleidx} \showindex{Index des chansons}{titleidx}
\showindex{Index des auteurs}{authidx} \showindex{Index des auteurs}{authidx}
% desactivate ':' as an active character from babel[french]
\shorthandoff{:}
\songsection{Chansons} \songsection{Chansons}
\begin{songs}{titleidx,authidx} \begin{songs}{titleidx,authidx}
\input{songs.sbd} \input{songs.sbd}

12
songs.sty

@ -22,7 +22,7 @@
%% %%
\NeedsTeXFormat{LaTeX2e} \NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{songs} \ProvidesPackage{songs}
[2009/03/14 v2.8 Songs package] [2009/08/12 v2.8.1 Songs package]
\newif\ifSB@etex \newif\ifSB@etex
\ifx\eTeXversion\undefined\else \ifx\eTeXversion\undefined\else
\ifx\eTeXversion\relax\else \ifx\eTeXversion\relax\else
@ -2559,8 +2559,14 @@
\newcommand\SB@targstr{} \newcommand\SB@targstr{}
\newcommand\SB@targfing{} \newcommand\SB@targfing{}
\newcommand\gtab{\SB@begincname\SB@gtab} \newcommand\gtab{\SB@begincname\SB@gtab}
\newcommand\SB@gtab[1]{\SB@endcname\SB@@gtab{#1}} \newcommand*\SB@gtab[1]{%
\newcommand\SB@@gtab[2]{% \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% \SB@tabargs#2\relax\relax\relax\relax\relax\relax\relax\fi%
\ifvmode\leavevmode\fi% \ifvmode\leavevmode\fi%
\vbox{% \vbox{%

3
volume-1.tex

@ -57,9 +57,6 @@
\showindex{Index des chansons}{titleidx} \showindex{Index des chansons}{titleidx}
\showindex{Index des auteurs}{authidx} \showindex{Index des auteurs}{authidx}
% desactivate ':' as an active character from babel[french]
\shorthandoff{:}
\songsection{Chansons} \songsection{Chansons}
\begin{songs}{titleidx,authidx} \begin{songs}{titleidx,authidx}
\input{volume-1.sbd} \input{volume-1.sbd}

Loading…
Cancel
Save