Dave Jarvis' Repositories

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

Fixed documentation error with R examples. Fixed bug when trying to load non-existent definition file.

Authordjarvis <email>
Date2017-01-23 23:00:11 GMT-0800
Commit7e4a24c2e2127083aae38780b18fe830390b951b
Parent24bce8b
build.gradle
}
-version = '1.2.0'
+version = '1.2.1'
applicationName = 'scrivenvar'
mainClassName = 'com.scrivenvar.Main'
src/main/java/com/scrivenvar/MainWindow.java
private DefinitionSource createDefinitionSource( final String path ) {
- final DefinitionSource ds
- = createDefinitionFactory().createDefinitionSource( path );
+ DefinitionSource ds;
- if( ds instanceof FileDefinitionSource ) {
- try {
- getSnitch().listen( ((FileDefinitionSource)ds).getPath() );
- } catch( final IOException ex ) {
- error( ex );
+ 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 );
}
src/main/r/README.md
Definition file variables are have the ability to reference other definitions. Try the following:
- `r#x( v$editor$examples$math$x )`
- `r#x( v$editor$examples$math$y )`
- `r#x( v$editor$examples$math$z )`
+ x = `r#x( v$editor$examples$math$x )`;
+ y = `r#x( v$editor$examples$math$y )`;
+ z = `r#x( v$editor$examples$math$z )`
The preview pane shows:
Delta17 lines added, 11 lines removed, 6-line increase