Browse Source

(import v2.9) New \nolyrics macro puts chords on the baseline instead of raised, to better typeset instrumental solos and intros.

remotes/origin/translate_notes
Alexandre Dupas 15 years ago
parent
commit
47b93269ff
  1. 71
      songs.sty

71
songs.sty

@ -2374,45 +2374,52 @@
\SB@skip\lastskip% \SB@skip\lastskip%
\unskip\penalty200\hskip\SB@skip% \unskip\penalty200\hskip\SB@skip%
\fi% \fi%
\ifnum\SB@numhyps>0 % \ifnum\SB@numhyps>\z@%
\ifnum\SB@numhyps>\@ne\relax% \ifnum\SB@numhyps>\@ne\relax%
\SB@brokenwordfalse% \SB@brokenwordfalse%
\else% \else%
\SB@brokenwordtrue% \SB@brokenwordtrue%
\fi% \fi%
\fi% \fi%
\vbox{\baselineskip\f@size\p@\kern2\p@% \SB@testfalse%
\ifSB@brokenword% \ifnolyrics\ifdim\wd\SB@lyricbox=\z@\SB@testtrue\fi\fi%
\global\setbox\SB@lyricbox\hbox{% \ifSB@test%
\unhbox\SB@lyricbox% \unhbox\SB@chordbox%
\SB@ligpre% \gdef\SB@temp{\expandafter\SB@clearlig\SB@ligfull}%
}% \else%
\ifdim\wd\SB@lyricbox>\SB@dimen% \vbox{\baselineskip\f@size\p@\kern2\p@%
\SB@dimen\wd\SB@lyricbox% \ifSB@brokenword%
\global\setbox\SB@lyricbox\hbox{%
\unhbox\SB@lyricbox%
\SB@ligpre%
}%
\ifdim\wd\SB@lyricbox>\SB@dimen%
\SB@dimen\wd\SB@lyricbox%
\fi%
\advance\SB@dimen.5em%
\hbox to\SB@dimen{\unhbox\SB@chordbox\hfil}%
\kern-2\p@%
\hbox to\SB@dimen{%
\unhcopy\SB@lyricbox\hfil\char\hyphenchar\font\hfil%
}%
\global\SB@cnt\@m%
\gdef\SB@temp{\expandafter\SB@clearlig\SB@ligpost}%
\else%
\hbox{\unhbox\SB@chordbox\hfil}%
\kern-2\p@%
\hbox{%
\unhcopy\SB@lyricbox%
\global\SB@cnt\spacefactor%
\hfil%
}%
\gdef\SB@temp{\expandafter\SB@clearlig\SB@ligfull}%
\fi% \fi%
\advance\SB@dimen.5em% }%
\hbox to\SB@dimen{\unhbox\SB@chordbox\hfil}% \ifSB@wordends%
\kern-2\p@% \ifdim\wd\SB@lyricbox>\z@\else\nobreak\fi%
\hbox to\SB@dimen{%
\unhcopy\SB@lyricbox\hfil\char\hyphenchar\font\hfil%
}%
\global\SB@cnt\@m%
\gdef\SB@temp{\expandafter\SB@clearlig\SB@ligpost}%
\else% \else%
\hbox{\unhbox\SB@chordbox\hfil}% \nobreak\spacefactor\SB@cnt%
\kern-2\p@%
\hbox{%
\unhcopy\SB@lyricbox%
\global\SB@cnt\spacefactor%
\hfil%
}%
\gdef\SB@temp{\expandafter\SB@clearlig\SB@ligfull}%
\fi% \fi%
}%
\ifSB@wordends%
\ifdim\wd\SB@lyricbox>\z@\else\nobreak\fi%
\else%
\nobreak\spacefactor\SB@cnt%
\fi% \fi%
\SB@temp% \SB@temp%
} }
@ -3355,12 +3362,15 @@
\newif\ifpartiallist \newif\ifpartiallist
\newif\ifrepchorus \newif\ifrepchorus
\newif\iftranscapos \newif\iftranscapos
\newif\ifnolyrics
\newif\ifrawtext \newif\ifrawtext
\newif\ifpdfindex\pdfindextrue \newif\ifpdfindex\pdfindextrue
\newif\ifsongindexes\songindexestrue \newif\ifsongindexes\songindexestrue
\newif\ifSB@colorboxes\SB@colorboxestrue \newif\ifSB@colorboxes\SB@colorboxestrue
\newif\ifSB@genindexes\SB@genindexestrue \newif\ifSB@genindexes\SB@genindexestrue
\newif\ifSB@omitscrip \newif\ifSB@omitscrip
\newcommand\nolyrics{}
\let\nolyrics\nolyricstrue
\SB@chordson \SB@chordson
\ProcessOptions\relax \ProcessOptions\relax
\ifSB@pdf\else\pdfindexfalse\fi \ifSB@pdf\else\pdfindexfalse\fi
@ -3446,6 +3456,7 @@
\def\rep#1{(x#1)} \def\rep#1{(x#1)}
\def\echo#1{(#1)} \def\echo#1{(#1)}
\def\mbar#1#2{} \def\mbar#1#2{}
\def\nolyrics{}
\fi \fi
\endinput \endinput
%% %%

Loading…
Cancel
Save