Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

git clone https://repo.autonoma.ca/repo/keenwrite.git

M build.gradle

   implementation 'org.fxmisc.wellbehaved:wellbehavedfx:0.3.3'
   implementation 'com.miglayout:miglayout-javafx:5.2'
   implementation 'com.vladsch.flexmark:flexmark:0.62.0'
   implementation 'com.vladsch.flexmark:flexmark-ext-tables:0.62.0'
   implementation 'com.vladsch.flexmark:flexmark-ext-superscript:0.62.0'
   implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.0'
   implementation 'com.dlsc.preferencesfx:preferencesfx-core:11.6.0'
   implementation 'com.vladsch.flexmark:flexmark:0.62.2'
   implementation 'com.vladsch.flexmark:flexmark-ext-tables:0.62.2'
   implementation 'com.vladsch.flexmark:flexmark-ext-superscript:0.62.2'
   implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.62.2'
   implementation 'com.fasterxml.jackson.core:jackson-core:2.11.0'
   implementation 'com.fasterxml.jackson.core:jackson-databind:2.11.0'
   implementation 'de.jensd:fontawesomefx-commons:11.0'
   implementation 'de.jensd:fontawesomefx-fontawesome:4.7.0-11'
   implementation "org.renjin:renjin-script-engine:3.5-beta76"
   implementation 'org.renjin:renjin-script-engine:3.5-beta76'
   implementation 'org.xhtmlrenderer:flying-saucer-core:9.1.20'
   implementation 'org.jsoup:jsoup:1.13.1'
   implementation 'org.apache.xmlgraphics:batik-all:1.13'
   def os = ['win', 'linux', 'mac']
   def fx = ['controls', 'graphics', 'web', 'fxml']
   def fx = ['controls', 'graphics', 'fxml', 'swing']
   fx.each { fxitem ->
 javafx {
   version = "14"
   modules = ['javafx.controls', 'javafx.graphics', 'javafx.web']
   modules = ['javafx.controls', 'javafx.graphics', 'javafx.swing']
+}
 compileJava {
   options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
+}
 sourceCompatibility = JavaVersion.VERSION_11
 applicationName = 'scrivenvar'
 version gitVersion()
 version = gitVersion()
 mainClassName = "com.${applicationName}.Main"
 def launcherClassName = "com.${applicationName}.Launcher"

M src/main/java/com/scrivenvar/Constants.java

   // Prevent double events when updating files on Linux (save and timestamp).
   public static final int APP_WATCHDOG_TIMEOUT = get(
       "application.watchdog.timeout", 100 );
       "application.watchdog.timeout", 200 );
   public static final String STYLESHEET_SCENE = get( "file.stylesheet.scene" );
   public static final String FILE_LOGO_256 = get( "file.logo.256" );
   public static final String FILE_LOGO_512 = get( "file.logo.512" );
   public static final String CARET_POSITION_BASE = get( "caret.token.base" );
   public static final String CARET_POSITION_MD = get( "caret.token.markdown" );
   public static final String CARET_POSITION_HTML = get( "caret.token.html" );
   public static final String PREFS_ROOT = get( "preferences.root" );
   public static final String PREFS_STATE = get( "preferences.root.state" );
   public static final String PREFS_OPTIONS = get( "preferences.root.options" );
   // Refer to filename extension settings in the configuration file. Do not
    */
   public static final int DEFAULT_MAP_SIZE = 64;
   /**
    * Location of the definition source file.
    */
   public static final String PERSIST_DEFINITION_SOURCE = "definitionSource";
   /**
    * Content of the R startup script.
    */
   public static final String PERSIST_R_STARTUP = "rStartup";
   /**
    * Bootstrap directory for R startup script.
    */
   public static final String PERSIST_R_DIRECTORY = "rDirectory";
   public static final String PERSIST_IMAGES_DEFAULT =
       get( "file.stylesheet.scene" );
   /**

M src/main/java/com/scrivenvar/FileEditorTab.java

    */
   private Charset detectEncoding( final byte[] bytes ) {
     final UniversalDetector detector = new UniversalDetector( null );
     final var detector = new UniversalDetector( null );
     detector.handleData( bytes, 0, bytes.length );
     detector.dataEnd();
     final String charset = detector.getDetectedCharset();
     final Charset charEncoding = charset == null
     return charset == null
         ? Charset.defaultCharset()
         : Charset.forName( charset.toUpperCase( ENGLISH ) );
     detector.reset();
     return charEncoding;
+  }

