Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Replace KeenTeX with KeenType
| Author | DaveJarvis <email> |
|---|---|
| Date | 2023-01-22 19:16:43 GMT-0800 |
| Commit | f1c8425e6751b4e4c7b9e279aaecdf5c058064c8 |
| Parent | ef9a073 |
| Delta | 6 lines added, 161 lines removed, 155-line decrease |
src/test/java/com/keenwrite/tex/TeXRasterizationTest.java
| -/* | ||
| - * Copyright 2020-2021 White Magic Software, Ltd. | ||
| - * | ||
| - * All rights reserved. | ||
| - * | ||
| - * Redistribution and use in source and binary forms, with or without | ||
| - * modification, are permitted provided that the following conditions are met: | ||
| - * | ||
| - * o Redistributions of source code must retain the above copyright | ||
| - * notice, this list of conditions and the following disclaimer. | ||
| - * | ||
| - * o Redistributions in binary form must reproduce the above copyright | ||
| - * notice, this list of conditions and the following disclaimer in the | ||
| - * documentation and/or other materials provided with the distribution. | ||
| - * | ||
| - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
| - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
| - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
| - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
| - * HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
| - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
| - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
| - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
| - */ | ||
| -package com.keenwrite.tex; | ||
| - | ||
| -import com.whitemagicsoftware.tex.DefaultTeXFont; | ||
| -import com.whitemagicsoftware.tex.TeXEnvironment; | ||
| -import com.whitemagicsoftware.tex.TeXFormula; | ||
| -import com.whitemagicsoftware.tex.TeXLayout; | ||
| -import com.whitemagicsoftware.tex.graphics.AbstractGraphics2D; | ||
| -import com.whitemagicsoftware.tex.graphics.SvgDomGraphics2D; | ||
| -import com.whitemagicsoftware.tex.graphics.SvgGraphics2D; | ||
| -import io.sf.carte.echosvg.transcoder.TranscoderException; | ||
| -import org.junit.jupiter.api.Test; | ||
| -import org.xml.sax.SAXException; | ||
| - | ||
| -import javax.imageio.ImageIO; | ||
| -import java.awt.image.BufferedImage; | ||
| -import java.io.ByteArrayInputStream; | ||
| -import java.io.File; | ||
| -import java.io.IOException; | ||
| -import java.nio.file.Path; | ||
| -import java.text.ParseException; | ||
| - | ||
| -import static com.keenwrite.dom.DocumentParser.parse; | ||
| -import static com.keenwrite.preview.SvgRasterizer.*; | ||
| -import static java.lang.System.getProperty; | ||
| -import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| - | ||
| -/** | ||
| - * Test that TeX rasterization produces a readable image. | ||
| - */ | ||
| -public class TeXRasterizationTest { | ||
| - private static final String EQUATION = | ||
| - "G_{\\mu \\nu} = \\frac{8 \\pi G}{c^4} T_{{\\mu \\nu}}"; | ||
| - | ||
| - private static final String DIR_TEMP = getProperty( "java.io.tmpdir" ); | ||
| - | ||
| - private static final long FILESIZE = 12364; | ||
| - | ||
| - /** | ||
| - * Test that an equation can be converted to a raster image and the | ||
| - * final raster image size corresponds to the input equation. This is | ||
| - * a simple way to verify that the rasterization process is correct, | ||
| - * albeit if any aspect of the SVG algorithm changes (such as padding | ||
| - * around the equation), it will cause this test to fail, which is a bit | ||
| - * misleading. | ||
| - */ | ||
| - @Test | ||
| - public void test_Rasterize_SimpleFormula_CorrectImageSize() | ||
| - throws IOException, ParseException, TranscoderException { | ||
| - final var g = new SvgGraphics2D(); | ||
| - | ||
| - drawGraphics( g ); | ||
| - verifyImage( rasterizeString( g.toString() ) ); | ||
| - } | ||
| - | ||
| - /** | ||
| - * Test that an SVG document object model can be parsed and rasterized into | ||
| - * an image. | ||
| - */ | ||
| - @Test | ||
| - public void getTest_SvgDomGraphics2D_InputElement_OutputRasterizedImage() | ||
| - throws IOException, SAXException, ParseException, TranscoderException { | ||
| - final var g = new SvgGraphics2D(); | ||
| - drawGraphics( g ); | ||
| - | ||
| - final var expectedSvg = g.toString(); | ||
| - final var bytes = expectedSvg.getBytes(); | ||
| - | ||
| - try( final var in = new ByteArrayInputStream( bytes ) ) { | ||
| - final var doc = parse( in ); | ||
| - final var actualSvg = toSvg( doc.getDocumentElement() ); | ||
| - | ||
| - verifyImage( rasterizeString( actualSvg ) ); | ||
| - } | ||
| - } | ||
| - | ||
| - /** | ||
| - * Test that an SVG image from a DOM element can be rasterized. | ||
| - * | ||
| - * @throws IOException Could not write the image. | ||
| - */ | ||
| - @Test | ||
| - public void test_SvgDomGraphics2D_InputDom_OutputRasterizedImage() | ||
| - throws IOException, ParseException, TranscoderException { | ||
| - final var g = new SvgDomGraphics2D(); | ||
| - | ||
| - drawGraphics( g ); | ||
| - verifyImage( rasterize( g.toDom() ) ); | ||
| - } | ||
| - | ||
| - /** | ||
| - * Asserts that the given image matches an expected file size. | ||
| - * | ||
| - * @param image The image to check against the file size. | ||
| - * @throws IOException Could not write the image. | ||
| - */ | ||
| - private void verifyImage( final BufferedImage image ) throws IOException { | ||
| - final var file = export( image, "dom.png" ); | ||
| - assertEquals( FILESIZE, file.length() ); | ||
| - } | ||
| - | ||
| - /** | ||
| - * Creates an SVG string for the default equation and font size. | ||
| - */ | ||
| - private void drawGraphics( final AbstractGraphics2D g ) { | ||
| - final var size = 100f; | ||
| - final var texFont = new DefaultTeXFont( size ); | ||
| - final var env = new TeXEnvironment( texFont ); | ||
| - g.scale( size, size ); | ||
| - | ||
| - final var formula = new TeXFormula( EQUATION ); | ||
| - final var box = formula.createBox( env ); | ||
| - final var layout = new TeXLayout( box, size ); | ||
| - | ||
| - g.initialize( layout.getWidth(), layout.getHeight() ); | ||
| - box.draw( g, layout.getX(), layout.getY() ); | ||
| - } | ||
| - | ||
| - @SuppressWarnings( "SameParameterValue" ) | ||
| - private File export( final BufferedImage image, final String filename ) | ||
| - throws IOException { | ||
| - final var path = Path.of( DIR_TEMP, filename ); | ||
| - final var file = path.toFile(); | ||
| - ImageIO.write( image, "png", file ); | ||
| - file.deleteOnExit(); | ||
| - return file; | ||
| - } | ||
| -} | ||
src/main/java/com/keenwrite/processors/markdown/extensions/tex/TexNodeRenderer.java
| import com.keenwrite.ExportFormat; | ||
| +import com.keenwrite.preview.MathRenderer; | ||
| import com.keenwrite.preview.SvgRasterizer; | ||
| import com.vladsch.flexmark.html.HtmlWriter; | ||
 | ||
