Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/keenwrite.git
pegdown Markdown parser updated to version 1.6; added five new pegdown 1.6 extension flags to Markdown Options tab
| Author | Karl Tauber <email> |
|---|---|
| Date | 2015-09-27 15:56:57 GMT+0200 |
| Commit | e03139b64715f1276c1ccfb97afd04e05a439b1e |
| Parent | db49ddb |
| Delta | 74 lines added, 4 lines removed, 70-line increase |
src/main/java/org/markdownwriterfx/options/MarkdownOptionsPane.java
| suppressHtmlBlocksExtCheckBox.setFlag(Extensions.SUPPRESS_HTML_BLOCKS); | ||
| suppressInlineHtmlExtCheckBox.setFlag(Extensions.SUPPRESS_INLINE_HTML); | ||
| + atxHeaderSpaceExtCheckBox.setFlag(Extensions.ATXHEADERSPACE); | ||
| + forceListItemParaExtCheckBox.setFlag(Extensions.FORCELISTITEMPARA); | ||
| + relaxedHrRulesExtCheckBox.setFlag(Extensions.RELAXEDHRULES); | ||
| + taskListItemsExtCheckBox.setFlag(Extensions.TASKLISTITEMS); | ||
| + extAnchorLinksExtCheckBox.setFlag(Extensions.EXTANCHORLINKS); | ||
| extensions.bindBidirectional(smartsExtCheckBox.flagsProperty()); | ||
 | ||
