Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Synchronize preview scroll for R Markdown
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-10-17 15:46:21 GMT-0700 |
| Commit | 812f940183d1246e9dadd98f9cd8e36093025b58 |
| Parent | 503c2f2 |
| Delta | 18 lines added, 19 lines removed, 1-line decrease |
src/main/resources/com/keenwrite/messages.properties
| Main.status.error.parse={0} (near ${Main.status.text.offset} {1}) | ||
| -Main.status.error.def.blank=Move the caret to a word before inserting a definition. | ||
| -Main.status.error.def.empty=Create a definition before inserting a definition. | ||
| -Main.status.error.def.missing=No definition value found for ''{0}''. | ||
| +Main.status.error.def.blank=Move the caret to a word before inserting a definition | ||
| +Main.status.error.def.empty=Create a definition before inserting a definition | ||
| +Main.status.error.def.missing=No definition value found for ''{0}'' | ||
| Main.status.error.r=Error with [{0}...]: {1} | ||
| Main.status.error.file.missing=Not found: {0} | ||
| + | ||
| +Main.status.error.messages.recursion=Lookup depth exceeded, check for loops in ''{0}'' | ||
| +Main.status.error.messages.syntax=Missing ''}'' in ''{0}'' | ||
| # ######################################################################## |
src/main/java/com/keenwrite/processors/ProcessorFactory.java
| case RXML -> createRXMLProcessor( successor ); | ||
| case XML -> createXMLProcessor( successor ); | ||
| - default -> createPreformattedProcessor(); | ||
| + default -> createPreformattedProcessor( successor ); | ||
| }; | ||
| } | ||
 | ||
| */ | ||
| private Processor<String> createMarkdownProcessor( | ||
| - final Processor<String> successor ) { | ||
| - final var dpp = createDefinitionProcessor( successor ); | ||
| - return MarkdownProcessor.create( dpp, getProcessorContext() ); | ||
| - } | ||
| - | ||
| - private Processor<String> createPreformattedProcessor( | ||
| final Processor<String> successor ) { | ||
| - return new PreformattedProcessor( successor ); | ||
| - } | ||
| - | ||
| - private Processor<String> createPreformattedProcessor() { | ||
| - return createPreformattedProcessor( createHtmlPreviewProcessor() ); | ||
| + final var dp = createDefinitionProcessor( successor ); | ||
| + return MarkdownProcessor.create( dp, getProcessorContext() ); | ||
| } | ||
| private Processor<String> createDefinitionProcessor( | ||
| final Processor<String> successor ) { | ||
| return new DefinitionProcessor( successor, getResolvedMap() ); | ||
| } | ||
| private Processor<String> createRProcessor( | ||
| final Processor<String> successor ) { | ||
| - final var rp = new InlineRProcessor( successor, getResolvedMap() ); | ||
| - return new RVariableProcessor( rp, getResolvedMap() ); | ||
| + final var irp = new InlineRProcessor( successor, getResolvedMap() ); | ||
| + final var rvp = new RVariableProcessor( irp, getResolvedMap() ); | ||
| + return MarkdownProcessor.create( rvp, getProcessorContext() ); | ||
| } | ||
| protected Processor<String> createRXMLProcessor( | ||
| final Processor<String> successor ) { | ||
| final var xmlp = new XmlProcessor( successor, getPath() ); | ||
| - final var rp = new InlineRProcessor( xmlp, getResolvedMap() ); | ||
| - return new RVariableProcessor( rp, getResolvedMap() ); | ||
| + return createRProcessor( xmlp ); | ||
| } | ||
| private Processor<String> createXMLProcessor( | ||
| final Processor<String> successor ) { | ||
| final var xmlp = new XmlProcessor( successor, getPath() ); | ||
| return createDefinitionProcessor( xmlp ); | ||
| + } | ||
| + | ||
| + private Processor<String> createPreformattedProcessor( | ||
| + final Processor<String> successor ) { | ||
| + return new PreformattedProcessor( successor ); | ||
| } | ||