Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
New broken image icon, fix blurry text
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-06-27 11:15:39 GMT-0700 |
| Commit | 9a7423e2ae98d8ce89c943d2acc599c1e570deb4 |
| Parent | 1455186 |
| Delta | 78 lines added, 31 lines removed, 47-line increase |
src/main/resources/com/scrivenvar/preview/webview.css
| /* RESET ***/ | ||
| -html{box-sizing:border-box;font-size:16px}body,h1,h2,h3,h4,h5,h6,ol,p,ul{margin:0;padding:0}img{max-width:100%;height:auto}table{table-collapse:collapse;table-spacing:0;border-spacing:0} | ||
| +html{box-sizing:border-box;font-size:12pt}body,h1,h2,h3,h4,h5,h6,ol,p,ul{margin:0;padding:0}img{max-width:100%;height:auto}table{table-collapse:collapse;table-spacing:0;border-spacing:0} | ||
| /* BODY ***/ | ||
| body { | ||
| /* Must be bundled in JAR file. */ | ||
| font-family: "Vollkorn", serif; | ||
| - font-size: 16px; | ||
| + font-size: 12pt; | ||
| background-color: #fff; | ||
| margin: 0 auto; | ||
 | ||
| h1 { | ||
| - font-size: 28px; | ||
| + font-size: 21pt; | ||
| } | ||
| h2 { | ||
| - font-size: 24px; | ||
| + font-size: 18pt; | ||
| border-bottom: 1px solid #ccc; | ||
| } | ||
| h3 { | ||
| - font-size: 20px; | ||
| + font-size: 15pt; | ||
| } | ||
| h4 { | ||
| - font-size: 18px; | ||
| + font-size: 13.5pt; | ||
| } | ||
| h5 { | ||
| - font-size: 16px; | ||
| + font-size: 12pt; | ||
| } | ||
| h6 { | ||
| - font-size: 14px; | ||
| + font-size: 10.5pt; | ||
| } | ||
| ||
| /* Must be bundled in JAR file. */ | ||
| font-family: "Fira Code", monospace; | ||
| - font-size: 14px; | ||
| + font-size: 14pt; | ||
| white-space: pre-wrap; | ||
| word-wrap: break-word; | ||
| ||
| blockquote>:first-child { | ||
| - margin-top: 0px; | ||
| + margin-top: 0; | ||
| } | ||
| blockquote>:last-child { | ||
| - margin-bottom: 0px; | ||
| + margin-bottom: 0; | ||
| } | ||
| /* HORIZONTAL RULES ***/ | ||
| hr { | ||
| clear: both; | ||
| margin: 1.5em 0 1.5em; | ||
| - height: 0px; | ||
| + height: 0; | ||
| overflow: hidden; | ||
| border: none; | ||
src/main/java/com/scrivenvar/preview/HTMLPreviewPane.java
| import org.xhtmlrenderer.simple.extend.XhtmlNamespaceHandler; | ||
| import org.xhtmlrenderer.swing.SwingReplacedElementFactory; | ||
| +import org.xhtmlrenderer.util.Configuration; | ||
| import javax.swing.*; | ||
| ||
| mSwingNode.setContent( mScrollPane ); | ||
| + mSwingNode.setCache( true ); | ||
| mHtmlRenderer.addDocumentListener( mDocumentHandler ); | ||
src/main/java/com/scrivenvar/preview/SVGRasterizer.java
| import org.apache.batik.transcoder.TranscoderOutput; | ||
| import org.apache.batik.transcoder.image.ImageTranscoder; | ||
| -import org.w3c.dom.svg.SVGDocument; | ||
| +import org.apache.batik.util.XMLResourceDescriptor; | ||
| +import org.w3c.dom.Document; | ||
| import java.awt.*; | ||
| import java.awt.image.BufferedImage; | ||
| import java.io.IOException; | ||
| +import java.io.StringReader; | ||
| import java.net.URL; | ||
| import java.util.Map; | ||
| -import static java.awt.Color.RED; | ||
| import static java.awt.Color.WHITE; | ||
| import static java.awt.RenderingHints.*; | ||
| ||
| ); | ||
| - public final static BufferedImage PLACEHOLDER_IMAGE; | ||
| + public final static Image BROKEN_IMAGE_PLACEHOLDER; | ||
| static { | ||
| + // A FontAwesome camera icon, cleft asunder. | ||
| + // @formatter:off | ||
| + final String BROKEN_IMAGE_SVG = "<svg xmlns='http://www.w3.org/2000/svg' " + | ||
| + "viewBox='0 0 150 150' width='150pt' height='150pt' " + | ||
| + "fill='#454545'><path d='m41.738281 87.738281c2.480469 11.433594 12" + | ||
| + ".464844 19.8125 24.15625 20.269531zm0 0'/><path d='m32.328125 76" + | ||
| + ".152344-2.25 1.800781 1.824219 1.527344c.089844-1.125.230468-2.230469" + | ||
| + ".425781-3.328125zm0 0'/><path d='m60.953125 7.5-18.90625 1.65625c-5" + | ||
| + ".835937.511719-10.746094 4.585938-12.308594 10.222656l-2.75 9" + | ||
| + ".917969-25.683593 2.246094c-7.734376.675781-13.460938 7.5-12.785157 15" + | ||
| + ".234375l7.355469 84.054687c.675781 7.734375 7.5 13.457031 15.234375 12" + | ||
| + ".78125l88.042969-7.703125-23.417969-19.648437c-1.867187.480469-3" + | ||
| + ".777344.855469-5.757813 1.027343-19.324218 1.691407-36.398437-12" + | ||
| + ".636718-38.089843-31.957031-.171875-1.980469-.136719-3.929687.015625-5" + | ||
| + ".851562l-1.824219-1.527344 2.25-1.800781c2.703125-15.277344 15" + | ||
| + ".339844-27.492188 31.519531-28.90625 1.570313-.140625 3.121094-.132813" + | ||
| + " 4.65625-.066406l7-5.605469zm0 0'/><path d='m58.210938 87.628906 22" + | ||
| + ".296874 22.300782c1.070313.132812 2.148438.226562 3.253907.226562 14" + | ||
| + ".210937 0 25.78125-11.570312 25.78125-25.78125 0-14.207031-11" + | ||
| + ".570313-25.78125-25.78125-25.78125-14.207031 0-25.78125 11.574219-25" + | ||
| + ".78125 25.78125 0 1.105469.09375 2.1875.230469 3.253906zm0 0'/><path " + | ||
| + "d='m90.203125 6.382812 8.410156 36.082032-7.867187 4.304687c16.9375 3" + | ||
| + ".773438 28.917968 19.589844 27.363281 37.339844-1.515625 17.339844-15" + | ||
| + ".433594 30.621094-32.238281 31.945313l19.652344 23.421874 33.367187 2" + | ||
| + ".917969c7.734375.675781 14.558594-5.050781 15.234375-12.785156l7" + | ||
| + ".351562-84.050781c.679688-7.734375-5.046874-14.558594-12.78125-15" + | ||
| + ".234375l-25.683593-2.246094-2.78125-9.921875c-1.5625-5.632812-6" + | ||
| + ".472657-9.710938-12.308594-10.222656zm0 0'/></svg>"; | ||
| + // @formatter:on | ||
| + | ||
| + // The width and height cannot be embedded in the SVG above because the | ||
| + // path element values are relative to the viewBox dimensions. | ||
| final int w = 150; | ||
| final int h = 150; | ||
| - final var image = new BufferedImage( w, h, TYPE_INT_RGB ); | ||
| - final var graphics = (Graphics2D) image.getGraphics(); | ||
| - graphics.setRenderingHints( RENDERING_HINTS ); | ||
| + Image image; | ||
| - graphics.setColor( new Color( 204, 204, 204 ) ); | ||
| - graphics.fillRect( 0, 0, w, h ); | ||
| - graphics.setColor( new Color( 255, 204, 204 ) ); | ||
| - graphics.setStroke( new BasicStroke( 4 ) ); | ||
| - graphics.drawOval( w / 4, h / 4, w / 2, h / 2 ); | ||
| - graphics.drawLine( w / 4 + (int) (w / 4 / Math.PI), | ||
| - h / 4 + (int) (w / 4 / Math.PI), | ||
| - w / 2 + w / 4 - (int) (w / 4 / Math.PI), | ||
| - h / 2 + h / 4 - (int) (w / 4 / Math.PI) ); | ||
| - PLACEHOLDER_IMAGE = image; | ||
| + try( final StringReader reader = new StringReader( BROKEN_IMAGE_SVG ) ) { | ||
| + final String parser = XMLResourceDescriptor.getXMLParserClassName(); | ||
| + final SAXSVGDocumentFactory factory = new SAXSVGDocumentFactory( parser ); | ||
| + final Document document = factory.createDocument( "", reader ); | ||
| + | ||
| + image = rasterize( document, w ); | ||
| + } catch( final Exception e ) { | ||
| + image = new BufferedImage( w, h, TYPE_INT_RGB ); | ||
| + final var graphics = (Graphics2D) image.getGraphics(); | ||
| + graphics.setRenderingHints( RENDERING_HINTS ); | ||
| + | ||
| + // Fall back to a (\) symbol. | ||
| + graphics.setColor( new Color( 204, 204, 204 ) ); | ||
| + graphics.fillRect( 0, 0, w, h ); | ||
| + graphics.setColor( new Color( 255, 204, 204 ) ); | ||
| + graphics.setStroke( new BasicStroke( 4 ) ); | ||
| + graphics.drawOval( w / 4, h / 4, w / 2, h / 2 ); | ||
| + graphics.drawLine( w / 4 + (int) (w / 4 / Math.PI), | ||
| + h / 4 + (int) (w / 4 / Math.PI), | ||
| + w / 2 + w / 4 - (int) (w / 4 / Math.PI), | ||
| + h / 2 + h / 4 - (int) (w / 4 / Math.PI) ); | ||
| + } | ||
| + | ||
| + BROKEN_IMAGE_PLACEHOLDER = image; | ||
| } | ||
| ||
| } catch( final Exception e ) { | ||
| NOTIFIER.notify( e ); | ||
| - return PLACEHOLDER_IMAGE; | ||
| + return BROKEN_IMAGE_PLACEHOLDER; | ||
| } | ||
| } | ||
| ||
| throws IOException, TranscoderException { | ||
| return rasterize( | ||
| - (SVGDocument) mFactory.createDocument( url.toString() ), width ); | ||
| + mFactory.createDocument( url.toString() ), width ); | ||
| } | ||
| public static Image rasterize( | ||
| - final SVGDocument svg, final int width ) throws TranscoderException { | ||
| + final Document svg, final int width ) throws TranscoderException { | ||
| final var transcoder = new BufferedImageTranscoder(); | ||
| final var input = new TranscoderInput( svg ); | ||