Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
Shrink images, refactor insert hyperlink and iamge
| Author | DaveJarvis <email> |
|---|---|
| Date | 2020-12-31 13:59:27 GMT-0800 |
| Commit | 19c52748da97c5f7defe5b15879360c1fe93683b |
| Parent | 64e1df7 |
| Delta | 68 lines added, 123 lines removed, 55-line decrease |
src/main/java/com/keenwrite/ui/actions/ApplicationActions.java
| import com.keenwrite.editors.TextDefinition; | ||
| import com.keenwrite.editors.TextEditor; | ||
| +import com.keenwrite.editors.markdown.HyperlinkModel; | ||
| +import com.keenwrite.editors.markdown.LinkVisitor; | ||
| import com.keenwrite.preferences.PreferencesController; | ||
| import com.keenwrite.preferences.Workspace; | ||
| -import com.keenwrite.processors.ProcessorContext; | ||
| +import com.keenwrite.processors.markdown.MarkdownProcessor; | ||
| import com.keenwrite.search.SearchModel; | ||
| import com.keenwrite.ui.controls.SearchBar; | ||
| +import com.keenwrite.ui.dialogs.ImageDialog; | ||
| +import com.keenwrite.ui.dialogs.LinkDialog; | ||
| +import com.vladsch.flexmark.ast.Link; | ||
| import javafx.scene.control.Alert; | ||
| +import javafx.scene.control.Dialog; | ||
| import javafx.scene.image.ImageView; | ||
| import javafx.stage.Window; | ||
 | ||
