--- testfile.ly.orig	2015-03-12 13:06:16.000000000 -0700
+++ testfile.ly	2015-03-12 13:17:01.000000000 -0700
@@ -1,17 +1,7 @@
 \version "2.18.2"
 \language "english"
 
-daCapo = {
-  \once
-  \override Score.RehearsalMark #'self-alignment-X = #RIGHT
-  \once
-  \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
-  %\tweak direction #DOWN
-  \mark
-  \markup {
-    \italic "Da Capo"
-  }
-}
+daCapo = \markup { \italic "Da Capo" }
 
 global = {
   \markLengthOn
@@ -29,7 +19,8 @@
   \mark "TRIO (ad lib.)"
   \key g \major
   \repeat volta 2 {
-    s2*8 
+    s2*7 
+    s4 s4_\daCapo
   }
 }
 
@@ -64,7 +55,6 @@
     c8 c d4 |
     b8 c a d |
     g,8\ff b16 a g8 r |
-    \daCapo
   }
 }