Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Upgrade Lucene, discount HTML entity in stats, continue CLI changes
| Author | DaveJarvis <email> |
|---|---|
| Date | 2021-12-12 15:06:56 GMT-0800 |
| Commit | fac56be087774f319fae38eecf06531f0b106181 |
| Parent | 83e3de2 |
| Delta | 32 lines added, 18 lines removed, 14-line increase |
src/main/java/com/keenwrite/processors/markdown/extensions/fences/FencedBlockExtension.java
| import com.keenwrite.processors.markdown.extensions.HtmlRendererAdapter; | ||
| import com.vladsch.flexmark.ast.FencedCodeBlock; | ||
| +import com.vladsch.flexmark.html.HtmlRendererOptions; | ||
| import com.vladsch.flexmark.html.HtmlWriter; | ||
| import com.vladsch.flexmark.html.renderer.DelegatingNodeRendererFactory; | ||
 | ||
| /** | ||
| * This method is a stop-gap because blank lines that contain only | ||
| - * whitespace are collapsed into lines without any spaces. Consequently | ||
| + * whitespace are collapsed into lines without any spaces. Consequently, | ||
| * the typesetting software does not honour the blank lines, which | ||
| - * then discards the blank lines entirely. | ||
| + * then would otherwise discard blank lines entirely. | ||
| * <p> | ||
| * Given the following: | ||
| ||
| final NodeRendererContext context, | ||
| final HtmlWriter html ) { | ||
| + assert node != null; | ||
| + assert context != null; | ||
| + assert html != null; | ||
| + | ||
| html.line(); | ||
| html.srcPosWithTrailingEOL( node.getChars() ) | ||
| .withAttr() | ||
| .tag( "pre" ) | ||
| .openPre(); | ||
| - final var info = node.getInfo(); | ||
| - final var htmlOptions = context.getHtmlOptions(); | ||
| + final var options = context.getHtmlOptions(); | ||
| + final var languageClass = lookupLanguageClass( node, options ); | ||
| - if( info.isNotNull() && !info.isBlank() ) { | ||
| - final var language = node | ||
| - .getInfoDelimitedByAny( htmlOptions.languageDelimiterSet ) | ||
| - .unescape(); | ||
| - final var languageClass = htmlOptions.languageClassMap | ||
| - .getOrDefault( language, htmlOptions.languageClassPrefix + language ); | ||
| + if( !languageClass.isBlank() ) { | ||
| html.attr( "class", languageClass ); | ||
| - } | ||
| - else { | ||
| - final var noLanguageClass = htmlOptions.noLanguageClass.trim(); | ||
| - | ||
| - if( !noLanguageClass.isEmpty() ) { | ||
| - html.attr( "class", noLanguageClass ); | ||
| - } | ||
| } | ||
| html.srcPosWithEOL( node.getContentChars() ) | ||
| .withAttr( CODE_CONTENT ) | ||
| .tag( "code" ); | ||
| final var lines = node.getContentLines(); | ||
| + | ||
| for( final var line : lines ) { | ||
| if( line.isBlank() ) { | ||
| ||
| html.tag( "/pre" ) | ||
| .closePre(); | ||
| - html.lineIf( htmlOptions.htmlBlockCloseTagEol ); | ||
| + html.lineIf( options.htmlBlockCloseTagEol ); | ||
| + } | ||
| + | ||
| + private String lookupLanguageClass( | ||
| + final FencedCodeBlock node, | ||
| + final HtmlRendererOptions options ) { | ||
| + assert node != null; | ||
| + assert options != null; | ||
| + | ||
| + final var info = node.getInfo(); | ||
| + | ||
| + if( info.isNotNull() && !info.isBlank() ) { | ||
| + final var lang = node | ||
| + .getInfoDelimitedByAny( options.languageDelimiterSet ) | ||
| + .unescape(); | ||
| + return options | ||
| + .languageClassMap | ||
| + .getOrDefault( lang, options.languageClassPrefix + lang ); | ||
| + } | ||
| + | ||
| + return options.noLanguageClass; | ||
| } | ||
| } | ||