2 files changed, 62 insertions, 2 deletions
diff --git a/laravel/app/Http/Controllers/SongController.php b/laravel/app/Http/Controllers/SongController.php
index 44c766d..d1d4741 100644
--- a/laravel/app/Http/Controllers/SongController.php
+++ b/laravel/app/Http/Controllers/SongController.php
@@ -11,6 +11,50 @@ class SongController extends Controller
     public function show( $songNumber )
     {
         $song = Song::where('number', $songNumber )->first();
-        return view('song', ['song' => $song ] );
+        $lines = explode( "\n", $song['text'] );
+        $newText = '';
+        foreach( $lines as $line ){
+            $line = htmlspecialchars( $line );
+            if ( $this->chordline( $line ) ) {
+                $transp = 0;
+                $class = "tabs chord$transp";
+                $line = str_replace(
+                    array('{','}'),
+                    array('</b>{', "}<b class='$class'>" ),
+                    $line );
+                $newText .= "<b class='$class'>" . $line . "</b>\n";
+            } else {
+            $newText .= "$line\n";
+            }
+        }
+        $song['escapedText'] = $newText;
+        return view('song', ['song' => $song, 'transp' => 0 ] );
     }
+
+    /**
+     * @brief Determine whether or not this line contains chords.
+     */
+    private function chordline($line)
+    {
+        $chords =
+            array( "C","C#","D","D#","E","F","F#","G","G#","A#","B",//"A",
+            "Db", "Eb", "Gb", "Bb",//"Ab",
+            "Cm", "Dm", "Fm", "Gm", "Bm",  //"Em", "Am",
+            );
+        $ambiguous = array( "Ab", "Em", "Am", "A" );
+        $line = str_replace(array('/','7', "\n", '2', '4'), ' ', $line);
+        $tokens = array_filter(explode(' ', $line));
+
+        $badtokens = 0;
+        $ambtokens = 0;
+        $goodtokens = 0;
+        foreach ($tokens as $token) {
+            if( in_array( substr($token, 0,2), $chords ) ) $goodtokens++;
+            else if ( in_array( substr( $token, 0,2), $ambiguous) ) $ambtokens++;
+            else if( $badtokens > 10 ) return FALSE;
+            else $badtokens++;
+        }
+        return ($goodtokens *2)+ $ambtokens >= $badtokens;
+    }
+
 }
diff --git a/laravel/resources/views/song.blade.php b/laravel/resources/views/song.blade.php
index e3b2f78..a1c0f57 100644
--- a/laravel/resources/views/song.blade.php
+++ b/laravel/resources/views/song.blade.php
@@ -5,8 +5,24 @@
 
 <div class='container'>
     <h2>{{$song['title']}}</h2>
+
+    <select name="transp" id="transp"
+        value = "<?php echo $transp;?>"
+    >
+        <?php
+            $transp = 0;
+            for ($i=-6; $i < 12; $i++) {
+                if (($transp + 24)%12 == $i) $selected = 'selected';
+                else $selected = '';
+                //$dir = ($i >= 0 ? "up" : "down" );
+                $dir = "transpose";
+                echo "<option value='$i' $selected>$dir $i semitones</option>";
+            }
+        ?>
+    </select>
+    
     <pre>
-    {{$song['text']}}
+    {!! $song['escapedText'] !!}
     </pre>
 </div>