Dave Jarvis' Repositories

Home Files Commits Tags Clone

Repository:

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

M .gitignore

 tex
 spell
 keenwrite.github.io

M build.gradle

   def v_junit = '5.9.0'
   def v_flexmark = '0.64.0'
   def v_jackson = '2.13.3'
   def v_batik = '1.14'
   def v_jackson = '2.13.4'
   def v_echosvg = '0.2.1'
   implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:${v_jackson}"
   implementation 'org.yaml:snakeyaml:1.30'
   // XML
   //implementation 'com.ximpleware:vtd-xml:2.13.4'
   // HTML parsing and rendering

M libs/keenquotes.jar

Binary file

M src/main/java/com/keenwrite/dom/DocumentParser.java

     "{http://xml.apache.org/xslt}indent-amount";
   private static final ByteArrayOutputStream sWriter =
     new ByteArrayOutputStream( 65536 );
   private static final OutputStreamWriter sOutput =
     new OutputStreamWriter( sWriter );
   /**
    * Caches {@link XPathExpression}s to avoid re-compiling.
     assert path != null;
     final var writer = new ByteArrayOutputStream( 65536 );
     final var output = new OutputStreamWriter( writer );
     final var target = new StreamResult( output );
     // Preprocessing the SVG image is a single-threaded operation, no matter
     // how many SVG images are in the document to typeset.
     sWriter.reset();
     final var target = new StreamResult( sOutput );
     final var source = sDocumentBuilder.parse( path.toFile() );
     transform( source, target );
     output.close();
     write( path, writer.toByteArray() );
     writer.close();
     write( path, sWriter.toByteArray() );
+  }

M src/main/java/com/keenwrite/processors/XhtmlProcessor.java

 import static com.keenwrite.util.ProtocolScheme.getProtocol;
 import static com.whitemagicsoftware.keenquotes.lex.FilterType.FILTER_XML;
 import static com.whitemagicsoftware.keenquotes.parser.Curler.CHARS;
 import static java.lang.String.format;
 import static java.lang.String.valueOf;
 public final class XhtmlProcessor extends ExecutorProcessor<String> {
   private final static Curler sTypographer =
     new Curler( contractions(), CHARS, FILTER_XML );
     new Curler( createContractions(), FILTER_XML, true );
   private final ProcessorContext mContext;
+      }
       // Strip comments, superfluous whitespace, DOCTYPE, and XML declarations.
       if( mediaType.isSvg() ) {
         DocumentParser.sanitize( imageFile );
    * @return List of contractions to use for curling straight quotes.
    */
   private static Contractions contractions() {
   private static Contractions createContractions() {
     return new Contractions.Builder().build();
+  }

M src/main/java/com/keenwrite/processors/markdown/extensions/fences/FencedBlockExtension.java

    */
   private final static String R_SVG_EXPORT =
     "tryCatch({svg('%s')%n%s%n},finally={dev.off()})%n";
     "tryCatch({svg('%s'%s)%n%s%n},finally={dev.off()})%n";
   private final static String STYLE_DIAGRAM = "diagram-";
+    }
     /**
      * Evaluates an R expression. This will take into consideration any
      * key/value pairs passed in from the document, such as width and height
      * attributes of the form: <code>{r width=5 height=5}</code>.
+     *
      * @param node    The {@link FencedCodeBlock} to evaluate using R.
      * @param context Used to resolve the link that refers to any resulting
      *                image produced by the R chunk (such as a plot).
      * @return The SVG text string associated with the content produced by
      * the chunk (such as a graphical data plot).
      */
     @SuppressWarnings( "unused" )
     private Tuple<String, ResolvedLink> evaluateRChunk(
       final FencedCodeBlock node,
       final NodeRendererContext context ) {
       final var content = node.getContentChars().normalizeEOL().trim();
       final var text = mRVariableProcessor.apply( content );
       final var hash = Integer.toHexString( text.hashCode() );
       final var filename = format( "%s-%s.svg", APP_TITLE_LOWERCASE, hash );
       final var svg = Paths.get( TEMP_DIR, filename ).toString();
       final var link = context.resolveLink( LINK, svg, false );
       final var r = format( R_SVG_EXPORT, svg, text );
       final var dimensions = getAttributes( node.getInfo() );
       final var r = format( R_SVG_EXPORT, svg, dimensions, text );
       final var result = mRChunkEvaluator.apply( r );
       return new Tuple<>( svg, link );
+    }
     /**
      * Splits attributes of the form <code>{r key1=value2 key2=value2}</code>
      * into a comma-separated string containing only the key/value pairs,
      * such as <code>key1=value1,key2=value2</code>.
+     *
      * @param bs The complete line after the fenced block demarcation.
      * @return A comma-separated string of name/value pairs.
      */
     private String getAttributes( final BasedSequence bs ) {
       final var result = new StringBuilder();
       final var split = bs.splitList( " " );
       final var splits = split.size();
       for( var i = 1; i < splits; i++ ) {
         final var based = split.get( i ).toString();
         final var attribute = based.replace( '}', ' ' );
         // The order of attribute evaluations is in order of performance.
         if( !attribute.isBlank() &&
           attribute.indexOf( '=' ) > 1 &&
           attribute.matches( ".*\\d.*" ) ) {
           // The comma will do double-duty for separating individual attributes
           // as well as being the comma that separates all attributes from the
           // SVG image file name.
           result.append( ',' ).append( attribute );
+        }
+      }
       return result.toString();
+    }