| * using their respective syntax. | ||
| */ | ||
| -@SuppressWarnings("NonAsciiCharacters") | ||
| +@SuppressWarnings( "NonAsciiCharacters" ) | ||
| public class ApplicationActions { | ||
| private static final String STYLE_SEARCH = "search"; | ||
| ||
| private void file‿export( final ExportFormat format ) { | ||
| - final var editor = getActiveTextEditor(); | ||
| - final var context = createProcessorContext( editor ); | ||
| + final var main = getMainPane(); | ||
| + final var editor = main.getActiveTextEditor(); | ||
| + final var context = main.createProcessorContext( editor ); | ||
| final var chain = createProcessors( context ); | ||
| final var doc = editor.getText(); | ||
| ||
| } | ||
| } ); | ||
| - } | ||
| - | ||
| - private ProcessorContext createProcessorContext( final TextEditor editor ) { | ||
| - return getMainPane().createProcessorContext( editor ); | ||
| } | ||
| ||
| public void insert‿link() { | ||
| - createMarkdownDialog().insertLink( getActiveTextEditor().getTextArea() ); | ||
| + insertObject( createLinkDialog() ); | ||
| } | ||
| public void insert‿image() { | ||
| - createMarkdownDialog().insertImage( getActiveTextEditor().getTextArea() ); | ||
| + insertObject( createImageDialog() ); | ||
| } | ||
| - private MarkdownCommands createMarkdownDialog() { | ||
| - return new MarkdownCommands( | ||
| - getMainPane(), getActiveTextEditor().getPath() ); | ||
| + private void insertObject( final Dialog<String> dialog ) { | ||
| + final var textArea = getActiveTextEditor().getTextArea(); | ||
| + dialog.showAndWait().ifPresent( textArea::replaceSelection ); | ||
| + } | ||
| + | ||
| + private Dialog<String> createLinkDialog() { | ||
| + final var editor = getActiveTextEditor(); | ||
| + return new LinkDialog( getWindow(), createHyperlinkModel( editor ) ); | ||
| + } | ||
| + | ||
| + private Dialog<String> createImageDialog() { | ||
| + final var path = getActiveTextEditor().getPath(); | ||
| + final var parentDir = path.getParent(); | ||
| + return new ImageDialog( getWindow(), parentDir ); | ||
| + } | ||
| + | ||
| + /** | ||
| + * Returns one of: selected text, word under cursor, or parsed hyperlink from | ||
| + * the markdown AST. | ||
| + * | ||
| + * @return An instance containing the link URL and display text. | ||
| + */ | ||
| + private HyperlinkModel createHyperlinkModel( final TextEditor editor ) { | ||
| + final var textArea = editor.getTextArea(); | ||
| + final var selectedText = textArea.getSelectedText(); | ||
| + | ||
| + // Convert current paragraph to Markdown nodes. | ||
| + final var mp = MarkdownProcessor.create( getWorkspace() ); | ||
| + final var p = textArea.getCurrentParagraph(); | ||
| + final var paragraph = textArea.getText( p ); | ||
| + final var node = mp.toNode( paragraph ); | ||
| + final var visitor = new LinkVisitor( textArea.getCaretColumn() ); | ||
| + final var link = visitor.process( node ); | ||
| + | ||
| + if( link != null ) { | ||
| + textArea.selectRange( p, link.getStartOffset(), p, link.getEndOffset() ); | ||
| + } | ||
| + | ||
| + return createHyperlinkModel( link, selectedText ); | ||
| + } | ||
| + | ||
| + private HyperlinkModel createHyperlinkModel( | ||
| + final Link link, final String selection ) { | ||
| + | ||
| + return link == null | ||
| + ? new HyperlinkModel( selection, "https://localhost" ) | ||
| + : new HyperlinkModel( link ); | ||
| } | ||
src/main/java/com/keenwrite/ui/actions/MarkdownCommands.java
| -/* Copyright 2020 White Magic Software, Ltd. -- All rights reserved. */ | ||
| -package com.keenwrite.ui.actions; | ||
| - | ||
| -import com.keenwrite.MainPane; | ||
| -import com.keenwrite.editors.markdown.HyperlinkModel; | ||
| -import com.keenwrite.editors.markdown.LinkVisitor; | ||
| -import com.keenwrite.preferences.Workspace; | ||
| -import com.keenwrite.processors.markdown.MarkdownProcessor; | ||
| -import com.keenwrite.ui.dialogs.ImageDialog; | ||
| -import com.keenwrite.ui.dialogs.LinkDialog; | ||
| -import com.vladsch.flexmark.ast.Link; | ||
| -import javafx.scene.control.Dialog; | ||
| -import javafx.stage.Window; | ||
| -import org.fxmisc.richtext.StyleClassedTextArea; | ||
| - | ||
| -import java.nio.file.Path; | ||
| - | ||
| -/** | ||
| - * TODO: Integrate the methods into {@link ApplicationActions} | ||
| - * | ||
| - * @deprecated Migrate into {@link ApplicationActions}. | ||
| - */ | ||
| -@Deprecated | ||
| -public class MarkdownCommands { | ||
| - | ||
| - private final MainPane mParent; | ||
| - private final Path mBase; | ||
| - | ||
| - public MarkdownCommands( final MainPane parent, final Path path ) { | ||
| - mParent = parent; | ||
| - mBase = path.getParent(); | ||
| - } | ||
| - | ||
| - public void insertLink( final StyleClassedTextArea textArea ) { | ||
| - insertObject( createLinkDialog( textArea ), textArea ); | ||
| - } | ||
| - | ||
| - public void insertImage( final StyleClassedTextArea textArea ) { | ||
| - insertObject( createImageDialog(), textArea ); | ||
| - } | ||
| - | ||
| - /** | ||
| - * Returns one of: selected text, word under cursor, or parsed hyperlink from | ||
| - * the markdown AST. | ||
| - * | ||
| - * @return An instance containing the link URL and display text. | ||
| - */ | ||
| - private HyperlinkModel getHyperlink( final StyleClassedTextArea textArea ) { | ||
| - final var selectedText = textArea.getSelectedText(); | ||
| - | ||
| - // Get the current paragraph, convert to Markdown nodes. | ||
| - final var mp = MarkdownProcessor.create( getWorkspace() ); | ||
| - final var p = textArea.getCurrentParagraph(); | ||
| - final var paragraph = textArea.getText( p ); | ||
| - final var node = mp.toNode( paragraph ); | ||
| - final var visitor = new LinkVisitor( textArea.getCaretColumn() ); | ||
| - final var link = visitor.process( node ); | ||
| - | ||
| - if( link != null ) { | ||
| - textArea.selectRange( p, link.getStartOffset(), p, link.getEndOffset() ); | ||
| - } | ||
| - | ||
| - return createHyperlinkModel( | ||
| - link, selectedText, "https://localhost" | ||
| - ); | ||
| - } | ||
| - | ||
| - @SuppressWarnings("SameParameterValue") | ||
| - private HyperlinkModel createHyperlinkModel( | ||
| - final Link link, final String selection, final String url ) { | ||
| - | ||
| - return link == null | ||
| - ? new HyperlinkModel( selection, url ) | ||
| - : new HyperlinkModel( link ); | ||
| - } | ||
| - | ||
| - private Dialog<String> createLinkDialog( | ||
| - final StyleClassedTextArea textArea ) { | ||
| - return new LinkDialog( getWindow(), getHyperlink( textArea ) ); | ||
| - } | ||
| - | ||
| - private Dialog<String> createImageDialog() { | ||
| - return new ImageDialog( getWindow(), getParentPath() ); | ||
| - } | ||
| - | ||
| - private void insertObject( | ||
| - final Dialog<String> dialog, final StyleClassedTextArea textArea ) { | ||
| - dialog.showAndWait().ifPresent( textArea::replaceSelection ); | ||
| - } | ||
| - | ||
| - private Path getParentPath() { | ||
| - return mBase; | ||
| - } | ||
| - | ||
| - private Workspace getWorkspace() { | ||
| - return mParent.getWorkspace(); | ||
| - } | ||
| - | ||
| - private Window getWindow() { | ||
| - return mParent.getWindow(); | ||
| - } | ||
| -} | ||
docs/math.yaml
| +--- | ||
| +formula: | ||
| + sqrt: | ||
| + value: "420" | ||
| + quadratic: | ||
| + a: "25" | ||
| + b: "84.906" | ||
| + c: "20" | ||
docs/variables.yaml
| ---- | ||
| -formula: | ||
| - sqrt: | ||
| - value: "420" | ||
| - quadratic: | ||
| - a: "25" | ||
| - b: "84.906" | ||
| - c: "20" | ||
docs/images/equations.png
Binary files differ
docs/images/resolved-text.png
Binary files differ