Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Moved caret insertion. Replaced backslashes with forward slashes.
| Author | djarvis <email> |
|---|---|
| Date | 2016-12-29 11:25:12 GMT-0800 |
| Commit | 893fdab4a2924df8f5b4570489d424d061290baf |
| Parent | 4eac608 |
| Delta | 10 lines added, 8 lines removed, 2-line increase |
src/main/java/com/scrivenvar/processors/InlineRProcessor.java
| public void init( final Path workingDirectory ) { | ||
| + // In Windows, setwd doesn't work. | ||
| eval( replace( "" | ||
| + "assign( 'anchor', as.Date( '$date.anchor$', format='%Y-%m-%d' ), envir = .GlobalEnv );" | ||
| - + "setwd( '" + workingDirectory + "' );" | ||
| + + "setwd( '" + workingDirectory.toString().replace( '\\', '/' ) + "' );" | ||
| + "source( '../bin/pluralize.R' );" | ||
| + "source( '../bin/common.R' )", getDefinitions() ) ); | ||
 | ||
| prevIndex = currIndex + 1; | ||
| - } else { | ||
| + } | ||
| + else { | ||
| // TODO: Implement this. | ||
| // There was a starting prefix but no ending suffix. Ignore the | ||
src/main/java/com/scrivenvar/processors/ProcessorFactory.java
| final Processor<String> tpc = getCommonProcessor(); | ||
| final Processor<String> xmlp = new XMLProcessor( tpc, tab.getPath() ); | ||
| - final Processor<String> xcip = createXMLInsertionProcessor( xmlp, caret ); | ||
| - final Processor<String> dvp = new DefaultVariableProcessor( xcip, getResolvedMap() ); | ||
| + final Processor<String> dvp = new DefaultVariableProcessor( xmlp, getResolvedMap() ); | ||
| + final Processor<String> xcip = createXMLInsertionProcessor( dvp, caret ); | ||
| - return dvp; | ||
| + return xcip; | ||
| } | ||
| ||
| final Processor<String> tpc = getCommonProcessor(); | ||
| final Processor<String> xmlp = new XMLProcessor( tpc, tab.getPath() ); | ||
| - final Processor<String> xcip = createXMLInsertionProcessor( xmlp, caret ); | ||
| - final Processor<String> rp = new InlineRProcessor( xcip, getResolvedMap(), tab.getPath() ); | ||
| + final Processor<String> rp = new InlineRProcessor( xmlp, getResolvedMap(), tab.getPath() ); | ||
| final Processor<String> rvp = new RVariableProcessor( rp, getResolvedMap() ); | ||
| + final Processor<String> xcip = createXMLInsertionProcessor( rvp, caret ); | ||
| - return rvp; | ||
| + return xcip; | ||
| } | ||