Skip to content

Commit

Permalink
Prepare v1.8.4
Browse files Browse the repository at this point in the history
  • Loading branch information
rahmanusta committed Jan 11, 2023
1 parent cec07c0 commit c0e6fa5
Show file tree
Hide file tree
Showing 11 changed files with 87 additions and 42 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@

All notable changes are documented in this file.

## [Version ~1.8.4](https://github.com/asciidocfx/AsciidocFX/releases/tag/v1.8.4) (01.2023)

* Bug fixes
* Load ruby and jar extensions dynamically
* Implement .asciidoctorconfig feature
* Implement images_paste_dir feature
* Undertow back for fast startup
* Morphdom integration

## [Version ~1.8.3](https://github.com/asciidocfx/AsciidocFX/releases/tag/v1.8.3) (12.2022)

* Java 19 Virtual Threads
Expand Down
6 changes: 3 additions & 3 deletions CMD_NOTES.adoc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
base64 -i code_sign.p12 | pbcopy
base64 -i asciidocfx.pfx | pbcopy
git tag -a v1.8.3 -m "Version 1.8.3"
git tag -d v1.8.3
git push --delete origin v1.8.3
git tag -a v1.8.4 -m "Version 1.8.4"
git tag -d v1.8.4
git push --delete origin v1.8.4
git push --atomic --tags
13 changes: 10 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ifndef::env-github[]
:toc-placement: left
endif::[]
:imagesdir: images
:asciidocfx-version: 1.8.3
:asciidocfx-version: 1.8.4
:download-root: https://github.com/asciidocfx/AsciidocFX/releases/download/v{asciidocfx-version}/

image:https://opencollective.com/AsciidocFX/backers/badge.svg["Backers on Open Collective", link="#backers"]
Expand Down Expand Up @@ -71,15 +71,21 @@ NOTE: In all releases we use AdoptOpenJDK JREs, so you will not have any licensi
| Windows | {download-root}AsciidocFX_Windows.zip[AsciidocFX_Windows.zip]
| Linux
| {download-root}AsciidocFX_Linux.tar.gz[AsciidocFX_Linux.tar.gz]
| Linux DEB
| {download-root}AsciidocFX_Linux_Deb.deb[AsciidocFX_Linux.deb]
| Linux RPM
| {download-root}AsciidocFX_Linux_Rpm.rpm[AsciidocFX_Linux.rpm]
|====================

=== Install on Linux

After the download is completed, untar the package in your preferred directory.
You can install AsciidocFX through the Deb or Rpm installers or via Archive file.

.Archive file
[source,bash]
----
$ cd bin
$ tar –xvzf AsciidocFX_Linux.tar.gz
$ cd AsciidocFX/bin
$ ./AsciidocFX
----

Expand Down Expand Up @@ -384,6 +390,7 @@ You can represent filesystem tree in following `tree` block. There is two style
--
----


== Filesystem Tree output

