Changeset 539307

Timestamp:

05/03/2012 04:09:21 AM (14 years ago)

Author:

rlisle

Message:

Version 1.7 Add European chord support.

Location:

chords-and-lyrics/trunk

Files:

• ChordsAndLyrics.php (modified) (12 diffs)
• readme.txt (modified) (2 diffs)
• screenshot-1.png (modified) (previous)

chords-and-lyrics/trunk/ChordsAndLyrics.php

@@ -3 +3 @@
  * @package Chords_And_Lyrics
  * @author  Ron Lisle
- * @version 1.6
+ * @version 1.7
  */
 /*
 Plugin Name: ChordsAndLyrics
-Plugin URI: http://BuildAWebsiteWorkshops.com/
+Plugin URI: http://Lisles.net/
 Description: This plugin assists in the creation of staffless lead sheets.
-Version: 1.6
+Version: 1.7
 Author: Ron Lisle
 Author URI: http://Lisles.net
@@ -15 +15 @@
 Refer to Readme.txt file for more information. 
 
-Copyright 2008-2010 Ron Lisle
+Copyright 2008-2012 Ron Lisle
 
 This program is free software; you can redistribute it and/or modify
@@ -46 +46 @@
     add_settings_field('lyrics-only','Display chords or lyrics only?','cnl_lyrics_only_enabled',
                     'reading','cnl_setting_section');
+    add_settings_field('european-chords','Display European chords?','cnl_european_chords_enabled',
+                    'reading','cnl_setting_section');
     register_setting('reading',$user_settings_name);
 }
 
 function cnl_setting_section(){
-    echo '<p>Choose whether to display both chords and lyrics or lyrics only</p>';
+    echo '<p>Select options for displaying chords</p>';
 }
 
@@ -64 +66 @@
 }
 
+function cnl_european_chords_enabled(){
+    global $userdata;
+    get_currentuserinfo();
+    $user_settings_name = 'cnl_setting_values_for_' . $userdata->user_login;
+    $cnl_options = get_option($user_settings_name);
+    if($cnl_options['european-chords']){
+        $checked = ' checked="checked" ';
+    }
+    echo '<input '.$checked.' name="'.$user_settings_name.'[european-chords]" type="checkbox" />European chords';
+}
 
 /*
@@ -85 +97 @@
 // [chordsandlyrics parm=val...] ... [/chordsandlyrics]
 // Parameters: 
+//      format="yes"                Enable/disable formatting
+//      size="normal"               Adjust display size
 //      transpose="#"               Sets the # +/- half-steps to adjust chords.
+//      european="yes"              Interpret input using european convention (aHcdefg and B=Bb)
 function chordsandlyricstag_func($atts, $content = null){
     $cnlData = new ChordsAndLyricsData();
-    extract(shortcode_atts(array('format' => 'yes', 'size' => 'normal', 'transpose' => '0'), $atts));
+    extract(shortcode_atts(array('format' => 'yes', 'size' => 'normal', 'transpose' => '0', 'european' => 'no'), $atts));
 
     if($format != 'yes') return "[chordsandlyrics]" . $content . "[/chordsandlyrics]";
@@ -94 +109 @@
     $cnlData->setTranspose($transpose);
     $cnlData->setSize($size);
+    $cnlData->setEuropean($european);
     
     // Break content into separate lines.
@@ -112 +128 @@
     private $transpose;
     private $size;
+    private $european;
+    private $displayEuropean;
     
     public function __construct()
@@ -122 +140 @@
         $this->twoPages = $cnl_options['two-pages'];
         $this->transpose = 0;
+        $this->displayEuropean = $cnl_options['european-chords'];
     }
 
@@ -136 +155 @@
     public function getSize(){
         return $this->size;
+    }
+    
+    public function setEuropean( $e ){
+        $this->european = $e;
+    }
+    public function getEuropean(){
+        return $this->european;
+    }
+    public function setDisplayEuropean( $e ){
+        $this->displayEuropean = $e;
+    }
+    public function getDisplayEuropean(){
+        return $this->displayEuropean;
     }
     
@@ -306 +338 @@
         case 'b':
         case 'B':
-            $noteVal = 2;
+            if($this->european == 'yes'){
+                $noteVal = 1;
+            }else{
+                $noteVal = 2;
+            }
             break;
         case 'c':
@@ -327 +363 @@
         case 'G':
             $noteVal = 10;
+            break;
+        case 'h':
+        case 'H':
+            $noteVal = 2;
             break;
         default:
@@ -357 +397 @@
             break;
         case 1:
-            if($useFlats) $xlatedNote = "Bb";
-            else $xlatedNote = "A#";
+            if($this->displayEuropean){
+                $xlatedNote = 'B';
+            }else{
+                if($useFlats) $xlatedNote = "Bb";
+                else $xlatedNote = "A#";
+            }
             break;
         case 2:
-            $xlatedNote = 'B';
+            if($this->displayEuropean){
+                $xlatedNote = 'H';
+            }else{
+                $xlatedNote = 'B';
+            }
             break;
         case 3:

chords-and-lyrics/trunk/readme.txt

@@ -47 +47 @@
       
 == Frequently Asked Questions ==
-= Is it possible to customize the formatting of the lyrics and chord symbols =
+= Is it possible to customize the formatting of the lyrics and chord symbols? =
 Yes. Adjust the CSS in your theme. 
 Chords are wrapped within <div class="cnl"><div class="chord"><strong> tags. 
 Lyrics are wrapped within a <div class="cnl"><div class="lyric"> tags.
+= Can I display European chords? =
+Yes. Beginning with version 1.7, European chord convention is supported.
+A new option in the Reading Settings allows enabling display using aHcdefg instead of abcdefg.
+For entering chords in a post using European chord convention, add the european=yes argument
+to the chordsandlyrics short tag (eg. [chordsandlyrics european=yes])
 
 == Directions for Use ==
@@ -72 +77 @@
 == Changelog ==
 
+= 1.7.0 =
+* Add support for European chord style (aHcdefg, B=Bb)
+
 = 1.6.0 =
 * Fix bug preventing headings from showing.