From: fred <fred>
Date: Sun, 24 Mar 2002 20:00:09 +0000 (+0000)
Subject: lilypond-0.1.22
X-Git-Tag: release/1.5.59~3743
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b996418e87c80985b9b9ff55eae23fb9a04a9867;p=lilypond.git

lilypond-0.1.22
---

diff --git a/init/engraver.ly b/init/engraver.ly
index 0852b4ca8c..528df1cc67 100644
--- a/init/engraver.ly
+++ b/init/engraver.ly
@@ -66,7 +66,7 @@ Lyric_voice =
 
 	\consists "Lyric_engraver";
 	\consists "Line_group_engraver";
-	%\consists "Swallow_engraver";
+	\consists "Beam_req_swallow_translator";
 }
 
 Lyrics = \translator {
diff --git a/lily/include/my-lily-lexer.hh b/lily/include/my-lily-lexer.hh
index e3272eb9cd..6b659ad7d9 100644
--- a/lily/include/my-lily-lexer.hh
+++ b/lily/include/my-lily-lexer.hh
@@ -26,37 +26,37 @@ void set_lexer();
 
 /// lexer for Mudela
 class My_lily_lexer : public Includable_lexer {
-    int lookup_keyword (String);
-    int scan_bare_word (String);
-    int scan_escaped_word (String);
+  int lookup_keyword (String);
+  int scan_bare_word (String);
+  int scan_escaped_word (String);
 
-    bool post_quotes_b_;
+  bool post_quotes_b_;
+  char escaped_char(char) const;
 public:
-    void * lexval_l;
+  void * lexval_l;
     
-    Notename_table  *note_tab_p_;
-    Dictionary<Identifier*> *identifier_p_dict_p_;
-    Keyword_table * keytable_p_;
-    int errorlevel_i_;
-
-    /* *************** */
-
-    void clear_notenames();
-    Identifier*lookup_identifier (String s);
-    Melodic_req* lookup_melodic_req_l (String s);
-  void push_header_state();
-    void push_note_state();
-    void push_lyric_state();
-    void pop_state();
-    void LexerError (char const *);
-    My_lily_lexer();
-    void set_identifier (String,Identifier*i);
-    ~My_lily_lexer();
-    int yylex();
-    void print_declarations (bool init_b) const;
-    void add_notename (String, Melodic_req*);
-    bool note_state_b() const;
-    bool lyric_state_b() const;
+  Notename_table  *note_tab_p_;
+  Dictionary<Identifier*> *identifier_p_dict_p_;
+  Keyword_table * keytable_p_;
+  int errorlevel_i_;
+
+  /* *************** */
+
+  void clear_notenames();
+  Identifier*lookup_identifier (String s);
+  Melodic_req* lookup_melodic_req_l (String s);
+  void push_note_state();
+  void push_lyric_state();
+  void pop_state();
+  void LexerError (char const *);
+  My_lily_lexer();
+  void set_identifier (String,Identifier*i);
+  ~My_lily_lexer();
+  int yylex();
+  void print_declarations (bool init_b) const;
+  void add_notename (String, Melodic_req*);
+  bool note_state_b() const;
+  bool lyric_state_b() const;
 };
 
 #endif