Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

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

M LICENSE

 Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
 Copyright 2017 White Magic Software, Ltd.
 All rights reserved.

A R/README.md

 R Functions
 ===
 Import the files in this directory into the application, which include:
 * pluralise.R
 * possessive.R
 pluralise.R
 ===
 This file defines a function that implements most of Damian Conway's [An Algorithmic Approach to English Pluralization](http://blob.perl.org/tpc/1998/User_Applications/Algorithmic%20Approach%20Plurals/Algorithmic_Plurals.html).
 Usage
 ---
 Example usages of the pluralise function include:
     `r#pluralise( 'mouse' )` - mice
     `r#pluralise( 'buzz' )` - buzzes
     `r#pluralise( 'bus' )` - busses
 possessive.R
 ===
 This file defines a function that applies possessives to English words.
 Usage
 ---
 Example usages of the possessive function include:
     `r#pos( 'Ross' )` - Ross'
     `r#pos( 'Ruby' )` - Ruby's
     `r#pos( 'Lois' )` - Lois'

A R/pluralise.R

 # ######################################################################
+#
 # Copyright 2016, White Magic Software, Ltd.
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 # ######################################################################
 # ######################################################################
+#
 # See Damian Conway's "An Algorithmic Approach to English Pluralization":
 #   http://goo.gl/oRL4MP
 # See Oliver Glerke's Evo Inflector: https://github.com/atteo/evo-inflector/
 # See Shevek's Pluralizer: https://github.com/shevek/linguistics/
 # See also: http://www.freevectors.net/assets/files/plural.txt
+#
 # ######################################################################
 pluralise <- function( s, n ) {
   result <- s
   # Partial implementation of Conway's algorithm for nouns.
   if( n != 1 ) {
     if( pl.noninflective( s ) ||
 				pl.suffix( "es", s ) ||
         pl.suffix( "fish", s ) ||
         pl.suffix( "ois", s ) ||
         pl.suffix( "sheep", s ) ||
         pl.suffix( "deer", s ) ||
         pl.suffix( "pox", s ) ||
         pl.suffix( "[A-Z].*ese", s ) ||
         pl.suffix( "itis", s ) ) {
       # 1. Retain non-inflective user-mapped noun as is.
       # 2. Retain non-inflective plural as is.
       result <- s
+    }
     else if( pl.is.irregular.pl( s ) ) {
       # 4. Change irregular plurals based on mapping.
       result <- pl.irregular.pl( s )
+    }
     else if( pl.is.irregular.es( s ) ) {
       # x. From Shevek's
       result <- pl.inflect( s, "", "es" )
+    }
     else if( pl.suffix( "man", s ) ) {
       # 5. For -man, change -an to -en
       result <- pl.inflect( s, "an", "en" )
+    }
     else if( pl.suffix( "[lm]ouse", s ) ) {
       # 5. For [lm]ouse, change -ouse to -ice
       result <- pl.inflect( s, "ouse", "ice" )
+    }
     else if( pl.suffix( "tooth", s ) ) {
       # 5. For -tooth, change -ooth to -eeth
       result <- pl.inflect( s, "ooth", "eeth" )
+    }
     else if( pl.suffix( "goose", s ) ) {
       # 5. For -goose, change -oose to -eese
       result <- pl.inflect( s, "oose", "eese" )
+    }
     else if( pl.suffix( "foot", s ) ) {
       # 5. For -foot, change -oot to -eet
       result <- pl.inflect( s, "oot", "eet" )
+    }
     else if( pl.suffix( "zoon", s ) ) {
       # 5. For -zoon, change -on to -a
       result <- pl.inflect( s, "on", "a" )
+    }
     else if( pl.suffix( "[csx]is", s ) ) {
       # 5. Change -cis, -sis, -xis to -es
       result <- pl.inflect( s, "is", "es" )
+    }
     else if( pl.suffix( "([cs]h|ss|zz|x|s)", s ) ) {
       # 8. Change -ch, -sh, -ss, -zz, -x, -s to -es
       result <- pl.inflect( s, "", "es" )
+    }
     else if( pl.suffix( "([aeo]lf|[^d]eaf|arf)", s ) ) {
       # 9. Change -f to -ves
       result <- pl.inflect( s, "f", "ves" )
+    }
     else if( pl.suffix( "[nlw]ife", s ) ) {
       # 10. Change -fe to -ves
       result <- pl.inflect( s, "fe", "ves" )
+    }
     else if( pl.suffix( "[aeiou]y", s ) ) {
       # 11. Change -[aeiou]y to -ys
       result <- pl.inflect( s, "", "s" )
+    }
     else if( pl.suffix( "y", s ) ) {
       # 12. Change -y to -ies
       result <- pl.inflect( s, "y", "ies" )
+    }
     else if( pl.suffix( "z", s ) ) {
       # x. Change -z to -zzes
       result <- pl.inflect( s, "", "zes" )
+    }
     else {
       # 13. Default plural: add -s
       result <- pl.inflect( s, "", "s" )
+    }
+  }
   result
+}
 # Returns the given string (s) with its suffix replaced by r.
 pl.inflect <- function( s, suffix, r ) {
   gsub( paste( suffix, "$", sep="" ), r, s )
+}
 # Answers whether the given string (s) has the given ending.
 pl.suffix <- function( ending, s ) {
   grepl( paste( ending, "$", sep="" ), s )
+}
 # Answers whether the given string (s) is a noninflective noun.
 pl.noninflective <- function( s ) {
   v <- c(
 		"aircraft",
 		"Bhutanese",
 		"bison",
 		"bream",
 		"Burmese",
 		"carp",
 		"chassis",
 		"Chinese",
 		"clippers",
 		"cod",
 		"contretemps",
 		"corps",
 		"debris",
 		"djinn",
 		"eland",
 		"elk",
 		"flounder",
 		"fracas",
 		"gallows",
 		"graffiti",
 		"headquarters",
 		"high-jinks",
 		"homework",
 		"hovercraft",
 		"innings",
 		"Japanese",
 		"Lebanese",
 		"mackerel",
 		"means",
 		"mews",
 		"mice",
 		"mumps",
 		"news",
 		"pincers",
 		"pliers",
 		"Portuguese",
 		"proceedings",
 		"salmon",
 		"scissors",
 		"sea-bass",
 		"Senegalese",
 		"shears",
 		"Siamese",
 		"Sinhalese",
 		"spacecraft",
 		"swine",
 		"trout",
 		"tuna",
 		"Vietnamese",
 		"watercraft",
 		"whiting",
 		"wildebeest"
+  )
   is.element( s, v )
+}
 # Answers whether the given string (s) is an irregular plural.
 pl.is.irregular.pl <- function( s ) {
   # Could be refactored with pl.irregular.pl...
   v <- c(
     "beef", "brother", "child", "cow", "ephemeris", "genie", "money",
     "mongoose", "mythos", "octopus", "ox", "soliloquy", "trilby"
+  )
   is.element( s, v )
+}
 # Call to pluralise an irregular noun. Only call after confirming
 # the noun is irregular via pl.is.irregular.pl.
 pl.irregular.pl <- function( s ) {
   v <- list(
     "beef" = "beefs",
     "brother" = "brothers",
     "child" = "children",
     "cow" = "cows",
     "ephemeris" = "ephemerides",
     "genie" = "genies",
     "money" = "moneys",
     "mongoose" = "mongooses",
     "mythos" = "mythoi",
     "octopus" = "octopuses",
     "ox" = "oxen",
     "soliloquy" = "soliloquies",
     "trilby" = "trilbys"
+  )
   # Faster version of v[[ s ]]
   .subset2( v, s )
+}
 # Answers whether the given string (s) pluralises with -es.
 pl.is.irregular.es <- function( s ) {
   v <- c(
     "acropolis", "aegis", "alias", "asbestos", "bathos", "bias", "bronchitis",
     "bursitis", "caddis", "cannabis", "canvas", "chaos", "cosmos", "dais",
     "digitalis", "epidermis", "ethos", "eyas", "gas", "glottis", "hubris",
     "ibis", "lens", "mantis", "marquis", "metropolis", "pathos", "pelvis",
     "polis", "rhinoceros", "sassafrass", "trellis"
+  )
   is.element( s, v )
+}

A R/possessive.R

 # ######################################################################
+#
 # Copyright 2017, White Magic Software, Ltd.
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish,
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 # NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 # LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
 # ######################################################################
 # ######################################################################
+#
 # Changes a word into its possessive form.
+#
 # ######################################################################
 # Returns leftmost n characters of s.
 lstr <- function( s, n = 1 ) {
   substr( s, 0, n )
+}
 # Returns rightmost n characters of s.
 rstr <- function( s, n = 1 ) {
   l = nchar( s )
   substr( s, l - n + 1, l )
+}
 # Returns the possessive form of the given word.
 pos <- function( s ) {
   result <- s
   # Check to see if the last character is an s.
   ch <- rstr( s, 1 )
   if( ch != "s" ) {
     result <- concat( result, "'s" )
+  }
   else {
     result <- concat( result, "'" )
+  }
   result
+}

