Fix issue 334.

ChordPro · Dec 25, 2023 · b5b0bae · b5b0bae
1 parent d48a94c
commit b5b0bae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -52,6 +52,7 @@
     - Fix comment labels for delegates (issue 329.3).
     - (Wx) Filter configs on prp ans json.
     - Fix memorize/recall/transpose issue 333.
+    - Fix issue 334.
     - !Internal
     - (ABC) ABC embedding use tohtml instead of toxhtml.
     - (PDF) Enhance assets (wip), labels; move grid to separate module.

diff --git a/lib/ChordPro/Chords/Parser.pm b/lib/ChordPro/Chords/Parser.pm
@@ -543,6 +543,7 @@ sub new {
     my $self = bless { chord_cache => {} } => $pkg;
     $self->{system} = "nashville";
     $self->{target} = 'ChordPro::Chord::Nashville';
+    $self->{intervals} = 12;
     warn("Chords: Created parser for ", $self->{system}, "\n")
       if $::options->{verbose} && $::options->{verbose} > 1;
     return $parsers{$self->{system}} = $self;
@@ -655,6 +656,7 @@ sub new {
     my $self = bless { chord_cache => {} } => $pkg;
     $self->{system} = "roman";
     $self->{target} = 'ChordPro::Chord::Roman';
+    $self->{intervals} = 12;
     warn("Chords: Created parser for ", $self->{system}, "\n")
       if $::options->{verbose} && $::options->{verbose} > 1;
     return $parsers{$self->{system}} = $self;
@@ -1003,7 +1005,9 @@ sub transcode ( $self, $xcode, $key_ord = 0 ) {
     my $p = $self->{parser}->get_parser($xcode);
     die("OOPS ", $p->{system}, " $xcode") unless $p->{system} eq $xcode;
     $info->{parser} = $p;
-    $info->{root_ord} -= $key_ord if $key_ord && $p->movable;
+    if ( $key_ord && $p->movable ) {
+	$info->{root_ord} -= $key_ord % $p->intervals;
+    }
 #    $info->{$_} = $p->{$_} for qw( ns_tbl nf_tbl ns_canon nf_canon );
     $info->{root_canon} = $info->{root} =
       $p->root_canon( $info->{root_ord},
@@ -1014,7 +1018,9 @@ sub transcode ( $self, $xcode, $key_ord = 0 ) {
 	$info->{qual_canon} = $info->{qual} = "";
     }
     if ( $self->{bass} && $self->{bass} ne "" ) {
-	$info->{bass_ord} -= $key_ord if $key_ord && $p->movable;
+	if ( $key_ord && $p->movable ) {
+	    $info->{bass_ord} -= $key_ord % $p->intervals;
+	}
 	$info->{bass_canon} = $info->{bass} =
 	  $p->root_canon( $info->{bass_ord}, $info->{bass_mod} >= 0 );
     }

diff --git a/lib/ChordPro/Version.pm b/lib/ChordPro/Version.pm
@@ -1,4 +1,4 @@
 # This file is generated. Do not edit!
 package ChordPro::Version;
-our $VERSION = "6.030_063";
+our $VERSION = "6.030_064";
 print "$VERSION\n" unless caller;