From: Han-Wen Nienhuys Date: Thu, 4 Nov 2004 15:10:58 +0000 (+0000) Subject: mention forcing. X-Git-Tag: release/2.4.2~3^2~16 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=4b028bb1fb19d87c033586b17b030190c011724b;p=lilypond.git mention forcing. --- diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly index f66966d0ae..67193f4a0c 100644 --- a/input/regression/new-slur.ly +++ b/input/regression/new-slur.ly @@ -68,10 +68,8 @@ \clef treble \new Voice { \slurDown - c=''4( d, c') s4 - } - \new Voice \relative c'' { - \slurDown f2( d4 f | g c a f | d c f2 | f1) | + c=''4(^"slurs forced down" d, c') s4 + f=''2( d4 f | g c a f | d c f2 | f1) | } % \override Slur #'excentricity = #-2 diff --git a/lily/lexer.ll b/lily/lexer.ll index 391d2d5141..dc55cdb1bb 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -28,10 +28,13 @@ /* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks when building the actual lexer. */ + #define LEXER_CC #include + using namespace std; + #include "music-function.hh" #include "source-file.hh" #include "parse-scm.hh"