| import static com.keenwrite.ExportFormat.*; | ||
| -import static com.keenwrite.preview.MathRenderer.MATH_RENDERER; | ||
| import static com.keenwrite.processors.markdown.extensions.tex.TexNode.*; | ||
| ||
| final HtmlWriter html ) { | ||
| final var tex = node.getText().toStringOrNull(); | ||
| - final var doc = MATH_RENDERER.render( | ||
| - tex == null ? "" : getEvaluator().apply( tex ) ); | ||
| + final var doc = MathRenderer.toDocument( | ||
| + tex == null ? "" : getEvaluator().apply( tex ) | ||
| + ); | ||
| final var svg = SvgRasterizer.toSvg( doc.getDocumentElement() ); | ||
| html.raw( svg ); | ||
src/main/java/com/keenwrite/preview/SvgReplacedElementFactory.java
| import static com.keenwrite.events.StatusEvent.clue; | ||
| import static com.keenwrite.io.downloads.DownloadManager.open; | ||
| -import static com.keenwrite.preview.MathRenderer.MATH_RENDERER; | ||
| -import static com.keenwrite.preview.SvgRasterizer.BROKEN_IMAGE_PLACEHOLDER; | ||
| -import static com.keenwrite.preview.SvgRasterizer.rasterize; | ||
| +import static com.keenwrite.preview.SvgRasterizer.*; | ||
| import static com.keenwrite.processors.markdown.extensions.tex.TexNode.HTML_TEX; | ||
| import static com.keenwrite.util.ProtocolScheme.getProtocol; | ||
| ||
| case HTML_TEX -> | ||
| // Convert the TeX element to a raster graphic. | ||
| - raster = rasterize( MATH_RENDERER.render( e.getTextContent() ) ); | ||
| + raster = rasterizeImage( MathRenderer.toString( e.getTextContent() ), 2.5 ); | ||
| } | ||