Merge branch 'upstream' into debian/sid

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb
index a6c48af0..22ec72b0 100644
--- a/lib/sisu/v0/dal_syntax.rb
+++ b/lib/sisu/v0/dal_syntax.rb
@@ -1,3 +1,4 @@
+# coding: utf-8
 =begin
 
  * Name: SiSU
@@ -99,6 +100,7 @@ module Syntax
     end
     def songsheet
       @data.each do |line|
+        line=if @md.sem_tag then sem(line) else line end
         line=pre(line)
         line=wordlist_italics(line)
         line=wordlist_bold(line)
@@ -107,9 +109,11 @@ module Syntax
       end
       @data_new
     end
+    def sem(line)
+      line=SiSU_sem::Tags.new(line,@md).rm.all
+    end
     def pre(line)
       line=line.dup
-      line=SiSU_sem::Tags.new(line).rm.all
       if line =~/\{(?:t|table)(?:~h)?\s*c?[\d; ]*\}/; line.gsub!(/(\n)/,';;\1') #markup for alternative tables
       end
       line