M src/main/java/com/scrivenvar/FileEditorTabPane.java

 import java.util.Optional;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import static com.scrivenvar.Constants.GLOB_PREFIX_FILE;
 import static com.scrivenvar.FileType.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.service.events.Notifier.YES;
 /**
  * Tab pane for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class FileEditorTabPane extends TabPane {
   private final static String FILTER_EXTENSION_TITLES =
       "Dialog.file.choose.filter";
   private final Options mOptions = Services.load( Options.class );
   private final Settings mSettings = Services.load( Settings.class );
   private final Notifier mNotifyService = Services.load( Notifier.class );
   private final ReadOnlyObjectWrapper<Path> openDefinition =
       new ReadOnlyObjectWrapper<>();
   private final ReadOnlyObjectWrapper<FileEditorTab> mActiveFileEditor =
       new ReadOnlyObjectWrapper<>();
   private final ReadOnlyBooleanWrapper anyFileEditorModified =
       new ReadOnlyBooleanWrapper();
   /**
    * Constructs a new file editor tab pane.
    */
   public FileEditorTabPane() {
     final ObservableList<Tab> tabs = getTabs();
     setFocusTraversable( false );
     setTabClosingPolicy( TabClosingPolicy.ALL_TABS );
     addTabSelectionListener(
         ( ObservableValue<? extends Tab> tabPane,
           final Tab oldTab, final Tab newTab ) -> {
           if( newTab != null ) {
             mActiveFileEditor.set( (FileEditorTab) newTab );
+          }
+        }
     );
     final ChangeListener<Boolean> modifiedListener = ( observable, oldValue,
                                                        newValue ) -> {
       for( final Tab tab : tabs ) {
         if( ((FileEditorTab) tab).isModified() ) {
           this.anyFileEditorModified.set( true );
           break;
+        }
+      }
     };
     tabs.addListener(
         (ListChangeListener<Tab>) change -> {
           while( change.next() ) {
             if( change.wasAdded() ) {
               change.getAddedSubList().forEach(
                   ( tab ) -> ((FileEditorTab) tab).modifiedProperty()
                                                   .addListener( modifiedListener ) );
+            }
             else if( change.wasRemoved() ) {
               change.getRemoved().forEach(
                   ( tab ) -> ((FileEditorTab) tab).modifiedProperty()
                                                   .removeListener(
                                                       modifiedListener ) );
+            }
+          }
           // Changes in the tabs may also change anyFileEditorModified property
           // (e.g. closed modified file)
           modifiedListener.changed( null, null, null );
+        }
     );
+  }
   /**
    * Allows observers to be notified when the current file editor tab changes.
+   *
    * @param listener The listener to notify of tab change events.
    */
   public void addTabSelectionListener( final ChangeListener<Tab> listener ) {
     // Observe the tab so that when a new tab is opened or selected,
     // a notification is kicked off.
     getSelectionModel().selectedItemProperty().addListener( listener );
+  }
   /**
    * Returns the tab that has keyboard focus.
+   *
    * @return A non-null instance.
    */
   public FileEditorTab getActiveFileEditor() {
     return mActiveFileEditor.get();
+  }
   /**
    * Returns the property corresponding to the tab that has focus.
+   *
    * @return A non-null instance.
    */
   public ReadOnlyObjectProperty<FileEditorTab> activeFileEditorProperty() {
     return mActiveFileEditor.getReadOnlyProperty();
+  }
   /**
    * Property that can answer whether the text has been modified.
+   *
    * @return A non-null instance, true meaning the content has not been saved.
    */
   ReadOnlyBooleanProperty anyFileEditorModifiedProperty() {
     return this.anyFileEditorModified.getReadOnlyProperty();
+  }
   /**
    * Creates a new editor instance from the given path.
+   *
    * @param path The file to open.
    * @return A non-null instance.
    */
   private FileEditorTab createFileEditor( final Path path ) {
     assert path != null;
     final FileEditorTab tab = new FileEditorTab( path );
     tab.setOnCloseRequest( e -> {
       if( !canCloseEditor( tab ) ) {
         e.consume();
+      }
       else if( isActiveFileEditor( tab ) ) {
         // Prevent prompting the user to save when there are no file editor
         // tabs open.
         mActiveFileEditor.set( null );
+      }
     } );
     return tab;
+  }
   private boolean isActiveFileEditor( final FileEditorTab tab ) {
     return getActiveFileEditor() == tab;
+  }
   private Path getDefaultPath() {
     final String filename = getDefaultFilename();
     return (new File( filename )).toPath();
+  }
   private String getDefaultFilename() {
     return getSettings().getSetting( "file.default", "untitled.md" );
+  }
   /**
    * Called when the user selects New from the File menu.
    */
   void newEditor() {
     final Path defaultPath = getDefaultPath();
     final FileEditorTab tab = createFileEditor( defaultPath );
     getTabs().add( tab );
     getSelectionModel().select( tab );
+  }
   void openFileDialog() {
     final String title = get( "Dialog.file.choose.open.title" );
     final FileChooser dialog = createFileChooser( title );
     final List<File> files = dialog.showOpenMultipleDialog( getWindow() );
     if( files != null ) {
       openFiles( files );
+    }
+  }
   /**
    * Opens the files into new editors, unless one of those files was a
    * definition file. The definition file is loaded into the definition pane,
    * but only the first one selected (multiple definition files will result in a
    * warning).
+   *
    * @param files The list of non-definition files that the were requested to
    *              open.
    */
   private void openFiles( final List<File> files ) {
     final List<String> extensions =
         createExtensionFilter( DEFINITION ).getExtensions();
     final FileTypePredicate predicate =
         new FileTypePredicate( extensions );
     // The user might have opened multiple definitions files. These will
     // be discarded from the text editable files.
     final List<File> definitions
         = files.stream().filter( predicate ).collect( Collectors.toList() );
     // Create a modifiable list to remove any definition files that were
     // opened.
     final List<File> editors = new ArrayList<>( files );
     if( !editors.isEmpty() ) {
       saveLastDirectory( editors.get( 0 ) );
+    }
     editors.removeAll( definitions );
     // Open editor-friendly files (e.g,. Markdown, XML) in new tabs.
     if( !editors.isEmpty() ) {
       openEditors( editors, 0 );
+    }
     if( !definitions.isEmpty() ) {
       openDefinition( definitions.get( 0 ) );
+    }
+  }
   private void openEditors( final List<File> files, final int activeIndex ) {
     final int fileTally = files.size();
     final List<Tab> tabs = getTabs();
     // Close single unmodified "Untitled" tab.
     if( tabs.size() == 1 ) {
       final FileEditorTab fileEditor = (FileEditorTab) (tabs.get( 0 ));
       if( fileEditor.getPath() == null && !fileEditor.isModified() ) {
         closeEditor( fileEditor, false );
+      }
+    }
     for( int i = 0; i < fileTally; i++ ) {
       final Path path = files.get( i ).toPath();
       FileEditorTab fileEditorTab = findEditor( path );
       // Only open new files.
       if( fileEditorTab == null ) {
         fileEditorTab = createFileEditor( path );
         getTabs().add( fileEditorTab );
+      }
       // Select the first file in the list.
       if( i == activeIndex ) {
         getSelectionModel().select( fileEditorTab );
+      }
+    }
+  }
   /**
    * Returns a property that changes when a new definition file is opened.
+   *
    * @return The path to a definition file that was opened.
    */
   public ReadOnlyObjectProperty<Path> onOpenDefinitionFileProperty() {
     return getOnOpenDefinitionFile().getReadOnlyProperty();
+  }
   private ReadOnlyObjectWrapper<Path> getOnOpenDefinitionFile() {
     return this.openDefinition;
+  }
   /**
    * Called when the user has opened a definition file (using the file open
    * dialog box). This will replace the current set of definitions for the
    * active tab.
+   *
    * @param definition The file to open.
    */
   private void openDefinition( final File definition ) {
     // TODO: Prevent reading this file twice when a new text document is opened.
     // (might be a matter of checking the value first).
     getOnOpenDefinitionFile().set( definition.toPath() );
+  }
   /**
    * Called when the contents of the editor are to be saved.
+   *
    * @param tab The tab containing content to save.
    * @return true The contents were saved (or needn't be saved).
    */
   public boolean saveEditor( final FileEditorTab tab ) {
     if( tab == null || !tab.isModified() ) {
       return true;
+    }
     return tab.getPath() == null ? saveEditorAs( tab ) : tab.save();
+  }
   /**
    * Opens the Save As dialog for the user to save the content under a new
    * path.
+   *
    * @param tab The tab with contents to save.
    * @return true The contents were saved, or the tab was null.
    */
   public boolean saveEditorAs( final FileEditorTab tab ) {
     if( tab == null ) {
       return true;
+    }
     getSelectionModel().select( tab );
     final FileChooser fileChooser = createFileChooser( get(
         "Dialog.file.choose.save.title" ) );
     final File file = fileChooser.showSaveDialog( getWindow() );
     if( file == null ) {
       return false;
+    }
     saveLastDirectory( file );
     tab.setPath( file.toPath() );
     return tab.save();
+  }
   void saveAllEditors() {
     for( final FileEditorTab fileEditor : getAllEditors() ) {
       saveEditor( fileEditor );
+    }
+  }
   /**
    * Answers whether the file has had modifications. '
+   *
    * @param tab THe tab to check for modifications.
    * @return false The file is unmodified.
    */
   @SuppressWarnings("BooleanMethodIsAlwaysInverted")
   boolean canCloseEditor( final FileEditorTab tab ) {
     final AtomicReference<Boolean> canClose = new AtomicReference<>();
     canClose.set( true );
     if( tab.isModified() ) {
       final Notification message = getNotifyService().createNotification(
           Messages.get( "Alert.file.close.title" ),
           Messages.get( "Alert.file.close.text" ),
           tab.getText()
       );
       final Alert confirmSave = getNotifyService().createConfirmation(
           getWindow(), message );
       final Optional<ButtonType> buttonType = confirmSave.showAndWait();
       buttonType.ifPresent(
           save -> canClose.set(
               save == YES ? saveEditor( tab ) : save == ButtonType.NO
+          )
       );
+    }
     return canClose.get();
+  }
   private Notifier getNotifyService() {
     return this.mNotifyService;
+  }
   boolean closeEditor( final FileEditorTab tab, final boolean save ) {
     if( tab == null ) {
       return true;
+    }
     if( save ) {
       Event event = new Event( tab, tab, Tab.TAB_CLOSE_REQUEST_EVENT );
       Event.fireEvent( tab, event );
       if( event.isConsumed() ) {
         return false;
+      }
+    }
     getTabs().remove( tab );
     if( tab.getOnClosed() != null ) {
       Event.fireEvent( tab, new Event( Tab.CLOSED_EVENT ) );
+    }
     return true;
+  }
   boolean closeAllEditors() {
     final FileEditorTab[] allEditors = getAllEditors();
     final FileEditorTab activeEditor = getActiveFileEditor();
     // try to save active tab first because in case the user decides to cancel,
     // then it stays active
     if( activeEditor != null && !canCloseEditor( activeEditor ) ) {
       return false;
+    }
     // This should be called any time a tab changes.
     persistPreferences();
     // save modified tabs
     for( int i = 0; i < allEditors.length; i++ ) {
       final FileEditorTab fileEditor = allEditors[ i ];
       if( fileEditor == activeEditor ) {
         continue;
+      }
       if( fileEditor.isModified() ) {
         // activate the modified tab to make its modified content visible to
         // the user
         getSelectionModel().select( i );
         if( !canCloseEditor( fileEditor ) ) {
           return false;
+        }
+      }
+    }
     // Close all tabs.
     for( final FileEditorTab fileEditor : allEditors ) {
       if( !closeEditor( fileEditor, false ) ) {
         return false;
+      }
+    }
     return getTabs().isEmpty();
+  }
   private FileEditorTab[] getAllEditors() {
     final ObservableList<Tab> tabs = getTabs();
     final int length = tabs.size();
     final FileEditorTab[] allEditors = new FileEditorTab[ length ];
     for( int i = 0; i < length; i++ ) {
       allEditors[ i ] = (FileEditorTab) tabs.get( i );
+    }
     return allEditors;
+  }
   /**
    * Returns the file editor tab that has the given path.
+   *
    * @return null No file editor tab for the given path was found.
    */
   private FileEditorTab findEditor( final Path path ) {
     for( final Tab tab : getTabs() ) {
       final FileEditorTab fileEditor = (FileEditorTab) tab;
       if( fileEditor.isPath( path ) ) {
         return fileEditor;
+      }
+    }
     return null;
+  }
   private FileChooser createFileChooser( String title ) {
     final FileChooser fileChooser = new FileChooser();
     fileChooser.setTitle( title );
     fileChooser.getExtensionFilters().addAll(
         createExtensionFilters() );
     final String lastDirectory = getPreferences().get( "lastDirectory", null );
     File file = new File( (lastDirectory != null) ? lastDirectory : "." );
     if( !file.isDirectory() ) {
       file = new File( "." );
+    }
     fileChooser.setInitialDirectory( file );
     return fileChooser;
+  }
   private List<ExtensionFilter> createExtensionFilters() {
     final List<ExtensionFilter> list = new ArrayList<>();
     // TODO: Return a list of all properties that match the filter prefix.
     // This will allow dynamic filters to be added and removed just by
     // updating the properties file.
     list.add( createExtensionFilter( ALL ) );
     list.add( createExtensionFilter( SOURCE ) );
     list.add( createExtensionFilter( DEFINITION ) );
     list.add( createExtensionFilter( XML ) );
     return list;
+  }
   /**
    * Returns a filter for file name extensions recognized by the application
    * that can be opened by the user.
+   *
    * @param filetype Used to find the globbing pattern for extensions.
    * @return A filename filter suitable for use by a FileDialog instance.
    */
   private ExtensionFilter createExtensionFilter( final FileType filetype ) {
     final String tKey = String.format( "%s.title.%s",
                                        FILTER_EXTENSION_TITLES,
                                        filetype );
     final String eKey = String.format( "%s.%s", GLOB_PREFIX_FILE, filetype );
     return new ExtensionFilter( Messages.get( tKey ), getExtensions( eKey ) );
+  }
   private List<String> getExtensions( final String key ) {
     return getSettings().getStringSettingList( key );
+  }
   private void saveLastDirectory( final File file ) {
     getPreferences().put( "lastDirectory", file.getParent() );
+  }
   public void restorePreferences() {
     int activeIndex = 0;
     final Preferences preferences = getPreferences();
     final String[] fileNames = Utils.getPrefsStrings( preferences, "file" );
     final String activeFileName = preferences.get( "activeFile", null );
     final ArrayList<File> files = new ArrayList<>( fileNames.length );
     for( final String fileName : fileNames ) {
       final File file = new File( fileName );
       if( file.exists() ) {
         files.add( file );
         if( fileName.equals( activeFileName ) ) {
           activeIndex = files.size() - 1;
+        }
+      }
+    }
     if( files.isEmpty() ) {
       newEditor();
+    }
     else {
       openEditors( files, activeIndex );
+    }
+  }
   public void persistPreferences() {
     final ObservableList<Tab> allEditors = getTabs();
     final List<String> fileNames = new ArrayList<>( allEditors.size() );
     for( final Tab tab : allEditors ) {
       final FileEditorTab fileEditor = (FileEditorTab) tab;
       final Path filePath = fileEditor.getPath();
       if( filePath != null ) {
         fileNames.add( filePath.toString() );
+      }
+    }
     final Preferences preferences = getPreferences();
     Utils.putPrefsStrings( preferences,
                            "file",
                            fileNames.toArray( new String[ 0 ] ) );
     final FileEditorTab activeEditor = getActiveFileEditor();
     final Path filePath = activeEditor == null ? null : activeEditor.getPath();
     if( filePath == null ) {
       preferences.remove( "activeFile" );
+    }
     else {
       preferences.put( "activeFile", filePath.toString() );
+    }
+  }
   private Settings getSettings() {
     return mSettings;
+  }
   protected Options getOptions() {
     return mOptions;
 import java.util.function.Consumer;
 import java.util.prefs.Preferences;
 import java.util.stream.Collectors;
 import static com.scrivenvar.Constants.GLOB_PREFIX_FILE;
 import static com.scrivenvar.FileType.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.service.events.Notifier.YES;
 /**
  * Tab pane for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class FileEditorTabPane extends TabPane {
   private final static String FILTER_EXTENSION_TITLES =
       "Dialog.file.choose.filter";
   private final static Options sOptions = Services.load( Options.class );
   private final static Settings sSettings = Services.load( Settings.class );
   private final static Notifier sNotifier = Services.load( Notifier.class );
   private final ReadOnlyObjectWrapper<Path> openDefinition =
       new ReadOnlyObjectWrapper<>();
   private final ReadOnlyObjectWrapper<FileEditorTab> mActiveFileEditor =
       new ReadOnlyObjectWrapper<>();
   private final ReadOnlyBooleanWrapper anyFileEditorModified =
       new ReadOnlyBooleanWrapper();
   private final Consumer<Double> mScrollEventObserver;
   /**
    * Constructs a new file editor tab pane.
    */
   public FileEditorTabPane( final Consumer<Double> scrollEventObserver ) {
     final ObservableList<Tab> tabs = getTabs();
     setFocusTraversable( false );
     setTabClosingPolicy( TabClosingPolicy.ALL_TABS );
     addTabSelectionListener(
         ( ObservableValue<? extends Tab> tabPane,
           final Tab oldTab, final Tab newTab ) -> {
           if( newTab != null ) {
             mActiveFileEditor.set( (FileEditorTab) newTab );
+          }
+        }
     );
     final ChangeListener<Boolean> modifiedListener = ( observable, oldValue,
                                                        newValue ) -> {
       for( final Tab tab : tabs ) {
         if( ((FileEditorTab) tab).isModified() ) {
           this.anyFileEditorModified.set( true );
           break;
+        }
+      }
     };
     tabs.addListener(
         (ListChangeListener<Tab>) change -> {
           while( change.next() ) {
             if( change.wasAdded() ) {
               change.getAddedSubList().forEach(
                   ( tab ) -> ((FileEditorTab) tab).modifiedProperty()
                                                   .addListener( modifiedListener ) );
+            }
             else if( change.wasRemoved() ) {
               change.getRemoved().forEach(
                   ( tab ) -> ((FileEditorTab) tab).modifiedProperty()
                                                   .removeListener(
                                                       modifiedListener ) );
+            }
+          }
           // Changes in the tabs may also change anyFileEditorModified property
           // (e.g. closed modified file)
           modifiedListener.changed( null, null, null );
+        }
     );
     mScrollEventObserver = scrollEventObserver;
+  }
   /**
    * Allows observers to be notified when the current file editor tab changes.
+   *
    * @param listener The listener to notify of tab change events.
    */
   public void addTabSelectionListener( final ChangeListener<Tab> listener ) {
     // Observe the tab so that when a new tab is opened or selected,
     // a notification is kicked off.
     getSelectionModel().selectedItemProperty().addListener( listener );
+  }
   /**
    * Returns the tab that has keyboard focus.
+   *
    * @return A non-null instance.
    */
   public FileEditorTab getActiveFileEditor() {
     return mActiveFileEditor.get();
+  }
   /**
    * Returns the property corresponding to the tab that has focus.
+   *
    * @return A non-null instance.
    */
   public ReadOnlyObjectProperty<FileEditorTab> activeFileEditorProperty() {
     return mActiveFileEditor.getReadOnlyProperty();
+  }
   /**
    * Property that can answer whether the text has been modified.
+   *
    * @return A non-null instance, true meaning the content has not been saved.
    */
   ReadOnlyBooleanProperty anyFileEditorModifiedProperty() {
     return this.anyFileEditorModified.getReadOnlyProperty();
+  }
   /**
    * Creates a new editor instance from the given path.
+   *
    * @param path The file to open.
    * @return A non-null instance.
    */
   private FileEditorTab createFileEditor( final Path path ) {
     assert path != null;
     final FileEditorTab tab = new FileEditorTab( path );
     tab.getEditorPane().getScrollPane().estimatedScrollYProperty().addObserver(
         mScrollEventObserver
     );
     tab.setOnCloseRequest( e -> {
       if( !canCloseEditor( tab ) ) {
         e.consume();
+      }
       else if( isActiveFileEditor( tab ) ) {
         // Prevent prompting the user to save when there are no file editor
         // tabs open.
         mActiveFileEditor.set( null );
+      }
     } );
     return tab;
+  }
   private boolean isActiveFileEditor( final FileEditorTab tab ) {
     return getActiveFileEditor() == tab;
+  }
   private Path getDefaultPath() {
     final String filename = getDefaultFilename();
     return (new File( filename )).toPath();
+  }
   private String getDefaultFilename() {
     return getSettings().getSetting( "file.default", "untitled.md" );
+  }
   /**
    * Called when the user selects New from the File menu.
    */
   void newEditor() {
     final Path defaultPath = getDefaultPath();
     final FileEditorTab tab = createFileEditor( defaultPath );
     getTabs().add( tab );
     getSelectionModel().select( tab );
+  }
   void openFileDialog() {
     final String title = get( "Dialog.file.choose.open.title" );
     final FileChooser dialog = createFileChooser( title );
     final List<File> files = dialog.showOpenMultipleDialog( getWindow() );
     if( files != null ) {
       openFiles( files );
+    }
+  }
   /**
    * Opens the files into new editors, unless one of those files was a
    * definition file. The definition file is loaded into the definition pane,
    * but only the first one selected (multiple definition files will result in a
    * warning).
+   *
    * @param files The list of non-definition files that the were requested to
    *              open.
    */
   private void openFiles( final List<File> files ) {
     final List<String> extensions =
         createExtensionFilter( DEFINITION ).getExtensions();
     final FileTypePredicate predicate =
         new FileTypePredicate( extensions );
     // The user might have opened multiple definitions files. These will
     // be discarded from the text editable files.
     final List<File> definitions
         = files.stream().filter( predicate ).collect( Collectors.toList() );
     // Create a modifiable list to remove any definition files that were
     // opened.
     final List<File> editors = new ArrayList<>( files );
     if( !editors.isEmpty() ) {
       saveLastDirectory( editors.get( 0 ) );
+    }
     editors.removeAll( definitions );
     // Open editor-friendly files (e.g,. Markdown, XML) in new tabs.
     if( !editors.isEmpty() ) {
       openEditors( editors, 0 );
+    }
     if( !definitions.isEmpty() ) {
       openDefinition( definitions.get( 0 ) );
+    }
+  }
   private void openEditors( final List<File> files, final int activeIndex ) {
     final int fileTally = files.size();
     final List<Tab> tabs = getTabs();
     // Close single unmodified "Untitled" tab.
     if( tabs.size() == 1 ) {
       final FileEditorTab fileEditor = (FileEditorTab) (tabs.get( 0 ));
       if( fileEditor.getPath() == null && !fileEditor.isModified() ) {
         closeEditor( fileEditor, false );
+      }
+    }
     for( int i = 0; i < fileTally; i++ ) {
       final Path path = files.get( i ).toPath();
       FileEditorTab fileEditorTab = findEditor( path );
       // Only open new files.
       if( fileEditorTab == null ) {
         fileEditorTab = createFileEditor( path );
         getTabs().add( fileEditorTab );
+      }
       // Select the first file in the list.
       if( i == activeIndex ) {
         getSelectionModel().select( fileEditorTab );
+      }
+    }
+  }
   /**
    * Returns a property that changes when a new definition file is opened.
+   *
    * @return The path to a definition file that was opened.
    */
   public ReadOnlyObjectProperty<Path> onOpenDefinitionFileProperty() {
     return getOnOpenDefinitionFile().getReadOnlyProperty();
+  }
   private ReadOnlyObjectWrapper<Path> getOnOpenDefinitionFile() {
     return this.openDefinition;
+  }
   /**
    * Called when the user has opened a definition file (using the file open
    * dialog box). This will replace the current set of definitions for the
    * active tab.
+   *
    * @param definition The file to open.
    */
   private void openDefinition( final File definition ) {
     // TODO: Prevent reading this file twice when a new text document is opened.
     // (might be a matter of checking the value first).
     getOnOpenDefinitionFile().set( definition.toPath() );
+  }
   /**
    * Called when the contents of the editor are to be saved.
+   *
    * @param tab The tab containing content to save.
    * @return true The contents were saved (or needn't be saved).
    */
   public boolean saveEditor( final FileEditorTab tab ) {
     if( tab == null || !tab.isModified() ) {
       return true;
+    }
     return tab.getPath() == null ? saveEditorAs( tab ) : tab.save();
+  }
   /**
    * Opens the Save As dialog for the user to save the content under a new
    * path.
+   *
    * @param tab The tab with contents to save.
    * @return true The contents were saved, or the tab was null.
    */
   public boolean saveEditorAs( final FileEditorTab tab ) {
     if( tab == null ) {
       return true;
+    }
     getSelectionModel().select( tab );
     final FileChooser fileChooser = createFileChooser( get(
         "Dialog.file.choose.save.title" ) );
     final File file = fileChooser.showSaveDialog( getWindow() );
     if( file == null ) {
       return false;
+    }
     saveLastDirectory( file );
     tab.setPath( file.toPath() );
     return tab.save();
+  }
   void saveAllEditors() {
     for( final FileEditorTab fileEditor : getAllEditors() ) {
       saveEditor( fileEditor );
+    }
+  }
   /**
    * Answers whether the file has had modifications. '
+   *
    * @param tab THe tab to check for modifications.
    * @return false The file is unmodified.
    */
   @SuppressWarnings("BooleanMethodIsAlwaysInverted")
   boolean canCloseEditor( final FileEditorTab tab ) {
     final AtomicReference<Boolean> canClose = new AtomicReference<>();
     canClose.set( true );
     if( tab.isModified() ) {
       final Notification message = getNotifyService().createNotification(
           Messages.get( "Alert.file.close.title" ),
           Messages.get( "Alert.file.close.text" ),
           tab.getText()
       );
       final Alert confirmSave = getNotifyService().createConfirmation(
           getWindow(), message );
       final Optional<ButtonType> buttonType = confirmSave.showAndWait();
       buttonType.ifPresent(
           save -> canClose.set(
               save == YES ? saveEditor( tab ) : save == ButtonType.NO
+          )
       );
+    }
     return canClose.get();
+  }
   boolean closeEditor( final FileEditorTab tab, final boolean save ) {
     if( tab == null ) {
       return true;
+    }
     if( save ) {
       Event event = new Event( tab, tab, Tab.TAB_CLOSE_REQUEST_EVENT );
       Event.fireEvent( tab, event );
       if( event.isConsumed() ) {
         return false;
+      }
+    }
     getTabs().remove( tab );
     if( tab.getOnClosed() != null ) {
       Event.fireEvent( tab, new Event( Tab.CLOSED_EVENT ) );
+    }
     return true;
+  }
   boolean closeAllEditors() {
     final FileEditorTab[] allEditors = getAllEditors();
     final FileEditorTab activeEditor = getActiveFileEditor();
     // try to save active tab first because in case the user decides to cancel,
     // then it stays active
     if( activeEditor != null && !canCloseEditor( activeEditor ) ) {
       return false;
+    }
     // This should be called any time a tab changes.
     persistPreferences();
     // save modified tabs
     for( int i = 0; i < allEditors.length; i++ ) {
       final FileEditorTab fileEditor = allEditors[ i ];
       if( fileEditor == activeEditor ) {
         continue;
+      }
       if( fileEditor.isModified() ) {
         // activate the modified tab to make its modified content visible to
         // the user
         getSelectionModel().select( i );
         if( !canCloseEditor( fileEditor ) ) {
           return false;
+        }
+      }
+    }
     // Close all tabs.
     for( final FileEditorTab fileEditor : allEditors ) {
       if( !closeEditor( fileEditor, false ) ) {
         return false;
+      }
+    }
     return getTabs().isEmpty();
+  }
   private FileEditorTab[] getAllEditors() {
     final ObservableList<Tab> tabs = getTabs();
     final int length = tabs.size();
     final FileEditorTab[] allEditors = new FileEditorTab[ length ];
     for( int i = 0; i < length; i++ ) {
       allEditors[ i ] = (FileEditorTab) tabs.get( i );
+    }
     return allEditors;
+  }
   /**
    * Returns the file editor tab that has the given path.
+   *
    * @return null No file editor tab for the given path was found.
    */
   private FileEditorTab findEditor( final Path path ) {
     for( final Tab tab : getTabs() ) {
       final FileEditorTab fileEditor = (FileEditorTab) tab;
       if( fileEditor.isPath( path ) ) {
         return fileEditor;
+      }
+    }
     return null;
+  }
   private FileChooser createFileChooser( String title ) {
     final FileChooser fileChooser = new FileChooser();
     fileChooser.setTitle( title );
     fileChooser.getExtensionFilters().addAll(
         createExtensionFilters() );
     final String lastDirectory = getPreferences().get( "lastDirectory", null );
     File file = new File( (lastDirectory != null) ? lastDirectory : "." );
     if( !file.isDirectory() ) {
       file = new File( "." );
+    }
     fileChooser.setInitialDirectory( file );
     return fileChooser;
+  }
   private List<ExtensionFilter> createExtensionFilters() {
     final List<ExtensionFilter> list = new ArrayList<>();
     // TODO: Return a list of all properties that match the filter prefix.
     // This will allow dynamic filters to be added and removed just by
     // updating the properties file.
     list.add( createExtensionFilter( ALL ) );
     list.add( createExtensionFilter( SOURCE ) );
     list.add( createExtensionFilter( DEFINITION ) );
     list.add( createExtensionFilter( XML ) );
     return list;
+  }
   /**
    * Returns a filter for file name extensions recognized by the application
    * that can be opened by the user.
+   *
    * @param filetype Used to find the globbing pattern for extensions.
    * @return A filename filter suitable for use by a FileDialog instance.
    */
   private ExtensionFilter createExtensionFilter( final FileType filetype ) {
     final String tKey = String.format( "%s.title.%s",
                                        FILTER_EXTENSION_TITLES,
                                        filetype );
     final String eKey = String.format( "%s.%s", GLOB_PREFIX_FILE, filetype );
     return new ExtensionFilter( Messages.get( tKey ), getExtensions( eKey ) );
+  }
   private List<String> getExtensions( final String key ) {
     return getSettings().getStringSettingList( key );
+  }
   private void saveLastDirectory( final File file ) {
     getPreferences().put( "lastDirectory", file.getParent() );
+  }
   public void restorePreferences() {
     int activeIndex = 0;
     final Preferences preferences = getPreferences();
     final String[] fileNames = Utils.getPrefsStrings( preferences, "file" );
     final String activeFileName = preferences.get( "activeFile", null );
     final List<File> files = new ArrayList<>( fileNames.length );
     for( final String fileName : fileNames ) {
       final File file = new File( fileName );
       if( file.exists() ) {
         files.add( file );
         if( fileName.equals( activeFileName ) ) {
           activeIndex = files.size() - 1;
+        }
+      }
+    }
     if( files.isEmpty() ) {
       newEditor();
+    }
     else {
       openEditors( files, activeIndex );
+    }
+  }
   public void persistPreferences() {
     final ObservableList<Tab> allEditors = getTabs();
     final List<String> fileNames = new ArrayList<>( allEditors.size() );
     for( final Tab tab : allEditors ) {
       final FileEditorTab fileEditor = (FileEditorTab) tab;
       final Path filePath = fileEditor.getPath();
       if( filePath != null ) {
         fileNames.add( filePath.toString() );
+      }
+    }
     final Preferences preferences = getPreferences();
     Utils.putPrefsStrings( preferences,
                            "file",
                            fileNames.toArray( new String[ 0 ] ) );
     final FileEditorTab activeEditor = getActiveFileEditor();
     final Path filePath = activeEditor == null ? null : activeEditor.getPath();
     if( filePath == null ) {
       preferences.remove( "activeFile" );
+    }
     else {
       preferences.put( "activeFile", filePath.toString() );
+    }
+  }
   private Notifier getNotifyService() {
     return sNotifier;
+  }
   private Settings getSettings() {
     return sSettings;
+  }
   protected Options getOptions() {
     return sOptions;
+  }

M src/main/java/com/scrivenvar/Launcher.java

    */
   public static void main( final String[] args ) throws IOException {
     // Shhh.
     System.err.close();
     showAppInfo();
     Main.main( args );
+  }
   @SuppressWarnings("RedundantStringFormatCall")
   private static void showAppInfo() throws IOException {
     out( format( "%s version %s", getTitle(), getVersion() ) );

M src/main/java/com/scrivenvar/MainWindow.java

 import com.scrivenvar.definition.MapInterpolator;
 import com.scrivenvar.definition.yaml.YamlDefinitionSource;
 import com.scrivenvar.dialogs.RScriptDialog;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.editors.VariableNameInjector;
 import com.scrivenvar.editors.markdown.MarkdownEditorPane;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import com.scrivenvar.processors.Processor;
 import com.scrivenvar.processors.ProcessorFactory;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Settings;
 import com.scrivenvar.service.Snitch;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.Action;
 import com.scrivenvar.util.ActionUtils;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import org.controlsfx.control.StatusBar;
 import org.fxmisc.richtext.model.TwoDimensional.Position;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.*;
 import java.util.function.Function;
 import java.util.prefs.Preferences;
 import static com.scrivenvar.Constants.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.Messages.getLiteral;
 import static com.scrivenvar.util.StageState.*;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.*;
 import static javafx.event.Event.fireEvent;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.TAB;
 import static javafx.stage.WindowEvent.WINDOW_CLOSE_REQUEST;
 /**
  * Main window containing a tab pane in the center for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class MainWindow implements Observer {
   private final Options mOptions = Services.load( Options.class );
   private final Snitch mSnitch = Services.load( Snitch.class );
   private final Settings mSettings = Services.load( Settings.class );
   private final Notifier mNotifier = Services.load( Notifier.class );
   private final Scene mScene;
   private final StatusBar mStatusBar;
   private final Text mLineNumberText;
   private final TextField mFindTextField;
   private DefinitionSource mDefinitionSource = createDefaultDefinitionSource();
   private final DefinitionPane mDefinitionPane = new DefinitionPane();
   private final HTMLPreviewPane mPreviewPane = new HTMLPreviewPane();
   private FileEditorTabPane fileEditorPane;
   /**
    * Prevents re-instantiation of processing classes.
    */
   private final Map<FileEditorTab, Processor<String>> mProcessors =
       new HashMap<>();
   private final Map<String, String> mResolvedMap =
       new HashMap<>( DEFAULT_MAP_SIZE );
   /**
    * Listens on the definition pane for double-click events.
    */
   private VariableNameInjector variableNameInjector;
   /**
    * Called when the definition data is changed.
    */
   final EventHandler<TreeItem.TreeModificationEvent<Event>> mTreeHandler =
       event -> {
         exportDefinitions( getDefinitionPath() );
         interpolateResolvedMap();
         refreshActiveTab();
       };
   final EventHandler<? super KeyEvent> mDefinitionKeyHandler =
       event -> {
         if( event.getCode() == ENTER ) {
           getVariableNameInjector().injectSelectedItem();
+        }
       };
   final EventHandler<? super KeyEvent> mEditorKeyHandler =
       (EventHandler<KeyEvent>) event -> {
         if( event.getCode() == TAB ) {
           getDefinitionPane().requestFocus();
           event.consume();
+        }
       };
   public MainWindow() {
     mStatusBar = createStatusBar();
     mLineNumberText = createLineNumberText();
     mFindTextField = createFindTextField();
     mScene = createScene();
     initLayout();
     initFindInput();
     initSnitch();
     initDefinitionListener();
     initTabAddedListener();
     initTabChangedListener();
     initPreferences();
+  }
   /**
    * Watch for changes to external files. In particular, this awaits
    * modifications to any XSL files associated with XML files being edited. When
    * an XSL file is modified (external to the application), the snitch's ears
    * perk up and the file is reloaded. This keeps the XSL transformation up to
    * date with what's on the file system.
    */
   private void initSnitch() {
     getSnitch().addObserver( this );
+  }
   /**
    * Initialize the find input text field to listen on F3, ENTER, and ESCAPE key
    * presses.
    */
   private void initFindInput() {
     final TextField input = getFindTextField();
     input.setOnKeyPressed( ( KeyEvent event ) -> {
       switch( event.getCode() ) {
         case F3:
         case ENTER:
           findNext();
           break;
         case F:
           if( !event.isControlDown() ) {
             break;
+          }
         case ESCAPE:
           getStatusBar().setGraphic( null );
           getActiveFileEditor().getEditorPane().requestFocus();
           break;
+      }
     } );
     // Remove when the input field loses focus.
     input.focusedProperty().addListener(
+        (
             final ObservableValue<? extends Boolean> focused,
             final Boolean oFocus,
             final Boolean nFocus ) -> {
           if( !nFocus ) {
             getStatusBar().setGraphic( null );
+          }
+        }
     );
+  }
   /**
    * Listen for {@link FileEditorTabPane} to receive open definition file event.
    */
   private void initDefinitionListener() {
     getFileEditorPane().onOpenDefinitionFileProperty().addListener(
         ( final ObservableValue<? extends Path> file,
           final Path oldPath, final Path newPath ) -> {
           // Indirectly refresh the resolved map.
           resetProcessors();
           openDefinitions( newPath );
           // Will create new processors and therefore a new resolved map.
           refreshActiveTab();
+        }
     );
+  }
   /**
    * When tabs are added, hook the various change listeners onto the new tab so
    * that the preview pane refreshes as necessary.
    */
   private void initTabAddedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Make sure the text processor kicks off when new files are opened.
     final ObservableList<Tab> tabs = editorPane.getTabs();
     // Update the preview pane on tab changes.
     tabs.addListener(
         ( final Change<? extends Tab> change ) -> {
           while( change.next() ) {
             if( change.wasAdded() ) {
               // Multiple tabs can be added simultaneously.
               for( final Tab newTab : change.getAddedSubList() ) {
                 final FileEditorTab tab = (FileEditorTab) newTab;
                 initTextChangeListener( tab );
                 initCaretParagraphListener( tab );
                 initKeyboardEventListeners( tab );
 //              initSyntaxListener( tab );
+              }
+            }
+          }
+        }
     );
+  }
   /**
    * Reloads the preferences from the previous session.
    */
   private void initPreferences() {
     restoreDefinitionPane();
     getFileEditorPane().restorePreferences();
+  }
   /**
    * Listen for new tab selection events.
    */
   private void initTabChangedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Update the preview pane changing tabs.
     editorPane.addTabSelectionListener(
         ( ObservableValue<? extends Tab> tabPane,
           final Tab oldTab, final Tab newTab ) -> {
           updateVariableNameInjector();
           // If there was no old tab, then this is a first time load, which
           // can be ignored.
           if( oldTab != null ) {
             if( newTab == null ) {
               closeRemainingTab();
+            }
             else {
               // Update the preview with the edited text.
               refreshSelectedTab( (FileEditorTab) newTab );
+            }
+          }
+        }
     );
+  }
   /**
    * Ensure that the keyboard events are received when a new tab is added
    * to the user interface.
+   *
    * @param tab The tab that can trigger keyboard events, such as control+space.
    */
   private void initKeyboardEventListeners( final FileEditorTab tab ) {
     final VariableNameInjector vin = getVariableNameInjector();
     vin.initKeyboardEventListeners( tab );
     tab.addEventFilter( KeyEvent.KEY_PRESSED, mEditorKeyHandler );
+  }
   private void initTextChangeListener( final FileEditorTab tab ) {
     tab.addTextChangeListener(
         ( ObservableValue<? extends String> editor,
           final String oldValue, final String newValue ) ->
             refreshSelectedTab( tab )
     );
+  }
   private void initCaretParagraphListener( final FileEditorTab tab ) {
     tab.addCaretParagraphListener(
         ( ObservableValue<? extends Integer> editor,
           final Integer oldValue, final Integer newValue ) ->
             refreshSelectedTab( tab )
     );
+  }
   private void updateVariableNameInjector() {
     getVariableNameInjector().setFileEditorTab( getActiveFileEditor() );
+  }
   private void setVariableNameInjector( final VariableNameInjector injector ) {
     this.variableNameInjector = injector;
+  }
   private synchronized VariableNameInjector getVariableNameInjector() {
     if( this.variableNameInjector == null ) {
       final VariableNameInjector vin = createVariableNameInjector();
       setVariableNameInjector( vin );
+    }
     return this.variableNameInjector;
+  }
   private VariableNameInjector createVariableNameInjector() {
     final FileEditorTab tab = getActiveFileEditor();
     final DefinitionPane pane = getDefinitionPane();
     return new VariableNameInjector( tab, pane );
+  }
   /**
    * Called whenever the preview pane becomes out of sync with the file editor
    * tab. This can be called when the text changes, the caret paragraph changes,
    * or the file tab changes.
+   *
    * @param tab The file editor tab that has been changed in some fashion.
    */
   private void refreshSelectedTab( final FileEditorTab tab ) {
     if( tab == null ) {
       return;
+    }
     getPreviewPane().setPath( tab.getPath() );
     // TODO: https://github.com/DaveJarvis/scrivenvar/issues/29
     final Position p = tab.getCaretOffset();
     getLineNumberText().setText(
         get( STATUS_BAR_LINE,
              p.getMajor() + 1,
              p.getMinor() + 1,
              tab.getCaretPosition() + 1
+        )
     );
     Processor<String> processor = getProcessors().get( tab );
     if( processor == null ) {
       processor = createProcessor( tab );
       getProcessors().put( tab, processor );
+    }
     try {
       processor.processChain( tab.getEditorText() );
     } catch( final Exception ex ) {
       error( ex );
+    }
+  }
   private void refreshActiveTab() {
     refreshSelectedTab( getActiveFileEditor() );
+  }
   /**
    * Used to find text in the active file editor window.
    */
   private void find() {
     final TextField input = getFindTextField();
     getStatusBar().setGraphic( input );
     input.requestFocus();
+  }
   public void findNext() {
     getActiveFileEditor().searchNext( getFindTextField().getText() );
+  }
   /**
    * Returns the variable map of interpolated definitions.
+   *
    * @return A map to help dereference variables.
    */
   private Map<String, String> getResolvedMap() {
     return mResolvedMap;
+  }
   private void interpolateResolvedMap() {
     final Map<String, String> treeMap = getDefinitionPane().toMap();
     final Map<String, String> map = new HashMap<>( treeMap );
     MapInterpolator.interpolate( map );
     getResolvedMap().clear();
     getResolvedMap().putAll( map );
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinitions( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path );
       setDefinitionSource( ds );
       storeDefinitionSourceFilename( path );
       final Tooltip tooltipPath = new Tooltip( path.toString() );
       tooltipPath.setShowDelay( Duration.millis( 200 ) );
       final DefinitionPane pane = getDefinitionPane();
       pane.update( ds );
       pane.addTreeChangeHandler( mTreeHandler );
       pane.addKeyEventHandler( mDefinitionKeyHandler );
       pane.filenameProperty().setValue( path.getFileName().toString() );
       pane.setTooltip( tooltipPath );
       interpolateResolvedMap();
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void exportDefinitions( final Path path ) {
     try {
       final DefinitionPane pane = getDefinitionPane();
       final TreeItem<String> root = pane.getTreeView().getRoot();
       final TreeItem<String> problemChild = pane.isTreeWellFormed();
       if( problemChild == null ) {
         getDefinitionSource().getTreeAdapter().export( root, path );
         getNotifier().clear();
+      }
       else {
         final String msg = get( "yaml.error.tree.form",
                                 problemChild.getValue() );
         getNotifier().notify( msg );
+      }
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private Path getDefinitionPath() {
     final String source = getPreferences().get(
         PERSIST_DEFINITION_SOURCE, "" );
     return new File(
         source.isBlank()
             ? getSetting( "file.definition.default", "variables.yaml" )
             : source
     ).toPath();
+  }
   private void restoreDefinitionPane() {
     openDefinitions( getDefinitionPath() );
+  }
   private void storeDefinitionSourceFilename( final Path path ) {
     getPreferences().put( PERSIST_DEFINITION_SOURCE, path.toString() );
+  }
   /**
    * Called when the last open tab is closed to clear the preview pane.
    */
   private void closeRemainingTab() {
     getPreviewPane().clear();
+  }
   /**
    * Called when an exception occurs that warrants the user's attention.
+   *
    * @param e The exception with a message that the user should know about.
    */
   private void error( final Exception e ) {
     getNotifier().notify( e );
+  }
   //---- File actions -------------------------------------------------------
   /**
    * Called when an observable instance has changed. This is called by both the
    * snitch service and the notify service. The snitch service can be called for
    * different file types, including definition sources.
+   *
    * @param observable The observed instance.
    * @param value      The noteworthy item.
    */
   @Override
   public void update( final Observable observable, final Object value ) {
     if( value != null ) {
       if( observable instanceof Snitch && value instanceof Path ) {
         updateSelectedTab();
+      }
       else if( observable instanceof Notifier && value instanceof String ) {
         updateStatusBar( (String) value );
+      }
+    }
+  }
   /**
    * Updates the status bar to show the given message.
+   *
    * @param s The message to show in the status bar.
    */
   private void updateStatusBar( final String s ) {
     Platform.runLater(
         () -> {
           final int index = s.indexOf( '\n' );
           final String message = s.substring(
 , index > 0 ? index : s.length() );
           getStatusBar().setText( message );
+        }
     );
+  }
   /**
    * Called when a file has been modified.
    */
   private void updateSelectedTab() {
     Platform.runLater(
         () -> {
           // Brute-force XSLT file reload by re-instantiating all processors.
           resetProcessors();
           refreshActiveTab();
+        }
     );
+  }
   /**
    * After resetting the processors, they will refresh anew to be up-to-date
    * with the files (text and definition) currently loaded into the editor.
    */
   private void resetProcessors() {
     getProcessors().clear();
+  }
   //---- File actions -------------------------------------------------------
   private void fileNew() {
     getFileEditorPane().newEditor();
+  }
   private void fileOpen() {
     getFileEditorPane().openFileDialog();
+  }
   private void fileClose() {
     getFileEditorPane().closeEditor( getActiveFileEditor(), true );
+  }
   private void fileCloseAll() {
     getFileEditorPane().closeAllEditors();
+  }
   private void fileSave() {
     getFileEditorPane().saveEditor( getActiveFileEditor() );
+  }
   private void fileSaveAs() {
     final FileEditorTab editor = getActiveFileEditor();
     getFileEditorPane().saveEditorAs( editor );
     getProcessors().remove( editor );
     try {
       refreshSelectedTab( editor );
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   private void fileSaveAll() {
     getFileEditorPane().saveAllEditors();
+  }
   private void fileExit() {
     final Window window = getWindow();
     fireEvent( window, new WindowEvent( window, WINDOW_CLOSE_REQUEST ) );
+  }
   //---- R menu actions
   private void rScript() {
     final String script = getPreferences().get( PERSIST_R_STARTUP, "" );
     final RScriptDialog dialog = new RScriptDialog(
         getWindow(), "Dialog.r.script.title", script );
     final Optional<String> result = dialog.showAndWait();
     result.ifPresent( this::putStartupScript );
+  }
   private void rDirectory() {
     final TextInputDialog dialog = new TextInputDialog(
         getPreferences().get( PERSIST_R_DIRECTORY, USER_DIRECTORY )
     );
     dialog.setTitle( get( "Dialog.r.directory.title" ) );
     dialog.setHeaderText( getLiteral( "Dialog.r.directory.header" ) );
     dialog.setContentText( "Directory" );
     final Optional<String> result = dialog.showAndWait();
     result.ifPresent( this::putStartupDirectory );
+  }
   /**
    * Stores the R startup script into the user preferences.
    */
   private void putStartupScript( final String script ) {
     putPreference( PERSIST_R_STARTUP, script );
+  }
   /**
    * Stores the R bootstrap script directory into the user preferences.
    */
   private void putStartupDirectory( final String directory ) {
     putPreference( PERSIST_R_DIRECTORY, directory );
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     final Alert alert = new Alert( AlertType.INFORMATION );
     alert.setTitle( get( "Dialog.about.title" ) );
     alert.setHeaderText( get( "Dialog.about.header" ) );
     alert.setContentText( get( "Dialog.about.content" ) );
     alert.setGraphic( new ImageView( new Image( FILE_LOGO_32 ) ) );
     alert.initOwner( getWindow() );
     alert.showAndWait();
+  }
   //---- Convenience accessors ----------------------------------------------
   private float getFloat( final String key, final float defaultValue ) {
     return getPreferences().getFloat( key, defaultValue );
+  }
   private Preferences getPreferences() {
     return getOptions().getState();
+  }
   protected Scene getScene() {
     return mScene;
+  }
   public Window getWindow() {
     return getScene().getWindow();
+  }
   private MarkdownEditorPane getActiveEditor() {
     final EditorPane pane = getActiveFileEditor().getEditorPane();
     return pane instanceof MarkdownEditorPane
         ? (MarkdownEditorPane) pane
         : null;
+  }
   private FileEditorTab getActiveFileEditor() {
     return getFileEditorPane().getActiveFileEditor();
+  }
   //---- Member accessors ---------------------------------------------------
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     return mProcessors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     return mPreviewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     assert definitionSource != null;
     mDefinitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     return mDefinitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     return mDefinitionPane;
+  }
   private Options getOptions() {
     return mOptions;
+  }
   private Snitch getSnitch() {
     return mSnitch;
+  }
   private Notifier getNotifier() {
     return mNotifier;
+  }
   private Text getLineNumberText() {
     return mLineNumberText;
+  }
   private StatusBar getStatusBar() {
     return mStatusBar;
+  }
   private TextField getFindTextField() {
     return mFindTextField;
+  }
   //---- Member creators ----------------------------------------------------
   /**
    * Factory to create processors that are suited to different file types.
+   *
    * @param tab The tab that is subjected to processing.
    * @return A processor suited to the file type specified by the tab's path.
    */
   private Processor<String> createProcessor( final FileEditorTab tab ) {
     return createProcessorFactory().createProcessor( tab );
+  }
   private ProcessorFactory createProcessorFactory() {
     return new ProcessorFactory( getPreviewPane(), getResolvedMap() );
+  }
   private DefinitionSource createDefaultDefinitionSource() {
     return new YamlDefinitionSource( getDefinitionPath() );
+  }
   private DefinitionSource createDefinitionSource( final Path path ) {
     try {
       return createDefinitionFactory().createDefinitionSource( path );
     } catch( final Exception ex ) {
       error( ex );
       return createDefaultDefinitionSource();
+    }
+  }
   private TextField createFindTextField() {
     return new TextField();
+  }
   /**
    * Create an editor pane to hold file editor tabs.
+   *
    * @return A new instance, never null.
    */
   private FileEditorTabPane createFileEditorPane() {
     return new FileEditorTabPane();
+  }
   private DefinitionFactory createDefinitionFactory() {
     return new DefinitionFactory();
+  }
   private StatusBar createStatusBar() {
     return new StatusBar();
+  }
   private Scene createScene() {
     final SplitPane splitPane = new SplitPane(
         getDefinitionPane().getNode(),
         getFileEditorPane().getNode(),
         getPreviewPane().getNode() );
     splitPane.setDividerPositions(
         getFloat( K_PANE_SPLIT_DEFINITION, .10f ),
         getFloat( K_PANE_SPLIT_EDITOR, .45f ),
         getFloat( K_PANE_SPLIT_PREVIEW, .45f ) );
     getDefinitionPane().prefHeightProperty().bind( splitPane.heightProperty() );
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox statusBar = new VBox();
     statusBar.setAlignment( Pos.BASELINE_CENTER );
     statusBar.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( statusBar );
     return new Scene( borderPane );
+  }
   private Text createLineNumberText() {
     return new Text( get( STATUS_BAR_LINE, 1, 1, 1 ) );
+  }
   private Node createMenuBar() {
     final BooleanBinding activeFileEditorIsNull =
         getFileEditorPane().activeFileEditorProperty()
                            .isNull();
     // File actions
     final Action fileNewAction = new Action( get( "Main.menu.file.new" ),
                                              "Shortcut+N", FILE_ALT,
                                              e -> fileNew() );
     final Action fileOpenAction = new Action( get( "Main.menu.file.open" ),
                                               "Shortcut+O", FOLDER_OPEN_ALT,
                                               e -> fileOpen() );
     final Action fileCloseAction = new Action( get( "Main.menu.file.close" ),
                                                "Shortcut+W", null,
                                                e -> fileClose(),
                                                activeFileEditorIsNull );
     final Action fileCloseAllAction = new Action( get(
         "Main.menu.file.close_all" ), null, null, e -> fileCloseAll(),
                                                   activeFileEditorIsNull );
     final Action fileSaveAction = new Action( get( "Main.menu.file.save" ),
                                               "Shortcut+S", FLOPPY_ALT,
                                               e -> fileSave(),
                                               createActiveBooleanProperty(
                                                   FileEditorTab::modifiedProperty )
                                                   .not() );
     final Action fileSaveAsAction = new Action( Messages.get(
         "Main.menu.file.save_as" ), null, null, e -> fileSaveAs(),
                                                 activeFileEditorIsNull );
     final Action fileSaveAllAction = new Action(
         get( "Main.menu.file.save_all" ), "Shortcut+Shift+S", null,
         e -> fileSaveAll(),
         Bindings.not( getFileEditorPane().anyFileEditorModifiedProperty() ) );
     final Action fileExitAction = new Action( get( "Main.menu.file.exit" ),
                                               null,
                                               null,
                                               e -> fileExit() );
     // Edit actions
     final Action editUndoAction = new Action( get( "Main.menu.edit.undo" ),
                                               "Shortcut+Z", UNDO,
                                               e -> getActiveEditor().undo(),
                                               createActiveBooleanProperty(
                                                   FileEditorTab::canUndoProperty )
                                                   .not() );
     final Action editRedoAction = new Action( get( "Main.menu.edit.redo" ),
                                               "Shortcut+Y", REPEAT,
                                               e -> getActiveEditor().redo(),
                                               createActiveBooleanProperty(
                                                   FileEditorTab::canRedoProperty )
                                                   .not() );
     final Action editFindAction = new Action( Messages.get(
         "Main.menu.edit.find" ), "Ctrl+F", SEARCH,
                                               e -> find(),
                                               activeFileEditorIsNull );
     final Action editFindNextAction = new Action( Messages.get(
         "Main.menu.edit.find.next" ), "F3", null,
                                                   e -> findNext(),
                                                   activeFileEditorIsNull );
     // Insert actions
     final Action insertBoldAction = new Action( get( "Main.menu.insert.bold" ),
                                                 "Shortcut+B", BOLD,
                                                 e -> getActiveEditor().surroundSelection(
                                                     "**", "**" ),
                                                 activeFileEditorIsNull );
     final Action insertItalicAction = new Action(
         get( "Main.menu.insert.italic" ), "Shortcut+I", ITALIC,
         e -> getActiveEditor().surroundSelection( "*", "*" ),
         activeFileEditorIsNull );
     final Action insertSuperscriptAction = new Action( get(
         "Main.menu.insert.superscript" ), "Shortcut+[", SUPERSCRIPT,
                                                        e -> getActiveEditor().surroundSelection(
                                                            "^", "^" ),
                                                        activeFileEditorIsNull );
     final Action insertSubscriptAction = new Action( get(
         "Main.menu.insert.subscript" ), "Shortcut+]", SUBSCRIPT,
                                                      e -> getActiveEditor().surroundSelection(
                                                          "~", "~" ),
                                                      activeFileEditorIsNull );
     final Action insertStrikethroughAction = new Action( get(
         "Main.menu.insert.strikethrough" ), "Shortcut+T", STRIKETHROUGH,
                                                          e -> getActiveEditor().surroundSelection(
                                                              "~~", "~~" ),
                                                          activeFileEditorIsNull );
     final Action insertBlockquoteAction = new Action( get(
         "Main.menu.insert.blockquote" ),
                                                       "Ctrl+Q",
                                                       QUOTE_LEFT,
                                                       // not Shortcut+Q
                                                       // because of conflict
                                                       // on Mac
                                                       e -> getActiveEditor().surroundSelection(
                                                           "\n\n> ", "" ),
                                                       activeFileEditorIsNull );
     final Action insertCodeAction = new Action( get( "Main.menu.insert.code" ),
                                                 "Shortcut+K", CODE,
                                                 e -> getActiveEditor().surroundSelection(
                                                     "`", "`" ),
                                                 activeFileEditorIsNull );
     final Action insertFencedCodeBlockAction = new Action( get(
         "Main.menu.insert.fenced_code_block" ),
                                                            "Shortcut+Shift+K",
                                                            FILE_CODE_ALT,
                                                            e -> getActiveEditor()
                                                                .surroundSelection(
                                                                    "\n\n```\n",
                                                                    "\n```\n\n",
                                                                    get(
                                                                        "Main.menu.insert.fenced_code_block.prompt" ) ),
                                                            activeFileEditorIsNull );
     final Action insertLinkAction = new Action( get( "Main.menu.insert.link" ),
                                                 "Shortcut+L", LINK,
                                                 e -> getActiveEditor().insertLink(),
                                                 activeFileEditorIsNull );
     final Action insertImageAction = new Action( get( "Main.menu.insert" +
                                                           ".image" ),
                                                  "Shortcut+G", PICTURE_ALT,
                                                  e -> getActiveEditor().insertImage(),
                                                  activeFileEditorIsNull );
     // Number of header actions (H1 ... H3)
     final int HEADERS = 3;
     final Action[] headers = new Action[ HEADERS ];
     for( int i = 1; i <= HEADERS; i++ ) {
       final String hashes = new String( new char[ i ] ).replace( "\0", "#" );
       final String markup = String.format( "%n%n%s ", hashes );
       final String text = get( "Main.menu.insert.header_" + i );
       final String accelerator = "Shortcut+" + i;
       final String prompt = get( "Main.menu.insert.header_" + i + ".prompt" );
       headers[ i - 1 ] = new Action( text, accelerator, HEADER,
                                      e -> getActiveEditor().surroundSelection(
                                          markup, "", prompt ),
                                      activeFileEditorIsNull );
+    }
     final Action insertUnorderedListAction = new Action(
         get( "Main.menu.insert.unordered_list" ), "Shortcut+U", LIST_UL,
         e -> getActiveEditor().surroundSelection( "\n\n* ", "" ),
         activeFileEditorIsNull );
     final Action insertOrderedListAction = new Action(
         get( "Main.menu.insert.ordered_list" ), "Shortcut+Shift+O", LIST_OL,
         e -> getActiveEditor().surroundSelection( "\n\n1. ", "" ),
         activeFileEditorIsNull );
     final Action insertHorizontalRuleAction = new Action(
         get( "Main.menu.insert.horizontal_rule" ), "Shortcut+H", null,
         e -> getActiveEditor().surroundSelection( "\n\n---\n\n", "" ),
         activeFileEditorIsNull );
     // R actions
     final Action mRScriptAction = new Action(
         get( "Main.menu.r.script" ), null, null, e -> rScript() );
     final Action mRDirectoryAction = new Action(
         get( "Main.menu.r.directory" ), null, null, e -> rDirectory() );
     // Help actions
     final Action helpAboutAction = new Action(
         get( "Main.menu.help.about" ), null, null, e -> helpAbout() );
     //---- MenuBar ----
     final Menu fileMenu = ActionUtils.createMenu(
         get( "Main.menu.file" ),
         fileNewAction,
         fileOpenAction,
         null,
         fileCloseAction,
         fileCloseAllAction,
         null,
         fileSaveAction,
         fileSaveAsAction,
         fileSaveAllAction,
         null,
         fileExitAction );
     final Menu editMenu = ActionUtils.createMenu(
         get( "Main.menu.edit" ),
         editUndoAction,
         editRedoAction,
         editFindAction,
         editFindNextAction );
     final Menu insertMenu = ActionUtils.createMenu(
         get( "Main.menu.insert" ),
         insertBoldAction,
         insertItalicAction,
         insertSuperscriptAction,
         insertSubscriptAction,
         insertStrikethroughAction,
         insertBlockquoteAction,
         insertCodeAction,
         insertFencedCodeBlockAction,
         null,
         insertLinkAction,
         insertImageAction,
         null,
         headers[ 0 ],
         headers[ 1 ],
         headers[ 2 ],
         null,
         insertUnorderedListAction,
         insertOrderedListAction,
         insertHorizontalRuleAction );
     final Menu rMenu = ActionUtils.createMenu(
         get( "Main.menu.r" ),
         mRScriptAction,
         mRDirectoryAction );
     final Menu helpMenu = ActionUtils.createMenu(
         get( "Main.menu.help" ),
         helpAboutAction );
     final MenuBar menuBar = new MenuBar(
         fileMenu,
         editMenu,
         insertMenu,
         rMenu,
         helpMenu );
     //---- ToolBar ----
     final ToolBar toolBar = ActionUtils.createToolBar(
         fileNewAction,
         fileOpenAction,
         fileSaveAction,
         null,
         editUndoAction,
         editRedoAction,
         null,
         insertBoldAction,
         insertItalicAction,
         insertSuperscriptAction,
         insertSubscriptAction,
         insertBlockquoteAction,
         insertCodeAction,
         insertFencedCodeBlockAction,
         null,
         insertLinkAction,
         insertImageAction,
         null,
         headers[ 0 ],
         null,
         insertUnorderedListAction,
         insertOrderedListAction );
     return new VBox( menuBar, toolBar );
+  }
   /**
    * Creates a boolean property that is bound to another boolean value of the
    * active editor.
    */
   private BooleanProperty createActiveBooleanProperty(
       final Function<FileEditorTab, ObservableBooleanValue> func ) {
     final BooleanProperty b = new SimpleBooleanProperty();
     final FileEditorTab tab = getActiveFileEditor();
     if( tab != null ) {
       b.bind( func.apply( tab ) );
+    }
     getFileEditorPane().activeFileEditorProperty().addListener(
         ( observable, oldFileEditor, newFileEditor ) -> {
           b.unbind();
           if( newFileEditor != null ) {
             b.bind( func.apply( newFileEditor ) );
+          }
           else {
             b.set( false );
+          }
+        }
     );
     return b;
+  }
   private void initLayout() {
     final Scene appScene = getScene();
     appScene.getStylesheets().add( STYLESHEET_SCENE );
     // TODO: Apply an XML syntax highlighting for XML files.
 //    appScene.getStylesheets().add( STYLESHEET_XML );
     appScene.windowProperty().addListener(
         ( observable, oldWindow, newWindow ) ->
             newWindow.setOnCloseRequest(
                 e -> {
                   if( !getFileEditorPane().closeAllEditors() ) {
                     e.consume();
+                  }
+                }
+            )
     );
+  }
   private void putPreference( final String key, final String value ) {
     try {
       getPreferences().put( key, value );
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   /**
    * Returns the value for a key from the settings properties file.
+   *
    * @param key   Key within the settings properties file to find.
    * @param value Default value to return if the key is not found.
    * @return The value for the given key from the settings file, or the
    * given {@code value} if no key found.
    */
   @SuppressWarnings("SameParameterValue")
   private String getSetting( final String key, final String value ) {
     return mSettings.getSetting( key, value );
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.editors.VariableNameInjector;
 import com.scrivenvar.editors.markdown.MarkdownEditorPane;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import com.scrivenvar.processors.Processor;
 import com.scrivenvar.processors.ProcessorFactory;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.Snitch;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.Action;
 import com.scrivenvar.util.ActionBuilder;
 import com.scrivenvar.util.ActionUtils;
 import javafx.application.Platform;
 import javafx.beans.binding.Bindings;
 import javafx.beans.binding.BooleanBinding;
 import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.ListChangeListener.Change;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.geometry.Pos;
 import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.scene.control.*;
 import javafx.scene.control.Alert.AlertType;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
 import javafx.scene.text.Text;
 import javafx.stage.Window;
 import javafx.stage.WindowEvent;
 import javafx.util.Duration;
 import org.controlsfx.control.StatusBar;
 import org.fxmisc.richtext.model.TwoDimensional.Position;
 import java.io.File;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Observable;
 import java.util.Observer;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.prefs.Preferences;
 import static com.scrivenvar.Constants.*;
 import static com.scrivenvar.Messages.get;
 import static com.scrivenvar.util.StageState.*;
 import static de.jensd.fx.glyphs.fontawesome.FontAwesomeIcon.*;
 import static javafx.event.Event.fireEvent;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.TAB;
 import static javafx.stage.WindowEvent.WINDOW_CLOSE_REQUEST;
 /**
  * Main window containing a tab pane in the center for file editors.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class MainWindow implements Observer {
   /**
    * The {@code OPTIONS} variable must be declared before all other variables
    * to prevent subsequent initializations from failing due to missing user
    * preferences.
    */
   private final static Options OPTIONS = Services.load( Options.class );
   private final static Snitch SNITCH = Services.load( Snitch.class );
   private final static Notifier NOTIFIER = Services.load( Notifier.class );
   private final Scene mScene;
   private final StatusBar mStatusBar;
   private final Text mLineNumberText;
   private final TextField mFindTextField;
   private DefinitionSource mDefinitionSource = createDefaultDefinitionSource();
   private final DefinitionPane mDefinitionPane = new DefinitionPane();
   private final HTMLPreviewPane mPreviewPane = createHTMLPreviewPane();
   private FileEditorTabPane fileEditorPane;
   /**
    * Prevents re-instantiation of processing classes.
    */
   private final Map<FileEditorTab, Processor<String>> mProcessors =
       new HashMap<>();
   private final Map<String, String> mResolvedMap =
       new HashMap<>( DEFAULT_MAP_SIZE );
   /**
    * Listens on the definition pane for double-click events.
    */
   private VariableNameInjector variableNameInjector;
   /**
    * Called when the definition data is changed.
    */
   private final EventHandler<TreeItem.TreeModificationEvent<Event>>
       mTreeHandler = event -> {
     exportDefinitions( getDefinitionPath() );
     interpolateResolvedMap();
     refreshActiveTab();
   };
   /**
    * Called to inject the selected item when the user presses ENTER in the
    * definition pane.
    */
   private final EventHandler<? super KeyEvent> mDefinitionKeyHandler =
       event -> {
         if( event.getCode() == ENTER ) {
           getVariableNameInjector().injectSelectedItem();
+        }
       };
   /**
    * Called to switch to the definition pane when the user presses TAB.
    */
   private final EventHandler<? super KeyEvent> mEditorKeyHandler =
       (EventHandler<KeyEvent>) event -> {
         if( event.getCode() == TAB ) {
           getDefinitionPane().requestFocus();
           event.consume();
+        }
       };
   private final Object mMutex = new Object();
   private final AtomicInteger mScrollRatio = new AtomicInteger( 0 );
   /**
    * Called to synchronize the scrolling areas.
    */
   private final Consumer<Double> mScrollEventObserver = o -> {
     final var eScrollPane = getActiveEditor().getScrollPane();
     final int eScrollY =
         eScrollPane.estimatedScrollYProperty().getValue().intValue();
     final int eHeight = (int)
         (eScrollPane.totalHeightEstimateProperty().getValue().intValue()
             - eScrollPane.getHeight());
     final double eRatio = eHeight > 0
         ? Math.min( Math.max( eScrollY / (float) eHeight, 0 ), 1 ) : 0;
     final var pPreviewPane = getPreviewPane();
     final var pScrollBar = pPreviewPane.getVerticalScrollBar();
     final var pHeight = pScrollBar.getMaximum() - pScrollBar.getHeight();
     final var pScrollY = (int) (pHeight * eRatio);
     final var pScrollPane = pPreviewPane.getScrollPane();
     final int oldScrollY = mScrollRatio.getAndSet( pScrollY );
     final int delta = Math.abs( oldScrollY - pScrollY );
     if( delta > 33 ) {
       // Prevent concurrent modification exceptions when attempting to
       // set the vertical scroll bar position.
       synchronized( mMutex ) {
         Platform.runLater( () -> {
           pScrollBar.setValue( pScrollY );
           pScrollPane.repaint();
         } );
+      }
+    }
   };
   public MainWindow() {
     mStatusBar = createStatusBar();
     mLineNumberText = createLineNumberText();
     mFindTextField = createFindTextField();
     mScene = createScene();
     initLayout();
     initFindInput();
     initSnitch();
     initDefinitionListener();
     initTabAddedListener();
     initTabChangedListener();
     restorePreferences();
+  }
   private void initLayout() {
     final Scene appScene = getScene();
     appScene.getStylesheets().add( STYLESHEET_SCENE );
     // TODO: Apply an XML syntax highlighting for XML files.
 //    appScene.getStylesheets().add( STYLESHEET_XML );
     appScene.windowProperty().addListener(
         ( observable, oldWindow, newWindow ) ->
             newWindow.setOnCloseRequest(
                 e -> {
                   if( !getFileEditorPane().closeAllEditors() ) {
                     e.consume();
+                  }
+                }
+            )
     );
+  }
   /**
    * Initialize the find input text field to listen on F3, ENTER, and ESCAPE key
    * presses.
    */
   private void initFindInput() {
     final TextField input = getFindTextField();
     input.setOnKeyPressed( ( KeyEvent event ) -> {
       switch( event.getCode() ) {
         case F3:
         case ENTER:
           editFindNext();
           break;
         case F:
           if( !event.isControlDown() ) {
             break;
+          }
         case ESCAPE:
           getStatusBar().setGraphic( null );
           getActiveFileEditor().getEditorPane().requestFocus();
           break;
+      }
     } );
     // Remove when the input field loses focus.
     input.focusedProperty().addListener(
+        (
             final ObservableValue<? extends Boolean> focused,
             final Boolean oFocus,
             final Boolean nFocus ) -> {
           if( !nFocus ) {
             getStatusBar().setGraphic( null );
+          }
+        }
     );
+  }
   /**
    * Watch for changes to external files. In particular, this awaits
    * modifications to any XSL files associated with XML files being edited. When
    * an XSL file is modified (external to the application), the snitch's ears
    * perk up and the file is reloaded. This keeps the XSL transformation up to
    * date with what's on the file system.
    */
   private void initSnitch() {
     SNITCH.addObserver( this );
+  }
   /**
    * Listen for {@link FileEditorTabPane} to receive open definition file event.
    */
   private void initDefinitionListener() {
     getFileEditorPane().onOpenDefinitionFileProperty().addListener(
         ( final ObservableValue<? extends Path> file,
           final Path oldPath, final Path newPath ) -> {
           // Indirectly refresh the resolved map.
           resetProcessors();
           openDefinitions( newPath );
           // Will create new processors and therefore a new resolved map.
           refreshActiveTab();
+        }
     );
+  }
   /**
    * When tabs are added, hook the various change listeners onto the new tab so
    * that the preview pane refreshes as necessary.
    */
   private void initTabAddedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Make sure the text processor kicks off when new files are opened.
     final ObservableList<Tab> tabs = editorPane.getTabs();
     // Update the preview pane on tab changes.
     tabs.addListener(
         ( final Change<? extends Tab> change ) -> {
           while( change.next() ) {
             if( change.wasAdded() ) {
               // Multiple tabs can be added simultaneously.
               for( final Tab newTab : change.getAddedSubList() ) {
                 final FileEditorTab tab = (FileEditorTab) newTab;
                 initTextChangeListener( tab );
                 initKeyboardEventListeners( tab );
 //              initSyntaxListener( tab );
+              }
+            }
+          }
+        }
     );
+  }
   /**
    * Listen for new tab selection events.
    */
   private void initTabChangedListener() {
     final FileEditorTabPane editorPane = getFileEditorPane();
     // Update the preview pane changing tabs.
     editorPane.addTabSelectionListener(
         ( ObservableValue<? extends Tab> tabPane,
           final Tab oldTab, final Tab newTab ) -> {
           updateVariableNameInjector();
           // If there was no old tab, then this is a first time load, which
           // can be ignored.
           if( oldTab != null ) {
             if( newTab == null ) {
               closeRemainingTab();
+            }
             else {
               // Update the preview with the edited text.
               refreshSelectedTab( (FileEditorTab) newTab );
+            }
+          }
+        }
     );
+  }
   /**
    * Reloads the preferences from the previous session.
    */
   private void restorePreferences() {
     restoreDefinitionPane();
     getFileEditorPane().restorePreferences();
+  }
   /**
    * Ensure that the keyboard events are received when a new tab is added
    * to the user interface.
+   *
    * @param tab The tab that can trigger keyboard events, such as control+space.
    */
   private void initKeyboardEventListeners( final FileEditorTab tab ) {
     final VariableNameInjector vin = getVariableNameInjector();
     vin.initKeyboardEventListeners( tab );
     tab.addEventFilter( KeyEvent.KEY_PRESSED, mEditorKeyHandler );
+  }
   private void initTextChangeListener( final FileEditorTab tab ) {
     tab.addTextChangeListener(
         ( ObservableValue<? extends String> editor,
           final String oldValue, final String newValue ) ->
             refreshSelectedTab( tab )
     );
+  }
   private void updateVariableNameInjector() {
     getVariableNameInjector().setFileEditorTab( getActiveFileEditor() );
+  }
   private void setVariableNameInjector( final VariableNameInjector injector ) {
     this.variableNameInjector = injector;
+  }
   private synchronized VariableNameInjector getVariableNameInjector() {
     if( this.variableNameInjector == null ) {
       final VariableNameInjector vin = createVariableNameInjector();
       setVariableNameInjector( vin );
+    }
     return this.variableNameInjector;
+  }
   private VariableNameInjector createVariableNameInjector() {
     final FileEditorTab tab = getActiveFileEditor();
     final DefinitionPane pane = getDefinitionPane();
     return new VariableNameInjector( tab, pane );
+  }
   /**
    * Called whenever the preview pane becomes out of sync with the file editor
    * tab. This can be called when the text changes, the caret paragraph changes,
    * or the file tab changes.
+   *
    * @param tab The file editor tab that has been changed in some fashion.
    */
   private void refreshSelectedTab( final FileEditorTab tab ) {
     if( tab == null ) {
       return;
+    }
     getPreviewPane().setPath( tab.getPath() );
     // TODO: https://github.com/DaveJarvis/scrivenvar/issues/29
     final Position p = tab.getCaretOffset();
     getLineNumberText().setText(
         get( STATUS_BAR_LINE,
              p.getMajor() + 1,
              p.getMinor() + 1,
              tab.getCaretPosition() + 1
+        )
     );
     Processor<String> processor = getProcessors().get( tab );
     if( processor == null ) {
       processor = createProcessor( tab );
       getProcessors().put( tab, processor );
+    }
     try {
       processor.processChain( tab.getEditorText() );
     } catch( final Exception ex ) {
       error( ex );
+    }
+  }
   private void refreshActiveTab() {
     refreshSelectedTab( getActiveFileEditor() );
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinitions( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path );
       setDefinitionSource( ds );
       getUserPreferences().definitionPathProperty().setValue( path.toFile() );
       getUserPreferences().save();
       final Tooltip tooltipPath = new Tooltip( path.toString() );
       tooltipPath.setShowDelay( Duration.millis( 200 ) );
       final DefinitionPane pane = getDefinitionPane();
       pane.update( ds );
       pane.addTreeChangeHandler( mTreeHandler );
       pane.addKeyEventHandler( mDefinitionKeyHandler );
       pane.filenameProperty().setValue( path.getFileName().toString() );
       pane.setTooltip( tooltipPath );
       interpolateResolvedMap();
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void exportDefinitions( final Path path ) {
     try {
       final DefinitionPane pane = getDefinitionPane();
       final TreeItem<String> root = pane.getTreeView().getRoot();
       final TreeItem<String> problemChild = pane.isTreeWellFormed();
       if( problemChild == null ) {
         getDefinitionSource().getTreeAdapter().export( root, path );
         getNotifier().clear();
+      }
       else {
         final String msg = get( "yaml.error.tree.form",
                                 problemChild.getValue() );
         getNotifier().notify( msg );
+      }
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void interpolateResolvedMap() {
     final Map<String, String> treeMap = getDefinitionPane().toMap();
     final Map<String, String> map = new HashMap<>( treeMap );
     MapInterpolator.interpolate( map );
     getResolvedMap().clear();
     getResolvedMap().putAll( map );
+  }
   private void restoreDefinitionPane() {
     openDefinitions( getDefinitionPath() );
+  }
   /**
    * Called when the last open tab is closed to clear the preview pane.
    */
   private void closeRemainingTab() {
     getPreviewPane().clear();
+  }
   /**
    * Called when an exception occurs that warrants the user's attention.
+   *
    * @param e The exception with a message that the user should know about.
    */
   private void error( final Exception e ) {
     getNotifier().notify( e );
+  }
   //---- File actions -------------------------------------------------------
   /**
    * Called when an observable instance has changed. This is called by both the
    * snitch service and the notify service. The snitch service can be called for
    * different file types, including definition sources.
+   *
    * @param observable The observed instance.
    * @param value      The noteworthy item.
    */
   @Override
   public void update( final Observable observable, final Object value ) {
     if( value != null ) {
       if( observable instanceof Snitch && value instanceof Path ) {
         updateSelectedTab();
+      }
       else if( observable instanceof Notifier && value instanceof String ) {
         updateStatusBar( (String) value );
+      }
+    }
+  }
   /**
    * Updates the status bar to show the given message.
+   *
    * @param s The message to show in the status bar.
    */
   private void updateStatusBar( final String s ) {
     Platform.runLater(
         () -> {
           final int index = s.indexOf( '\n' );
           final String message = s.substring(
 , index > 0 ? index : s.length() );
           getStatusBar().setText( message );
+        }
     );
+  }
   /**
    * Called when a file has been modified.
    */
   private void updateSelectedTab() {
     Platform.runLater(
         () -> {
           // Brute-force XSLT file reload by re-instantiating all processors.
           resetProcessors();
           refreshActiveTab();
+        }
     );
+  }
   /**
    * After resetting the processors, they will refresh anew to be up-to-date
    * with the files (text and definition) currently loaded into the editor.
    */
   private void resetProcessors() {
     getProcessors().clear();
+  }
   //---- File actions -------------------------------------------------------
   private void fileNew() {
     getFileEditorPane().newEditor();
+  }
   private void fileOpen() {
     getFileEditorPane().openFileDialog();
+  }
   private void fileClose() {
     getFileEditorPane().closeEditor( getActiveFileEditor(), true );
+  }
   /**
    * TODO: Upon closing, first remove the tab change listeners. (There's no
    * need to re-render each tab when all are being closed.)
    */
   private void fileCloseAll() {
     getFileEditorPane().closeAllEditors();
+  }
   private void fileSave() {
     getFileEditorPane().saveEditor( getActiveFileEditor() );
+  }
   private void fileSaveAs() {
     final FileEditorTab editor = getActiveFileEditor();
     getFileEditorPane().saveEditorAs( editor );
     getProcessors().remove( editor );
     try {
       refreshSelectedTab( editor );
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   private void fileSaveAll() {
     getFileEditorPane().saveAllEditors();
+  }
   private void fileExit() {
     final Window window = getWindow();
     fireEvent( window, new WindowEvent( window, WINDOW_CLOSE_REQUEST ) );
+  }
   //---- Edit actions -------------------------------------------------------
   /**
    * Used to find text in the active file editor window.
    */
   private void editFind() {
     final TextField input = getFindTextField();
     getStatusBar().setGraphic( input );
     input.requestFocus();
+  }
   public void editFindNext() {
     getActiveFileEditor().searchNext( getFindTextField().getText() );
+  }
   public void editPreferences() {
     getUserPreferences().show();
+  }
   //---- Insert actions -----------------------------------------------------
   /**
    * Delegates to the active editor to handle wrapping the current text
    * selection with leading and trailing strings.
+   *
    * @param leading  The string to put before the selection.
    * @param trailing The string to put after the selection.
    */
   private void insertMarkdown(
       final String leading, final String trailing ) {
     getActiveEditor().surroundSelection( leading, trailing );
+  }
   @SuppressWarnings("SameParameterValue")
   private void insertMarkdown(
       final String leading, final String trailing, final String hint ) {
     getActiveEditor().surroundSelection( leading, trailing, hint );
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     final Alert alert = new Alert( AlertType.INFORMATION );
     alert.setTitle( get( "Dialog.about.title" ) );
     alert.setHeaderText( get( "Dialog.about.header" ) );
     alert.setContentText( get( "Dialog.about.content" ) );
     alert.setGraphic( new ImageView( new Image( FILE_LOGO_32 ) ) );
     alert.initOwner( getWindow() );
     alert.showAndWait();
+  }
   //---- Member creators ----------------------------------------------------
   /**
    * Factory to create processors that are suited to different file types.
+   *
    * @param tab The tab that is subjected to processing.
    * @return A processor suited to the file type specified by the tab's path.
    */
   private Processor<String> createProcessor( final FileEditorTab tab ) {
     return createProcessorFactory().createProcessor( tab );
+  }
   private ProcessorFactory createProcessorFactory() {
     return new ProcessorFactory( getPreviewPane(), getResolvedMap() );
+  }
   private HTMLPreviewPane createHTMLPreviewPane() {
     return new HTMLPreviewPane();
+  }
   private DefinitionSource createDefaultDefinitionSource() {
     return new YamlDefinitionSource( getDefinitionPath() );
+  }
   private DefinitionSource createDefinitionSource( final Path path ) {
     try {
       return createDefinitionFactory().createDefinitionSource( path );
     } catch( final Exception ex ) {
       error( ex );
       return createDefaultDefinitionSource();
+    }
+  }
   private TextField createFindTextField() {
     return new TextField();
+  }
   /**
    * Create an editor pane to hold file editor tabs.
+   *
    * @return A new instance, never null.
    */
   private FileEditorTabPane createFileEditorPane() {
     return new FileEditorTabPane( mScrollEventObserver );
+  }
   private DefinitionFactory createDefinitionFactory() {
     return new DefinitionFactory();
+  }
   private StatusBar createStatusBar() {
     return new StatusBar();
+  }
   private Scene createScene() {
     final SplitPane splitPane = new SplitPane(
         getDefinitionPane().getNode(),
         getFileEditorPane().getNode(),
         getPreviewPane().getNode() );
     splitPane.setDividerPositions(
         getFloat( K_PANE_SPLIT_DEFINITION, .10f ),
         getFloat( K_PANE_SPLIT_EDITOR, .45f ),
         getFloat( K_PANE_SPLIT_PREVIEW, .45f ) );
     getDefinitionPane().prefHeightProperty().bind( splitPane.heightProperty() );
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox statusBar = new VBox();
     statusBar.setAlignment( Pos.BASELINE_CENTER );
     statusBar.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( statusBar );
     return new Scene( borderPane );
+  }
   private Text createLineNumberText() {
     return new Text( get( STATUS_BAR_LINE, 1, 1, 1 ) );
+  }
   private Node createMenuBar() {
     final BooleanBinding activeFileEditorIsNull =
         getFileEditorPane().activeFileEditorProperty().isNull();
     // File actions
     final Action fileNewAction = new ActionBuilder()
         .setText( "Main.menu.file.new" )
         .setAccelerator( "Shortcut+N" )
         .setIcon( FILE_ALT )
         .setAction( e -> fileNew() )
         .build();
     final Action fileOpenAction = new ActionBuilder()
         .setText( "Main.menu.file.open" )
         .setAccelerator( "Shortcut+O" )
         .setIcon( FOLDER_OPEN_ALT )
         .setAction( e -> fileOpen() )
         .build();
     final Action fileCloseAction = new ActionBuilder()
         .setText( "Main.menu.file.close" )
         .setAccelerator( "Shortcut+W" )
         .setAction( e -> fileClose() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action fileCloseAllAction = new ActionBuilder()
         .setText( "Main.menu.file.close_all" )
         .setAction( e -> fileCloseAll() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action fileSaveAction = new ActionBuilder()
         .setText( "Main.menu.file.save" )
         .setAccelerator( "Shortcut+S" )
         .setIcon( FLOPPY_ALT )
         .setAction( e -> fileSave() )
         .setDisable( createActiveBooleanProperty(
             FileEditorTab::modifiedProperty ).not() )
         .build();
     final Action fileSaveAsAction = new ActionBuilder()
         .setText( "Main.menu.file.save_as" )
         .setAction( e -> fileSaveAs() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action fileSaveAllAction = new ActionBuilder()
         .setText( "Main.menu.file.save_all" )
         .setAccelerator( "Shortcut+Shift+S" )
         .setAction( e -> fileSaveAll() )
         .setDisable( Bindings.not(
             getFileEditorPane().anyFileEditorModifiedProperty() ) )
         .build();
     final Action fileExitAction = new ActionBuilder()
         .setText( "Main.menu.file.exit" )
         .setAction( e -> fileExit() )
         .build();
     // Edit actions
     final Action editUndoAction = new ActionBuilder()
         .setText( "Main.menu.edit.undo" )
         .setAccelerator( "Shortcut+Z" )
         .setIcon( UNDO )
         .setAction( e -> getActiveEditor().undo() )
         .setDisable( createActiveBooleanProperty(
             FileEditorTab::canUndoProperty ).not() )
         .build();
     final Action editRedoAction = new ActionBuilder()
         .setText( "Main.menu.edit.redo" )
         .setAccelerator( "Shortcut+Y" )
         .setIcon( REPEAT )
         .setAction( e -> getActiveEditor().redo() )
         .setDisable( createActiveBooleanProperty(
             FileEditorTab::canRedoProperty ).not() )
         .build();
     final Action editFindAction = new ActionBuilder()
         .setText( "Main.menu.edit.find" )
         .setAccelerator( "Ctrl+F" )
         .setIcon( SEARCH )
         .setAction( e -> editFind() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action editFindNextAction = new ActionBuilder()
         .setText( "Main.menu.edit.find.next" )
         .setAccelerator( "F3" )
         .setIcon( null )
         .setAction( e -> editFindNext() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action editPreferencesAction = new ActionBuilder()
         .setText( "Main.menu.edit.preferences" )
         .setAccelerator( "Ctrl+Alt+S" )
         .setAction( e -> editPreferences() )
         .build();
     // Insert actions
     final Action insertBoldAction = new ActionBuilder()
         .setText( "Main.menu.insert.bold" )
         .setAccelerator( "Shortcut+B" )
         .setIcon( BOLD )
         .setAction( e -> insertMarkdown( "**", "**" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertItalicAction = new ActionBuilder()
         .setText( "Main.menu.insert.italic" )
         .setAccelerator( "Shortcut+I" )
         .setIcon( ITALIC )
         .setAction( e -> insertMarkdown( "*", "*" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertSuperscriptAction = new ActionBuilder()
         .setText( "Main.menu.insert.superscript" )
         .setAccelerator( "Shortcut+[" )
         .setIcon( SUPERSCRIPT )
         .setAction( e -> insertMarkdown( "^", "^" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertSubscriptAction = new ActionBuilder()
         .setText( "Main.menu.insert.subscript" )
         .setAccelerator( "Shortcut+]" )
         .setIcon( SUBSCRIPT )
         .setAction( e -> insertMarkdown( "~", "~" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertStrikethroughAction = new ActionBuilder()
         .setText( "Main.menu.insert.strikethrough" )
         .setAccelerator( "Shortcut+T" )
         .setIcon( STRIKETHROUGH )
         .setAction( e -> insertMarkdown( "~~", "~~" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertBlockquoteAction = new ActionBuilder()
         .setText( "Main.menu.insert.blockquote" )
         .setAccelerator( "Ctrl+Q" )
         .setIcon( QUOTE_LEFT )
         .setAction( e -> insertMarkdown( "\n\n> ", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertCodeAction = new ActionBuilder()
         .setText( "Main.menu.insert.code" )
         .setAccelerator( "Shortcut+K" )
         .setIcon( CODE )
         .setAction( e -> insertMarkdown( "`", "`" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertFencedCodeBlockAction = new ActionBuilder()
         .setText( "Main.menu.insert.fenced_code_block" )
         .setAccelerator( "Shortcut+Shift+K" )
         .setIcon( FILE_CODE_ALT )
         .setAction( e -> getActiveEditor().surroundSelection(
             "\n\n```\n",
             "\n```\n\n",
             get( "Main.menu.insert.fenced_code_block.prompt" ) ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertLinkAction = new ActionBuilder()
         .setText( "Main.menu.insert.link" )
         .setAccelerator( "Shortcut+L" )
         .setIcon( LINK )
         .setAction( e -> getActiveEditor().insertLink() )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertImageAction = new ActionBuilder()
         .setText( "Main.menu.insert.image" )
         .setAccelerator( "Shortcut+G" )
         .setIcon( PICTURE_ALT )
         .setAction( e -> getActiveEditor().insertImage() )
         .setDisable( activeFileEditorIsNull )
         .build();
     // Number of header actions (H1 ... H3)
     final int HEADERS = 3;
     final Action[] headers = new Action[ HEADERS ];
     for( int i = 1; i <= HEADERS; i++ ) {
       final String hashes = new String( new char[ i ] ).replace( "\0", "#" );
       final String markup = String.format( "%n%n%s ", hashes );
       final String text = "Main.menu.insert.header." + i;
       final String accelerator = "Shortcut+" + i;
       final String prompt = text + ".prompt";
       headers[ i - 1 ] = new ActionBuilder()
           .setText( text )
           .setAccelerator( accelerator )
           .setIcon( HEADER )
           .setAction( e -> insertMarkdown( markup, "", get( prompt ) ) )
           .setDisable( activeFileEditorIsNull )
           .build();
+    }
     final Action insertUnorderedListAction = new ActionBuilder()
         .setText( "Main.menu.insert.unordered_list" )
         .setAccelerator( "Shortcut+U" )
         .setIcon( LIST_UL )
         .setAction( e -> getActiveEditor()
             .surroundSelection( "\n\n* ", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertOrderedListAction = new ActionBuilder()
         .setText( "Main.menu.insert.ordered_list" )
         .setAccelerator( "Shortcut+Shift+O" )
         .setIcon( LIST_OL )
         .setAction( e -> insertMarkdown(
             "\n\n1. ", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     final Action insertHorizontalRuleAction = new ActionBuilder()
         .setText( "Main.menu.insert.horizontal_rule" )
         .setAccelerator( "Shortcut+H" )
         .setAction( e -> insertMarkdown(
             "\n\n---\n\n", "" ) )
         .setDisable( activeFileEditorIsNull )
         .build();
     // Help actions
     final Action helpAboutAction = new ActionBuilder()
         .setText( "Main.menu.help.about" )
         .setAction( e -> helpAbout() )
         .build();
     //---- MenuBar ----
     final Menu fileMenu = ActionUtils.createMenu(
         get( "Main.menu.file" ),
         fileNewAction,
         fileOpenAction,
         null,
         fileCloseAction,
         fileCloseAllAction,
         null,
         fileSaveAction,
         fileSaveAsAction,
         fileSaveAllAction,
         null,
         fileExitAction );
     final Menu editMenu = ActionUtils.createMenu(
         get( "Main.menu.edit" ),
         editUndoAction,
         editRedoAction,
         editFindAction,
         editFindNextAction,
         null,
         editPreferencesAction );
     final Menu insertMenu = ActionUtils.createMenu(
         get( "Main.menu.insert" ),
         insertBoldAction,
         insertItalicAction,
         insertSuperscriptAction,
         insertSubscriptAction,
         insertStrikethroughAction,
         insertBlockquoteAction,
         insertCodeAction,
         insertFencedCodeBlockAction,
         null,
         insertLinkAction,
         insertImageAction,
         null,
         headers[ 0 ],
         headers[ 1 ],
         headers[ 2 ],
         null,
         insertUnorderedListAction,
         insertOrderedListAction,
         insertHorizontalRuleAction );
     final Menu helpMenu = ActionUtils.createMenu(
         get( "Main.menu.help" ),
         helpAboutAction );
     final MenuBar menuBar = new MenuBar(
         fileMenu,
         editMenu,
         insertMenu,
         helpMenu );
     //---- ToolBar ----
     final ToolBar toolBar = ActionUtils.createToolBar(
         fileNewAction,
         fileOpenAction,
         fileSaveAction,
         null,
         editUndoAction,
         editRedoAction,
         null,
         insertBoldAction,
         insertItalicAction,
         insertSuperscriptAction,
         insertSubscriptAction,
         insertBlockquoteAction,
         insertCodeAction,
         insertFencedCodeBlockAction,
         null,
         insertLinkAction,
         insertImageAction,
         null,
         headers[ 0 ],
         null,
         insertUnorderedListAction,
         insertOrderedListAction );
     return new VBox( menuBar, toolBar );
+  }
   private UserPreferences createUserPreferences() {
     return new UserPreferences();
+  }
   /**
    * Creates a boolean property that is bound to another boolean value of the
    * active editor.
    */
   private BooleanProperty createActiveBooleanProperty(
       final Function<FileEditorTab, ObservableBooleanValue> func ) {
     final BooleanProperty b = new SimpleBooleanProperty();
     final FileEditorTab tab = getActiveFileEditor();
     if( tab != null ) {
       b.bind( func.apply( tab ) );
+    }
     getFileEditorPane().activeFileEditorProperty().addListener(
         ( observable, oldFileEditor, newFileEditor ) -> {
           b.unbind();
           if( newFileEditor == null ) {
             b.set( false );
+          }
           else {
             b.bind( func.apply( newFileEditor ) );
+          }
+        }
     );
     return b;
+  }
   //---- Convenience accessors ----------------------------------------------
   private Preferences getPreferences() {
     return OPTIONS.getState();
+  }
   private float getFloat( final String key, final float defaultValue ) {
     return getPreferences().getFloat( key, defaultValue );
+  }
   public Window getWindow() {
     return getScene().getWindow();
+  }
   private MarkdownEditorPane getActiveEditor() {
     final EditorPane pane = getActiveFileEditor().getEditorPane();
     return pane instanceof MarkdownEditorPane
         ? (MarkdownEditorPane) pane
         : new MarkdownEditorPane();
+  }
   private FileEditorTab getActiveFileEditor() {
     return getFileEditorPane().getActiveFileEditor();
+  }
   //---- Member accessors ---------------------------------------------------
   protected Scene getScene() {
     return mScene;
+  }
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     return mProcessors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     return mPreviewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     assert definitionSource != null;
     mDefinitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     return mDefinitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     return mDefinitionPane;
+  }
   private Notifier getNotifier() {
     return NOTIFIER;
+  }
   private Text getLineNumberText() {
     return mLineNumberText;
+  }
   private StatusBar getStatusBar() {
     return mStatusBar;
+  }
   private TextField getFindTextField() {
     return mFindTextField;
+  }
   /**
    * Returns the variable map of interpolated definitions.
+   *
    * @return A map to help dereference variables.
    */
   private Map<String, String> getResolvedMap() {
     return mResolvedMap;
+  }
   //---- Persistence accessors ----------------------------------------------
   private UserPreferences getUserPreferences() {
     return OPTIONS.getUserPreferences();
+  }
   private Path getDefinitionPath() {
     return getUserPreferences().getDefinitionPath();
+  }
   private File getImagesDirectory() {
     return getUserPreferences().getImagesDirectory();
+  }
   private String getImagesOrder() {
     return getUserPreferences().getImagesOrder();
+  }
+}

M src/main/java/com/scrivenvar/Messages.java

+  }
   public static String get( final String key, final boolean interpolate ) {
     return interpolate ? get( key ) : getLiteral( key );
+  }
   /**
    * Returns the value for a key from the message bundle with the arguments

M src/main/java/com/scrivenvar/definition/DefinitionFactory.java

 import com.scrivenvar.FileType;
 import com.scrivenvar.definition.yaml.YamlDefinitionSource;
 import com.scrivenvar.util.ProtocolResolver;
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
 import java.nio.file.Path;
 import static com.scrivenvar.Constants.*;
 import static com.scrivenvar.Constants.DEFINITION_PROTOCOL_FILE;
 import static com.scrivenvar.Constants.GLOB_PREFIX_DEFINITION;
 import static com.scrivenvar.FileType.YAML;
     assert path != null;
     final String protocol = getProtocol( path.toString() );
     final String protocol = ProtocolResolver.getProtocol( path.toString() );
     DefinitionSource result = null;
     throw new IllegalArgumentException( filetype.toString() );
+  }
   /**
    * Returns the protocol for a given URI or filename.
+   *
    * @param source Determine the protocol for this URI or filename.
    * @return The protocol for the given source.
    */
   private String getProtocol( final String source ) {
     String protocol;
     try {
       final URI uri = new URI( source );
       if( uri.isAbsolute() ) {
         protocol = uri.getScheme();
+      }
       else {
         final URL url = new URL( source );
         protocol = url.getProtocol();
+      }
     } catch( final Exception e ) {
       // Could be HTTP, HTTPS?
       if( source.startsWith( "//" ) ) {
         throw new IllegalArgumentException( "Relative context: " + source );
+      }
       else {
         final File file = new File( source );
         protocol = getProtocol( file );
+      }
+    }
     return protocol;
+  }
   /**
    * Returns the protocol for a given file.
+   *
    * @param file Determine the protocol for this file.
    * @return The protocol for the given file.
    */
   private String getProtocol( final File file ) {
     String result;
     try {
       result = file.toURI().toURL().getProtocol();
     } catch( final Exception e ) {
       result = DEFINITION_PROTOCOL_UNKNOWN;
+    }
     return result;
+  }
+}

M src/main/java/com/scrivenvar/definition/DefinitionPane.java

 /**
  * Provides the user interface that holdsa {@link TreeView}, which
  * allows users to interact with key/value pairs loaded from the
  * {@link DocumentParser} and adapted using a {@link TreeAdapter}.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class DefinitionPane extends TitledPane {
   /**
    * Trimmed off the end of a word to match a variable name.
    */
   private final static String TERMINALS = ":;,.!?-/\\¡¿";
   /**
    * Contains a view of the definitions.
    */
   private final TreeView<String> mTreeView = new TreeView<>();
   /**
    * Handlers for key press events.
    */
   private final Set<EventHandler<? super KeyEvent>> mKeyEventHandlers
       = new HashSet<>();
   /**
    * Definition file name shown in the title of the pane.
    */
   private final StringProperty mFilename = new SimpleStringProperty();
   /**
    * Constructs a definition pane with a given tree view root.
    */
   public DefinitionPane() {
     final var treeView = getTreeView();
     treeView.setEditable( true );
     treeView.setCellFactory( cell -> createTreeCell() );
     treeView.setContextMenu( createContextMenu() );
     treeView.addEventFilter( KEY_PRESSED, this::keyEventFilter );
     treeView.setShowRoot( false );
     getSelectionModel().setSelectionMode( SelectionMode.MULTIPLE );
     textProperty().bind( mFilename );
     setContent( treeView );
     setCollapsible( false );
+  }
   /**
    * Changes the root of the {@link TreeView} to the root of the
    * {@link TreeView} from the {@link DefinitionSource}.
+   *
    * @param definitionSource Container for the hierarchy of key/value pairs
    *                         to replace the existing hierarchy.
    */
   public void update( final DefinitionSource definitionSource ) {
     assert definitionSource != null;
     final TreeAdapter treeAdapter = definitionSource.getTreeAdapter();
     final TreeItem<String> root = treeAdapter.adapt(
         get( "Pane.definition.node.root.title" )
     );
     getTreeView().setRoot( root );
+  }
   public Map<String, String> toMap() {
     return TreeItemAdapter.toMap( getTreeView().getRoot() );
+  }
   /**
    * Informs the caller of whenever any {@link TreeItem} in the {@link TreeView}
    * is modified. The modifications include: item value changes, item additions,
    * and item removals.
    * <p>
    * Safe to call multiple times; if a handler is already registered, the
    * old handler is used.
    * </p>
+   *
    * @param handler The handler to call whenever any {@link TreeItem} changes.
    */
   public void addTreeChangeHandler(
       final EventHandler<TreeItem.TreeModificationEvent<Event>> handler ) {
     final TreeItem<String> root = getTreeView().getRoot();
     root.addEventHandler( TreeItem.valueChangedEvent(), handler );
     root.addEventHandler( TreeItem.childrenModificationEvent(), handler );
+  }
   public void addKeyEventHandler(
       final EventHandler<? super KeyEvent> handler ) {
     getKeyEventHandlers().add( handler );
+  }
   /**
    * Answers whether the {@link TreeItem}s in the {@link TreeView} are suitably
    * well-formed for export. A tree is considered well-formed if the following
    * conditions are met:
+   *
    * <ul>
    *   <li>The root node contains at least one child node having a leaf.</li>
    *   <li>There are no leaf nodes with sibling leaf nodes.</li>
    * </ul>
+   *
    * @return {@code null} if the document is well-formed, otherwise the
    * problematic child {@link TreeItem}.
    */
   public TreeItem<String> isTreeWellFormed() {
     final var root = getTreeView().getRoot();
     for( final var child : root.getChildren() ) {
       final var problemChild = isWellFormed( child );
       if( child.isLeaf() || problemChild != null ) {
         return problemChild;
+      }
+    }
     return null;
+  }
   /**
    * Determines whether the document is well-formed by ensuring that
    * child branches do not contain multiple leaves.
+   *
    * @param item The sub-tree to check for well-formedness.
    * @return {@code null} when the tree is well-formed, otherwise the
    * problematic {@link TreeItem}.
    */
   private TreeItem<String> isWellFormed( final TreeItem<String> item ) {
     int childLeafs = 0;
     int childBranches = 0;
     for( final TreeItem<String> child : item.getChildren() ) {
       if( child.isLeaf() ) {
         childLeafs++;
+      }
       else {
         childBranches++;
+      }
       final var problemChild = isWellFormed( child );
       if( problemChild != null ) {
         return problemChild;
+      }
+    }
     return ((childBranches > 0 && childLeafs == 0) ||
         (childBranches == 0 && childLeafs <= 1)) ? null : item;
+  }
   /**
    * Returns the leaf that matches the given value. If the value is terminally
    * punctuated, the punctuation is removed if no match was found.
+   *
    * @param value    The value to find, never null.
    * @param findMode Defines how to match words.
    * @return The leaf that contains the given value, or null if neither the
    * original value nor the terminally-trimmed value was found.
    */
   public VariableTreeItem<String> findLeaf(
       final String value, final FindMode findMode ) {
     final VariableTreeItem<String> root = getTreeRoot();
     final VariableTreeItem<String> leaf = root.findLeaf( value, findMode );
     return leaf == null
         ? root.findLeaf( rtrimTerminalPunctuation( value ) )
         : leaf;
+  }
   /**
    * Removes punctuation from the end of a string.
+   *
    * @param s The string to trim, never null.
    * @return The string trimmed of all terminal characters from the end
    */
   private String rtrimTerminalPunctuation( final String s ) {
     assert s != null;
     int index = s.length() - 1;
     while( index > 0 && (TERMINALS.indexOf( s.charAt( index ) ) >= 0) ) {
       index--;
+    }
     return s.substring( 0, index );
+  }
   /**
    * Expands the node to the root, recursively.
+   *
    * @param <T>  The type of tree item to expand (usually String).
    * @param node The node to expand.
    */
   public <T> void expand( final TreeItem<T> node ) {
     if( node != null ) {
       expand( node.getParent() );
       if( !node.isLeaf() ) {
         node.setExpanded( true );
+      }
+    }
+  }
   public void select( final TreeItem<String> item ) {
     getSelectionModel().clearSelection();
     getSelectionModel().select( getTreeView().getRow( item ) );
+  }
   /**
    * Collapses the tree, recursively.
    */
   public void collapse() {
     collapse( getTreeRoot().getChildren() );
+  }
   /**
    * Collapses the tree, recursively.
+   *
    * @param <T>   The type of tree item to expand (usually String).
    * @param nodes The nodes to collapse.
    */
   private <T> void collapse( final ObservableList<TreeItem<T>> nodes ) {
     for( final TreeItem<T> node : nodes ) {
       node.setExpanded( false );
       collapse( node.getChildren() );
+    }
+  }
   /**
    * @return {@code true} when the user is editing a {@link TreeItem}.
    */
   private boolean isEditingTreeItem() {
     return getTreeView().editingItemProperty().getValue() != null;
+  }
   /**
    * Changes to edit mode for the selected item.
    */
   private void editSelectedItem() {
     getTreeView().edit( getSelectedItem() );
+  }
   /**
    * Removes all selected items from the {@link TreeView}.
    */
   private void deleteSelectedItems() {
     for( final TreeItem<String> item : getSelectedItems() ) {
       final TreeItem<String> parent = item.getParent();
       if( parent != null ) {
         parent.getChildren().remove( item );
+      }
+    }
+  }
   /**
    * Deletes the selected item.
    */
   private void deleteSelectedItem() {
     final TreeItem<String> c = getSelectedItem();
     getSiblings( c ).remove( c );
+  }
   /**
    * Adds a new item under the selected item (or root if nothing is selected).
    * There are a few conditions to consider: when adding to the root,
    * when adding to a leaf, and when adding to a non-leaf. Items added to the
    * root must contain two items: a key and a value.
    */
   private void addItem() {
     final TreeItem<String> value = createTreeItem();
     getSelectedItem().getChildren().add( value );
     expand( value );
     select( value );
+  }
   private ContextMenu createContextMenu() {
     final ContextMenu menu = new ContextMenu();
     final ObservableList<MenuItem> items = menu.getItems();
     addMenuItem( items, "Definition.menu.create" )
         .setOnAction( e -> addItem() );
     addMenuItem( items, "Definition.menu.rename" )
         .setOnAction( e -> editSelectedItem() );
     addMenuItem( items, "Definition.menu.remove" )
         .setOnAction( e -> deleteSelectedItem() );
     return menu;
+  }
   /**
    * Executes hot-keys for edits to the definition tree.
+   *
    * @param event Contains the key code of the key that was pressed.
    */
   private void keyEventFilter( final KeyEvent event ) {
     if( !isEditingTreeItem() ) {
       switch( event.getCode() ) {
         case ENTER:
           expand( getSelectedItem() );
           event.consume();
           break;
         case DELETE:
           deleteSelectedItems();
           break;
         case INSERT:
           addItem();
           break;
         case R:
           if( event.isControlDown() ) {
             editSelectedItem();
+          }
           break;
+      }
       for( final var handler : getKeyEventHandlers() ) {
         handler.handle( event );
+      }
+    }
+  }
   /**
    * Adds a menu item to a list of menu items.
+   *
    * @param items    The list of menu items to append to.
    * @param labelKey The resource bundle key name for the menu item's label.
    * @return The menu item added to the list of menu items.
    */
   private MenuItem addMenuItem(
       final List<MenuItem> items, final String labelKey ) {
     final MenuItem menuItem = createMenuItem( labelKey );
     items.add( menuItem );
     return menuItem;
+  }
   private MenuItem createMenuItem( final String labelKey ) {
     return new MenuItem( get( labelKey ) );
+  }
   private VariableTreeItem<String> createTreeItem() {
     return new VariableTreeItem<>( get( "Definition.menu.add.default" ) );
+  }
   private TreeCell<String> createTreeCell() {
     return new TextFieldTreeCell<>(
         createStringConverter() ) {
       @Override
       public void commitEdit( final String newValue ) {
         super.commitEdit( newValue );
         select( getTreeItem() );
         requestFocus();
+      }
     };
+  }
   @Override
   public void requestFocus() {
     super.requestFocus();
     getTreeView().requestFocus();
+  }
   private StringConverter<String> createStringConverter() {
     return new StringConverter<>() {
       @Override
       public String toString( final String object ) {
         return object == null ? "" : object;
+      }
       @Override
       public String fromString( final String string ) {
         return string == null ? "" : string;
+      }
     };
+  }
   /**
    * Returns the tree view that contains the definition hierarchy.
+   *
    * @return A non-null instance.
    */
   public TreeView<String> getTreeView() {
     return mTreeView;
+  }
   /**
    * Returns this pane.
+   *
    * @return this
    */
   public Node getNode() {
     return this;
+  }
   /**
    * Returns the property used to set the title of the pane: the file name.
+   *
    * @return A non-null property used for showing the definition file name.
    */
   public StringProperty filenameProperty() {
     return mFilename;
+  }
   /**
    * Returns the root of the tree.
+   *
    * @return The first node added to the definition tree.
    */
   private VariableTreeItem<String> getTreeRoot() {
     final TreeItem<String> root = getTreeView().getRoot();
     return root instanceof VariableTreeItem ?
         (VariableTreeItem<String>) root : new VariableTreeItem<>( "root" );
+  }
   private ObservableList<TreeItem<String>> getSiblings(
       final TreeItem<String> item ) {
     final TreeItem<String> root = getTreeView().getRoot();
     final TreeItem<String> parent =
         (item == null || item == root) ? root : item.getParent();
     return parent.getChildren();
+  }
   private MultipleSelectionModel<TreeItem<String>> getSelectionModel() {
     return getTreeView().getSelectionModel();
+  }
   /**
    * Returns a copy of all the selected items.
+   *
    * @return A list, possibly empty, containing all selected items in the
    * {@link TreeView}.
    */
   private List<TreeItem<String>> getSelectedItems() {
     return new LinkedList<>( getSelectionModel().getSelectedItems() );
  * Provides the user interface that holds a {@link TreeView}, which
  * allows users to interact with key/value pairs loaded from the
  * {@link DocumentParser} and adapted using a {@link TreeAdapter}.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class DefinitionPane extends TitledPane {
   /**
    * Trimmed off the end of a word to match a variable name.
    */
   private final static String TERMINALS = ":;,.!?-/\\¡¿";
   /**
    * Contains a view of the definitions.
    */
   private final TreeView<String> mTreeView = new TreeView<>();
   /**
    * Handlers for key press events.
    */
   private final Set<EventHandler<? super KeyEvent>> mKeyEventHandlers
       = new HashSet<>();
   /**
    * Definition file name shown in the title of the pane.
    */
   private final StringProperty mFilename = new SimpleStringProperty();
   /**
    * Constructs a definition pane with a given tree view root.
    */
   public DefinitionPane() {
     final var treeView = getTreeView();
     treeView.setEditable( true );
     treeView.setCellFactory( cell -> createTreeCell() );
     treeView.setContextMenu( createContextMenu() );
     treeView.addEventFilter( KEY_PRESSED, this::keyEventFilter );
     treeView.setShowRoot( false );
     getSelectionModel().setSelectionMode( SelectionMode.MULTIPLE );
     textProperty().bind( mFilename );
     setContent( treeView );
     setCollapsible( false );
+  }
   /**
    * Changes the root of the {@link TreeView} to the root of the
    * {@link TreeView} from the {@link DefinitionSource}.
+   *
    * @param definitionSource Container for the hierarchy of key/value pairs
    *                         to replace the existing hierarchy.
    */
   public void update( final DefinitionSource definitionSource ) {
     assert definitionSource != null;
     final TreeAdapter treeAdapter = definitionSource.getTreeAdapter();
     final TreeItem<String> root = treeAdapter.adapt(
         get( "Pane.definition.node.root.title" )
     );
     getTreeView().setRoot( root );
+  }
   public Map<String, String> toMap() {
     return TreeItemAdapter.toMap( getTreeView().getRoot() );
+  }
   /**
    * Informs the caller of whenever any {@link TreeItem} in the {@link TreeView}
    * is modified. The modifications include: item value changes, item additions,
    * and item removals.
    * <p>
    * Safe to call multiple times; if a handler is already registered, the
    * old handler is used.
    * </p>
+   *
    * @param handler The handler to call whenever any {@link TreeItem} changes.
    */
   public void addTreeChangeHandler(
       final EventHandler<TreeItem.TreeModificationEvent<Event>> handler ) {
     final TreeItem<String> root = getTreeView().getRoot();
     root.addEventHandler( TreeItem.valueChangedEvent(), handler );
     root.addEventHandler( TreeItem.childrenModificationEvent(), handler );
+  }
   public void addKeyEventHandler(
       final EventHandler<? super KeyEvent> handler ) {
     getKeyEventHandlers().add( handler );
+  }
   /**
    * Answers whether the {@link TreeItem}s in the {@link TreeView} are suitably
    * well-formed for export. A tree is considered well-formed if the following
    * conditions are met:
+   *
    * <ul>
    *   <li>The root node contains at least one child node having a leaf.</li>
    *   <li>There are no leaf nodes with sibling leaf nodes.</li>
    * </ul>
+   *
    * @return {@code null} if the document is well-formed, otherwise the
    * problematic child {@link TreeItem}.
    */
   public TreeItem<String> isTreeWellFormed() {
     final var root = getTreeView().getRoot();
     for( final var child : root.getChildren() ) {
       final var problemChild = isWellFormed( child );
       if( child.isLeaf() || problemChild != null ) {
         return problemChild;
+      }
+    }
     return null;
+  }
   /**
    * Determines whether the document is well-formed by ensuring that
    * child branches do not contain multiple leaves.
+   *
    * @param item The sub-tree to check for well-formedness.
    * @return {@code null} when the tree is well-formed, otherwise the
    * problematic {@link TreeItem}.
    */
   private TreeItem<String> isWellFormed( final TreeItem<String> item ) {
     int childLeafs = 0;
     int childBranches = 0;
     for( final TreeItem<String> child : item.getChildren() ) {
       if( child.isLeaf() ) {
         childLeafs++;
+      }
       else {
         childBranches++;
+      }
       final var problemChild = isWellFormed( child );
       if( problemChild != null ) {
         return problemChild;
+      }
+    }
     return ((childBranches > 0 && childLeafs == 0) ||
         (childBranches == 0 && childLeafs <= 1)) ? null : item;
+  }
   /**
    * Returns the leaf that matches the given value. If the value is terminally
    * punctuated, the punctuation is removed if no match was found.
+   *
    * @param value    The value to find, never null.
    * @param findMode Defines how to match words.
    * @return The leaf that contains the given value, or null if neither the
    * original value nor the terminally-trimmed value was found.
    */
   public VariableTreeItem<String> findLeaf(
       final String value, final FindMode findMode ) {
     final VariableTreeItem<String> root = getTreeRoot();
     final VariableTreeItem<String> leaf = root.findLeaf( value, findMode );
     return leaf == null
         ? root.findLeaf( rtrimTerminalPunctuation( value ) )
         : leaf;
+  }
   /**
    * Removes punctuation from the end of a string.
+   *
    * @param s The string to trim, never null.
    * @return The string trimmed of all terminal characters from the end
    */
   private String rtrimTerminalPunctuation( final String s ) {
     assert s != null;
     int index = s.length() - 1;
     while( index > 0 && (TERMINALS.indexOf( s.charAt( index ) ) >= 0) ) {
       index--;
+    }
     return s.substring( 0, index );
+  }
   /**
    * Expands the node to the root, recursively.
+   *
    * @param <T>  The type of tree item to expand (usually String).
    * @param node The node to expand.
    */
   public <T> void expand( final TreeItem<T> node ) {
     if( node != null ) {
       expand( node.getParent() );
       if( !node.isLeaf() ) {
         node.setExpanded( true );
+      }
+    }
+  }
   public void select( final TreeItem<String> item ) {
     getSelectionModel().clearSelection();
     getSelectionModel().select( getTreeView().getRow( item ) );
+  }
   /**
    * Collapses the tree, recursively.
    */
   public void collapse() {
     collapse( getTreeRoot().getChildren() );
+  }
   /**
    * Collapses the tree, recursively.
+   *
    * @param <T>   The type of tree item to expand (usually String).
    * @param nodes The nodes to collapse.
    */
   private <T> void collapse( final ObservableList<TreeItem<T>> nodes ) {
     for( final TreeItem<T> node : nodes ) {
       node.setExpanded( false );
       collapse( node.getChildren() );
+    }
+  }
   /**
    * @return {@code true} when the user is editing a {@link TreeItem}.
    */
   private boolean isEditingTreeItem() {
     return getTreeView().editingItemProperty().getValue() != null;
+  }
   /**
    * Changes to edit mode for the selected item.
    */
   private void editSelectedItem() {
     getTreeView().edit( getSelectedItem() );
+  }
   /**
    * Removes all selected items from the {@link TreeView}.
    */
   private void deleteSelectedItems() {
     for( final TreeItem<String> item : getSelectedItems() ) {
       final TreeItem<String> parent = item.getParent();
       if( parent != null ) {
         parent.getChildren().remove( item );
+      }
+    }
+  }
   /**
    * Deletes the selected item.
    */
   private void deleteSelectedItem() {
     final TreeItem<String> c = getSelectedItem();
     getSiblings( c ).remove( c );
+  }
   /**
    * Adds a new item under the selected item (or root if nothing is selected).
    * There are a few conditions to consider: when adding to the root,
    * when adding to a leaf, and when adding to a non-leaf. Items added to the
    * root must contain two items: a key and a value.
    */
   private void addItem() {
     final TreeItem<String> value = createTreeItem();
     getSelectedItem().getChildren().add( value );
     expand( value );
     select( value );
+  }
   private ContextMenu createContextMenu() {
     final ContextMenu menu = new ContextMenu();
     final ObservableList<MenuItem> items = menu.getItems();
     addMenuItem( items, "Definition.menu.create" )
         .setOnAction( e -> addItem() );
     addMenuItem( items, "Definition.menu.rename" )
         .setOnAction( e -> editSelectedItem() );
     addMenuItem( items, "Definition.menu.remove" )
         .setOnAction( e -> deleteSelectedItem() );
     return menu;
+  }
   /**
    * Executes hot-keys for edits to the definition tree.
+   *
    * @param event Contains the key code of the key that was pressed.
    */
   private void keyEventFilter( final KeyEvent event ) {
     if( !isEditingTreeItem() ) {
       switch( event.getCode() ) {
         case ENTER:
           expand( getSelectedItem() );
           event.consume();
           break;
         case DELETE:
           deleteSelectedItems();
           break;
         case INSERT:
           addItem();
           break;
         case R:
           if( event.isControlDown() ) {
             editSelectedItem();
+          }
           break;
+      }
       for( final var handler : getKeyEventHandlers() ) {
         handler.handle( event );
+      }
+    }
+  }
   /**
    * Adds a menu item to a list of menu items.
+   *
    * @param items    The list of menu items to append to.
    * @param labelKey The resource bundle key name for the menu item's label.
    * @return The menu item added to the list of menu items.
    */
   private MenuItem addMenuItem(
       final List<MenuItem> items, final String labelKey ) {
     final MenuItem menuItem = createMenuItem( labelKey );
     items.add( menuItem );
     return menuItem;
+  }
   private MenuItem createMenuItem( final String labelKey ) {
     return new MenuItem( get( labelKey ) );
+  }
   private VariableTreeItem<String> createTreeItem() {
     return new VariableTreeItem<>( get( "Definition.menu.add.default" ) );
+  }
   private TreeCell<String> createTreeCell() {
     return new TextFieldTreeCell<>(
         createStringConverter() ) {
       @Override
       public void commitEdit( final String newValue ) {
         super.commitEdit( newValue );
         select( getTreeItem() );
         requestFocus();
+      }
     };
+  }
   @Override
   public void requestFocus() {
     super.requestFocus();
     getTreeView().requestFocus();
+  }
   private StringConverter<String> createStringConverter() {
     return new StringConverter<>() {
       @Override
       public String toString( final String object ) {
         return object == null ? "" : object;
+      }
       @Override
       public String fromString( final String string ) {
         return string == null ? "" : string;
+      }
     };
+  }
   /**
    * Returns the tree view that contains the definition hierarchy.
+   *
    * @return A non-null instance.
    */
   public TreeView<String> getTreeView() {
     return mTreeView;
+  }
   /**
    * Returns this pane.
+   *
    * @return this
    */
   public Node getNode() {
     return this;
+  }
   /**
    * Returns the property used to set the title of the pane: the file name.
+   *
    * @return A non-null property used for showing the definition file name.
    */
   public StringProperty filenameProperty() {
     return mFilename;
+  }
   /**
    * Returns the root of the tree.
+   *
    * @return The first node added to the definition tree.
    */
   private VariableTreeItem<String> getTreeRoot() {
     final TreeItem<String> root = getTreeView().getRoot();
     return root instanceof VariableTreeItem ?
         (VariableTreeItem<String>) root : new VariableTreeItem<>( "root" );
+  }
   private ObservableList<TreeItem<String>> getSiblings(
       final TreeItem<String> item ) {
     final TreeItem<String> root = getTreeView().getRoot();
     final TreeItem<String> parent =
         (item == null || item == root) ? root : item.getParent();
     return parent.getChildren();
+  }
   private MultipleSelectionModel<TreeItem<String>> getSelectionModel() {
     return getTreeView().getSelectionModel();
+  }
   /**
    * Returns a copy of all the selected items.
+   *
    * @return A list, possibly empty, containing all selected items in the
    * {@link TreeView}.
    */
   private List<TreeItem<String>> getSelectedItems() {
     return new ArrayList<>( getSelectionModel().getSelectedItems() );
+  }

M src/main/java/com/scrivenvar/editors/EditorPane.java

 import com.scrivenvar.AbstractPane;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import javafx.application.Platform;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.value.ChangeListener;
 import javafx.event.Event;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.input.InputEvent;
 import org.fxmisc.flowless.VirtualizedScrollPane;
 import org.fxmisc.richtext.StyleClassedTextArea;
 import org.fxmisc.undo.UndoManager;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import org.fxmisc.wellbehaved.event.InputMap;
 import org.fxmisc.wellbehaved.event.Nodes;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import org.fxmisc.wellbehaved.event.Nodes;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 /**
       new VirtualizedScrollPane<>( mEditor );
   private final ObjectProperty<Path> mPath = new SimpleObjectProperty<>();
   /**
    * Set when entering variable edit mode; retrieved upon exiting.
    */
   private InputMap<InputEvent> mNodeMap;
   public EditorPane() {
   public void setText( final String text ) {
     getEditor().deselect();
     getEditor().replaceText( text );
     final var editor = getEditor();
     editor.deselect();
     editor.replaceText( text );
     getUndoManager().mark();
+  }
       final Consumer<? super U> consumer ) {
     Nodes.addInputMap( getEditor(), consume( event, consumer ) );
+  }
   /**
    * This method adds listeners to editor events that can be removed without
    * affecting the original listeners (i.e., the original lister is restored on
    * a call to removeEventListener).
+   *
    * @param map The map of methods to events.
    */
   @SuppressWarnings("unchecked")
   public void addEventListener( final InputMap<InputEvent> map ) {
     mNodeMap = (InputMap<InputEvent>) getInputMap();
     Nodes.addInputMap( getEditor(), map );
+  }
   /**
    * This method removes listeners to editor events and restores the default
    * handler.
+   *
    * @param map The map of methods to events.
    */
   public void removeEventListener( final InputMap<InputEvent> map ) {
     Nodes.removeInputMap( getEditor(), map );
     Nodes.addInputMap( getEditor(), mNodeMap );
+  }
   /**
    * Returns the value for "org.fxmisc.wellbehaved.event.inputmap".
+   *
    * @return An input map of input events.
    */
   private Object getInputMap() {
     return getEditor().getProperties().get( getInputMapKey() );
+  }
   /**
    * Returns the hashmap key entry for the input map.
+   *
    * @return "org.fxmisc.wellbehaved.event.inputmap"
    */
   private String getInputMapKey() {
     return "org.fxmisc.wellbehaved.event.inputmap";
+  }

M src/main/java/com/scrivenvar/editors/markdown/MarkdownEditorPane.java

 import com.scrivenvar.dialogs.LinkDialog;
 import com.scrivenvar.editors.EditorPane;
 import com.scrivenvar.processors.MarkdownProcessor;
 import com.scrivenvar.processors.markdown.MarkdownProcessor;
 import com.vladsch.flexmark.ast.Link;
 import com.vladsch.flexmark.util.ast.Node;

M src/main/java/com/scrivenvar/preferences/FilePreferences.java

 package com.scrivenvar.preferences;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.events.Notifier;
 import java.io.File;
 import java.io.FileInputStream;
  */
 public class FilePreferences extends AbstractPreferences {
   private final Notifier mNotifier = Services.load( Notifier.class );
   private final Map<String, String> mRoot = new TreeMap<>();
   private final Map<String, FilePreferences> mChildren = new TreeMap<>();
   private boolean mRemoved;
   private final Object mMutex = new Object();
   public FilePreferences( final AbstractPreferences parent,
                           final String name ) {
   public FilePreferences(
       final AbstractPreferences parent, final String name ) {
     super( parent, name );
         final String path = getPath();
         final Enumeration<?> pnen = p.propertyNames();
         final Enumeration<?> propertyNames = p.propertyNames();
         while( pnen.hasMoreElements() ) {
           final String propKey = (String) pnen.nextElement();
         while( propertyNames.hasMoreElements() ) {
           final String propKey = (String) propertyNames.nextElement();
           if( propKey.startsWith( path ) ) {
           // Make a list of all direct children of this node to be removed
           final Enumeration<?> pnen = p.propertyNames();
           final Enumeration<?> propertyNames = p.propertyNames();
           while( pnen.hasMoreElements() ) {
             String propKey = (String) pnen.nextElement();
           while( propertyNames.hasMoreElements() ) {
             final String propKey = (String) propertyNames.nextElement();
             if( propKey.startsWith( path ) ) {
               final String subKey = propKey.substring( path.length() );
   private void error( final BackingStoreException ex ) {
     throw new RuntimeException( ex );
     getNotifier().notify( ex );
+  }
   private Notifier getNotifier() {
     return mNotifier;
+  }
+}

A src/main/java/com/scrivenvar/preferences/UserPreferences.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preferences;
 import com.dlsc.formsfx.model.structure.StringField;
 import com.dlsc.preferencesfx.PreferencesFx;
 import com.dlsc.preferencesfx.model.Category;
 import com.dlsc.preferencesfx.model.Group;
 import com.dlsc.preferencesfx.model.Setting;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.Settings;
 import javafx.beans.property.ObjectProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
 import java.io.File;
 import java.nio.file.Path;
 import static com.scrivenvar.Constants.PERSIST_IMAGES_DEFAULT;
 import static com.scrivenvar.Constants.USER_DIRECTORY;
 import static com.scrivenvar.Messages.get;
 public class UserPreferences {
   private final Settings SETTINGS = Services.load( Settings.class );
   private final ObjectProperty<File> mPropRDirectory;
   private final StringProperty mPropRScript;
   private final ObjectProperty<File> mPropImagesDirectory;
   private final StringProperty mPropImagesOrder;
   private final ObjectProperty<File> mPropDefinitionPath;
   private final PreferencesFx mPreferencesFx;
   public UserPreferences() {
     mPropRDirectory = simpleFile( USER_DIRECTORY );
     mPropRScript = new SimpleStringProperty( "" );
     mPropImagesDirectory = simpleFile( USER_DIRECTORY );
     mPropImagesOrder = new SimpleStringProperty( PERSIST_IMAGES_DEFAULT );
     mPropDefinitionPath = simpleFile( getSetting(
         "file.definition.default", "variables.yaml" )
     );
     mPreferencesFx = createPreferencesFx();
+  }
   /**
    * Display the user preferences settings dialog (non-modal).
    */
   public void show() {
     mPreferencesFx.show( false );
+  }
   /**
    * Call to persist the settings. Strictly speaking, this could watch on
    * all values for external changes then save automatically.
    */
   public void save() {
     mPreferencesFx.saveSettings();
+  }
   /**
    * Creates the preferences dialog.
    * <p>
    * TODO: Make this dynamic by iterating over all "Preferences.*" values
    * that follow a particular naming pattern.
    * </p>
+   *
    * @return A new instance of preferences for users to edit.
    */
   @SuppressWarnings("unchecked")
   private PreferencesFx createPreferencesFx() {
     final Setting<StringField, StringProperty> scriptSetting =
         Setting.of( "Script", mPropRScript );
     final StringField field = scriptSetting.getElement();
     field.multiline( true );
     return PreferencesFx.of(
         UserPreferences.class,
         Category.of(
             get( "Preferences.r" ),
             Group.of(
                 get( "Preferences.r.directory" ),
                 Setting.of( label( "Preferences.r.directory.desc", false ) ),
                 Setting.of( "Directory", mPropRDirectory, true )
             ),
             Group.of(
                 get( "Preferences.r.script" ),
                 Setting.of( label( "Preferences.r.script.desc" ) ),
                 scriptSetting
+            )
         ),
         Category.of(
             get( "Preferences.images" ),
             Group.of(
                 get( "Preferences.images.directory" ),
                 Setting.of( label( "Preferences.images.directory.desc" ) ),
                 Setting.of( "Directory", mPropImagesDirectory, true )
             ),
             Group.of(
                 get( "Preferences.images.suffixes" ),
                 Setting.of( label( "Preferences.images.suffixes.desc" ) ),
                 Setting.of( "Extensions", mPropImagesOrder )
+            )
         ),
         Category.of(
             get( "Preferences.definitions" ),
             Group.of(
                 get( "Preferences.definitions.path" ),
                 Setting.of( label( "Preferences.definitions.path.desc" ) ),
                 Setting.of( "Path", mPropDefinitionPath, false )
+            )
+        )
     );
+  }
   /**
    * Wraps a {@link File} inside a {@link SimpleObjectProperty}.
+   *
    * @param path The file name to use when constructing the {@link File}.
    * @return A new {@link SimpleObjectProperty} instance with a {@link File}
    * that references the given {@code path}.
    */
   private SimpleObjectProperty<File> simpleFile( final String path ) {
     return new SimpleObjectProperty<>( new File( path ) );
+  }
   /**
    * Creates a label for the given key after interpolating its value.
+   *
    * @param key The key to find in the resource bundle.
    * @return The value of the key as a label.
    */
   private Node label( final String key ) {
     return new Label( get( key, true ) );
+  }
   /**
    * Creates a label for the given key.
+   *
    * @param key         The key to find in the resource bundle.
    * @param interpolate {@code true} means to interpolate the value.
    * @return The value of the key, interpolated if {@code interpolate} is
    * {@code true}.
    */
   @SuppressWarnings("SameParameterValue")
   private Node label( final String key, final boolean interpolate ) {
     return new Label( get( key, interpolate ) );
+  }
   /**
    * Returns the value for a key from the settings properties file.
+   *
    * @param key   Key within the settings properties file to find.
    * @param value Default value to return if the key is not found.
    * @return The value for the given key from the settings file, or the
    * given {@code value} if no key found.
    */
   @SuppressWarnings("SameParameterValue")
   private String getSetting( final String key, final String value ) {
     return SETTINGS.getSetting( key, value );
+  }
   public ObjectProperty<File> definitionPathProperty() {
     return mPropDefinitionPath;
+  }
   public Path getDefinitionPath() {
     return definitionPathProperty().getValue().toPath();
+  }
   private ObjectProperty<File> rDirectoryProperty() {
     return mPropRDirectory;
+  }
   public File getRDirectory() {
     return rDirectoryProperty().getValue();
+  }
   private StringProperty rScriptProperty() {
     return mPropRScript;
+  }
   public String getRScript() {
     return rScriptProperty().getValue();
+  }
   private ObjectProperty<File> imagesDirectoryProperty() {
     return mPropImagesDirectory;
+  }
   public File getImagesDirectory() {
     return imagesDirectoryProperty().getValue();
+  }
   private StringProperty imagesOrderProperty() {
     return mPropImagesOrder;
+  }
   public String getImagesOrder() {
     return imagesOrderProperty().getValue();
+  }
+}

A src/main/java/com/scrivenvar/preview/ChainedReplacedElementFactory.java

 /*
  * {{{ header & license
  * Copyright (c) 2006 Patrick Wright
  * Copyright (c) 2007 Wisconsin Court System
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
  * as published by the Free Software Foundation; either version 2.1
  * of the License, or (at your option) any later version.
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
  * GNU Lesser General Public License for more details.
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  * }}}
  */
 package com.scrivenvar.preview;
 import org.w3c.dom.Element;
 import org.xhtmlrenderer.extend.ReplacedElement;
 import org.xhtmlrenderer.extend.ReplacedElementFactory;
 import org.xhtmlrenderer.extend.UserAgentCallback;
 import org.xhtmlrenderer.layout.LayoutContext;
 import org.xhtmlrenderer.render.BlockBox;
 import org.xhtmlrenderer.simple.extend.FormSubmissionListener;
 import java.util.ArrayList;
 import java.util.List;
 public class ChainedReplacedElementFactory implements ReplacedElementFactory {
   private final List<ReplacedElementFactory> mFactoryList = new ArrayList<>();
   public ChainedReplacedElementFactory() {
+  }
   public ReplacedElement createReplacedElement(
       LayoutContext c, BlockBox box, UserAgentCallback uac,
       int cssWidth, int cssHeight ) {
     ReplacedElement re = null;
     for( final ReplacedElementFactory ref : mFactoryList ) {
       re = ref.createReplacedElement( c, box, uac, cssWidth, cssHeight );
       if( re != null ) {
         break;
+      }
+    }
     return re;
+  }
   public void addFactory( final ReplacedElementFactory factory ) {
     mFactoryList.add( factory );
+  }
   public void reset() {
     for( final ReplacedElementFactory factory : mFactoryList ) {
       factory.reset();
+    }
+  }
   public void remove( final Element element ) {
     for( final ReplacedElementFactory factory : mFactoryList ) {
       factory.remove( element );
+    }
+  }
   public void setFormSubmissionListener( FormSubmissionListener listener ) {
+  }
+}

M src/main/java/com/scrivenvar/preview/HTMLPreviewPane.java

 package com.scrivenvar.preview;
 import static com.scrivenvar.Constants.CARET_POSITION_BASE;
 import static com.scrivenvar.Constants.STYLESHEET_PREVIEW;
 import javafx.embed.swing.SwingNode;
 import javafx.scene.Node;
 import javafx.scene.layout.Pane;
 import org.jsoup.Jsoup;
 import org.jsoup.helper.W3CDom;
 import org.jsoup.nodes.Document;
 import org.xhtmlrenderer.simple.XHTMLPanel;
 import org.xhtmlrenderer.simple.extend.XhtmlNamespaceHandler;
 import org.xhtmlrenderer.swing.SwingReplacedElementFactory;
 import javax.swing.*;
 import java.nio.file.Path;
 import javafx.beans.value.ObservableValue;
 import javafx.concurrent.Worker.State;
 import static javafx.concurrent.Worker.State.SUCCEEDED;
 import javafx.scene.Node;
 import javafx.scene.layout.Pane;
 import javafx.scene.web.WebEngine;
 import javafx.scene.web.WebView;
 import static com.scrivenvar.Constants.STYLESHEET_PREVIEW;
 /**
  * HTML preview pane is responsible for rendering an HTML document.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public final class HTMLPreviewPane extends Pane {
   private static class HTMLPanel extends XHTMLPanel {
     /**
      * Prevent scrolling to the top.
      */
     @Override
     public void resetScrollPosition() {
+    }
+  }
   private final WebView webView = new WebView();
   private Path path;
   private final static String HTML_HEADER = "<!DOCTYPE html>"
       + "<html>"
       + "<head>"
       + "<link rel='stylesheet' href='" +
       HTMLPreviewPane.class.getResource( STYLESHEET_PREVIEW ) + "'/>"
       + "</head>"
       + "<body>";
   private final static String HTML_FOOTER = "</body></html>";
   private final StringBuilder mHtml = new StringBuilder( 65536 );
   private final int mHtmlPrefixLength;
   private final W3CDom mW3cDom = new W3CDom();
   private final XhtmlNamespaceHandler mNamespaceHandler =
       new XhtmlNamespaceHandler();
   private final HTMLPanel mRenderer = new HTMLPanel();
   private final SwingNode mSwingNode = new SwingNode();
   private final JScrollPane mScrollPane = new JScrollPane( mRenderer );
   private Path mPath;
   /**
    * Creates a new preview pane that can scroll to the caret position within the
    * document.
    */
   public HTMLPreviewPane() {
     initListeners();
     initTraversal();
+  }
   /**
    * Initializes observers for document changes. When the document is reloaded
    * with new HTML, this triggers a scroll event that repositions the document
    * to the injected caret (that corresponds with the position in the text
    * editor).
    */
   private void initListeners() {
     // Scrolls to the caret after the content has been loaded.
     getEngine().getLoadWorker().stateProperty().addListener(
         ( ObservableValue<? extends State> observable,
           final State oldValue, final State newValue ) -> {
           if( newValue == SUCCEEDED ) {
             scrollToCaret();
+          }
         } );
+  }
     final ChainedReplacedElementFactory factory =
         new ChainedReplacedElementFactory();
     factory.addFactory( new SVGReplacedElementFactory() );
     factory.addFactory( new SwingReplacedElementFactory() );
   /**
    * Ensures images can be found relative to the document.
+   *
    * @return The base path element to use for the document, or the empty string
    * if no path has been set, yet.
    */
   private String getBase() {
     final Path basePath = getPath();
     final Path parent = basePath == null ? null : basePath.getParent();
     mRenderer.getSharedContext().setReplacedElementFactory( factory );
     mRenderer.getSharedContext().getTextRenderer().setSmoothingThreshold( 0 );
     mSwingNode.setContent( mScrollPane );
     return parent == null
         ? ""
         : ("<base href='" + parent.toUri().toString() + "'>");
     mHtml.append( HTML_HEADER );
     mHtmlPrefixLength = mHtml.length();
+  }
   /**
    * Updates the internal HTML source, loads it into the preview pane, then
    * scrolls to the caret position.
+   *
    * @param html The new HTML document to display.
    */
   public void update( final String html ) {
     getEngine().loadContent(
         "<!DOCTYPE html>"
             + "<html>"
             + "<head>"
             + "<link rel='stylesheet' href='" + getClass().getResource(
             STYLESHEET_PREVIEW ) + "'>"
             + getBase()
             + "</head>"
             + "<body>"
             + html
             + "</body>"
             + "</html>" );
+  }
   /**
    * Clears out the HTML content from the preview.
    */
   public void clear() {
     update( "" );
+  }
     final Document jsoupDoc = Jsoup.parse( decorate( html ) );
     org.w3c.dom.Document w3cDoc = mW3cDom.fromJsoup( jsoupDoc );
   /**
    * Scrolls to the caret position in the document.
    */
   private void scrollToCaret() {
     execute( getScrollScript() );
     mRenderer.setDocument( w3cDoc, getBaseUrl(), mNamespaceHandler );
+  }
   /**
    * Returns the JavaScript used to scroll the WebView pane.
+   *
    * @return A script that tries to center the view port on the CARET POSITION.
    */
   private String getScrollScript() {
     return ""
         + "var e = document.getElementById('" + CARET_POSITION_BASE + "');"
         + "if( e != null ) { "
         + "  Element.prototype.topOffset = function () {"
         + "    return this.offsetTop + (this.offsetParent ? this.offsetParent" +
         ".topOffset() : 0);"
         + "  };"
         + "  window.scrollTo( 0, e.topOffset() - (window.innerHeight / 2 ) );"
         + "}";
   private String decorate( final String html ) {
     mHtml.setLength( mHtmlPrefixLength );
     return mHtml.append( html )
                 .append( HTML_FOOTER )
                 .toString();
+  }
   /**
    * Prevent tabbing into the preview pane.
    * Clears out the HTML content from the preview.
    */
   private void initTraversal() {
     getWebView().setFocusTraversable( false );
+  }
   private void execute( final String script ) {
     getEngine().executeScript( script );
   public void clear() {
     update( "" );
+  }
   private WebEngine getEngine() {
     return getWebView().getEngine();
+  }
   private String getBaseUrl() {
     final Path basePath = getPath();
     final Path parent = basePath == null ? null : basePath.getParent();
   private WebView getWebView() {
     return this.webView;
     return parent == null ? "" : parent.toUri().toString();
+  }
   private Path getPath() {
     return this.path;
   public Path getPath() {
     return mPath;
+  }
   public void setPath( final Path path ) {
     assert path != null;
     this.path = path;
     mPath = path;
+  }
   /**
    * Content to embed in a panel.
+   *
    * @return The content to display to the user.
    */
   public Node getNode() {
     return getWebView();
     return mSwingNode;
+  }
   public JScrollPane getScrollPane() {
     return mScrollPane;
+  }
   public JScrollBar getVerticalScrollBar() {
     return getScrollPane().getVerticalScrollBar();
+  }
+}

A src/main/java/com/scrivenvar/preview/SVGRasterizer.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preview;
 import org.apache.batik.anim.dom.SAXSVGDocumentFactory;
 import org.apache.batik.gvt.renderer.ImageRenderer;
 import org.apache.batik.transcoder.TranscoderException;
 import org.apache.batik.transcoder.TranscoderInput;
 import org.apache.batik.transcoder.TranscoderOutput;
 import org.apache.batik.transcoder.image.ImageTranscoder;
 import org.w3c.dom.svg.SVGDocument;
 import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.net.URL;
 import java.util.Map;
 import static java.awt.Color.WHITE;
 import static java.awt.RenderingHints.*;
 import static org.apache.batik.transcoder.SVGAbstractTranscoder.KEY_WIDTH;
 import static org.apache.batik.transcoder.image.ImageTranscoder.KEY_BACKGROUND_COLOR;
 import static org.apache.batik.util.XMLResourceDescriptor.getXMLParserClassName;
 public class SVGRasterizer {
   private final static SAXSVGDocumentFactory mFactory =
       new SAXSVGDocumentFactory( getXMLParserClassName() );
   private final static Map<Object, Object> RENDERING_HINTS = Map.of(
       KEY_ALPHA_INTERPOLATION,
       VALUE_ALPHA_INTERPOLATION_QUALITY,
       KEY_INTERPOLATION,
       VALUE_INTERPOLATION_BICUBIC,
       KEY_ANTIALIASING,
       VALUE_ANTIALIAS_ON,
       KEY_COLOR_RENDERING,
       VALUE_COLOR_RENDER_QUALITY,
       KEY_DITHERING,
       VALUE_DITHER_DISABLE,
       KEY_RENDERING,
       VALUE_RENDER_QUALITY,
       KEY_STROKE_CONTROL,
       VALUE_STROKE_PURE,
       KEY_FRACTIONALMETRICS,
       VALUE_FRACTIONALMETRICS_ON,
       KEY_TEXT_ANTIALIASING,
       VALUE_TEXT_ANTIALIAS_OFF
   );
   private static class BufferedImageTranscoder extends ImageTranscoder {
     private BufferedImage mImage;
     @Override
     public BufferedImage createImage( final int w, final int h ) {
       return new BufferedImage( w, h, BufferedImage.TYPE_INT_ARGB );
+    }
     @Override
     public void writeImage(
         final BufferedImage image, final TranscoderOutput output ) {
       mImage = image;
+    }
     public BufferedImage getBufferedImage() {
       return mImage;
+    }
     @Override
     protected ImageRenderer createRenderer() {
       final ImageRenderer renderer = super.createRenderer();
       final RenderingHints hints = renderer.getRenderingHints();
       hints.putAll( RENDERING_HINTS );
       renderer.setRenderingHints( hints );
       return renderer;
+    }
+  }
   public static BufferedImage rasterize( final String url, final int width )
       throws IOException, TranscoderException {
     return rasterize( new URL( url ), width );
+  }
   public static BufferedImage rasterize( final URL url, final int width )
       throws IOException, TranscoderException {
     return rasterize(
         (SVGDocument) mFactory.createDocument( url.toString() ), width );
+  }
   public static BufferedImage rasterize(
       final SVGDocument svg, final int width ) throws TranscoderException {
     final var transcoder = new BufferedImageTranscoder();
     final var input = new TranscoderInput( svg );
     transcoder.addTranscodingHint( KEY_BACKGROUND_COLOR, WHITE );
     transcoder.addTranscodingHint( KEY_WIDTH, (float) width );
     transcoder.transcode( input, null );
     return transcoder.getBufferedImage();
+  }
+}

A src/main/java/com/scrivenvar/preview/SVGReplacedElementFactory.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.preview;
 import com.scrivenvar.Services;
 import com.scrivenvar.service.events.Notifier;
 import org.apache.commons.io.FilenameUtils;
 import org.w3c.dom.Element;
 import org.xhtmlrenderer.extend.ReplacedElement;
 import org.xhtmlrenderer.extend.ReplacedElementFactory;
 import org.xhtmlrenderer.extend.UserAgentCallback;
 import org.xhtmlrenderer.layout.LayoutContext;
 import org.xhtmlrenderer.render.BlockBox;
 import org.xhtmlrenderer.simple.extend.FormSubmissionListener;
 import org.xhtmlrenderer.swing.ImageReplacedElement;
 import java.awt.*;
 public class SVGReplacedElementFactory
     implements ReplacedElementFactory {
   private final static Notifier sNotifier = Services.load( Notifier.class );
   /**
    * SVG filename extension.
    */
   private static final String SVG_FILE = "svg";
   private static final String HTML_IMAGE = "img";
   private static final String HTML_IMAGE_SRC = "src";
   public ReplacedElement createReplacedElement(
       final LayoutContext c, final BlockBox box, final UserAgentCallback uac,
       final int cssWidth, final int cssHeight ) {
     final Element e = box.getElement();
     if( e == null ) {
       return null;
+    }
     final String nodeName = e.getNodeName();
     ReplacedElement result = null;
     if( HTML_IMAGE.equals( nodeName ) ) {
       final String src = e.getAttribute( HTML_IMAGE_SRC );
       final String ext = FilenameUtils.getExtension( src );
       if( SVG_FILE.equalsIgnoreCase( ext ) ) {
         try {
           final int width = box.getContentWidth();
           final Image image = SVGRasterizer.rasterize( src, width );
           final int w = image.getWidth( null );
           final int h = image.getHeight( null );
           result = new ImageReplacedElement( image, w, h );
         } catch( final Exception ex ) {
           getNotifier().notify( ex );
+        }
+      }
+    }
     return result;
+  }
   @Override
   public void reset() {
+  }
   @Override
   public void remove( Element e ) {
+  }
   @Override
   public void setFormSubmissionListener( FormSubmissionListener listener ) {
+  }
   private Notifier getNotifier() {
     return sNotifier;
+  }
+}

M src/main/java/com/scrivenvar/processors/AbstractProcessor.java

 public abstract class AbstractProcessor<T> implements Processor<T> {
   protected static final char NEWLINE = '\n';
   /**
    * When performing string searches using indexOf, a return value of -1
    * indicates that the string could not be found.
    */
   protected static final int INDEX_NOT_FOUND = -1;
   /**
    * Used while processing the entire chain; null to signify no more links.

D src/main/java/com/scrivenvar/processors/CaretInsertionProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import static com.scrivenvar.Constants.CARET_POSITION_MD;
 import javafx.beans.property.IntegerProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.value.ObservableValue;
 /**
  * Base class for inserting the magic CARET POSITION into the text so that, upon
  * previewing, the preview pane can scroll to the correct position (relative to
  * the caret position in the editor).
+ *
  * @author White Magic Software, Ltd.
  */
 public abstract class CaretInsertionProcessor extends AbstractProcessor<String> {
   private final IntegerProperty caretPosition = new SimpleIntegerProperty();
   private final static String NEWLINE_CARET_POSITION_MD = NEWLINE + CARET_POSITION_MD;
   public CaretInsertionProcessor(
     final Processor<String> processor,
     final ObservableValue<Integer> position ) {
     super( processor );
     this.caretPosition.bind( position );
+  }
   /**
    * Inserts the caret position token into the text at an offset that won't
    * interfere with parsing the text itself, regardless of text format.
+   *
    * @param text The text document to change.
    * @param i The caret position token insertion point to use, or -1 to return
    * the text without any injection.
+   *
    * @return The given text with a caret position token inserted at the given
    * offset.
    */
   protected String inject( final String text, final int i ) {
     if( i > 0 && i <= text.length() ) {
       // Preserve the newline character when inserting the caret position mark.
       final String replacement = text.charAt( i - 1 ) == NEWLINE
         ? NEWLINE_CARET_POSITION_MD
         : CARET_POSITION_MD;
       return new StringBuilder( text ).replace( i, i, replacement ).toString();
+    }
     return text;
+  }
   /**
    * Returns true if i is greater than or equal to min and less than or equal to
    * max.
+   *
    * @param i The value to check.
    * @param min The lower bound.
    * @param max The upper bound.
+   *
    * @return false The value of i is either lower than min or greater than max.
    */
   protected boolean isBetween( int i, int min, int max ) {
     return i >= min && i <= max;
+  }
   /**
    * Returns the editor's caret position.
+   *
    * @return Where the user has positioned the caret.
    */
   protected int getCaretPosition() {
     return this.caretPosition.getValue();
+  }
+}

D src/main/java/com/scrivenvar/processors/CaretReplacementProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import static com.scrivenvar.Constants.CARET_POSITION_HTML;
 import static com.scrivenvar.Constants.CARET_POSITION_MD;
 /**
  * Responsible for replacing the caret position marker with an HTML element
  * suitable to use as a reference for scrolling a view port.
+ *
  * @author White Magic Software, Ltd.
  */
 public class CaretReplacementProcessor extends AbstractProcessor<String> {
   public CaretReplacementProcessor( final Processor<String> processor ) {
     super( processor );
+  }
   /**
    * Replaces each MD_CARET_POSITION with an HTML element that has an id
    * attribute of CARET_POSITION. This should only replace one item.
+   *
    * @param t The text that contains
    * @return The value of the first instance replaced.
    */
   @Override
   public String processLink( final String t ) {
     return replace( t, CARET_POSITION_MD, CARET_POSITION_HTML );
+  }
   /**
    * Replaces the needle with thread in the given haystack. Based on Apache
    * Commons 3 StringUtils.replace method. Should be faster than String.replace,
    * which performs a little regex under the hood.
+   *
    * @param haystack Search this string for the needle, must not be null.
    * @param needle   The text to find in the haystack.
    * @param thread   Replace the needle with this text, if the needle is found.
    * @return The haystack with the first instance of needle replaced with
    * thread.
    */
   @SuppressWarnings("SameParameterValue")
   private static String replace(
       final String haystack, final String needle, final String thread ) {
     final int end = haystack.indexOf( needle );
     return end == INDEX_NOT_FOUND ?
         haystack :
         haystack.substring( 0, end ) + thread +
             haystack.substring( end + needle.length() );
+  }
+}

M src/main/java/com/scrivenvar/processors/InlineRProcessor.java

 import com.scrivenvar.Services;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.events.Notifier;
 import org.renjin.eval.EvalException;
 import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 import java.nio.file.Path;
 import java.util.LinkedHashMap;
 import java.util.Map;
   private static final Options OPTIONS = Services.load( Options.class );
   // Only one editor is open at a time.
   /**
    * Constrain memory when typing new R expressions into the document.
    */
   private static final int MAX_CACHED_R_STATEMENTS = 512;
   /**
    * Only one editor is open at a time.
    */
   private static final ScriptEngine ENGINE =
       (new ScriptEngineManager()).getEngineByName( "Renjin" );
   /**
    * Where to put document inline evaluated R expressions.
    */
   private final Map<String, Object> mEvalCache = new LinkedHashMap<>() {
     @Override
     protected boolean removeEldestEntry(
         final Map.Entry<String, Object> eldest ) {
       return size() > MAX_CACHED_R_STATEMENTS;
+    }
   };
   /**
       map.put( "$application.r.working.directory$", dir );
       final String initScript = getInitScript();
       final String bootstrap = getBootstrapScript();
       if( !initScript.isBlank() ) {
         eval( replace( initScript, map ) );
       if( !bootstrap.isBlank() ) {
         eval( replace( bootstrap, map ) );
+      }
     } catch( final Exception e ) {
       getNotifier().notify( e );
+    }
+  }
   /**
    * Loads the R init script from the application's persisted preferences.
+   *
    * @return A non-null String, possibly empty.
    */
   private String getInitScript() {
     return getOptions().get( PERSIST_R_STARTUP, "" );
+  }
     final int prefixLength = PREFIX.length();
     // Pre-allocate the same amount of space. A calculation is longer to write
     // than its computed value inserted into the text.
     final StringBuilder sb = new StringBuilder( length );
     // The * 2 is a wild guess at the ratio of R statements to the length
     // of text produced by those statements.
     final StringBuilder sb = new StringBuilder( length * 2 );
     int prevIndex = 0;
       currIndex = text.indexOf( SUFFIX, min( currIndex + 1, length ) );
       // Only evalutate inline R statements that have end delimiters.
       // Only evaluate inline R statements that have end delimiters.
       if( currIndex > 1 ) {
         // Extract the inline R statement to be evaluated.
         final String r = text.substring( prevIndex, currIndex );
         // Pass the R statement into the R engine for evaluation.
         try {
           final Object result = eval( r );
           final Object result = evalText( r );
           // Append the string representation of the result into the text.
   /**
    * Evaluate an R expression and return the resulting object.
    * Look up an R expression from the cache then return the resulting object.
    * If the R expression hasn't been cached, it'll first be evalulated.
+   *
    * @param r The expression to evaluate.
    * @return The object resulting from the evaluation.
    */
   private Object eval( final String r ) throws ScriptException, EvalException {
     return getScriptEngine().eval( r );
+  }
   private synchronized ScriptEngine getScriptEngine() {
     return ENGINE;
+  }
   private Notifier getNotifier() {
     return NOTIFIER;
   private Object evalText( final String r ) {
     return mEvalCache.computeIfAbsent( r, v -> eval( r ) );
+  }
   private Options getOptions() {
     return OPTIONS;
   /**
    * Evaluate an R expression and return the resulting object.
+   *
    * @param r The expression to evaluate.
    * @return The object resulting from the evaluation.
    */
   private Object eval( final String r ) {
     try {
       return getScriptEngine().eval( r );
     } catch( final ScriptException e ) {
       getNotifier().notify( e );
       return "";
+    }
+  }
   /**
    * This will return the given path if not null, otherwise it will return
    * the path to the user's directory.
+   *
    * @return A non-null path.
    */
   private Path getWorkingDirectory() {
     return Path.of( getPreference( PERSIST_R_DIRECTORY, USER_DIRECTORY ) );
     return getUserPreferences().getRDirectory().toPath();
+  }
   /**
    * Returns the user-defined preference value for the given key.
    * Loads the R init script from the application's persisted preferences.
+   *
    * @param key          The key to find in the user's preferences.
    * @param defaultValue The default value to return if no preference is set.
    * @return The value for the preference, or {@code defaultValue} if not found.
    * @return A non-null String, possibly empty.
    */
   @SuppressWarnings("SameParameterValue")
   private String getPreference( final String key, final String defaultValue ) {
     return OPTIONS.get( key, defaultValue );
   private String getBootstrapScript() {
     return getUserPreferences().getRScript();
+  }
   private UserPreferences getUserPreferences() {
     return getOptions().getUserPreferences();
+  }
   private ScriptEngine getScriptEngine() {
     return ENGINE;
+  }
   private Notifier getNotifier() {
     return NOTIFIER;
+  }
   private Options getOptions() {
     return OPTIONS;
+  }
+}

D src/main/java/com/scrivenvar/processors/MarkdownCaretInsertionProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import static java.lang.Character.isLetter;
 import static java.lang.Math.min;
 import javafx.beans.value.ObservableValue;
 /**
  * Responsible for inserting a caret position token into a markdown document.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownCaretInsertionProcessor extends CaretInsertionProcessor {
   /**
    * Constructs a processor capable of inserting a caret marker into Markdown.
+   *
    * @param processor The next processor in the chain.
    * @param position  The caret's current position in the text.
    */
   public MarkdownCaretInsertionProcessor(
       final Processor<String> processor,
       final ObservableValue<Integer> position ) {
     super( processor, position );
+  }
   /**
    * Changes the text to insert a "caret" at the caret position. This will
    * insert the unique key of Constants.MD_CARET_POSITION into the document.
+   *
    * @param t The text document to process.
    * @return The text with the caret position token inserted at the caret
    * position.
    */
   @Override
   public String processLink( final String t ) {
     final int length = t.length();
     int offset = min( getCaretPosition(), length );
     // TODO: Ensure that the caret position is outside of an element,
     // so that a caret inserted in the image doesn't corrupt it. Such as:
     //
     // ![Screenshot](images/scr|eenshot.png)
     //
     // 1. Scan back to the previous EOL, which will be the MD AST start point.
     // 2. Scan forward until EOF or EOL, which will be the MD AST ending point.
     // 3. Convert the text between start and end into MD AST.
     // 4. Find the nearest text node to the caret.
     // 5. Insert the CARET_POSITION_MD value in the text at that offsset.
     // Insert the caret at the closest non-Markdown delimiter (i.e., the
     // closest character from the caret position forward).
     while( offset < length && !isLetter( t.charAt( offset ) ) ) {
       offset++;
+    }
     return inject( t, offset );
+  }
+}

D src/main/java/com/scrivenvar/processors/MarkdownProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
 import com.vladsch.flexmark.ext.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.ext.tables.TablesExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.misc.Extension;
 import java.util.ArrayList;
 import java.util.Collection;
 /**
  * Responsible for parsing a Markdown document and rendering it as HTML.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownProcessor extends AbstractProcessor<String> {
   private final static HtmlRenderer RENDERER;
   private final static Parser PARSER;
   static {
     final Collection<Extension> extensions = new ArrayList<>();
     extensions.add( TablesExtension.create() );
     extensions.add( SuperscriptExtension.create() );
     extensions.add( StrikethroughSubscriptExtension.create() );
     RENDERER = HtmlRenderer.builder().extensions( extensions ).build();
     PARSER = Parser.builder().extensions( extensions ).build();
+  }
   /**
    * Constructs a new Markdown processor that can create HTML documents.
+   *
    * @param successor Usually the HTML Preview Processor.
    */
   public MarkdownProcessor( final Processor<String> successor ) {
     super( successor );
+  }
   /**
    * Converts the given Markdown string into HTML, without the doctype, html,
    * head, and body tags.
+   *
    * @param markdown The string to convert from Markdown to HTML.
    * @return The HTML representation of the Markdown document.
    */
   @Override
   public String processLink( final String markdown ) {
     return toHtml( markdown );
+  }
   /**
    * Returns the AST in the form of a node for the given markdown document. This
    * can be used, for example, to determine if a hyperlink exists inside of a
    * paragraph.
+   *
    * @param markdown The markdown to convert into an AST.
    * @return The markdown AST for the given text (usually a paragraph).
    */
   public Node toNode( final String markdown ) {
     return parse( markdown );
+  }
   /**
    * Helper method to create an AST given some markdown.
+   *
    * @param markdown The markdown to parse.
    * @return The root node of the markdown tree.
    */
   private Node parse( final String markdown ) {
     return getParser().parse( markdown );
+  }
   /**
    * Converts a string of markdown into HTML.
+   *
    * @param markdown The markdown text to convert to HTML, must not be null.
    * @return The markdown rendered as an HTML document.
    */
   private String toHtml( final String markdown ) {
     return getRenderer().render( parse( markdown ) );
+  }
   /**
    * Creates the Markdown document processor.
+   *
    * @return A Parser that can build an abstract syntax tree.
    */
   private Parser getParser() {
     return PARSER;
+  }
   private HtmlRenderer getRenderer() {
     return RENDERER;
+  }
+}

M src/main/java/com/scrivenvar/processors/ProcessorFactory.java

 import com.scrivenvar.FileEditorTab;
 import com.scrivenvar.preview.HTMLPreviewPane;
 import javafx.beans.value.ObservableValue;
 import com.scrivenvar.processors.markdown.MarkdownProcessor;
 import java.nio.file.Path;
   private final HTMLPreviewPane mPreviewPane;
   private final Map<String, String> mResolvedMap;
   private final Processor<String> mCommonProcessor;
   private final Processor<String> mMarkdownProcessor;
   /**
     mPreviewPane = previewPane;
     mResolvedMap = resolvedMap;
     mCommonProcessor = createCommonProcessor();
     mMarkdownProcessor = createMarkdownProcessor();
+  }
     switch( lookup( path ) ) {
       case RMARKDOWN:
         processor = createRProcessor( tab );
         processor = createRProcessor();
         break;
       case SOURCE:
         processor = createMarkdownProcessor( tab );
         processor = createMarkdownDefinitionProcessor();
         break;
     return processor;
+  }
   private Processor<String> createHTMLPreviewProcessor() {
     return new HTMLPreviewProcessor( getPreviewPane() );
+  }
   /**
    * Creates and links the processors at the end of the processing chain.
+   *
    * @return A markdown, caret replacement, and preview pane processor chain.
    */
   private Processor<String> createCommonProcessor() {
     final var hpp = new HTMLPreviewProcessor( getPreviewPane() );
     final var mcrp = new CaretReplacementProcessor( hpp );
     return new MarkdownProcessor( mcrp );
   private Processor<String> createMarkdownProcessor() {
     final var hpp = createHTMLPreviewProcessor();
     return new MarkdownProcessor( hpp, getPreviewPane().getPath() );
+  }
   protected Processor<String> createIdentityProcessor() {
     final var hpp = new HTMLPreviewProcessor( getPreviewPane() );
     final var hpp = createHTMLPreviewProcessor();
     return new IdentityProcessor( hpp );
+  }
   protected Processor<String> createDefinitionProcessor(
       final Processor<String> p ) {
     return new DefinitionProcessor( p, getResolvedMap() );
+  }
   protected Processor<String> createMarkdownProcessor(
       final FileEditorTab tab ) {
     final var caret = tab.caretPositionProperty();
   protected Processor<String> createMarkdownDefinitionProcessor() {
     final var tpc = getCommonProcessor();
     final var cip = createMarkdownInsertionProcessor( tpc, caret );
     return createDefinitionProcessor( cip );
     return createDefinitionProcessor( tpc );
+  }
   protected Processor<String> createXMLProcessor( final FileEditorTab tab ) {
     final var caret = tab.caretPositionProperty();
     final var tpc = getCommonProcessor();
     final var xmlp = new XMLProcessor( tpc, tab.getPath() );
     final var dp = createDefinitionProcessor( xmlp );
     return createXMLInsertionProcessor( dp, caret );
     return createDefinitionProcessor( xmlp );
+  }
   protected Processor<String> createRProcessor( final FileEditorTab tab ) {
     final var caret = tab.caretPositionProperty();
   protected Processor<String> createRProcessor() {
     final var tpc = getCommonProcessor();
     final var rp = new InlineRProcessor( tpc, getResolvedMap() );
     final var rvp = new RVariableProcessor( rp, getResolvedMap() );
     return createRInsertionProcessor( rvp, caret );
     return new RVariableProcessor( rp, getResolvedMap() );
+  }
   protected Processor<String> createRXMLProcessor( final FileEditorTab tab ) {
     final var caret = tab.caretPositionProperty();
     final var tpc = getCommonProcessor();
     final var xmlp = new XMLProcessor( tpc, tab.getPath() );
     final var rp = new InlineRProcessor( xmlp, getResolvedMap() );
     final var rvp = new RVariableProcessor( rp, getResolvedMap() );
     return createXMLInsertionProcessor( rvp, caret );
+  }
   private Processor<String> createMarkdownInsertionProcessor(
       final Processor<String> tpc, final ObservableValue<Integer> caret ) {
     return new MarkdownCaretInsertionProcessor( tpc, caret );
+  }
   /**
    * Create an insertion processor that is aware of R statements and will insert
    * a caret outside of any statement the caret falls within.
+   *
    * @param processor Another link in the processor chain.
    * @param caret     The caret insertion point.
    * @return A processor that can insert a caret token without disturbing any R
    * code.
    */
   private Processor<String> createRInsertionProcessor(
       final Processor<String> processor,
       final ObservableValue<Integer> caret ) {
     return new RMarkdownCaretInsertionProcessor( processor, caret );
+  }
   private Processor<String> createXMLInsertionProcessor(
       final Processor<String> tpc, final ObservableValue<Integer> caret ) {
     return new XMLCaretInsertionProcessor( tpc, caret );
     return new RVariableProcessor( rp, getResolvedMap() );
+  }
    */
   private Processor<String> getCommonProcessor() {
     return mCommonProcessor;
     return mMarkdownProcessor;
+  }
+}

D src/main/java/com/scrivenvar/processors/RMarkdownCaretInsertionProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import static com.scrivenvar.decorators.RVariableDecorator.PREFIX;
 import static com.scrivenvar.decorators.RVariableDecorator.SUFFIX;
 import static java.lang.Integer.max;
 import javafx.beans.value.ObservableValue;
 /**
  * Responsible for inserting a caret position token into an R document.
+ *
  * @author White Magic Software, Ltd.
  */
 public class RMarkdownCaretInsertionProcessor
     extends MarkdownCaretInsertionProcessor {
   /**
    * Constructs a processor capable of inserting a caret marker into Markdown.
+   *
    * @param processor The next processor in the chain.
    * @param position  The caret's current position in the text.
    */
   public RMarkdownCaretInsertionProcessor(
       final Processor<String> processor,
       final ObservableValue<Integer> position ) {
     super( processor, position );
+  }
   /**
    * Changes the text to insert a "caret" at the caret position. This will
    * insert the unique key of Constants.MD_CARET_POSITION into the document.
+   *
    * @param text The text document to process.
    * @return The text with the caret position token inserted at the caret
    * position.
    */
   @Override
   public String processLink( final String text ) {
     int offset = getCaretPosition();
     // Search for inline R code from the start of the caret's paragraph.
     // This should be much faster than scanning text from the beginning.
     int index = text.lastIndexOf( NEWLINE, offset );
     if( index == INDEX_NOT_FOUND ) {
       index = 0;
+    }
     // Scan for an inline R statement, either from the nearest paragraph or
     // the beginning of the file, whichever was found first.
     index = text.indexOf( PREFIX, index );
     // If there was no R prefix then insert at the caret's initial offset...
     if( index != INDEX_NOT_FOUND ) {
       // Otherwise, retain the starting index of the first R statement in the
       // paragraph.
       int rPrefix = index + 1;
       // Scan for inline R prefixes until the text is exhausted or indexed
       // beyond the caret position.
       while( index != INDEX_NOT_FOUND && index < offset ) {
         // Set rPrefix to the index that might precede the caret. The + 1 is
         // to skip passed the leading backtick in the prefix (`r#).
         rPrefix = index + 1;
         // If there are no more R prefixes, exit the loop and look for a
         // suffix starting from the rPrefix position.
         index = text.indexOf( PREFIX, rPrefix );
+      }
       // Scan from the character after the R prefix up to any R suffix.
       final int rSuffix = max( text.indexOf( SUFFIX, rPrefix ), rPrefix );
       // If the caret falls between the rPrefix and rSuffix, then change the
       // insertion point.
       final boolean between = isBetween( offset, rPrefix, rSuffix );
       // Insert the caret marker at the start of the R statement.
       if( between ) {
         offset = rPrefix - 1;
+      }
+    }
     return inject( text, offset );
+  }
+}

D src/main/java/com/scrivenvar/processors/XMLCaretInsertionProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors;
 import com.ximpleware.VTDException;
 import com.ximpleware.VTDGen;
 import static com.ximpleware.VTDGen.TOKEN_CHARACTER_DATA;
 import com.ximpleware.VTDNav;
 import static java.nio.charset.StandardCharsets.UTF_8;
 import java.text.ParseException;
 import javafx.beans.value.ObservableValue;
 /**
  * Inserts a caret position indicator into the document.
+ *
  * @author White Magic Software, Ltd.
  */
 public class XMLCaretInsertionProcessor extends CaretInsertionProcessor {
   private final static VTDGen PARSER = new VTDGen();
   /**
    * Constructs a processor capable of inserting a caret marker into XML.
+   *
    * @param processor The next processor in the chain.
    * @param position The caret's current position in the text, cannot be null.
    */
   public XMLCaretInsertionProcessor(
     final Processor<String> processor,
     final ObservableValue<Integer> position ) {
     super( processor, position );
+  }
   /**
    * Inserts a caret at a valid position within the XML document.
+   *
    * @param text The string into which caret position marker text is inserted.
+   *
    * @return The text with a caret position marker included, or the original
    * text if no insertion point could be found.
    */
   @Override
   public String processLink( final String text ) {
     final int caret = getCaretPosition();
     int insertOffset = -1;
     if( text.length() > 0 ) {
       try {
         final VTDNav vn = getNavigator( text );
         final int tokens = vn.getTokenCount();
         int currTokenIndex = 0;
         int prevTokenIndex = currTokenIndex;
         int currOffset = 0;
         // To find the insertion spot even faster, the algorithm could
         // use a binary search or interpolation search algorithm. This
         // would reduce the worst-case iterations to O(log n) from O(n).
         while( currTokenIndex < tokens ) {
           if( vn.getTokenType( currTokenIndex ) == TOKEN_CHARACTER_DATA ) {
             final int prevOffset = currOffset;
             currOffset = vn.getTokenOffset( currTokenIndex );
             if( currOffset > caret ) {
               final int prevLength = vn.getTokenLength( prevTokenIndex );
               // If the caret falls within the limits of the previous token,
               // theninsert the caret position marker at the caret offset.
               if( isBetween( caret, prevOffset, prevOffset + prevLength ) ) {
                 insertOffset = caret;
               } else {
                 // The caret position is outside the previous token's text
                 // boundaries, but not inside the current text token. The
                 // caret should be positioned into the closer text token.
                 // For now, the cursor is positioned at the start of the
                 // current text token.
                 insertOffset = currOffset;
+              }
               break;
+            }
             prevTokenIndex = currTokenIndex;
+          }
           currTokenIndex++;
+        }
       } catch( final Exception ex ) {
         throw new RuntimeException(
           new ParseException( ex.getMessage(), caret )
         );
+      }
+    }
     return inject( text, insertOffset );
+  }
   /**
    * Parses the given XML document and returns a high-performance navigator
    * instance for scanning through the XML elements.
+   *
    * @param xml The XML document to parse.
+   *
    * @return A document navigator instance.
    */
   private VTDNav getNavigator( final String xml ) throws VTDException {
     final VTDGen vg = getParser();
     // XML recommends UTF-8 encoding.
     // See: http://stackoverflow.com/a/36696214/59087
     //
     // The encoding should be derived, not assumed.
     vg.setDoc( xml.getBytes( UTF_8 ) );
     vg.parse( true );
     return vg.getNav();
+  }
   private synchronized VTDGen getParser() {
     return PARSER;
+  }
+}

A src/main/java/com/scrivenvar/processors/markdown/ImageLinkExtension.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.markdown;
 import com.scrivenvar.Services;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.service.Options;
 import com.scrivenvar.service.events.Notifier;
 import com.scrivenvar.util.ProtocolResolver;
 import com.vladsch.flexmark.ast.Image;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.html.IndependentLinkResolverFactory;
 import com.vladsch.flexmark.html.LinkResolver;
 import com.vladsch.flexmark.html.renderer.LinkResolverBasicContext;
 import com.vladsch.flexmark.html.renderer.LinkStatus;
 import com.vladsch.flexmark.html.renderer.ResolvedLink;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.data.MutableDataHolder;
 import org.jetbrains.annotations.NotNull;
 import org.renjin.repackaged.guava.base.Splitter;
 import java.io.File;
 import java.nio.file.Path;
 import static java.lang.String.format;
 /**
  * Responsible for ensuring that images can be rendered relative to a path.
  * This allows images to be located virtually anywhere.
+ *
  * @author White Magic Software, Ltd.
  */
 public class ImageLinkExtension implements HtmlRenderer.HtmlRendererExtension {
   private final static Options sOptions = Services.load( Options.class );
   private final static Notifier sNotifier = Services.load( Notifier.class );
   /**
    * Creates an extension capable of using a relative path to embed images.
+   *
    * @param path The {@link Path} to the file being edited; the parent path
    *             is the starting location of the relative image directory.
    * @return The new {@link ImageLinkExtension}, never {@code null}.
    */
   public static ImageLinkExtension create( final Path path ) {
     return new ImageLinkExtension( path );
+  }
   private class Factory extends IndependentLinkResolverFactory {
     @Override
     public @NotNull LinkResolver apply(
         @NotNull final LinkResolverBasicContext context ) {
       return new ImageLinkResolver();
+    }
+  }
   private class ImageLinkResolver implements LinkResolver {
     private final UserPreferences mUserPref = getUserPreferences();
     private final String mImagePrefix =
         mUserPref.getImagesDirectory().toString();
     private final String mImageSuffixes = mUserPref.getImagesOrder();
     public ImageLinkResolver() {
+    }
     // you can also set/clear/modify attributes through
     // ResolvedLink.getAttributes() and
     // ResolvedLink.getNonNullAttributes()
     @NotNull
     @Override
     public ResolvedLink resolveLink(
         @NotNull final Node node,
         @NotNull final LinkResolverBasicContext context,
         @NotNull final ResolvedLink link ) {
       return node instanceof Image ? resolve( link ) : link;
+    }
     @NotNull
     private ResolvedLink resolve( @NotNull final ResolvedLink link ) {
       String url = link.getUrl();
       try {
         final String imageFile = format( "%s/%s", getImagePrefix(), url );
         final String suffixes = getImageSuffixes();
         final String editDir = getEditDirectory();
         for( final String ext : Splitter.on( ' ' ).split( suffixes ) ) {
           final String imagePath = format(
               "%s/%s.%s", editDir, imageFile, ext );
           final File file = new File( imagePath );
           if( file.exists() ) {
             url = file.toString();
             break;
+          }
+        }
         final String protocol = ProtocolResolver.getProtocol( url );
         if( "file".equals( protocol ) ) {
           url = "file://" + url;
+        }
         return link.withStatus( LinkStatus.VALID ).withUrl( url );
       } catch( final Exception e ) {
         getNotifier().notify( e );
+      }
       return link;
+    }
     private String getImagePrefix() {
       return mImagePrefix;
+    }
     private String getImageSuffixes() {
       return mImageSuffixes;
+    }
     private String getEditDirectory() {
       return mPath.getParent().toString();
+    }
+  }
   private final Path mPath;
   private ImageLinkExtension( final Path path ) {
     mPath = path;
+  }
   @Override
   public void rendererOptions( @NotNull final MutableDataHolder options ) {
+  }
   @Override
   public void extend(
       final HtmlRenderer.Builder rendererBuilder,
       @NotNull final String rendererType ) {
     rendererBuilder.linkResolverFactory( new Factory() );
+  }
   private UserPreferences getUserPreferences() {
     return getOptions().getUserPreferences();
+  }
   private Options getOptions() {
     return sOptions;
+  }
   private Notifier getNotifier() {
     return sNotifier;
+  }
+}

A src/main/java/com/scrivenvar/processors/markdown/MarkdownProcessor.java

 /*
  * Copyright 2016 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.processors.markdown;
 import com.scrivenvar.processors.AbstractProcessor;
 import com.scrivenvar.processors.Processor;
 import com.vladsch.flexmark.ext.gfm.strikethrough.StrikethroughSubscriptExtension;
 import com.vladsch.flexmark.ext.superscript.SuperscriptExtension;
 import com.vladsch.flexmark.ext.tables.TablesExtension;
 import com.vladsch.flexmark.html.HtmlRenderer;
 import com.vladsch.flexmark.parser.Parser;
 import com.vladsch.flexmark.util.ast.IParse;
 import com.vladsch.flexmark.util.ast.Node;
 import com.vladsch.flexmark.util.misc.Extension;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Collection;
 import static com.scrivenvar.Constants.USER_DIRECTORY;
 /**
  * Responsible for parsing a Markdown document and rendering it as HTML.
+ *
  * @author White Magic Software, Ltd.
  */
 public class MarkdownProcessor extends AbstractProcessor<String> {
   private final HtmlRenderer mRenderer;
   private final IParse mParser;
   public MarkdownProcessor(
       final Processor<String> successor ) {
     this( successor, Path.of( USER_DIRECTORY ) );
+  }
   /**
    * Constructs a new Markdown processor that can create HTML documents.
+   *
    * @param successor Usually the HTML Preview Processor.
    */
   public MarkdownProcessor(
       final Processor<String> successor, final Path path ) {
     super( successor );
     final Collection<Extension> extensions = new ArrayList<>();
     extensions.add( TablesExtension.create() );
     extensions.add( SuperscriptExtension.create() );
     extensions.add( StrikethroughSubscriptExtension.create() );
     extensions.add( ImageLinkExtension.create( path ) );
     mRenderer = HtmlRenderer.builder().extensions( extensions ).build();
     mParser = Parser.builder().extensions( extensions ).build();
+  }
   /**
    * Converts the given Markdown string into HTML, without the doctype, html,
    * head, and body tags.
+   *
    * @param markdown The string to convert from Markdown to HTML.
    * @return The HTML representation of the Markdown document.
    */
   @Override
   public String processLink( final String markdown ) {
     return toHtml( markdown );
+  }
   /**
    * Returns the AST in the form of a node for the given markdown document. This
    * can be used, for example, to determine if a hyperlink exists inside of a
    * paragraph.
+   *
    * @param markdown The markdown to convert into an AST.
    * @return The markdown AST for the given text (usually a paragraph).
    */
   public Node toNode( final String markdown ) {
     return parse( markdown );
+  }
   /**
    * Helper method to create an AST given some markdown.
+   *
    * @param markdown The markdown to parse.
    * @return The root node of the markdown tree.
    */
   private Node parse( final String markdown ) {
     return getParser().parse( markdown );
+  }
   /**
    * Converts a string of markdown into HTML.
+   *
    * @param markdown The markdown text to convert to HTML, must not be null.
    * @return The markdown rendered as an HTML document.
    */
   private String toHtml( final String markdown ) {
     return getRenderer().render( parse( markdown ) );
+  }
   /**
    * Creates the Markdown document processor.
+   *
    * @return A Parser that can build an abstract syntax tree.
    */
   private IParse getParser() {
     return mParser;
+  }
   private HtmlRenderer getRenderer() {
     return mRenderer;
+  }
+}

M src/main/java/com/scrivenvar/service/Options.java

 package com.scrivenvar.service;
 import com.scrivenvar.preferences.UserPreferences;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 /**
  * Responsible for persisting options.
+ *
  * @author White Magic Software, Ltd.
  */
 public interface Options extends Service {
   /**
    * Returns a reference to the persistent settings that may be configured
    * through the UI.
+   *
    * @return A valid {@link UserPreferences} instance, never {@code null}.
    */
   UserPreferences getUserPreferences();
   /**
    * Returns the {@link Preferences} that persist settings that cannot
    * be configured via the user interface.
+   *
    * @return A valid {@link Preferences} instance, never {@code null}.
    */
   Preferences getState();

M src/main/java/com/scrivenvar/service/impl/DefaultOptions.java

 package com.scrivenvar.service.impl;
 import static com.scrivenvar.Constants.PREFS_OPTIONS;
 import static com.scrivenvar.Constants.PREFS_ROOT;
 import static com.scrivenvar.Constants.PREFS_STATE;
 import com.scrivenvar.preferences.UserPreferences;
 import com.scrivenvar.service.Options;
 import java.util.prefs.BackingStoreException;
 import java.util.prefs.Preferences;
 import static com.scrivenvar.Constants.PREFS_ROOT;
 import static com.scrivenvar.Constants.PREFS_STATE;
 import static java.util.prefs.Preferences.userRoot;
 /**
  * Persistent options user can change at runtime.
+ *
  * @author Karl Tauber and White Magic Software, Ltd.
  */
 public class DefaultOptions implements Options {
   private Preferences mPreferences;
   private final UserPreferences mPreferences = new UserPreferences();
   public DefaultOptions() {
     setPreferences( getRootPreferences().node( PREFS_OPTIONS ) );
+  }
   public String get( final String key ) {
     return get( key, "" );
+  }
   private void setPreferences( final Preferences preferences ) {
     mPreferences = preferences;
+  }
   private Preferences getRootPreferences() {
     return userRoot().node( PREFS_ROOT );
+  }
   @Override
   public Preferences getState() {
     return getRootPreferences().node( PREFS_STATE );
+  }
   @Override
   public UserPreferences getUserPreferences() {
     return mPreferences;
+  }
+}

M src/main/java/com/scrivenvar/util/Action.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * Copyright (c) 2015 Karl Tauber and White Magic Software, Ltd.
  * All rights reserved.
+ *
+ *
  * @author Karl Tauber
  * @author White Magic Software, Ltd.
  */
 public class Action {
   public final String text;
   public final KeyCombination accelerator;
   public final GlyphIcons icon;
   public final EventHandler<ActionEvent> action;
   public final ObservableBooleanValue disable;
   public Action(
     final String text,
     final String accelerator,
     final GlyphIcons icon,
     final EventHandler<ActionEvent> action ) {
     this( text, accelerator, icon, action, null );
+  }
   public Action(
     final String text,
     final String accelerator,
     final GlyphIcons icon,
     final EventHandler<ActionEvent> action,
     final ObservableBooleanValue disable ) {
       final String text,
       final String accelerator,
       final GlyphIcons icon,
       final EventHandler<ActionEvent> action,
       final ObservableBooleanValue disable ) {
     this.text = text;
     this.accelerator = (accelerator != null)
       ? KeyCombination.valueOf( accelerator )
       : null;
     this.accelerator = accelerator == null ?
         null : KeyCombination.valueOf( accelerator );
     this.icon = icon;
     this.action = action;

A src/main/java/com/scrivenvar/util/ActionBuilder.java

 /*
  * Copyright 2020 White Magic Software, Ltd.
+ *
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
+ *
  *  o Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
+ *
  *  o Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
  * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
  * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package com.scrivenvar.util;
 import com.scrivenvar.Messages;
 import de.jensd.fx.glyphs.GlyphIcons;
 import javafx.beans.value.ObservableBooleanValue;
 import javafx.event.ActionEvent;
 import javafx.event.EventHandler;
 /**
  * Provides a fluent interface around constructing actions so that duplication
  * can be avoided.
  */
 public class ActionBuilder {
   private String mText;
   private String mAccelerator;
   private GlyphIcons mIcon;
   private EventHandler<ActionEvent> mAction;
   private ObservableBooleanValue mDisable;
   /**
    * Sets the action text based on a resource bundle key.
+   *
    * @param key The key to look up in the {@link Messages}.
    * @return The corresponding value, or the key name if none found.
    */
   public ActionBuilder setText( final String key ) {
     mText = Messages.get( key, key );
     return this;
+  }
   public ActionBuilder setAccelerator( final String accelerator ) {
     mAccelerator = accelerator;
     return this;
+  }
   public ActionBuilder setIcon( final GlyphIcons icon ) {
     mIcon = icon;
     return this;
+  }
   public ActionBuilder setAction( final EventHandler<ActionEvent> action ) {
     mAction = action;
     return this;
+  }
   public ActionBuilder setDisable( final ObservableBooleanValue disable ) {
     mDisable = disable;
     return this;
+  }
   public Action build() {
     return new Action( mText, mAccelerator, mIcon, mAction, mDisable );
+  }
+}

M src/main/java/com/scrivenvar/util/ActionUtils.java

 /*
  * Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
  * Copyright (c) 2015 Karl Tauber
  * All rights reserved.
+ *
+ *
  * @author Karl Tauber
  * @author White Magic Software, Ltd.
  */
 public class ActionUtils {
   public static Menu createMenu( final String text, final Action... actions ) {
     return new Menu( text, null, createMenuItems( actions ) );
+  }
   public static MenuItem[] createMenuItems( Action... actions ) {
     MenuItem[] menuItems = new MenuItem[ actions.length ];
   public static MenuItem[] createMenuItems( final Action... actions ) {
     final MenuItem[] menuItems = new MenuItem[ actions.length ];
     for( int i = 0; i < actions.length; i++ ) {
       menuItems[ i ] = (actions[ i ] != null)
         ? createMenuItem( actions[ i ] )
         : new SeparatorMenuItem();
           ? createMenuItem( actions[ i ] )
           : new SeparatorMenuItem();
+    }
     return menuItems;
+  }
   public static MenuItem createMenuItem( Action action ) {
     MenuItem menuItem = new MenuItem( action.text );
   public static MenuItem createMenuItem( final Action action ) {
     final MenuItem menuItem = new MenuItem( action.text );
     if( action.accelerator != null ) {
       menuItem.setAccelerator( action.accelerator );
+    }
     if( action.icon != null ) {
       menuItem.setGraphic( FontAwesomeIconFactory.get().createIcon( action.icon ) );
       menuItem.setGraphic(
           FontAwesomeIconFactory.get().createIcon( action.icon ) );
+    }
+  }
   public static ToolBar createToolBar( Action... actions ) {
   public static ToolBar createToolBar( final Action... actions ) {
     return new ToolBar( createToolBarButtons( actions ) );
+  }
   public static Node[] createToolBarButtons( Action... actions ) {
   public static Node[] createToolBarButtons( final Action... actions ) {
     Node[] buttons = new Node[ actions.length ];
     for( int i = 0; i < actions.length; i++ ) {
       buttons[ i ] = (actions[ i ] != null)
         ? createToolBarButton( actions[ i ] )
         : new Separator();
           ? createToolBarButton( actions[ i ] )
           : new Separator();
+    }
     return buttons;
+  }
   public static Button createToolBarButton( Action action ) {
     Button button = new Button();
     button.setGraphic( FontAwesomeIconFactory.get().createIcon( action.icon, "1.2em" ) );
   public static Button createToolBarButton( final Action action ) {
     final Button button = new Button();
     button.setGraphic(
         FontAwesomeIconFactory
             .get()
             .createIcon( action.icon, "1.2em" ) );
     String tooltip = action.text;
     if( tooltip.endsWith( "..." ) ) {
       tooltip = tooltip.substring( 0, tooltip.length() - 3 );
+    }
     if( action.accelerator != null ) {
       tooltip += " (" + action.accelerator.getDisplayText() + ')';
+    }
     button.setTooltip( new Tooltip( tooltip ) );
     button.setFocusTraversable( false );
     button.setOnAction( action.action );
     if( action.disable != null ) {
       button.disableProperty().bind( action.disable );
+    }
     return button;
+  }

A src/main/java/com/scrivenvar/util/ProtocolResolver.java

 package com.scrivenvar.util;
 import java.io.File;
 import java.net.URI;
 import java.net.URL;
 import static com.scrivenvar.Constants.DEFINITION_PROTOCOL_UNKNOWN;
 /**
  * Responsible for determining the protocol of a resource.
  */
 public class ProtocolResolver {
   /**
    * Returns the protocol for a given URI or filename.
+   *
    * @param resource Determine the protocol for this URI or filename.
    * @return The protocol for the given source.
    */
   public static String getProtocol( final String resource ) {
     String protocol;
     try {
       final URI uri = new URI( resource );
       if( uri.isAbsolute() ) {
         protocol = uri.getScheme();
+      }
       else {
         final URL url = new URL( resource );
         protocol = url.getProtocol();
+      }
     } catch( final Exception e ) {
       // Could be HTTP, HTTPS?
       if( resource.startsWith( "//" ) ) {
         throw new IllegalArgumentException( "Relative context: " + resource );
+      }
       else {
         final File file = new File( resource );
         protocol = getProtocol( file );
+      }
+    }
     return protocol;
+  }
   /**
    * Returns the protocol for a given file.
+   *
    * @param file Determine the protocol for this file.
    * @return The protocol for the given file.
    */
   public static String getProtocol( final File file ) {
     String result;
     try {
       result = file.toURI().toURL().getProtocol();
     } catch( final Exception e ) {
       result = DEFINITION_PROTOCOL_UNKNOWN;
+    }
     return result;
+  }
+}

M src/main/resources/com/scrivenvar/messages.properties

 Main.menu.edit.find=_Find
 Main.menu.edit.find.next=Find _Next
 Main.menu.edit.preferences=_Preferences
 Main.menu.insert=_Insert
 Main.menu.insert.link=Link...
 Main.menu.insert.image=Image...
 Main.menu.insert.header_1=Header 1
 Main.menu.insert.header_1.prompt=header 1
 Main.menu.insert.header_2=Header 2
 Main.menu.insert.header_2.prompt=header 2
 Main.menu.insert.header_3=Header 3
 Main.menu.insert.header_3.prompt=header 3
 Main.menu.insert.header.1=Header 1
 Main.menu.insert.header.1.prompt=header 1
 Main.menu.insert.header.2=Header 2
 Main.menu.insert.header.2.prompt=header 2
 Main.menu.insert.header.3=Header 3
 Main.menu.insert.header.3.prompt=header 3
 Main.menu.insert.unordered_list=Unordered List
 Main.menu.insert.ordered_list=Ordered List
 Main.menu.insert.horizontal_rule=Horizontal Rule
 Main.menu.r=_R
 Main.menu.r.script=_Script
 Main.menu.r.directory=_Directory
 Main.menu.help=_Help
 Main.statusbar.state.default=OK
 Main.statusbar.parse.error={0} (near ${Main.statusbar.text.offset} {1})
 # ########################################################################
 # Preferences
 # ########################################################################
 Preferences.r=R
 Preferences.r.script=Startup Script
 Preferences.r.script.desc=Script runs prior to executing R statements within the document.
 Preferences.r.directory=Working Directory
 Preferences.r.directory.desc=Value assigned to $application.r.working.directory$ and usable in the startup script.
 Preferences.images=Images
 Preferences.images.directory=Relative Directory
 Preferences.images.directory.desc=Path prepended to embedded images referenced using local file paths.
 Preferences.images.suffixes=Extensions
 Preferences.images.suffixes.desc=Preferred order of image file types to embed, separated by spaces.
 Preferences.definitions=Definitions
 Preferences.definitions.path=File name
 Preferences.definitions.path.desc=Absolute path to interpolated string definitions.
 # ########################################################################
 Dialog.about.header=${Main.title}
 Dialog.about.content=Copyright 2020 White Magic Software, Ltd.\n\nBased on Markdown Writer FX by Karl Tauber
 # R ################################################################
 # ########################################################################
 # R Script
 # ########################################################################
 Dialog.r.script.title=R Startup Script
 Dialog.r.script.content=Provide R statements to run prior to interpreting R statements embedded in the document.
 # ########################################################################
 # R Directory
 # ########################################################################
 Dialog.r.directory.title=Bootstrap Working Directory
 Dialog.r.directory.header=Value for $application.r.working.directory$.
 # Options ################################################################

M src/main/resources/com/scrivenvar/preview/webview.css

 body {
   font-family: Helvetica, arial, freesans, clean, sans-serif;
   font-family: serif;
   font-size: 14px;
   line-height: 1.6;
 img {
   max-width: 100%
+}
 /* CARET
 =============================================================================*/
 #CARETPOSITION {
   border-top: 2px solid #333;
   border-bottom: 2px solid #333;
   border-right: 1px solid #333;
   margin-right:-1px;
   animation: blink 1s linear infinite;
+}
 @keyframes blink {
   from {
     visibility:hidden;
+  }
 % {
     visibility:hidden;
+  }
   to {
     visibility:visible;
+  }
+}

M src/main/resources/com/scrivenvar/settings.properties

 # ########################################################################
+#
 # Application
+#
 # ########################################################################
 # ########################################################################
+#
 # Preferences
+#
 # ########################################################################
 preferences.root=com.${application.title}
 preferences.root.state=state
 preferences.root.options=options
 preferences.root.definition.source=definition.source
 # ########################################################################
+#
 # File and Path References
+#
 # ########################################################################
 file.stylesheet.scene=${application.package}/scene.css
 file.stylesheet.markdown=${application.package}/editor/markdown.css
 file.logo.256=${application.package}/logo256.png
 file.logo.512=${application.package}/logo512.png
 # Startup script for R
 file.r.startup=/${application.package}/startup.R
 # Default filename when a new file is created.
 # Default file name when a new file is created.
 # This ensures that the file type can always be
 # discerned so that the correct type of variable
 # reference can be inserted.
 file.default=untitled.md
 file.definition.default=variables.yaml
 # ########################################################################
+#
 # Caret token
+#
 # ########################################################################
 caret.token.base=CARETPOSITION
 caret.token.markdown=%${constant.caret.token.base}%
 caret.token.html=<span id="${caret.token.base}"></span>
 # ########################################################################
+#
 # Filename Extensions
+#
 # File name Extensions
 # ########################################################################
 # Comma-separated list of definition filename extensions.
 # Comma-separated list of definition file name extensions.
 definition.file.ext.json=*.json
 definition.file.ext.toml=*.toml
 definition.file.ext.yaml=*.yml,*.yaml
 definition.file.ext.properties=*.properties,*.props
 # Comma-separated list of filename extensions.
 # Comma-separated list of file name extensions.
 file.ext.rmarkdown=*.Rmd
 file.ext.rxml=*.Rxml
 file.ext.source=*.md,*.markdown,*.mkdown,*.mdown,*.mkdn,*.mkd,*.mdwn,*.mdtxt,*.mdtext,*.text,*.txt,${file.ext.rmarkdown},${file.ext.rxml}
 file.ext.definition=${definition.file.ext.yaml}
 file.ext.xml=*.xml,${file.ext.rxml}
 file.ext.all=*.*
 # File name extension search order for images.
 file.ext.image.order=svg pdf png jpg tiff
 # ########################################################################
+#
 # Variable Name Editor
+#
 # ########################################################################
 # Maximum number of characters for a variable name. A variable is defined
 # as one or more non-whitespace characters up to this maximum length.
 editor.variable.maxLength=256
 # ########################################################################
+#
 # Dialog Preferences
+#
 # ########################################################################
 # docs.oracle.com/javase/8/javafx/api/javafx/scene/control/ButtonBar.html
 dialog.alert.button.order.mac=L_HE+U+FBIX_NCYOA_R
 dialog.alert.button.order.linux=L_HE+UNYACBXIO_R
 dialog.alert.button.order.windows=L_E+U+FBXI_YNOCAH_R
 # Ensures a consistent button order for alert dialogs across platforms (because
 # the default button order on Linux defies all logic). Power to the people.
 # the default button order on Linux defies all logic).
 dialog.alert.button.order=${dialog.alert.button.order.windows}