From b2b633e01d06322e0aa769988f0ea7320d9f9a37 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 19 Mar 2009 16:39:43 +0000 Subject: guitar update (17mar09) git-svn-id: svn://tug.org/texlive/trunk@12435 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/guitar/guitar.sty | 36 ++++++++++++++++----------- 1 file changed, 22 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex/guitar') diff --git a/Master/texmf-dist/tex/latex/guitar/guitar.sty b/Master/texmf-dist/tex/latex/guitar/guitar.sty index 20d6deaf272..78eaa5fc45c 100644 --- a/Master/texmf-dist/tex/latex/guitar/guitar.sty +++ b/Master/texmf-dist/tex/latex/guitar/guitar.sty @@ -12,10 +12,10 @@ \def\tbx@tmp{\immediate\write17}\expandafter\tbx@tmp \else \expandafter\typeout -\fi{guitar.sty by M. Vaeth: Guitar chords over song texts 1.5} +\fi{guitar.sty by M. Vaeth: Guitar chords over song texts 1.6} \ifx\ProvidesPackage\undefined\else - \ProvidesPackage{guitar}[2001/10/08 v1.5] + \ProvidesPackage{guitar}[2009/03/17 v1.6] \fi \ifx\RequirePackage\undefined \ifx\toolboxDef\undefined @@ -138,20 +138,23 @@ \def\gtr@magicOff{\gtr@magicOffCat \let\gtr@magicCondOff\toolboxEmpty \let\gtr@magicCondOn\toolboxEmpty} -\def\gtr@magicOnCat{\catcode`\[=13\relax} -\gtr@magicOnCat\def[{\gtr@chordTest\gtr@scanBrace} -\def\gtr@magicOffCat{\catcode`\[=12\relax} -\gtr@magicOff +\let\gtr@magicOnDef\toolboxEmpty +\def\gtr@magicOnCat{\catcode`\[=13\gtr@magicOnDef} +\gtr@magicOnCat\def\gtr@magicOnDef{\let\gtr@magicSave[\let[\gtr@magicNew}% +\def\gtr@magicNew{\gtr@chordTest\gtr@scanBrace} +\def\gtr@magicOffCat{\let[\gtr@magicSave\catcode`\[=12\relax} +\gtr@magicOnDef\gtr@magicOff \def\gtr@scanBrace#1]{\gtr@parse{#1}} \def\guitarChord{\gtr@chordTest\gtr@parse} \def\gtr@chordTest#1{\gtr@crMagicCondOff\gtr@change \toolboxIfNextGobbling*{\gtr@normal#1}{#1}} -\def\gtr@parse#1{\gtr@normal +\def\gtr@parse#1{\gtr@normal\gtr@changeDef \guitarSplitDist{#1}\guitarAccord\gtr@dist \expandafter \guitarSplitMerge\expandafter{\guitarAccord}\guitarAccord\gtr@merge + \gtr@changeUndef \toolboxIfNextGobbling\toolboxSpaceToken {\gtr@crMagicCondOn\guitarPutOnSpace}\gtr@para} \def\gtr@para#1{\gtr@crMagicCondOn @@ -166,10 +169,13 @@ \fi\gtr@tmp{#1}} \def\gtr@change{\catcode`\#=13\catcode`b=13\relax} -\gtr@change\def#{\guitarSharp} -\def b{\guitarFlat} +\gtr@change\def\gtr@changeDef{\let\gtr@sharpSave#\let#\gtr@sharpNew + \let\gtr@flatSave b\let b\gtr@flatNew} +\def\gtr@changeUndef{\let#\gtr@sharpSave\let b\gtr@flatSave} +\def\gtr@sharpNew{\guitarSharp} +\def\gtr@flatNew{\guitarFlat} \def\gtr@normal{\catcode`\#=6\catcode`b=11\relax} -\gtr@normal +\gtr@changeDef\gtr@normal \def\guitarCrOn{\guitarCrOnHook\gtr@crOn\gtr@ignorespaces} \def\guitarCrOff{\gtr@crOff\guitarCrOffHook} @@ -179,13 +185,15 @@ \def\gtr@crOff{\gtr@crOffCat \let\gtr@crCondOff\toolboxEmpty \let\gtr@crCondOn\toolboxEmpty} -\def\gtr@crOnCat{\catcode`\^^M=13\relax} -\gtr@crOnCat\def^^M{\toolboxIfNextGobbling^^M\gtr@par\guitarEndLine}% +\let\gtr@crOnDef\toolboxEmpty +\def\gtr@crOnCat{\catcode`\^^M=13\gtr@crOnDef} +\gtr@crOnCat\def\gtr@crOnDef{\let\gtr@crSave^^M\let^^M\gtr@crNew}% +\def\gtr@crNew{\toolboxIfNextGobbling^^M\gtr@par\guitarEndLine}% \def\gtr@par{\toolboxIfNextGobbling^^M\gtr@dblpar\guitarEndPar}% \def\gtr@dblpar{\toolboxIfNextGobbling^^M\gtr@dblpar\guitarEndDoublePar}% \def\gtr@ignorespaces{\toolboxIfNextGobbling^^M\gtr@ignorespaces\ignorespaces}% -\def\gtr@crOffCat{\catcode`\^^M=5\relax}% -\gtr@crOff +\def\gtr@crOffCat{\let^^M\gtr@crSave\catcode`\^^M=5\relax}% +\gtr@crOnDef\gtr@crOff \endinput %% -- cgit v1.2.3