| extensions.bindBidirectional(suppressHtmlBlocksExtCheckBox.flagsProperty()); | ||
| extensions.bindBidirectional(suppressInlineHtmlExtCheckBox.flagsProperty()); | ||
| + extensions.bindBidirectional(atxHeaderSpaceExtCheckBox.flagsProperty()); | ||
| + extensions.bindBidirectional(forceListItemParaExtCheckBox.flagsProperty()); | ||
| + extensions.bindBidirectional(relaxedHrRulesExtCheckBox.flagsProperty()); | ||
| + extensions.bindBidirectional(taskListItemsExtCheckBox.flagsProperty()); | ||
| + extensions.bindBidirectional(extAnchorLinksExtCheckBox.flagsProperty()); | ||
| } | ||
| ||
| suppressHtmlBlocksExtCheckBox = new FlagCheckBox(); | ||
| suppressInlineHtmlExtCheckBox = new FlagCheckBox(); | ||
| + atxHeaderSpaceExtCheckBox = new FlagCheckBox(); | ||
| + forceListItemParaExtCheckBox = new FlagCheckBox(); | ||
| + relaxedHrRulesExtCheckBox = new FlagCheckBox(); | ||
| + taskListItemsExtCheckBox = new FlagCheckBox(); | ||
| + extAnchorLinksExtCheckBox = new FlagCheckBox(); | ||
| //======== this ======== | ||
| setCols("[][fill]"); | ||
| - setRows("[][][][][][][][][][][][][]"); | ||
| + setRows("[][][][][][][][][][][][][][][][][][]"); | ||
| //---- smartsExtCheckBox ---- | ||
| ||
| suppressInlineHtmlExtCheckBox.setText("Suppress the o_utput of inline HTML elements"); | ||
| add(suppressInlineHtmlExtCheckBox, "cell 0 12"); | ||
| + | ||
| + //---- atxHeaderSpaceExtCheckBox ---- | ||
| + atxHeaderSpaceExtCheckBox.setText("Requires a space char after Atx # header prefixes, so that #dasdsdaf is not a header"); | ||
| + add(atxHeaderSpaceExtCheckBox, "cell 0 13"); | ||
| + | ||
| + //---- forceListItemParaExtCheckBox ---- | ||
| + forceListItemParaExtCheckBox.setText("Force List and Definition Paragraph wrapping if it includes more than just a single paragraph"); | ||
| + add(forceListItemParaExtCheckBox, "cell 0 14"); | ||
| + | ||
| + //---- relaxedHrRulesExtCheckBox ---- | ||
| + relaxedHrRulesExtCheckBox.setText("Allow horizontal rules without a blank line following them"); | ||
| + add(relaxedHrRulesExtCheckBox, "cell 0 15"); | ||
| + | ||
| + //---- taskListItemsExtCheckBox ---- | ||
| + taskListItemsExtCheckBox.setText("GitHub style task list items"); | ||
| + add(taskListItemsExtCheckBox, "cell 0 16"); | ||
| + | ||
| + //---- extAnchorLinksExtCheckBox ---- | ||
| + extAnchorLinksExtCheckBox.setText("Generate anchor links for headers using complete contents of the header"); | ||
| + add(extAnchorLinksExtCheckBox, "cell 0 17"); | ||
| // JFormDesigner - End of component initialization //GEN-END:initComponents | ||
| } | ||
| ||
| private FlagCheckBox suppressHtmlBlocksExtCheckBox; | ||
| private FlagCheckBox suppressInlineHtmlExtCheckBox; | ||
| + private FlagCheckBox atxHeaderSpaceExtCheckBox; | ||
| + private FlagCheckBox forceListItemParaExtCheckBox; | ||
| + private FlagCheckBox relaxedHrRulesExtCheckBox; | ||
| + private FlagCheckBox taskListItemsExtCheckBox; | ||
| + private FlagCheckBox extAnchorLinksExtCheckBox; | ||
| // JFormDesigner - End of variables declaration //GEN-END:variables | ||
| } | ||
src/main/java/org/markdownwriterfx/options/MarkdownOptionsPane.jfd
| -JFDML JFormDesigner: "9.9.9.9.9999" Java: "1.8.0_51" encoding: "UTF-8" | ||
| +JFDML JFormDesigner: "9.9.9.9.9999" Java: "1.8.0_60" encoding: "UTF-8" | ||
| new FormModel { | ||
| contentType: "form/javafx" | ||
| root: new FormRoot { | ||
| add( new FormContainer( "org.tbee.javafx.scene.layout.fxml.MigPane", new FormLayoutManager( class org.tbee.javafx.scene.layout.fxml.MigPane ) { | ||
| - "$rowConstraints": "[][][][][][][][][][][][][]" | ||
| + "$rowConstraints": "[][][][][][][][][][][][][][][][][][]" | ||
| "$columnConstraints": "[][fill]" | ||
| } ) { | ||
| ||
| }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { | ||
| "value": "cell 0 12" | ||
| + } ) | ||
| + add( new FormComponent( "org.markdownwriterfx.controls.FlagCheckBox" ) { | ||
| + name: "atxHeaderSpaceExtCheckBox" | ||
| + "text": "Requires a space char after Atx # header prefixes, so that #dasdsdaf is not a header" | ||
| + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { | ||
| + "value": "cell 0 13" | ||
| + } ) | ||
| + add( new FormComponent( "org.markdownwriterfx.controls.FlagCheckBox" ) { | ||
| + name: "forceListItemParaExtCheckBox" | ||
| + "text": "Force List and Definition Paragraph wrapping if it includes more than just a single paragraph" | ||
| + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { | ||
| + "value": "cell 0 14" | ||
| + } ) | ||
| + add( new FormComponent( "org.markdownwriterfx.controls.FlagCheckBox" ) { | ||
| + name: "relaxedHrRulesExtCheckBox" | ||
| + "text": "Allow horizontal rules without a blank line following them" | ||
| + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { | ||
| + "value": "cell 0 15" | ||
| + } ) | ||
| + add( new FormComponent( "org.markdownwriterfx.controls.FlagCheckBox" ) { | ||
| + name: "taskListItemsExtCheckBox" | ||
| + "text": "GitHub style task list items" | ||
| + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { | ||
| + "value": "cell 0 16" | ||
| + } ) | ||
| + add( new FormComponent( "org.markdownwriterfx.controls.FlagCheckBox" ) { | ||
| + name: "extAnchorLinksExtCheckBox" | ||
| + "text": "Generate anchor links for headers using complete contents of the header" | ||
| + }, new FormLayoutConstraints( class net.miginfocom.layout.CC ) { | ||
| + "value": "cell 0 17" | ||
| } ) | ||
| }, new FormLayoutConstraints( null ) { | ||
build.gradle
| compile group: 'com.miglayout', name: 'miglayout-javafx', version: '5.0' | ||
| compile group: 'de.jensd', name: 'fontawesomefx', version: '8.4' | ||
| - compile group: 'org.pegdown', name: 'pegdown', version: '1.5.0' | ||
| + compile group: 'org.pegdown', name: 'pegdown', version: '1.6.0' | ||
| // newer versions of dependencies |