Live preview

lib/ChordPro/Output/PDF.pm

@@ -98,7 +98,7 @@ sub generate_songbook {
 		 Creator => $name );
     while ( my ( $k, $v ) = each %{ $ps->{info} } ) {
 	next unless defined($v) && $v ne "";
-	next if $k eq "title" && $options->{title} && $k eq '%{title}';
+	next if $k eq "title" && $options->{title} && $v eq '%{title}';
 	$info{ucfirst($k)} = fmt_subst( $sb->{songs}->[0], $v );
     }
 

lib/ChordPro/Song.pm

@@ -441,6 +441,9 @@ sub parse_song {
 		    $_ = shift(@a);
 		    unshift( @$lines, @a );
 		    $skipcnt += @a;
+		    if ( $config->{debug}->{echo} ) {
+			warn(sprintf("==[%3d]=> %s\n", $diag->{line}, $_ ) );
+		    }
 		}
 	    }
 	}

lib/ChordPro/Version.pm

@@ -1,4 +1,4 @@
 # This file is generated. Do not edit!
 package ChordPro::Version;
-our $VERSION = "6.101.0";
+our $VERSION = "6.101_002";
 print "$VERSION\n" unless caller;

lib/ChordPro/Wx/Config.pm

@@ -114,6 +114,7 @@ my %prefs =
 
    editorwrap       => 1,
    editorwrapindent => 2,
+   livepreview      => 0,
 
    # Messages.
    msgsfont	   => 0,	# inital, later "Monospace 10" etc.

lib/ChordPro/Wx/EditorPanel.pm

@@ -37,6 +37,9 @@ BUILD {
     # Setup WebView, if possible.
     $self->setup_webview if $::options->{webview}//1;
 
+    # Inline "Preview Tasks" controls in the toolbar, left of Settings.
+    $self->setup_preview_tasks_bar;
+
     # Single pane.
     $self->unsplit;
 
@@ -75,6 +78,7 @@ method refresh() {
     else {
 	$self->{bmp_songbook}->Show(0);
     }
+    $self->refresh_preview_tasks_bar;
     $self->{sz_toolbar}->Layout;
 
     my $mod = $self->{t_editor}->IsModified;

lib/ChordPro/Wx/Main.pm

@@ -419,27 +419,28 @@ method OnIdle($event) {
 	$f .= " (modified)" if $mod;
     }
     $f = "ChordPro — $f" if $state{windowtitle};
-    $self->SetTitle($f);
+    $self->SetTitle($f) unless $self->GetTitle eq $f;
 
     if ( $state{mode} eq "editor") {
 	my $t = $self->{p_editor}->{t_editor}->GetText;
 
 	if ( $t =~ /^\{\s*t(?:itle)?[: ]+([^\}]*)\}/m ) {
-	    $self->{p_editor}->{l_status}->SetLabel(demarkup($1));
+	    my $title = demarkup($1);
+	    my $l_status = $self->{p_editor}->{l_status};
+	    $l_status->SetLabel($title) unless $l_status->GetLabel eq $title;
 	}
+    }
 
-	if ( $state{editchanged}
-	     && $self->{p_editor}->{sw_lr}->IsSplit ) {
-
-	    if ( $state{have_webview}
-		 && $preferences{enable_htmlviewer} ) {
-		$self->{p_editor}->preview([]);
-		$state{editchanged} = 0;
-	    }
-	    else {
-		# Preview is no longer actual -- how to signal?
-	    }
+    if ( $state{editchanged} && $state{mode} eq "editor" ) {
+	my $panel = $self->{p_editor};
+	if ( $preferences{livepreview}
+	     && $state{have_webview}
+	     && !$preferences{enable_pdfviewer}
+	     && $panel->{sw_lr}->IsSplit ) {
+	    $panel->preview( [ $panel->preview_tasks_args ] );
+	    $state{editchanged} = 0;
 	}
+	# else: preview is stale; nothing to do.
     }
 
 }
@@ -555,6 +556,10 @@ method OnPreferences($event) {
     $state{panel}->update_preferences unless $state{mode} eq "initial";
 
     $self->setup_menubar;
+
+    # Style/config may have changed; mark the preview as stale so the
+    # OnIdle live-preview path picks it up.
+    $state{editchanged}++;
 }
 
 # On the recents list, click selects and displays the file name.