Skip to content
Permalink
Browse files

New release with 5.0.2 of the formatter.

  • Loading branch information...
kalaspuffar committed Oct 21, 2019
1 parent d2ee7fe commit 50a47d28969d8c4579bbfadaf56c5bd6c8e24712
Showing with 45 additions and 29 deletions.
  1. +1 −1 build.gradle
  2. +18 −2 docs/changes.md
  3. +1 −1 gradle.properties
  4. +25 −25 integrationtest/osgi/config/ConfigurationOptions.java
@@ -96,7 +96,7 @@ dependencies {
compile 'org.daisy.streamline:streamline-api:1.3.0'

runtimeOnly 'org.daisy.braille:braille-utils.impl:7.0.0'
runtimeOnly ('org.daisy.dotify:dotify.formatter.impl:5.0.0') {
runtimeOnly ('org.daisy.dotify:dotify.formatter.impl:5.0.2') {
exclude module: 'Saxon-HE'
}
runtimeOnly 'org.daisy.dotify:dotify.hyphenator.impl:5.0.0'
@@ -1,5 +1,21 @@
[Table of Contents](toc.md)

# 3.2.1
## New in this version
- Formatting
- Formatting process is faster and guaranteed to converge
- Volume breaking is more stable #50
- Fix interpretation of volume-keep-priority in and around nested blocks
- Fix break-before="page" when already at the beginning of a page, resulting in less empty pages in the result. #98
- Allow evaluation of $volume in volume transitions and in the normal flow #99
- Allow <evaluate expression="$page"/>`, where you previously had to say (round $page) or (format {0} $page) #99
- Be more strict about what is allowed in an expression #99
- Don't normalize space in evaluating expressions #99
- Call setResolver earlier to enable peeking to Evaluate or PageNumberReference segments #105
- Fix a mismatch between the behavior of ScenarioData and RowGroupDataSource that could result in an IllegalStateException, notably when a break-before="page" occurs when there are only empty blocks on the current page, some of which have markers. #98
- any-resumed does not reduce available space on page when not rendered
- Improved documentation #102
# 3.2.0
## New in this version
- User interface
@@ -202,10 +218,10 @@
* Added option to re-run conversion upon change in source file
* Added translator command
* Improved volume breaking
* Improved pagination algorithm
* Improved pagination algorithm
* Added support for collapsing margins
* Added additional variables in OBFL
# 2.3 #
* Added support for footnotes and end of volume notes in API and formatter implementation
* Added support for note/noteref to the dtbook conversion
@@ -1,7 +1,7 @@
sonatypeUsername=user
sonatypePassword=password
releaseName=Dotify
version=3.2.1-SNAPSHOT
version=3.2.1
repositoryRevision=N/A
repositoryURL=https://github.com/brailleapps/dotify-cli
repositorySCM=scm:git:https://github.com/brailleapps/dotify-cli.git
@@ -11,7 +11,7 @@

@SuppressWarnings("javadoc")
public abstract class ConfigurationOptions {

public static Option felixDS() {
return MavenRepo.CENTRAL.get("org.apache.felix", "org.apache.felix.scr", "2.1.14");
}
@@ -24,30 +24,30 @@ public static Option brailleUtilsCore() {
MavenRepo.CENTRAL.get("org.daisy.braille", "braille-utils.pef-tools", "6.0.0")
);
}

public static Option brailleUtilsCatalog() {
return MavenRepo.CENTRAL.get("org.daisy.braille", "braille-utils.impl", "7.0.0");
}

static Option dotifyApi() {
return MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.api", "5.0.0");
}

static Option dotifyCommon() {
return MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.common", "4.4.0");
}

public static Option dotifyText() {
return composite(
dotifyApi(),
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.text.impl", "5.0.0")
);
}

static Option texhyphj() {
return MavenRepo.CENTRAL.get("com.googlecode.texhyphj", "texhyphj", "1.2");
}

public static Option dotifyHyphenator() {
return composite(
dotifyApi(),
@@ -56,7 +56,7 @@ public static Option dotifyHyphenator() {
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.hyphenator.impl", "5.0.0")
);
}

public static Option dotifyTranslator() {
return composite(
dotifyHyphenator(),
@@ -65,43 +65,43 @@ public static Option dotifyTranslator() {
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.translator.impl", "5.0.0")
);
}

static Option streamlineApi() {
return MavenRepo.CENTRAL.get("org.daisy.streamline", "streamline-api", "1.4.0");
}

static Option jing() {
return MavenRepo.CENTRAL.get("org.daisy.libs", "jing", "20120724.0.0");
}

static Option saxon() {
return MavenRepo.CENTRAL.get("org.daisy.libs", "saxon-he", "9.5.1.5");
}

static Option stax2() {
return MavenRepo.CENTRAL.get("org.codehaus.woodstox", "stax2-api", "3.1.4");
}

static Option wstx() {
return composite(
stax2(),
MavenRepo.CENTRAL.get("com.fasterxml.woodstox", "woodstox-core", "5.0.2")
);

}

public static Option dotifyFormatter() {
return composite(
streamlineApi(),
dotifyText(),
dotifyHyphenator(),
dotifyText(),
dotifyHyphenator(),
dotifyTranslator(),
wstx(),
saxon(),
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.formatter.impl", "5.0.0")
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.formatter.impl", "5.0.2")
);
}

public static Option dotifyTasks() {
return composite(
dotifyApi(),
@@ -112,7 +112,7 @@ public static Option dotifyTasks() {
MavenRepo.CENTRAL.get("org.daisy.dotify", "dotify.task.impl", "4.7.0")
);
}

public static Option streamlineEngine() {
return composite(
dotifyCommon(),
@@ -125,7 +125,7 @@ public static Option streamlineEngine() {
CENTRAL,
SONATYPE_STAGING,
LOCAL;

Option get(String group, String artifact, String version) {
switch(this) {
case LOCAL:
@@ -136,26 +136,26 @@ Option get(String group, String artifact, String version) {
return mavenBundle().groupId(group).artifactId(artifact).version(version);
}
}

static Option sonatypeStaging(String group, String artifact, String version) {
String path = group.replaceAll("\\.", "/");
return bundle("https://oss.sonatype.org/content/groups/staging/"+path+
"/"+artifact+"/"+version+"/"+artifact+"-"+version+".jar");
}

static File mavenLocal = null;

static synchronized File getMavenLocal() {
if (mavenLocal==null) {
File home = new File(System.getProperty("user.home"));
mavenLocal = new File(new File(home, ".m2"), "repository");
if (!mavenLocal.isDirectory()) {
throw new RuntimeException("Cannot find maven local at " + mavenLocal);
}
}
}
return mavenLocal;
}

static Option local(String group, String artifact, String version) {
try {
String path = group.replaceAll("\\.", "/");

0 comments on commit 50a47d2

Please sign in to comment.
You can’t perform that action at this time.