When you drag and drop a folder to editor, AFX will generate this like tree automatically.
Expand Down
18 changes: 16 additions & 2 deletions asciidocfx.install4j
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<install4j version="10.0.4" transformSequenceNumber="10">
<directoryPresets config="/Users/usta/Library/CloudStorage/GoogleDrive-rahman.usta.88@gmail.com/My Drive/projects/AsciidocFX/cert/asciidocfx.pfx" />
<application name="AsciidocFX" applicationId="7853-9376-5862-1224" mediaDir="target" compression="4" lzmaCompression="true" excludeSignedFromPacking="false" shortName="AsciidocFX" publisher="AsciidocFX" publisherWeb="http://asciidocfx.com" version="1.8.3" macVolumeId="b98c377570068f5e" javaMinVersion="19" javaMaxVersion="19" allowBetaVM="true">
<application name="AsciidocFX" applicationId="7853-9376-5862-1224" mediaDir="target" compression="4" lzmaCompression="true" excludeSignedFromPacking="false" shortName="AsciidocFX" publisher="AsciidocFX" publisherWeb="http://asciidocfx.com" version="1.8.4" macVolumeId="b98c377570068f5e" javaMinVersion="19" javaMaxVersion="19" allowBetaVM="true">
<searchSequence>
<envVar name="JAVA_HOME" />
<envVar name="JDK_HOME" />
Expand Down Expand Up @@ -1181,7 +1181,7 @@ return true;</property>
</modules>
</jreBundle>
</windowsArchive>
<unixArchive name="Unix Archive" id="1110" mediaFileName="AsciidocFX_Linux">
<unixArchive name="Linux Archive" id="1110" mediaFileName="AsciidocFX_Linux">
<jreBundle>
<modules>
<jmodDirectory location="jmods/linux" />
Expand All @@ -1195,5 +1195,19 @@ return true;</property>
</modules>
</jreBundle>
</macosFolder>
<linuxDeb name="Linux Deb Archive" id="1125" mediaFileName="AsciidocFX_Linux_Deb">
<jreBundle>
<modules>
<jmodDirectory location="jmods/linux" />
</modules>
</jreBundle>
</linuxDeb>
<linuxRPM name="Linux RPM" id="1140" mediaFileName="AsciidocFX_Linux_Rpm" arch="x86_64">
<jreBundle>
<modules>
<jmodDirectory location="jmods/linux" />
</modules>
</jreBundle>
</linuxRPM>
</mediaSets>
</install4j>
2 changes: 1 addition & 1 deletion conf/public/js/event-binder.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
$("#placeholder").on("click", function (event) {
$("body").on("click", function (event) {
var elem = $(event.target);

if (elem.is("[class*=data-line]")) {
Expand Down
6 changes: 2 additions & 4 deletions conf/public/js/preview.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
var $placeholder = $("#placeholder");

var clearCacheAction = new BufferedAction();

function clearImageCache(imageName) {
clearCacheAction.buff(function () {
$placeholder.find("img").each(function () {
$("body").find("img").each(function () {
var image = $(this);
var srcAttr = image.attr("src");
if (srcAttr) {
Expand All @@ -16,7 +14,7 @@ function clearImageCache(imageName) {

function imageToBase64Url() {

window.clonedContent = $placeholder.clone();
window.clonedContent = $("body").clone();
clonedContent.find("img").each(function (index) {
afx.imageToBase64Url(this.src, index);
});
Expand Down
5 changes: 2 additions & 3 deletions conf/public/js/scroller.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var placeholder = $("#placeholder");
function runScroller(lineno) {
//lineno++;
var node = placeholder.find(".data-line-" + lineno);
var node = $("body").find(".data-line-" + lineno);
if (node.length > 0) {
node.get(0).scrollIntoView(true);
}
Expand Down Expand Up @@ -46,7 +45,7 @@ function findLowerBound(lineno) {
var node;
while (lineno >= 0) {
lineno--;
node = placeholder.find(".data-line-" + lineno);
node = $("body").find(".data-line-" + lineno);
if (node.length > 0)
break;
}
Expand Down
64 changes: 41 additions & 23 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="generator" content="Asciidoctor 2.0.17">
<title>Asciidoc Book Editor based on JavaFX 18</title>
<meta name="generator" content="Asciidoctor 2.0.18">
<title>Asciidoc Book Editor based on JavaFX 19</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic%7CNoto+Serif:400,400italic,700,700italic%7CDroid+Sans+Mono:400,700">
<style>
/*! Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
Expand Down Expand Up @@ -84,10 +84,10 @@
ul,ol,dl{line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
ul,ol{margin-left:1.5em}
ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0}
ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
ul.square{list-style-type:square}
ul.circle{list-style-type:circle}
ul.disc{list-style-type:disc}
ul.square{list-style-type:square}
ul.circle ul:not([class]),ul.disc ul:not([class]),ul.square ul:not([class]){list-style:inherit}
ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
dl dt{margin-bottom:.3125em;font-weight:bold}
dl dd{margin-bottom:1.25em}
Expand Down Expand Up @@ -435,10 +435,11 @@
#footer-text{color:rgba(0,0,0,.6);font-size:.9em}}
@media amzn-kf8{#header,#content,#footnotes,#footer{padding:0}}
</style>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.3/styles/github.min.css">
</head>
<body class="article toc2 toc-left">
<div id="header">
<h1>Asciidoc Book Editor based on JavaFX 18</h1>
<h1>Asciidoc Book Editor based on JavaFX 19</h1>
<div id="toc" class="toc2">
<div id="toctitle">Table of Contents</div>
<ul class="sectlevel1">
Expand Down Expand Up @@ -640,34 +641,44 @@ <h2 id="how-to-install-asciidocfx"><a class="anchor" href="#how-to-install-ascii
<tbody>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Mac</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.3/AsciidocFX_Mac.dmg">AsciidocFX_Mac.dmg</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Mac.dmg">AsciidocFX_Mac.dmg</a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Mac M1</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.3/AsciidocFX_Mac_M1.dmg">AsciidocFX_Mac_M1.dmg</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Mac_M1.dmg">AsciidocFX_Mac_M1.dmg</a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Windows</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.3/AsciidocFX_Windows.exe">AsciidocFX_Windows.exe</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Windows.exe">AsciidocFX_Windows.exe</a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Windows</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.3/AsciidocFX_Windows.zip">AsciidocFX_Windows.zip</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Windows.zip">AsciidocFX_Windows.zip</a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Linux</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.3/AsciidocFX_Linux.tar.gz">AsciidocFX_Linux.tar.gz</a></p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Linux.tar.gz">AsciidocFX_Linux.tar.gz</a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Linux DEB</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Linux_Deb.deb">AsciidocFX_Linux.deb</a></p></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">Linux RPM</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="https://github.com/asciidocfx/AsciidocFX/releases/download/v1.8.4/AsciidocFX_Linux_Rpm.rpm">AsciidocFX_Linux.rpm</a></p></td>
</tr>
</tbody>
</table>
<div class="sect2">
<h3 id="install-on-linux"><a class="anchor" href="#install-on-linux"></a>Install on Linux</h3>
<div class="paragraph">
<p>After the download is completed, untar the package in your preferred directory.</p>
<p>You can install AsciidocFX through the Deb or Rpm installers or via Archive file.</p>
</div>
<div class="listingblock">
<div class="title">Archive file</div>
<div class="content">
<pre class="highlight"><code class="language-bash" data-lang="bash">$ cd bin
<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">$ tar –xvzf AsciidocFX_Linux.tar.gz
$ cd AsciidocFX/bin
$ ./AsciidocFX</code></pre>
</div>
</div>
Expand Down Expand Up @@ -758,7 +769,7 @@ <h2 id="plantuml-extension"><a class="anchor" href="#plantuml-extension"></a>Pla
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-java" data-lang="java">.UML Diagram Example
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">.UML Diagram Example
[plantuml,target="uml-example"]
--
abstract class AbstractList
Expand Down Expand Up @@ -830,7 +841,7 @@ <h2 id="mermaid-extension"><a class="anchor" href="#mermaid-extension"></a>Merma
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-bash" data-lang="bash">npm install @mermaid-js/mermaid-cli</code></pre>
<pre class="highlightjs highlight"><code class="language-bash hljs" data-lang="bash">npm install @mermaid-js/mermaid-cli</code></pre>
</div>
</div>
<div class="paragraph">
Expand All @@ -842,7 +853,7 @@ <h2 id="mermaid-extension"><a class="anchor" href="#mermaid-extension"></a>Merma
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-asciidoc" data-lang="asciidoc">[mermaid,target="mermaid-graph"]
<pre class="highlightjs highlight"><code class="language-asciidoc hljs" data-lang="asciidoc">[mermaid,target="mermaid-graph"]
--
graph TD
A[Start] --&gt; B{Is it?};
Expand All @@ -860,7 +871,7 @@ <h2 id="mermaid-extension"><a class="anchor" href="#mermaid-extension"></a>Merma
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-asciidoc" data-lang="asciidoc">[mermaid,target="mermaid-flowchart"]
<pre class="highlightjs highlight"><code class="language-asciidoc hljs" data-lang="asciidoc">[mermaid,target="mermaid-flowchart"]
--
flowchart TB
c1--&gt;a2
Expand Down Expand Up @@ -897,7 +908,7 @@ <h2 id="ditaa-extension"><a class="anchor" href="#ditaa-extension"></a>ditaa Ext
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-asciidoc" data-lang="asciidoc">.ditaa Diagram Example
<pre class="highlightjs highlight"><code class="language-asciidoc hljs" data-lang="asciidoc">.ditaa Diagram Example
[ditaa,target="ditaa-example"]
--
+--------+ +-------+ +-------+
Expand Down Expand Up @@ -931,7 +942,7 @@ <h2 id="mathjax-extension"><a class="anchor" href="#mathjax-extension"></a>MathJ
<div class="listingblock">
<div class="title">For Example (Tex)</div>
<div class="content">
<pre class="highlight"><code class="language-tex" data-lang="tex">[latexmath_,target="tex-formula"]
<pre class="highlightjs highlight"><code class="language-tex hljs" data-lang="tex">[latexmath_,target="tex-formula"]
--
\begin{align}
\dot{x} &amp; = \sigma(y-x) \\
Expand All @@ -954,7 +965,7 @@ <h2 id="tex-output"><a class="anchor" href="#tex-output"></a>Tex output</h2>
<div class="listingblock">
<div class="title">For Example (MathML)</div>
<div class="content">
<pre class="highlight"><code class="language-xml" data-lang="xml">[mathml_,target="mathml-formula"]
<pre class="highlightjs highlight"><code class="language-xml hljs" data-lang="xml">[mathml_,target="mathml-formula"]
--
&lt;math xmlns="http://www.w3.org/1998/Math/MathML" display="block"&gt;
&lt;mi&gt;x&lt;/mi&gt;
Expand Down Expand Up @@ -1007,7 +1018,7 @@ <h2 id="filesystem-tree-extension"><a class="anchor" href="#filesystem-tree-exte
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-java" data-lang="java">[tree,target="tree-view"]
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">[tree,target="tree-view"]
--
#src
##main
Expand Down Expand Up @@ -1040,7 +1051,7 @@ <h2 id="filesystem-tree-output"><a class="anchor" href="#filesystem-tree-output"
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-java" data-lang="java">[tree,target="tree-view-new"]
<pre class="highlightjs highlight"><code class="language-java hljs" data-lang="java">[tree,target="tree-view-new"]
--
root
|-- photos
Expand Down Expand Up @@ -1242,7 +1253,7 @@ <h2 id="slides-reveal-js"><a class="anchor" href="#slides-reveal-js"></a>Slides
</div>
<div class="listingblock">
<div class="content">
<pre class="highlight"><code class="language-asciidoc" data-lang="asciidoc">include::_settings_reveal.adoc[]</code></pre>
<pre class="highlightjs highlight"><code class="language-asciidoc hljs" data-lang="asciidoc">include::_settings_reveal.adoc[]</code></pre>
</div>
</div>
</div>
Expand Down Expand Up @@ -1543,8 +1554,15 @@ <h2 id="sponsors"><a class="anchor" href="#sponsors"></a>Sponsors</h2>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2022-11-06 18:16:06 +0100
Last updated 2023-01-11 13:09:43 +0100
</div>
</div>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.18.3/highlight.min.js"></script>
<script>
if (!hljs.initHighlighting.called) {
hljs.initHighlighting.called = true
;[].slice.call(document.querySelectorAll('pre.highlight > code[data-lang]')).forEach(function (el) { hljs.highlightBlock(el) })
}
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>com.kodedu</groupId>
<artifactId>AsciidocFX</artifactId>
<version>1.8.3</version>
<version>1.8.4</version>
<packaging>jar</packaging>

<name>AsciidocFX</name>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/kodedu/config/ConfigurationBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public abstract class ConfigurationBase {
@Value("${application.version}")
private String afxVersion;

private static final List<String> ignoreVersionList = List.of("1.7.5", "1.7.6", "1.7.7", "1.7.8", "1.7.9", "1.8.0", "1.8.1", "1.8.2", "1.8.3");
private static final List<String> ignoreVersionList = List.of("1.7.5", "1.7.6", "1.7.7", "1.7.8", "1.7.9", "1.8.0", "1.8.1", "1.8.2", "1.8.3","1.8.4");

public static ObjectProperty<Path> configRootLocation = new SimpleObjectProperty<>();

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ server.port=0
server.undertow.direct-buffers=true
server.undertow.worker-threads=4
#server.undertow.accesslog.enabled=true
application.version=1.8.3
application.version=1.8.4
application.name=Asciidoc FX
application.website=http://asciidocfx.com
application.config.folder=.AsciidocFX-${application.version}
Expand Down

0 comments on commit c0e6fa5

Please sign in to comment.