M USAGE.md

 # Introduction
 This document describes how to write documentation (technical or otherwise) using a master copy for generating a variety of output formats, such as: HTML pages, PDFs, and EPUBs. What's more, the document provides an overview of how to use variables and--for the unintimidated--leverage the power of R, a programming language.
 This document describes how to use the application.
 # Software Requirements
 # Variable Definitions
 Install Java, ConTeXt, Pandoc, R, and Lib V8. Then install the R packages knitr, yaml, and devtools, and pluralize by running the following commands:
 Variable definitions provide a way to insert key names having associated values into a document. The variable names and values are declared inside an external file using the [YAML](http://www.yaml.org/) file format. Simply put, variables are written in the file as follows:
     sudo su -
     apt-get install default-jre
     apt-get install context
     apt-get install pandoc
     apt-get install r
     apt-get install libv8-dev
+    r
     url <- "http://cran.us.r-project.org"
     install.packages('knitr', repos=url)
     install.packages('yaml', repos=url)
     install.packages('devtools', repos=url)
     devtools::install_github("hrbrmstr/pluralize")
 ```
 key: value
 ```
 To exit R, press `Ctrl+d` or type `q()` followed by pressing `Enter`.
 Any number of variables can be defined, in any order:
 The required software packages are installed.
 ```
 key_1: Value 1
 key_2: Value 2
 ```
 # Markdown
 Variables can reference other variables by enclosing the key name within dollar symbols:
 |Table|Table|
 |---|---|
 |Data|Data|
 ```
 key: Value
 key_1: $key$ 1
 key_2: $key$ 2
 ```
 Variables can use a nested structure to help group related information:
 ```
 novel:
   title: Book Title
   author: Author Name
   isbn: 978-3-16-148410-0
 ```
 Use a period to reference nested keys, such as:
 ```
 novel:
   author: Author Name
 copyright:
   owner: $novel.author$
 ```
 Save the variable definitions in a file having an extension of `.yaml` or `.yml`.
 # Document Editing
 The application's purpose is to completely separate the document's content from its presentation. To achieve this, documents are composed using a [plain text](http://spec.commonmark.org/0.28/) format.
 ## Create Document
 Start a new document as follows:
 . Start the application.
 . Click **File → New** to create an empty document to edit.
 . Click **File → Open** to open a variable definition file.
 . Change **Source Files** to **Definition Files** to list definition files.
 . Browse to and select a file saved with a `.yaml` or `.yml` extension.
 . Click **Open**.
 The variable definitions appear in the variable definition pane under the heading of **Definitions**.
 ## Edit Document
 Edit the document as normal. Notice how the preview pane updates as new content is added. The toolbar shows various icons that perform different formatting operations. Try them to see how they appear in the preview pane. Other operations not shown on the toolbar include:
 * Struck text (enclose the words within `~~` and `~~`)
 * Horizontal rule (use `---` on an otherwise empty line).
 The preview pane shows one way to interpret and format the document, but many other presentations are possible.
 ## Insert Variable
 Let's assume that the variable definitions loaded into the application include:
 ```
 novel:
   title: Diary of $novel.author$
   author: Anne Frank
 ```
 To reference a variable, type in the key name enclosed within dollar symbols, such as:
 ```
 The novel "$novel.title$" is one of the most widely read books in the world.
 ```
 The preview pane shows:
 > The novel "Diary of Anne Frank" is one of the most widely read books in the world.
 As it is laborious to type in variable names, it is possible to inject the variable name using autocomplete. Accomplish this as follows:
 . Create a new file.
 . Type in a partial variable value, such as **Dia**.
 . Press `Ctrl+Space` (hold down the `Control` key and tap the spacebar).
 The editor shows:
 ```
 $novel.title$
 ```
 The preview pane shows:
 ```
 Diary of Anne Frank
 ```
 The variable name is inserted into the document and the preview pane shows the variable's value.

M build.gradle

 dependencies {
   compile 'org.controlsfx:controlsfx:8.40.12'
   compile 'org.controlsfx:controlsfx:8.40.14'
   compile 'org.fxmisc.wellbehaved:wellbehavedfx:0.3'
   compile 'org.fxmisc.richtext:richtextfx:0.8.1'
   compile 'com.miglayout:miglayout-javafx:5.0'
   compile 'de.jensd:fontawesomefx-fontawesome:4.5.0'
   compile 'org.ahocorasick:ahocorasick:0.4.0'
   compile 'com.vladsch.flexmark:flexmark:0.28.2'
   compile 'com.vladsch.flexmark:flexmark-ext-tables:0.28.2'
   compile 'com.vladsch.flexmark:flexmark-ext-superscript:0.28.2'
   compile 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.28.2'
   compile 'com.fasterxml.jackson.core:jackson-core:2.9.2'
   compile 'com.fasterxml.jackson.core:jackson-databind:2.9.2'
   compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.2'
   compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.2'
   compile 'com.vladsch.flexmark:flexmark:0.28.24'
   compile 'com.vladsch.flexmark:flexmark-ext-tables:0.28.24'
   compile 'com.vladsch.flexmark:flexmark-ext-superscript:0.28.24'
   compile 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.28.24'
   compile 'com.fasterxml.jackson.core:jackson-core:2.9.3'
   compile 'com.fasterxml.jackson.core:jackson-databind:2.9.3'
   compile 'com.fasterxml.jackson.core:jackson-annotations:2.9.3'
   compile 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.9.3'
   compile 'org.yaml:snakeyaml:1.19'
   compile 'com.ximpleware:vtd-xml:2.13.4'
   compile 'net.sf.saxon:Saxon-HE:9.8.0-6'
   compile 'net.sf.saxon:Saxon-HE:9.8.0-7'
   compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
   compile 'org.apache.commons:commons-configuration2:2.2'
   compile files('libs/renjin-script-engine-0.8.2514-jar-with-dependencies.jar')
   compile files('libs/renjin-script-engine-0.8.2562-jar-with-dependencies.jar')
+}
 version = '1.3.2'
 version = '1.3.3'
 applicationName = 'scrivenvar'
 mainClassName = 'com.scrivenvar.Main'

D libs/renjin-script-engine-0.8.2514-jar-with-dependencies.jar

Binary file

A libs/renjin-script-engine-0.8.2562-jar-with-dependencies.jar

Binary file

A licenses/MARKDOWN-WRITER-FX

 Copyright (c) 2015 Karl Tauber <karl at jformdesigner dot com>
 All rights reserved.
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright
   notice, this list of conditions and the following disclaimer.
 * 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.

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

   private Map<FileEditorTab, Processor<String>> processors;
   public MainWindow() {
     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 file editor tab pane to receive an open definition source event.
    */
   private void initDefinitionListener() {
     getFileEditorPane().onOpenDefinitionFileProperty().addListener(
       (ObservableValue<? extends Path> definitionFile,
         final Path oldPath, final Path newPath) -> {
         openDefinition( newPath );
         // Indirectly refresh the resolved map.
         setProcessors( null );
         updateDefinitionPane();
         try {
           getSnitch().ignore( oldPath );
           getSnitch().listen( newPath );
         } catch( final IOException ex ) {
           error( ex );
+        }
         // Will create new processors and therefore a new resolved map.
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * 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 );
               initVariableNameInjector( tab );
 //              initSyntaxListener( tab );
+            }
+          }
+        }
+      }
     );
+  }
   /**
    * Reloads the preferences from the previous session.
    */
   private void initPreferences() {
     restoreDefinitionSource();
     getFileEditorPane().restorePreferences();
     updateDefinitionPane();
+  }
   /**
    * 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) -> {
         // 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 );
+          }
+        }
+      }
     );
+  }
   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 initVariableNameInjector( final FileEditorTab tab ) {
     VariableNameInjector.listen( tab, getDefinitionPane() );
+  }
   /**
    * 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.isFileOpen() ) {
       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 {
         getNotifier().clear();
         processor.processChain( tab.getEditorText() );
       } catch( final Exception ex ) {
         error( ex );
+      }
+    }
+  }
   /**
    * 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 getDefinitionSource().getResolvedMap();
+  }
   /**
    * Returns the root node for the hierarchical definition source.
+   *
    * @return Data to display in the definition pane.
    */
   private TreeView<String> getTreeView() {
     try {
       return getDefinitionSource().asTreeView();
     } catch( Exception e ) {
       error( e );
+    }
     // Slightly redundant as getDefinitionSource() might have returned an
     // empty definition source.
     return (new EmptyDefinitionSource()).asTreeView();
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinition( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path.toString() );
       setDefinitionSource( ds );
       storeDefinitionSource();
       updateDefinitionPane();
     } catch( final Exception e ) {
       error( e );
+    }
+  }
   private void updateDefinitionPane() {
     getDefinitionPane().setRoot( getDefinitionSource().asTreeView() );
+  }
   private void restoreDefinitionSource() {
     final Preferences preferences = getPreferences();
     final String source = preferences.get( PERSIST_DEFINITION_SOURCE, null );
     // If there's no definition source set, don't try to load it.
     if( source != null ) {
       setDefinitionSource( createDefinitionSource( source ) );
+    }
+  }
   private void storeDefinitionSource() {
     final Preferences preferences = getPreferences();
     final DefinitionSource ds = getDefinitionSource();
     preferences.put( PERSIST_DEFINITION_SOURCE, ds.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 ) {
         final Path path = (Path)value;
         final FileTypePredicate predicate
           = new FileTypePredicate( GLOB_DEFINITION_EXTENSIONS );
         // Reload definitions.
         if( predicate.test( path.toFile() ) ) {
           updateDefinitionSource( 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( 0, index > 0 ? index : s.length() );
         getStatusBar().setText( message );
+      }
     );
+  }
   /**
    * Called when a file has been modified.
+   *
    * @param file Path to the modified file.
    */
   private void updateSelectedTab() {
     Platform.runLater(
       () -> {
         // Brute-force XSLT file reload by re-instantiating all processors.
         resetProcessors();
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * Reloads the definition source from the given path.
+   *
    * @param path The path containing new definition information.
    */
   private void updateDefinitionSource( final Path path ) {
     Platform.runLater(
       () -> {
         openDefinition( path );
+      }
     );
+  }
   /**
    * 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 ) );
+  }
   //---- Tools actions
   private void toolsScript() {
     final String script = getStartupScript();
     final RScriptDialog dialog = new RScriptDialog(
       getWindow(), "Dialog.rScript.title", script );
     final Optional<String> result = dialog.showAndWait();
     result.ifPresent( (String s) -> {
       putStartupScript( s );
     } );
+  }
   /**
    * Gets the R startup script from the user preferences.
    */
   private String getStartupScript() {
     return getPreferences().get( PERSIST_R_STARTUP, "" );
+  }
   /**
    * Puts an R startup script into the user preferences.
    */
   private void putStartupScript( final String s ) {
     try {
       getPreferences().put( PERSIST_R_STARTUP, s );
     } catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     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() {
     if( this.scene == null ) {
       this.scene = createScene();
+    }
     return this.scene;
+  }
   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 void setProcessors( final Map<FileEditorTab, Processor<String>> map ) {
     this.processors = map;
+  }
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     if( this.processors == null ) {
       setProcessors( new HashMap<>() );
+    }
     return this.processors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     if( this.previewPane == null ) {
       this.previewPane = createPreviewPane();
+    }
     return this.previewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     this.definitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     if( this.definitionSource == null ) {
       this.definitionSource = new EmptyDefinitionSource();
+    }
     return this.definitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     if( this.definitionPane == null ) {
       this.definitionPane = createDefinitionPane();
+    }
     return this.definitionPane;
+  }
   private Options getOptions() {
     return this.options;
+  }
   private Snitch getSnitch() {
     return this.snitch;
+  }
   private Notifier getNotifier() {
     return this.notifier;
+  }
   public void setMenuBar( final MenuBar menuBar ) {
     this.menuBar = menuBar;
+  }
   public MenuBar getMenuBar() {
     return this.menuBar;
+  }
   private Text getLineNumberText() {
     if( this.lineNumberText == null ) {
       this.lineNumberText = createLineNumberText();
+    }
     return this.lineNumberText;
+  }
   private synchronized StatusBar getStatusBar() {
     if( this.statusBar == null ) {
       this.statusBar = createStatusBar();
+    }
     return this.statusBar;
+  }
   private TextField getFindTextField() {
     if( this.findTextField == null ) {
       this.findTextField = createFindTextField();
+    }
     return this.findTextField;
+  }
   //---- 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 createDefinitionSource( final String path ) {
     DefinitionSource ds;
     try {
        ds = createDefinitionFactory().createDefinitionSource( path );
       if( ds instanceof FileDefinitionSource ) {
         try {
           getSnitch().listen( ((FileDefinitionSource)ds).getPath() );
         } catch( final IOException ex ) {
           error( ex );
+        }
+      }
     } catch( final Exception ex ) {
       ds = new EmptyDefinitionSource();
       error( ex );
+    }
     return ds;
+  }
   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 HTMLPreviewPane createPreviewPane() {
     return new HTMLPreviewPane();
+  }
   private DefinitionPane createDefinitionPane() {
     return new DefinitionPane( getTreeView() );
+  }
   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 ) );
     // See: http://broadlyapplicable.blogspot.ca/2015/03/javafx-capture-restorePreferences-splitpane.html
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox box = new VBox();
     box.setAlignment( Pos.BASELINE_CENTER );
     box.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( box );
     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 editReplaceAction = new Action( Messages.get( "Main.menu.edit.find.replace" ), "Shortcut+H", RETWEET,
       e -> getActiveEditor().replace(),
       activeFileEditorIsNull );
     final Action editFindNextAction = new Action( Messages.get( "Main.menu.edit.find.next" ), "F3", null,
       e -> findNext(),
       activeFileEditorIsNull );
     final Action editFindPreviousAction = new Action( Messages.get( "Main.menu.edit.find.previous" ), "Shift+F3", null,
       e -> getActiveEditor().findPrevious(),
       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 );
     final Action[] headers = new Action[ 6 ];
     // Insert header actions (H1 ... H6)
     for( int i = 1; i <= 6; 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 );
     // Tools actions
     final Action toolsScriptAction = new Action(
       get( "Main.menu.tools.script" ), null, null, e -> toolsScript() );
     // 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,
       editReplaceAction,
       editFindNextAction,
       editFindPreviousAction );
     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 ],
       headers[ 3 ],
       headers[ 4 ],
       headers[ 5 ],
       null,
       insertUnorderedListAction,
       insertOrderedListAction,
       insertHorizontalRuleAction );
     final Menu toolsMenu = ActionUtils.createMenu( get( "Main.menu.tools" ),
       toolsScriptAction );
     final Menu helpMenu = ActionUtils.createMenu( get( "Main.menu.help" ),
       helpAboutAction );
   /**
    * Listens on the definition pane for double-click events.
    */
   private VariableNameInjector variableNameInjector;
   public MainWindow() {
     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 file editor tab pane to receive an open definition source event.
    */
   private void initDefinitionListener() {
     getFileEditorPane().onOpenDefinitionFileProperty().addListener(
       (ObservableValue<? extends Path> definitionFile,
         final Path oldPath, final Path newPath) -> {
         openDefinition( newPath );
         // Indirectly refresh the resolved map.
         setProcessors( null );
         updateDefinitionPane();
         try {
           getSnitch().ignore( oldPath );
           getSnitch().listen( newPath );
+        }
         catch( final IOException ex ) {
           error( ex );
+        }
         // Will create new processors and therefore a new resolved map.
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * 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 );
 //              initSyntaxListener( tab );
+            }
+          }
+        }
+      }
     );
+  }
   /**
    * Reloads the preferences from the previous session.
    */
   private void initPreferences() {
     restoreDefinitionSource();
     getFileEditorPane().restorePreferences();
     updateDefinitionPane();
+  }
   /**
    * 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 );
+          }
+        }
+      }
     );
+  }
   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 );
+  }
   /**
    * Add a listener for variable name injection the given tab.
+   *
    * @param tab The tab to inject variable names into upon a double-click.
    */
   private void initVariableNameInjector( final Tab tab ) {
     final FileEditorTab editorTab = (FileEditorTab)tab;
+  }
   /**
    * 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.isFileOpen() ) {
       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 {
         getNotifier().clear();
         processor.processChain( tab.getEditorText() );
+      }
       catch( final Exception ex ) {
         error( ex );
+      }
+    }
+  }
   /**
    * 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 getDefinitionSource().getResolvedMap();
+  }
   /**
    * Returns the root node for the hierarchical definition source.
+   *
    * @return Data to display in the definition pane.
    */
   private TreeView<String> getTreeView() {
     try {
       return getDefinitionSource().asTreeView();
+    }
     catch( Exception e ) {
       error( e );
+    }
     // Slightly redundant as getDefinitionSource() might have returned an
     // empty definition source.
     return (new EmptyDefinitionSource()).asTreeView();
+  }
   /**
    * Called when a definition source is opened.
+   *
    * @param path Path to the definition source that was opened.
    */
   private void openDefinition( final Path path ) {
     try {
       final DefinitionSource ds = createDefinitionSource( path.toString() );
       setDefinitionSource( ds );
       storeDefinitionSource();
       updateDefinitionPane();
+    }
     catch( final Exception e ) {
       error( e );
+    }
+  }
   private void updateDefinitionPane() {
     getDefinitionPane().setRoot( getDefinitionSource().asTreeView() );
+  }
   private void restoreDefinitionSource() {
     final Preferences preferences = getPreferences();
     final String source = preferences.get( PERSIST_DEFINITION_SOURCE, null );
     // If there's no definition source set, don't try to load it.
     if( source != null ) {
       setDefinitionSource( createDefinitionSource( source ) );
+    }
+  }
   private void storeDefinitionSource() {
     final Preferences preferences = getPreferences();
     final DefinitionSource ds = getDefinitionSource();
     preferences.put( PERSIST_DEFINITION_SOURCE, ds.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 ) {
         final Path path = (Path)value;
         final FileTypePredicate predicate
           = new FileTypePredicate( GLOB_DEFINITION_EXTENSIONS );
         // Reload definitions.
         if( predicate.test( path.toFile() ) ) {
           updateDefinitionSource( 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( 0, index > 0 ? index : s.length() );
         getStatusBar().setText( message );
+      }
     );
+  }
   /**
    * Called when a file has been modified.
+   *
    * @param file Path to the modified file.
    */
   private void updateSelectedTab() {
     Platform.runLater(
       () -> {
         // Brute-force XSLT file reload by re-instantiating all processors.
         resetProcessors();
         refreshSelectedTab( getActiveFileEditor() );
+      }
     );
+  }
   /**
    * Reloads the definition source from the given path.
+   *
    * @param path The path containing new definition information.
    */
   private void updateDefinitionSource( final Path path ) {
     Platform.runLater(
       () -> {
         openDefinition( path );
+      }
     );
+  }
   /**
    * 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 ) );
+  }
   //---- Tools actions
   private void toolsScript() {
     final String script = getStartupScript();
     final RScriptDialog dialog = new RScriptDialog(
       getWindow(), "Dialog.rScript.title", script );
     final Optional<String> result = dialog.showAndWait();
     result.ifPresent( (String s) -> {
       putStartupScript( s );
     } );
+  }
   /**
    * Gets the R startup script from the user preferences.
    */
   private String getStartupScript() {
     return getPreferences().get( PERSIST_R_STARTUP, "" );
+  }
   /**
    * Puts an R startup script into the user preferences.
    */
   private void putStartupScript( final String s ) {
     try {
       getPreferences().put( PERSIST_R_STARTUP, s );
+    }
     catch( final Exception ex ) {
       getNotifier().notify( ex );
+    }
+  }
   //---- Help actions -------------------------------------------------------
   private void helpAbout() {
     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() {
     if( this.scene == null ) {
       this.scene = createScene();
+    }
     return this.scene;
+  }
   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 void setProcessors( final Map<FileEditorTab, Processor<String>> map ) {
     this.processors = map;
+  }
   private Map<FileEditorTab, Processor<String>> getProcessors() {
     if( this.processors == null ) {
       setProcessors( new HashMap<>() );
+    }
     return this.processors;
+  }
   private FileEditorTabPane getFileEditorPane() {
     if( this.fileEditorPane == null ) {
       this.fileEditorPane = createFileEditorPane();
+    }
     return this.fileEditorPane;
+  }
   private HTMLPreviewPane getPreviewPane() {
     if( this.previewPane == null ) {
       this.previewPane = createPreviewPane();
+    }
     return this.previewPane;
+  }
   private void setDefinitionSource( final DefinitionSource definitionSource ) {
     this.definitionSource = definitionSource;
+  }
   private DefinitionSource getDefinitionSource() {
     if( this.definitionSource == null ) {
       this.definitionSource = new EmptyDefinitionSource();
+    }
     return this.definitionSource;
+  }
   private DefinitionPane getDefinitionPane() {
     if( this.definitionPane == null ) {
       this.definitionPane = createDefinitionPane();
+    }
     return this.definitionPane;
+  }
   private Options getOptions() {
     return this.options;
+  }
   private Snitch getSnitch() {
     return this.snitch;
+  }
   private Notifier getNotifier() {
     return this.notifier;
+  }
   public void setMenuBar( final MenuBar menuBar ) {
     this.menuBar = menuBar;
+  }
   public MenuBar getMenuBar() {
     return this.menuBar;
+  }
   private Text getLineNumberText() {
     if( this.lineNumberText == null ) {
       this.lineNumberText = createLineNumberText();
+    }
     return this.lineNumberText;
+  }
   private synchronized StatusBar getStatusBar() {
     if( this.statusBar == null ) {
       this.statusBar = createStatusBar();
+    }
     return this.statusBar;
+  }
   private TextField getFindTextField() {
     if( this.findTextField == null ) {
       this.findTextField = createFindTextField();
+    }
     return this.findTextField;
+  }
   //---- 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 createDefinitionSource( final String path ) {
     DefinitionSource ds;
     try {
       ds = createDefinitionFactory().createDefinitionSource( path );
       if( ds instanceof FileDefinitionSource ) {
         try {
           getSnitch().listen( ((FileDefinitionSource)ds).getPath() );
+        }
         catch( final IOException ex ) {
           error( ex );
+        }
+      }
+    }
     catch( final Exception ex ) {
       ds = new EmptyDefinitionSource();
       error( ex );
+    }
     return ds;
+  }
   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 HTMLPreviewPane createPreviewPane() {
     return new HTMLPreviewPane();
+  }
   private DefinitionPane createDefinitionPane() {
     return new DefinitionPane( getTreeView() );
+  }
   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 ) );
     // See: http://broadlyapplicable.blogspot.ca/2015/03/javafx-capture-restorePreferences-splitpane.html
     final BorderPane borderPane = new BorderPane();
     borderPane.setPrefSize( 1024, 800 );
     borderPane.setTop( createMenuBar() );
     borderPane.setBottom( getStatusBar() );
     borderPane.setCenter( splitPane );
     final VBox box = new VBox();
     box.setAlignment( Pos.BASELINE_CENTER );
     box.getChildren().add( getLineNumberText() );
     getStatusBar().getRightItems().add( box );
     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 editReplaceAction = new Action( Messages.get(
       "Main.menu.edit.find.replace" ), "Shortcut+H", RETWEET,
                                                  e -> getActiveEditor().replace(),
                                                  activeFileEditorIsNull );
     final Action editFindNextAction = new Action( Messages.get(
       "Main.menu.edit.find.next" ), "F3", null,
                                                   e -> findNext(),
                                                   activeFileEditorIsNull );
     final Action editFindPreviousAction = new Action( Messages.get(
       "Main.menu.edit.find.previous" ), "Shift+F3", null,
                                                       e -> getActiveEditor().findPrevious(),
                                                       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 );
     final Action[] headers = new Action[ 6 ];
     // Insert header actions (H1 ... H6)
     for( int i = 1; i <= 6; 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 );
     // Tools actions
     final Action toolsScriptAction = new Action(
       get( "Main.menu.tools.script" ), null, null, e -> toolsScript() );
     // 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,
                                                   editReplaceAction,
                                                   editFindNextAction,
                                                   editFindPreviousAction );
     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 ],
                                                     headers[ 3 ],
                                                     headers[ 4 ],
                                                     headers[ 5 ],
                                                     null,
                                                     insertUnorderedListAction,
                                                     insertOrderedListAction,
                                                     insertHorizontalRuleAction );
     final Menu toolsMenu = ActionUtils.createMenu( get( "Main.menu.tools" ),
                                                    toolsScriptAction );
     final Menu helpMenu = ActionUtils.createMenu( get( "Main.menu.help" ),
                                                   helpAboutAction );
     menuBar = new MenuBar( fileMenu, editMenu, insertMenu, toolsMenu, helpMenu );

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

 import javafx.collections.ObservableList;
 import javafx.event.EventHandler;
 import javafx.event.EventType;
 import javafx.scene.Node;
 import javafx.scene.control.MultipleSelectionModel;
 import javafx.scene.control.SelectionMode;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.input.MouseButton;
 import static javafx.scene.input.MouseButton.PRIMARY;
 import javafx.scene.input.MouseEvent;
 import static javafx.scene.input.MouseEvent.MOUSE_CLICKED;
 /**
    * Allows observers to receive double-click events on the tree view.
+   *
    * @param handler The handler that
    * @param handler The handler that will receive double-click events.
    */
   public void addBranchSelectedListener(
     final EventHandler<? super MouseEvent> handler ) {
     getTreeView().addEventHandler(
       MouseEvent.ANY, event -> {
         final MouseButton button = event.getButton();
         final int clicks = event.getClickCount();
         final EventType<? extends MouseEvent> eventType = event.getEventType();
     getTreeView().addEventHandler( MouseEvent.ANY, event -> {
       if( event.getButton().equals( MouseButton.PRIMARY ) && event.getClickCount() == 2 ) {
         if( event.getEventType().equals( MouseEvent.MOUSE_CLICKED ) ) {
           handler.handle( event );
         if( PRIMARY.equals( button ) && clicks == 2 ) {
           if( MOUSE_CLICKED.equals( eventType ) ) {
             handler.handle( event );
+          }
           event.consume();
+        }
       } );
+  }
         event.consume();
+      }
     } );
   /**
    * Allows observers to stop receiving double-click events on the tree view.
+   *
    * @param handler The handler that will no longer receive double-click events.
    */
   public void removeBranchSelectedListener(
     final EventHandler<? super MouseEvent> handler ) {
     getTreeView().removeEventHandler( MouseEvent.ANY, handler );
+  }
     String path = word;
     // Current tree item.
     TreeItem<String> cItem = getTreeRoot();
     // Previous tree item.
     TreeItem<String> pItem = cItem;

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

 import static com.scrivenvar.util.Lists.getFirst;
 import static com.scrivenvar.util.Lists.getLast;
 import static java.lang.Character.isSpaceChar;
 import static java.lang.Character.isWhitespace;
 import static java.lang.Math.min;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.scene.control.IndexRange;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.input.InputEvent;
 import javafx.scene.input.KeyCode;
 import static javafx.scene.input.KeyCode.AT;
 import static javafx.scene.input.KeyCode.DIGIT2;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.MINUS;
 import static javafx.scene.input.KeyCode.SPACE;
 import static javafx.scene.input.KeyCombination.CONTROL_DOWN;
 import static javafx.scene.input.KeyCombination.SHIFT_DOWN;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import org.fxmisc.richtext.StyledTextArea;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyTyped;
 import org.fxmisc.wellbehaved.event.InputMap;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 import static org.fxmisc.wellbehaved.event.InputMap.sequence;
 /**
  * Provides the logic for injecting variable names within the editor.
+ *
  * @author White Magic Software, Ltd.
  */
 public class VariableNameInjector {
   public static final int DEFAULT_MAX_VAR_LENGTH = 64;
   private static final int NO_DIFFERENCE = -1;
   private final Settings settings = Services.load( Settings.class );
   /**
    * Used to capture keyboard events once the user presses @.
    */
   private InputMap<InputEvent> keyboardMap;
   private FileEditorTab tab;
   private DefinitionPane definitionPane;
   /**
    * Position of the variable in the text when in variable mode (0 by default).
    */
   private int initialCaretPosition;
   /**
    * Empty constructor.
    */
   private VariableNameInjector() {
+  }
   public static void listen( final FileEditorTab tab, final DefinitionPane pane ) {
     final VariableNameInjector vni = new VariableNameInjector();
     vni.setFileEditorTab( tab );
     vni.setDefinitionPane( pane );
     vni.initBranchSelectedListener();
     vni.initKeyboardEventListeners();
+  }
   /**
    * Traps double-click events on the definition pane.
    */
   private void initBranchSelectedListener() {
     getDefinitionPane().addBranchSelectedListener( (final MouseEvent event) -> {
       final Object source = event.getSource();
       if( source instanceof TreeView ) {
         final TreeView tree = (TreeView)source;
         final TreeItem item = (TreeItem)tree.getSelectionModel().getSelectedItem();
         if( item instanceof VariableTreeItem ) {
           final VariableTreeItem var = (VariableTreeItem)item;
           final String text = decorate( var.toPath() );
           replaceSelection( text );
+        }
+      }
     } );
+  }
   /**
    * Traps keys for performing various short-cut tasks, such as @-mode variable
    * insertion and control+space for variable autocomplete.
+   *
    * @ key is pressed, a new keyboard map is inserted in place of the current
    * map -- this class goes into "variable edit mode" (a.k.a. vMode).
+   *
    * @see createKeyboardMap()
    */
   private void initKeyboardEventListeners() {
     // Control and space are pressed.
     addEventListener( keyPressed( SPACE, CONTROL_DOWN ), this::autocomplete );
     // @ key in Linux?
     addEventListener( keyPressed( DIGIT2, SHIFT_DOWN ), this::vMode );
     // @ key in Windows.
     addEventListener( keyPressed( AT ), this::vMode );
+  }
   /**
    * The @ symbol is a short-cut to inserting a YAML variable reference.
+   *
    * @param e Superfluous information about the key that was pressed.
    */
   private void vMode( KeyEvent e ) {
     setInitialCaretPosition();
     vModeStart();
     vModeAutocomplete();
+  }
   /**
    * Receives key presses until the user completes the variable selection. This
    * allows the arrow keys to be used for selecting variables.
+   *
    * @param e The key that was pressed.
    */
   private void vModeKeyPressed( KeyEvent e ) {
     final KeyCode keyCode = e.getCode();
     switch( keyCode ) {
       case BACK_SPACE:
         // Don't decorate the variable upon exiting vMode.
         vModeBackspace();
         break;
       case ESCAPE:
         // Don't decorate the variable upon exiting vMode.
         vModeStop();
         break;
       case ENTER:
       case PERIOD:
       case RIGHT:
       case END:
         // Stop at a leaf node, ENTER means accept.
         if( vModeConditionalComplete() && keyCode == ENTER ) {
           vModeStop();
           // Decorate the variable upon exiting vMode.
           decorate();
+        }
         break;
       case UP:
         cyclePathPrev();
         break;
       case DOWN:
         cyclePathNext();
         break;
       default:
         vModeFilterKeyPressed( e );
         break;
+    }
     e.consume();
+  }
   private void vModeBackspace() {
     deleteSelection();
     // Break out of variable mode by back spacing to the original position.
     if( getCurrentCaretPosition() > getInitialCaretPosition() ) {
       vModeAutocomplete();
+    }
     else {
       vModeStop();
+    }
+  }
   /**
    * Updates the text with the path selected (or typed) by the user.
    */
   private void vModeAutocomplete() {
     final TreeItem<String> node = getCurrentNode();
     if( node != null && !node.isLeaf() ) {
       final String word = getLastPathWord();
       final String label = node.getValue();
       final int delta = difference( label, word );
       final String remainder = delta == NO_DIFFERENCE
         ? label
         : label.substring( delta );
       final StyledTextArea textArea = getEditor();
       final int posBegan = getCurrentCaretPosition();
       final int posEnded = posBegan + remainder.length();
       textArea.replaceSelection( remainder );
       if( posEnded - posBegan > 0 ) {
         textArea.selectRange( posEnded, posBegan );
+      }
       expand( node );
+    }
+  }
   /**
    * Only variable name keys can pass through the filter. This is called when
    * the user presses a key.
+   *
    * @param e The key that was pressed.
    */
   private void vModeFilterKeyPressed( final KeyEvent e ) {
     if( isVariableNameKey( e ) ) {
       typed( e.getText() );
+    }
+  }
   /**
    * Performs an autocomplete depending on whether the user has finished typing
    * in a word. If there is a selected range, then this will complete the most
    * recent word and jump to the next child.
+   *
    * @return true The auto-completed node was a terminal node.
    */
   private boolean vModeConditionalComplete() {
     acceptPath();
     final TreeItem<String> node = getCurrentNode();
     final boolean terminal = isTerminal( node );
     if( !terminal ) {
       typed( SEPARATOR );
+    }
     return terminal;
+  }
   /**
    * Pressing control+space will find a node that matches the current word and
    * substitute the YAML variable reference. This is called when the user is not
    * editing in vMode.
+   *
    * @param e Ignored -- it can only be Ctrl+Space.
    */
   private void autocomplete( final KeyEvent e ) {
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundaries( paragraph );
     final String word = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     VariableTreeItem<String> leaf = findLeaf( word );
     if( leaf == null ) {
       // If a leaf doesn't match using "starts with", then try using "contains".
       leaf = findLeaf( word, true );
+    }
     if( leaf != null ) {
       replaceText( boundaries[ 0 ], boundaries[ 1 ], leaf.toPath() );
       decorate();
       expand( leaf );
+    }
+  }
   /**
    * Called when autocomplete finishes on a valid leaf or when the user presses
    * Enter to finish manual autocomplete.
    */
   private void decorate() {
     // A little bit of duplication...
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundaries( paragraph );
     final String old = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     final String newVariable = decorate( old );
     final int posEnded = getCurrentCaretPosition();
     final int posBegan = posEnded - old.length();
     getEditor().replaceText( posBegan, posEnded, newVariable );
+  }
   /**
    * Called when user double-clicks on a tree view item.
+   *
    * @param variable The variable to decorate.
    */
   private String decorate( final String variable ) {
     return getVariableDecorator().decorate( variable );
+  }
   /**
    * Inserts the given string at the current caret position, or replaces
    * selected text (if any).
+   *
    * @param s The string to inject.
    */
   private void replaceSelection( final String s ) {
     getEditor().replaceSelection( s );
+  }
   /**
    * Updates the text at the given position within the current paragraph.
+   *
    * @param posBegan The starting index in the paragraph text to replace.
    * @param posEnded The ending index in the paragraph text to replace.
    * @param text Overwrite the paragraph substring with this text.
    */
   private void replaceText(
     final int posBegan, final int posEnded, final String text ) {
     final int p = getCurrentParagraph();
     getEditor().replaceText( p, posBegan, p, posEnded, text );
+  }
   /**
    * Returns the caret's current paragraph position.
+   *
    * @return A number greater than or equal to 0.
    */
   private int getCurrentParagraph() {
     return getEditor().getCurrentParagraph();
+  }
   /**
    * Returns current word boundary indexes into the current paragraph, including
    * punctuation.
+   *
    * @param p The paragraph wherein to hunt word boundaries.
    * @param offset The offset into the paragraph to begin scanning left and
    * right.
+   *
    * @return The starting and ending index of the word closest to the caret.
    */
   private int[] getWordBoundaries( final String p, final int offset ) {
     // Remove dashes, but retain hyphens. Retain same number of characters
     // to preserve relative indexes.
     final String paragraph = p.replace( "---", "   " ).replace( "--", "  " );
     return getWordAt( paragraph, offset );
+  }
   /**
    * Helper method to get the word boundaries for the current paragraph.
+   *
    * @param paragraph
+   *
    * @return
    */
   private int[] getWordBoundaries( final String paragraph ) {
     return getWordBoundaries( paragraph, getCurrentCaretColumn() );
+  }
   /**
    * Given an arbitrary offset into a string, this returns the word at that
    * index. The inputs and outputs include:
+   *
    * <ul>
    * <li>surrounded by space: <code>hello | world!</code> ("");</li>
    * <li>end of word: <code>hello| world!</code> ("hello");</li>
    * <li>start of a word: <code>hello |world!</code> ("world!");</li>
    * <li>within a word: <code>hello wo|rld!</code> ("world!");</li>
    * <li>end of a paragraph: <code>hello world!|</code> ("world!");</li>
    * <li>start of a paragraph: <code>|hello world!</code> ("hello!"); or</li>
    * <li>after punctuation: <code>hello world!|</code> ("world!").</li>
    * </ul>
+   *
    * @param p The string to scan for a word.
    * @param offset The offset within s to begin searching for the nearest word
    * boundary, must not be out of bounds of s.
+   *
    * @return The word in s at the offset.
+   *
    * @see getWordBegan( String, int )
    * @see getWordEnded( String, int )
    */
   private int[] getWordAt( final String p, final int offset ) {
     return new int[]{ getWordBegan( p, offset ), getWordEnded( p, offset ) };
+  }
   /**
    * Returns the index into s where a word begins.
+   *
    * @param s Never null.
    * @param offset Index into s to begin searching backwards for a word
    * boundary.
+   *
    * @return The index where a word begins.
    */
   private int getWordBegan( final String s, int offset ) {
     while( offset > 0 && isBoundary( s.charAt( offset - 1 ) ) ) {
       offset--;
+    }
     return offset;
+  }
   /**
    * Returns the index into s where a word ends.
+   *
    * @param s Never null.
    * @param offset Index into s to begin searching forwards for a word boundary.
+   *
    * @return The index where a word ends.
    */
   private int getWordEnded( final String s, int offset ) {
     final int length = s.length();
     while( offset < length && isBoundary( s.charAt( offset ) ) ) {
       offset++;
+    }
     return offset;
+  }
   /**
    * Returns true if the given character can be reasonably expected to be part
    * of a word, including punctuation marks.
+   *
    * @param c The character to compare.
+   *
    * @return false The character is a space character.
    */
   private boolean isBoundary( final char c ) {
     return !isSpaceChar( c );
+  }
   /**
    * Returns the text for the paragraph that contains the caret.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCaretParagraph() {
     return getEditor().getText( getCurrentParagraph() );
+  }
   /**
    * Returns true if the node has children that can be selected (i.e., any
    * non-leaves).
+   *
    * @param <T> The type that the TreeItem contains.
    * @param node The node to test for terminality.
+   *
    * @return true The node has one branch and its a leaf.
    */
   private <T> boolean isTerminal( final TreeItem<T> node ) {
     final ObservableList<TreeItem<T>> branches = node.getChildren();
     return branches.size() == 1 && branches.get( 0 ).isLeaf();
+  }
   /**
    * Inserts text that the user typed at the current caret position, then
    * performs an autocomplete for the variable name.
+   *
    * @param text The text to insert, never null.
    */
   private void typed( final String text ) {
     getEditor().replaceSelection( text );
     vModeAutocomplete();
+  }
   /**
    * Called when the user presses either End or Enter key.
    */
   private void acceptPath() {
     final IndexRange range = getSelectionRange();
     if( range != null ) {
       final int rangeEnd = range.getEnd();
       final StyledTextArea textArea = getEditor();
       textArea.deselect();
       textArea.moveTo( rangeEnd );
+    }
+  }
   /**
    * Replaces the entirety of the existing path (from the initial caret
    * position) with the given path.
+   *
    * @param oldPath The path to replace.
    * @param newPath The replacement path.
    */
   private void replacePath( final String oldPath, final String newPath ) {
     final StyledTextArea textArea = getEditor();
     final int posBegan = getInitialCaretPosition();
     final int posEnded = posBegan + oldPath.length();
     textArea.deselect();
     textArea.replaceText( posBegan, posEnded, newPath );
+  }
   /**
    * Called when the user presses the Backspace key.
    */
   private void deleteSelection() {
     final StyledTextArea textArea = getEditor();
     textArea.replaceSelection( "" );
     textArea.deletePreviousChar();
+  }
   /**
    * Cycles the selected text through the nodes.
+   *
    * @param direction true - next; false - previous
    */
   private void cycleSelection( final boolean direction ) {
     final TreeItem<String> node = getCurrentNode();
     // Find the sibling for the current selection and replace the current
     // selection with the sibling's value
     TreeItem< String> cycled = direction
       ? node.nextSibling()
       : node.previousSibling();
     // When cycling at the end (or beginning) of the list, jump to the first
     // (or last) sibling depending on the cycle direction.
     if( cycled == null ) {
       cycled = direction ? getFirstSibling( node ) : getLastSibling( node );
+    }
     final String path = getCurrentPath();
     final String cycledWord = cycled.getValue();
     final String word = getLastPathWord();
     final int index = path.indexOf( word );
     final String cycledPath = path.substring( 0, index ) + cycledWord;
     expand( cycled );
     replacePath( path, cycledPath );
+  }
   /**
    * Cycles to the next sibling of the currently selected tree node.
    */
   private void cyclePathNext() {
     cycleSelection( true );
+  }
   /**
    * Cycles to the previous sibling of the currently selected tree node.
    */
   private void cyclePathPrev() {
     cycleSelection( false );
+  }
   /**
    * Returns the variable name (or as much as has been typed so far). Returns
    * all the characters from the initial caret column to the the first
    * whitespace character. This will return a path that contains zero or more
    * separators.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCurrentPath() {
     final String s = extractTextChunk();
     final int length = s.length();
     int i = 0;
     while( i < length && !isWhitespace( s.charAt( i ) ) ) {
       i++;
+    }
     return s.substring( 0, i );
+  }
   private <T> ObservableList<TreeItem<T>> getSiblings(
     final TreeItem<T> item ) {
     final TreeItem<T> parent = item.getParent();
     return parent == null ? item.getChildren() : parent.getChildren();
+  }
   private <T> TreeItem<T> getFirstSibling( final TreeItem<T> item ) {
     return getFirst( getSiblings( item ), item );
+  }
   private <T> TreeItem<T> getLastSibling( final TreeItem<T> item ) {
     return getLast( getSiblings( item ), item );
+  }
   /**
    * Returns the caret position as an offset into the text.
+   *
    * @return A value from 0 to the length of the text (minus one).
    */
   private int getCurrentCaretPosition() {
     return getEditor().getCaretPosition();
+  }
   /**
    * Returns the caret position within the current paragraph.
+   *
    * @return A value from 0 to the length of the current paragraph.
    */
   private int getCurrentCaretColumn() {
     return getEditor().getCaretColumn();
+  }
   /**
    * Returns the last word from the path.
+   *
    * @return The last token.
    */
   private String getLastPathWord() {
     String path = getCurrentPath();
     int i = path.indexOf( SEPARATOR_CHAR );
     while( i > 0 ) {
       path = path.substring( i + 1 );
       i = path.indexOf( SEPARATOR_CHAR );
+    }
     return path;
+  }
   /**
    * Returns text from the initial caret position until some arbitrarily long
    * number of characters. The number of characters extracted will be
    * getMaxVarLength, or fewer, depending on how many characters remain to be
    * extracted. The result from this method is trimmed to the first whitespace
    * character.
+   *
    * @return A chunk of text that includes all the words representing a path,
    * and then some.
    */
   private String extractTextChunk() {
     final StyledTextArea textArea = getEditor();
     final int textBegan = getInitialCaretPosition();
     final int remaining = textArea.getLength() - textBegan;
     final int textEnded = min( remaining, getMaxVarLength() );
     try {
       return textArea.getText( textBegan, textEnded );
     } catch( final Exception e ) {
       return textArea.getText();
+    }
+  }
   /**
    * Returns the node for the current path.
    */
   private TreeItem<String> getCurrentNode() {
     return findNode( getCurrentPath() );
+  }
   /**
    * Finds the node that most closely matches the given path.
+   *
    * @param path The path that represents a node.
+   *
    * @return The node for the path, or the root node if the path could not be
    * found, but never null.
    */
   private TreeItem<String> findNode( final String path ) {
     return getDefinitionPane().findNode( path );
+  }
   /**
    * Finds the first leaf having a value that starts with the given text.
+   *
    * @param text The text to find in the definition tree.
+   *
    * @return The leaf that starts with the given text, or null if not found.
    */
   private VariableTreeItem<String> findLeaf( final String text ) {
     return getDefinitionPane().findLeaf( text, false );
+  }
   /**
    * Finds the first leaf having a value that starts with the given text, or
    * contains the text if contains is true.
+   *
    * @param text The text to find in the definition tree.
    * @param contains Set true to perform a substring match after a starts with
    * match.
+   *
    * @return The leaf that starts with the given text, or null if not found.
    */
   private VariableTreeItem<String> findLeaf(
     final String text,
     final boolean contains ) {
     return getDefinitionPane().findLeaf( text, contains );
+  }
   /**
    * Used to ignore typed keys in favour of trapping pressed keys.
+   *
    * @param e The key that was typed.
    */
   private void vModeKeyTyped( KeyEvent e ) {
     e.consume();
+  }
   /**
    * Used to lazily initialize the keyboard map.
+   *
    * @return Mappings for keyTyped and keyPressed.
    */
   protected InputMap<InputEvent> createKeyboardMap() {
     return sequence(
       consume( keyTyped(), this::vModeKeyTyped ),
       consume( keyPressed(), this::vModeKeyPressed )
     );
+  }
   private InputMap<InputEvent> getKeyboardMap() {
     if( this.keyboardMap == null ) {
       this.keyboardMap = createKeyboardMap();
+    }
     return this.keyboardMap;
+  }
   /**
    * Collapses the tree then expands and selects the given node.
+   *
    * @param node The node to expand.
    */
   private void expand( final TreeItem<String> node ) {
     final DefinitionPane pane = getDefinitionPane();
     pane.collapse();
     pane.expand( node );
     pane.select( node );
+  }
   /**
    * Returns true iff the key code the user typed can be used as part of a YAML
    * variable name.
+   *
    * @param keyEvent Keyboard key press event information.
+   *
    * @return true The key is a value that can be inserted into the text.
    */
   private boolean isVariableNameKey( final KeyEvent keyEvent ) {
     final KeyCode kc = keyEvent.getCode();
     return (kc.isLetterKey()
       || kc.isDigitKey()
       || (keyEvent.isShiftDown() && kc == MINUS))
       && !keyEvent.isControlDown();
+  }
   /**
    * Starts to capture user input events.
    */
   private void vModeStart() {
     addEventListener( getKeyboardMap() );
+  }
   /**
    * Restores capturing of user input events to the previous event listener.
    * Also asks the processing chain to modify the variable text into a
    * machine-readable variable based on the format required by the file type.
    * For example, a Markdown file (.md) will substitute a $VAR$ name while an R
    * file (.Rmd, .Rxml) will use `r#xVAR`.
    */
   private void vModeStop() {
     removeEventListener( getKeyboardMap() );
+  }
   /**
    * Returns a variable decorator that corresponds to the given file type.
+   *
    * @return
    */
   private VariableDecorator getVariableDecorator() {
     return VariableNameDecoratorFactory.newInstance( getFilename() );
+  }
   private Path getFilename() {
     return getFileEditorTab().getPath();
+  }
   /**
    * Returns the index where the two strings diverge.
+   *
    * @param s1 The string that could be a substring of s2, null allowed.
    * @param s2 The string that could be a substring of s1, null allowed.
+   *
    * @return NO_DIFFERENCE if the strings are the same, otherwise the index
    * where they differ.
    */
   @SuppressWarnings( "StringEquality" )
   private int difference( final CharSequence s1, final CharSequence s2 ) {
     if( s1 == s2 ) {
       return NO_DIFFERENCE;
+    }
     if( s1 == null || s2 == null ) {
       return 0;
+    }
     int i = 0;
     final int limit = min( s1.length(), s2.length() );
     while( i < limit && s1.charAt( i ) == s2.charAt( i ) ) {
       i++;
+    }
     // If one string was shorter than the other, that's where they differ.
     return i;
+  }
   private EditorPane getEditorPane() {
     return getFileEditorTab().getEditorPane();
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
    */
   private <T extends Event, U extends T> void addEventListener(
     final EventPattern<? super T, ? extends U> event,
     final Consumer<? super U> consumer ) {
     getEditorPane().addEventListener( event, consumer );
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
+   *
    * @param map The map of methods to events.
    */
   private void addEventListener( final InputMap<InputEvent> map ) {
     getEditorPane().addEventListener( map );
+  }
   private void removeEventListener( final InputMap<InputEvent> map ) {
     getEditorPane().removeEventListener( map );
+  }
   /**
    * Returns the position of the caret when variable mode editing was requested.
+   *
    * @return The variable mode caret position.
    */
   private int getInitialCaretPosition() {
     return this.initialCaretPosition;
+  }
   /**
    * Sets the position of the caret when variable mode editing was requested.
    * Stores the current position because only the text that comes afterwards is
    * a suitable variable reference.
+   *
    * @return The variable mode caret position.
    */
   private void setInitialCaretPosition() {
     this.initialCaretPosition = getEditor().getCaretPosition();
+  }
   private StyledTextArea getEditor() {
     return getFileEditorTab().getEditorPane().getEditor();
+  }
   public FileEditorTab getFileEditorTab() {
     return this.tab;
+  }
   private void setFileEditorTab( final FileEditorTab editorTab ) {
     this.tab = editorTab;
+  }
   private DefinitionPane getDefinitionPane() {
     return this.definitionPane;
+  }
   private void setDefinitionPane( final DefinitionPane definitionPane ) {
     this.definitionPane = definitionPane;
+  }
   private IndexRange getSelectionRange() {
     return getEditor().getSelection();
+  }
   /**
    * Don't look ahead too far when trying to find the end of a node.
+   *
    * @return 512 by default.
    */
   private int getMaxVarLength() {
     return getSettings().getSetting(
       "editor.variable.maxLength", DEFAULT_MAX_VAR_LENGTH );
+  }
   private Settings getSettings() {
     return this.settings;
 import static java.lang.Character.isWhitespace;
 import static java.lang.Math.min;
 import java.nio.file.Path;
 import java.util.function.Consumer;
 import javafx.collections.ObservableList;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.scene.control.IndexRange;
 import javafx.scene.control.TreeItem;
 import javafx.scene.control.TreeView;
 import javafx.scene.input.InputEvent;
 import javafx.scene.input.KeyCode;
 import static javafx.scene.input.KeyCode.AT;
 import static javafx.scene.input.KeyCode.DIGIT2;
 import static javafx.scene.input.KeyCode.ENTER;
 import static javafx.scene.input.KeyCode.MINUS;
 import static javafx.scene.input.KeyCode.SPACE;
 import static javafx.scene.input.KeyCombination.CONTROL_DOWN;
 import static javafx.scene.input.KeyCombination.SHIFT_DOWN;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseEvent;
 import org.fxmisc.richtext.StyledTextArea;
 import org.fxmisc.wellbehaved.event.EventPattern;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyPressed;
 import static org.fxmisc.wellbehaved.event.EventPattern.keyTyped;
 import org.fxmisc.wellbehaved.event.InputMap;
 import static org.fxmisc.wellbehaved.event.InputMap.consume;
 import static org.fxmisc.wellbehaved.event.InputMap.sequence;
 /**
  * Provides the logic for injecting variable names within the editor.
+ *
  * @author White Magic Software, Ltd.
  */
 public final class VariableNameInjector {
   public static final int DEFAULT_MAX_VAR_LENGTH = 64;
   private static final int NO_DIFFERENCE = -1;
   /**
    * TODO: Move this into settings.
    */
   private static final String PUNCTUATION = "\"#$%&'()*+,-/:;<=>?@[]^_`{|}~";
   private final Settings settings = Services.load( Settings.class );
   /**
    * Used to capture keyboard events once the user presses @.
    */
   private InputMap<InputEvent> keyboardMap;
   /**
    * Position of the variable in the text when in variable mode (0 by default).
    */
   private int initialCaretPosition;
   /**
    * Recipient of name injections.
    */
   private FileEditorTab tab;
   /**
    * Initiates double-click events.
    */
   private DefinitionPane definitionPane;
   private EventHandler<MouseEvent> panelEventHandler;
   /**
    * Initializes the variable name injector against the given pane.
+   *
    * @param tab The tab to inject variable names into.
    * @param pane The definition panel to listen to for double-click events.
    */
   public VariableNameInjector(
     final FileEditorTab tab, final DefinitionPane pane ) {
     setFileEditorTab( tab );
     setDefinitionPane( pane );
     initBranchSelectedListener();
     initKeyboardEventListeners();
+  }
   /**
    * Traps double-click events on the definition pane.
    */
   private void initBranchSelectedListener() {
     final EventHandler<MouseEvent> eventHandler = getPanelEventHandler();
     getDefinitionPane().addBranchSelectedListener( eventHandler );
+  }
   /**
    * Traps keys for performing various short-cut tasks, such as @-mode variable
    * insertion and control+space for variable autocomplete.
+   *
    * @ key is pressed, a new keyboard map is inserted in place of the current
    * map -- this class goes into "variable edit mode" (a.k.a. vMode).
+   *
    * @see createKeyboardMap()
    */
   private void initKeyboardEventListeners() {
     // Control and space are pressed.
     addEventListener( keyPressed( SPACE, CONTROL_DOWN ), this::autocomplete );
     // @ key in Linux?
     addEventListener( keyPressed( DIGIT2, SHIFT_DOWN ), this::vMode );
     // @ key in Windows.
     addEventListener( keyPressed( AT ), this::vMode );
+  }
   /**
    * The @ symbol is a short-cut to inserting a YAML variable reference.
+   *
    * @param e Superfluous information about the key that was pressed.
    */
   private void vMode( KeyEvent e ) {
     setInitialCaretPosition();
     vModeStart();
     vModeAutocomplete();
+  }
   /**
    * Receives key presses until the user completes the variable selection. This
    * allows the arrow keys to be used for selecting variables.
+   *
    * @param e The key that was pressed.
    */
   private void vModeKeyPressed( KeyEvent e ) {
     final KeyCode keyCode = e.getCode();
     switch( keyCode ) {
       case BACK_SPACE:
         // Don't decorate the variable upon exiting vMode.
         vModeBackspace();
         break;
       case ESCAPE:
         // Don't decorate the variable upon exiting vMode.
         vModeStop();
         break;
       case ENTER:
       case PERIOD:
       case RIGHT:
       case END:
         // Stop at a leaf node, ENTER means accept.
         if( vModeConditionalComplete() && keyCode == ENTER ) {
           vModeStop();
           // Decorate the variable upon exiting vMode.
           decorate();
+        }
         break;
       case UP:
         cyclePathPrev();
         break;
       case DOWN:
         cyclePathNext();
         break;
       default:
         vModeFilterKeyPressed( e );
         break;
+    }
     e.consume();
+  }
   private void vModeBackspace() {
     deleteSelection();
     // Break out of variable mode by back spacing to the original position.
     if( getCurrentCaretPosition() > getInitialCaretPosition() ) {
       vModeAutocomplete();
+    }
     else {
       vModeStop();
+    }
+  }
   /**
    * Updates the text with the path selected (or typed) by the user.
    */
   private void vModeAutocomplete() {
     final TreeItem<String> node = getCurrentNode();
     if( node != null && !node.isLeaf() ) {
       final String word = getLastPathWord();
       final String label = node.getValue();
       final int delta = difference( label, word );
       final String remainder = delta == NO_DIFFERENCE
         ? label
         : label.substring( delta );
       final StyledTextArea textArea = getEditor();
       final int posBegan = getCurrentCaretPosition();
       final int posEnded = posBegan + remainder.length();
       textArea.replaceSelection( remainder );
       if( posEnded - posBegan > 0 ) {
         textArea.selectRange( posEnded, posBegan );
+      }
       expand( node );
+    }
+  }
   /**
    * Only variable name keys can pass through the filter. This is called when
    * the user presses a key.
+   *
    * @param e The key that was pressed.
    */
   private void vModeFilterKeyPressed( final KeyEvent e ) {
     if( isVariableNameKey( e ) ) {
       typed( e.getText() );
+    }
+  }
   /**
    * Performs an autocomplete depending on whether the user has finished typing
    * in a word. If there is a selected range, then this will complete the most
    * recent word and jump to the next child.
+   *
    * @return true The auto-completed node was a terminal node.
    */
   private boolean vModeConditionalComplete() {
     acceptPath();
     final TreeItem<String> node = getCurrentNode();
     final boolean terminal = isTerminal( node );
     if( !terminal ) {
       typed( SEPARATOR );
+    }
     return terminal;
+  }
   /**
    * Pressing control+space will find a node that matches the current word and
    * substitute the YAML variable reference. This is called when the user is not
    * editing in vMode.
+   *
    * @param e Ignored -- it can only be Ctrl+Space.
    */
   private void autocomplete( final KeyEvent e ) {
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundaries( paragraph );
     final String word = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     VariableTreeItem<String> leaf = findLeaf( word );
     if( leaf == null ) {
       // If a leaf doesn't match using "starts with", then try using "contains".
       leaf = findLeaf( word, true );
+    }
     if( leaf != null ) {
       replaceText( boundaries[ 0 ], boundaries[ 1 ], leaf.toPath() );
       decorate();
       expand( leaf );
+    }
+  }
   /**
    * Called when autocomplete finishes on a valid leaf or when the user presses
    * Enter to finish manual autocomplete.
    */
   private void decorate() {
     // A little bit of duplication...
     final String paragraph = getCaretParagraph();
     final int[] boundaries = getWordBoundaries( paragraph );
     final String old = paragraph.substring( boundaries[ 0 ], boundaries[ 1 ] );
     final String newVariable = decorate( old );
     final int posEnded = getCurrentCaretPosition();
     final int posBegan = posEnded - old.length();
     getEditor().replaceText( posBegan, posEnded, newVariable );
+  }
   /**
    * Called when user double-clicks on a tree view item.
+   *
    * @param variable The variable to decorate.
    */
   private String decorate( final String variable ) {
     return getVariableDecorator().decorate( variable );
+  }
   /**
    * Inserts the given string at the current caret position, or replaces
    * selected text (if any).
+   *
    * @param s The string to inject.
    */
   private void replaceSelection( final String s ) {
     getEditor().replaceSelection( s );
+  }
   /**
    * Updates the text at the given position within the current paragraph.
+   *
    * @param posBegan The starting index in the paragraph text to replace.
    * @param posEnded The ending index in the paragraph text to replace.
    * @param text Overwrite the paragraph substring with this text.
    */
   private void replaceText(
     final int posBegan, final int posEnded, final String text ) {
     final int p = getCurrentParagraph();
     getEditor().replaceText( p, posBegan, p, posEnded, text );
+  }
   /**
    * Returns the caret's current paragraph position.
+   *
    * @return A number greater than or equal to 0.
    */
   private int getCurrentParagraph() {
     return getEditor().getCurrentParagraph();
+  }
   /**
    * Returns current word boundary indexes into the current paragraph, excluding
    * punctuation.
+   *
    * @param p The paragraph wherein to hunt word boundaries.
    * @param offset The offset into the paragraph to begin scanning left and
    * right.
+   *
    * @return The starting and ending index of the word closest to the caret.
    */
   private int[] getWordBoundaries( final String p, final int offset ) {
     // Remove dashes, but retain hyphens. Retain same number of characters
     // to preserve relative indexes.
     final String paragraph = p.replace( "---", "   " ).replace( "--", "  " );
     return getWordAt( paragraph, offset );
+  }
   /**
    * Helper method to get the word boundaries for the current paragraph.
+   *
    * @param paragraph
+   *
    * @return
    */
   private int[] getWordBoundaries( final String paragraph ) {
     return getWordBoundaries( paragraph, getCurrentCaretColumn() );
+  }
   /**
    * Given an arbitrary offset into a string, this returns the word at that
    * index. The inputs and outputs include:
+   *
    * <ul>
    * <li>surrounded by space: <code>hello | world!</code> ("");</li>
    * <li>end of word: <code>hello| world!</code> ("hello");</li>
    * <li>start of a word: <code>hello |world!</code> ("world");</li>
    * <li>within a word: <code>hello wo|rld!</code> ("world");</li>
    * <li>end of a paragraph: <code>hello world!|</code> ("world");</li>
    * <li>start of a paragraph: <code>|hello world!</code> ("hello"); or</li>
    * <li>after punctuation: <code>hello world!|</code> ("world").</li>
    * </ul>
+   *
    * @param p The string to scan for a word.
    * @param offset The offset within s to begin searching for the nearest word
    * boundary, must not be out of bounds of s.
+   *
    * @return The word in s at the offset.
+   *
    * @see getWordBegan( String, int )
    * @see getWordEnded( String, int )
    */
   private int[] getWordAt( final String p, final int offset ) {
     return new int[]{ getWordBegan( p, offset ), getWordEnded( p, offset ) };
+  }
   /**
    * Returns the index into s where a word begins.
+   *
    * @param s Never null.
    * @param offset Index into s to begin searching backwards for a word
    * boundary.
+   *
    * @return The index where a word begins.
    */
   private int getWordBegan( final String s, int offset ) {
     while( offset > 0 && isBoundary( s.charAt( offset - 1 ) ) ) {
       offset--;
+    }
     return offset;
+  }
   /**
    * Returns the index into s where a word ends.
+   *
    * @param s Never null.
    * @param offset Index into s to begin searching forwards for a word boundary.
+   *
    * @return The index where a word ends.
    */
   private int getWordEnded( final String s, int offset ) {
     final int length = s.length();
     while( offset < length && isBoundary( s.charAt( offset ) ) ) {
       offset++;
+    }
     return offset;
+  }
   /**
    * Returns true if the given character can be reasonably expected to be part
    * of a word, including punctuation marks.
+   *
    * @param c The character to compare.
+   *
    * @return false The character is a space character.
    */
   private boolean isBoundary( final char c ) {
     return !isWhitespace( c ) && !isPunctuation( c );
+  }
   /**
    * Returns true if the given character is part of the set of Latin (English)
    * punctuation marks.
+   *
    * @param c
+   *
    * @return
    */
   private static boolean isPunctuation( final char c ) {
     return PUNCTUATION.indexOf( c ) != -1;
+  }
   /**
    * Returns the text for the paragraph that contains the caret.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCaretParagraph() {
     return getEditor().getText( getCurrentParagraph() );
+  }
   /**
    * Returns true if the node has children that can be selected (i.e., any
    * non-leaves).
+   *
    * @param <T> The type that the TreeItem contains.
    * @param node The node to test for terminality.
+   *
    * @return true The node has one branch and its a leaf.
    */
   private <T> boolean isTerminal( final TreeItem<T> node ) {
     final ObservableList<TreeItem<T>> branches = node.getChildren();
     return branches.size() == 1 && branches.get( 0 ).isLeaf();
+  }
   /**
    * Inserts text that the user typed at the current caret position, then
    * performs an autocomplete for the variable name.
+   *
    * @param text The text to insert, never null.
    */
   private void typed( final String text ) {
     getEditor().replaceSelection( text );
     vModeAutocomplete();
+  }
   /**
    * Called when the user presses either End or Enter key.
    */
   private void acceptPath() {
     final IndexRange range = getSelectionRange();
     if( range != null ) {
       final int rangeEnd = range.getEnd();
       final StyledTextArea textArea = getEditor();
       textArea.deselect();
       textArea.moveTo( rangeEnd );
+    }
+  }
   /**
    * Replaces the entirety of the existing path (from the initial caret
    * position) with the given path.
+   *
    * @param oldPath The path to replace.
    * @param newPath The replacement path.
    */
   private void replacePath( final String oldPath, final String newPath ) {
     final StyledTextArea textArea = getEditor();
     final int posBegan = getInitialCaretPosition();
     final int posEnded = posBegan + oldPath.length();
     textArea.deselect();
     textArea.replaceText( posBegan, posEnded, newPath );
+  }
   /**
    * Called when the user presses the Backspace key.
    */
   private void deleteSelection() {
     final StyledTextArea textArea = getEditor();
     textArea.replaceSelection( "" );
     textArea.deletePreviousChar();
+  }
   /**
    * Cycles the selected text through the nodes.
+   *
    * @param direction true - next; false - previous
    */
   private void cycleSelection( final boolean direction ) {
     final TreeItem<String> node = getCurrentNode();
     // Find the sibling for the current selection and replace the current
     // selection with the sibling's value
     TreeItem< String> cycled = direction
       ? node.nextSibling()
       : node.previousSibling();
     // When cycling at the end (or beginning) of the list, jump to the first
     // (or last) sibling depending on the cycle direction.
     if( cycled == null ) {
       cycled = direction ? getFirstSibling( node ) : getLastSibling( node );
+    }
     final String path = getCurrentPath();
     final String cycledWord = cycled.getValue();
     final String word = getLastPathWord();
     final int index = path.indexOf( word );
     final String cycledPath = path.substring( 0, index ) + cycledWord;
     expand( cycled );
     replacePath( path, cycledPath );
+  }
   /**
    * Cycles to the next sibling of the currently selected tree node.
    */
   private void cyclePathNext() {
     cycleSelection( true );
+  }
   /**
    * Cycles to the previous sibling of the currently selected tree node.
    */
   private void cyclePathPrev() {
     cycleSelection( false );
+  }
   /**
    * Returns the variable name (or as much as has been typed so far). Returns
    * all the characters from the initial caret column to the the first
    * whitespace character. This will return a path that contains zero or more
    * separators.
+   *
    * @return A non-null string, possibly empty.
    */
   private String getCurrentPath() {
     final String s = extractTextChunk();
     final int length = s.length();
     int i = 0;
     while( i < length && !isWhitespace( s.charAt( i ) ) ) {
       i++;
+    }
     return s.substring( 0, i );
+  }
   private <T> ObservableList<TreeItem<T>> getSiblings(
     final TreeItem<T> item ) {
     final TreeItem<T> parent = item.getParent();
     return parent == null ? item.getChildren() : parent.getChildren();
+  }
   private <T> TreeItem<T> getFirstSibling( final TreeItem<T> item ) {
     return getFirst( getSiblings( item ), item );
+  }
   private <T> TreeItem<T> getLastSibling( final TreeItem<T> item ) {
     return getLast( getSiblings( item ), item );
+  }
   /**
    * Returns the caret position as an offset into the text.
+   *
    * @return A value from 0 to the length of the text (minus one).
    */
   private int getCurrentCaretPosition() {
     return getEditor().getCaretPosition();
+  }
   /**
    * Returns the caret position within the current paragraph.
+   *
    * @return A value from 0 to the length of the current paragraph.
    */
   private int getCurrentCaretColumn() {
     return getEditor().getCaretColumn();
+  }
   /**
    * Returns the last word from the path.
+   *
    * @return The last token.
    */
   private String getLastPathWord() {
     String path = getCurrentPath();
     int i = path.indexOf( SEPARATOR_CHAR );
     while( i > 0 ) {
       path = path.substring( i + 1 );
       i = path.indexOf( SEPARATOR_CHAR );
+    }
     return path;
+  }
   /**
    * Returns text from the initial caret position until some arbitrarily long
    * number of characters. The number of characters extracted will be
    * getMaxVarLength, or fewer, depending on how many characters remain to be
    * extracted. The result from this method is trimmed to the first whitespace
    * character.
+   *
    * @return A chunk of text that includes all the words representing a path,
    * and then some.
    */
   private String extractTextChunk() {
     final StyledTextArea textArea = getEditor();
     final int textBegan = getInitialCaretPosition();
     final int remaining = textArea.getLength() - textBegan;
     final int textEnded = min( remaining, getMaxVarLength() );
     try {
       return textArea.getText( textBegan, textEnded );
+    }
     catch( final Exception e ) {
       return textArea.getText();
+    }
+  }
   /**
    * Returns the node for the current path.
    */
   private TreeItem<String> getCurrentNode() {
     return findNode( getCurrentPath() );
+  }
   /**
    * Finds the node that most closely matches the given path.
+   *
    * @param path The path that represents a node.
+   *
    * @return The node for the path, or the root node if the path could not be
    * found, but never null.
    */
   private TreeItem<String> findNode( final String path ) {
     return getDefinitionPane().findNode( path );
+  }
   /**
    * Finds the first leaf having a value that starts with the given text.
+   *
    * @param text The text to find in the definition tree.
+   *
    * @return The leaf that starts with the given text, or null if not found.
    */
   private VariableTreeItem<String> findLeaf( final String text ) {
     return getDefinitionPane().findLeaf( text, false );
+  }
   /**
    * Finds the first leaf having a value that starts with the given text, or
    * contains the text if contains is true.
+   *
    * @param text The text to find in the definition tree.
    * @param contains Set true to perform a substring match after a starts with
    * match.
+   *
    * @return The leaf that starts with the given text, or null if not found.
    */
   private VariableTreeItem<String> findLeaf(
     final String text,
     final boolean contains ) {
     return getDefinitionPane().findLeaf( text, contains );
+  }
   /**
    * Used to ignore typed keys in favour of trapping pressed keys.
+   *
    * @param e The key that was typed.
    */
   private void vModeKeyTyped( KeyEvent e ) {
     e.consume();
+  }
   /**
    * Used to lazily initialize the keyboard map.
+   *
    * @return Mappings for keyTyped and keyPressed.
    */
   protected InputMap<InputEvent> createKeyboardMap() {
     return sequence(
       consume( keyTyped(), this::vModeKeyTyped ),
       consume( keyPressed(), this::vModeKeyPressed )
     );
+  }
   private InputMap<InputEvent> getKeyboardMap() {
     if( this.keyboardMap == null ) {
       this.keyboardMap = createKeyboardMap();
+    }
     return this.keyboardMap;
+  }
   /**
    * Collapses the tree then expands and selects the given node.
+   *
    * @param node The node to expand.
    */
   private void expand( final TreeItem<String> node ) {
     final DefinitionPane pane = getDefinitionPane();
     pane.collapse();
     pane.expand( node );
     pane.select( node );
+  }
   /**
    * Returns true iff the key code the user typed can be used as part of a YAML
    * variable name.
+   *
    * @param keyEvent Keyboard key press event information.
+   *
    * @return true The key is a value that can be inserted into the text.
    */
   private boolean isVariableNameKey( final KeyEvent keyEvent ) {
     final KeyCode kc = keyEvent.getCode();
     return (kc.isLetterKey()
       || kc.isDigitKey()
       || (keyEvent.isShiftDown() && kc == MINUS))
       && !keyEvent.isControlDown();
+  }
   /**
    * Starts to capture user input events.
    */
   private void vModeStart() {
     addEventListener( getKeyboardMap() );
+  }
   /**
    * Restores capturing of user input events to the previous event listener.
    * Also asks the processing chain to modify the variable text into a
    * machine-readable variable based on the format required by the file type.
    * For example, a Markdown file (.md) will substitute a $VAR$ name while an R
    * file (.Rmd, .Rxml) will use `r#xVAR`.
    */
   private void vModeStop() {
     removeEventListener( getKeyboardMap() );
+  }
   /**
    * Returns a variable decorator that corresponds to the given file type.
+   *
    * @return
    */
   private VariableDecorator getVariableDecorator() {
     return VariableNameDecoratorFactory.newInstance( getFilename() );
+  }
   private Path getFilename() {
     return getFileEditorTab().getPath();
+  }
   /**
    * Returns the index where the two strings diverge.
+   *
    * @param s1 The string that could be a substring of s2, null allowed.
    * @param s2 The string that could be a substring of s1, null allowed.
+   *
    * @return NO_DIFFERENCE if the strings are the same, otherwise the index
    * where they differ.
    */
   @SuppressWarnings( "StringEquality" )
   private int difference( final CharSequence s1, final CharSequence s2 ) {
     if( s1 == s2 ) {
       return NO_DIFFERENCE;
+    }
     if( s1 == null || s2 == null ) {
       return 0;
+    }
     int i = 0;
     final int limit = min( s1.length(), s2.length() );
     while( i < limit && s1.charAt( i ) == s2.charAt( i ) ) {
       i++;
+    }
     // If one string was shorter than the other, that's where they differ.
     return i;
+  }
   private EditorPane getEditorPane() {
     return getFileEditorTab().getEditorPane();
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
    */
   private <T extends Event, U extends T> void addEventListener(
     final EventPattern<? super T, ? extends U> event,
     final Consumer<? super U> consumer ) {
     getEditorPane().addEventListener( event, consumer );
+  }
   /**
    * Delegates to the file editor pane, and, ultimately, to its text area.
+   *
    * @param map The map of methods to events.
    */
   private void addEventListener( final InputMap<InputEvent> map ) {
     getEditorPane().addEventListener( map );
+  }
   private void removeEventListener( final InputMap<InputEvent> map ) {
     getEditorPane().removeEventListener( map );
+  }
   /**
    * Returns the position of the caret when variable mode editing was requested.
+   *
    * @return The variable mode caret position.
    */
   private int getInitialCaretPosition() {
     return this.initialCaretPosition;
+  }
   /**
    * Sets the position of the caret when variable mode editing was requested.
    * Stores the current position because only the text that comes afterwards is
    * a suitable variable reference.
+   *
    * @return The variable mode caret position.
    */
   private void setInitialCaretPosition() {
     this.initialCaretPosition = getEditor().getCaretPosition();
+  }
   private StyledTextArea getEditor() {
     return getEditorPane().getEditor();
+  }
   public FileEditorTab getFileEditorTab() {
     return this.tab;
+  }
   public void setFileEditorTab( final FileEditorTab editorTab ) {
     this.tab = editorTab;
+  }
   private DefinitionPane getDefinitionPane() {
     return this.definitionPane;
+  }
   private void setDefinitionPane( final DefinitionPane definitionPane ) {
     this.definitionPane = definitionPane;
+  }
   private IndexRange getSelectionRange() {
     return getEditor().getSelection();
+  }
   /**
    * Don't look ahead too far when trying to find the end of a node.
+   *
    * @return 512 by default.
    */
   private int getMaxVarLength() {
     return getSettings().getSetting(
       "editor.variable.maxLength", DEFAULT_MAX_VAR_LENGTH );
+  }
   private Settings getSettings() {
     return this.settings;
+  }
   private void setPanelEventHandler( final EventHandler<MouseEvent> eventHandler ) {
     this.panelEventHandler = eventHandler;
+  }
   private synchronized EventHandler<MouseEvent> getPanelEventHandler() {
     if( this.panelEventHandler == null ) {
       this.panelEventHandler = createPanelEventHandler();
+    }
     return this.panelEventHandler;
+  }
   private EventHandler<MouseEvent> createPanelEventHandler() {
     return new PanelEventHandler();
+  }
   /**
    * Responsible for handling double-click events on the definition pane.
    */
   private class PanelEventHandler implements EventHandler<MouseEvent> {
     public PanelEventHandler() {
+    }
     @Override
     public void handle( final MouseEvent event ) {
       final Object source = event.getSource();
       if( source instanceof TreeView ) {
         final TreeView tree = (TreeView)source;
         final TreeItem item = (TreeItem)tree.getSelectionModel().getSelectedItem();
         if( item instanceof VariableTreeItem ) {
           final VariableTreeItem var = (VariableTreeItem)item;
           final String text = decorate( var.toPath() );
           replaceSelection( text );
+        }
+      }
+    }
+  }
+}

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

    execute( getScrollScript() );
  }

  
  /**
   * Returns the JavaScript used to scroll the WebView pane.

M src/main/java/com/scrivenvar/processors/text/AhoCorasickReplacer.java

     // The TrieBuilder should only match whole words and ignore overlaps (there
     // shouldn't be any).
     final TrieBuilder builder = builder().onlyWholeWords().removeOverlaps();
     final TrieBuilder builder = builder().onlyWholeWords().ignoreOverlaps();
     for( final String key : keys( map ) ) {

122	122	execute( getScrollScript() );
123	123	}
124
	124
125	125	/**
126	126	* Returns the JavaScript used to scroll the WebView pane.