foray-commit Mailing List for FOray (Page 59)
Modular XSL-FO Implementation for Java.
Status: Alpha
Brought to you by:
victormote
Menu
▾
▴
foray-commit — FOray repository commit log messages
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
(139) |
Apr
(98) |
May
(250) |
Jun
(394) |
Jul
(84) |
Aug
(13) |
Sep
(420) |
Oct
(186) |
Nov
(1) |
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(108) |
Feb
(202) |
Mar
(291) |
Apr
(247) |
May
(374) |
Jun
(227) |
Jul
(231) |
Aug
(60) |
Sep
(31) |
Oct
(45) |
Nov
(18) |
Dec
|
| 2008 |
Jan
(38) |
Feb
(71) |
Mar
(142) |
Apr
|
May
(59) |
Jun
(6) |
Jul
(10) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
(12) |
Feb
(4) |
Mar
(88) |
Apr
(121) |
May
(17) |
Jun
(30) |
Jul
|
Aug
(5) |
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2010 |
Jan
(11) |
Feb
(76) |
Mar
(11) |
Apr
|
May
(11) |
Jun
|
Jul
|
Aug
(44) |
Sep
(14) |
Oct
(7) |
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(9) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(10) |
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
(4) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(168) |
| 2017 |
Jan
(77) |
Feb
(11) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2018 |
Jan
|
Feb
|
Mar
(1) |
Apr
(6) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2019 |
Jan
|
Feb
(88) |
Mar
(118) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(6) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(141) |
| 2021 |
Jan
(170) |
Feb
(20) |
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
(62) |
Nov
(189) |
Dec
(162) |
| 2022 |
Jan
(201) |
Feb
(118) |
Mar
(8) |
Apr
|
May
(2) |
Jun
(47) |
Jul
(19) |
Aug
(14) |
Sep
(3) |
Oct
|
Nov
(28) |
Dec
(235) |
| 2023 |
Jan
(112) |
Feb
(23) |
Mar
(2) |
Apr
(2) |
May
|
Jun
(1) |
Jul
|
Aug
(70) |
Sep
(92) |
Oct
(20) |
Nov
(1) |
Dec
(1) |
| 2024 |
Jan
|
Feb
|
Mar
(1) |
Apr
(1) |
May
(14) |
Jun
(11) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2025 |
Jan
(10) |
Feb
(29) |
Mar
|
Apr
(162) |
May
(245) |
Jun
(83) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(4) |
Dec
|
|
From: <vic...@us...> - 2022-01-18 18:56:52
|
Revision: 12427
http://sourceforge.net/p/foray/code/12427
Author: victormote
Date: 2022-01-18 18:56:49 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
1. Fixes for Gradle deprecations. 2. Fixes related to directory movement related to Gradle upgrade.
Modified Paths:
--------------
trunk/foray/build.gradle
trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java
trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java
trunk/foray/foray-font/build.gradle
trunk/foray/foray-orthography/build.gradle
Modified: trunk/foray/build.gradle
===================================================================
--- trunk/foray/build.gradle 2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/build.gradle 2022-01-18 18:56:49 UTC (rev 12427)
@@ -256,7 +256,7 @@
task zipAllJavadoc(type: Zip, dependsOn: allJavadoc) {
from ("${buildDir}/docs/javadoc")
- appendix = "all"
+ archiveAppendix = "all"
classifier = "javadoc"
destinationDirectory = file("${buildDir}")
}
Modified: trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch
===================================================================
--- trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch 2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-00-master/ide/eclipse/launch-configurations/graphics-basic.launch 2022-01-18 18:56:49 UTC (rev 12427)
@@ -15,7 +15,7 @@
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.foray.app.FOray"/>
<stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="foray-app"/>
- <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-configuration-file ${foray-config} -fo ${fo-example-path}/basic/graphics.fo -pdf ${foray-test-output-file}/graphics-basic.pdf"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${build_files}-configuration-file ${foray-config} -fo ${fo-example-path}/basic/graphics.fo -pdf ${foray-test-output-file}/graphics-basic.pdf"/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="foray-app"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
</launchConfiguration>
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java 2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/Environment.java 2022-01-18 18:56:49 UTC (rev 12427)
@@ -129,7 +129,7 @@
*/
public static File getExamplesDirectory() throws IOException {
final File sandbox = Environment.getSandbox();
- return new File(sandbox, "master/dist/resource/fo-examples/");
+ return new File(sandbox, "foray-00-master/dist/resource/fo-examples/");
}
}
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java 2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/ForayEntityResolver.java 2022-01-18 18:56:49 UTC (rev 12427)
@@ -108,7 +108,7 @@
* website directory in the "master" project, the IDE does not know about them.
* See build.gradle where the file is copied into the jar file.
* Therefore, we look for the file on the local file system. */
- final File file = new File("../master/doc/web/dtds/0.1/en/" + dtdName);
+ final File file = new File("../foray-00-master/doc/web/dtds/0.1/en/" + dtdName);
if (file.exists()) {
inputStream = new FileInputStream(file);
}
Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle 2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-font/build.gradle 2022-01-18 18:56:49 UTC (rev 12427)
@@ -37,7 +37,7 @@
outputs.upToDateWhen { false }
description = "Parse and serialize the Base-14 metrics files"
classpath = sourceSets.main.runtimeClasspath
- main = 'org.foray.font.format.type1.Type1MetricsSerializer'
+ mainClass = 'org.foray.font.format.type1.Type1MetricsSerializer'
args('--input')
args('src/main/data/base-14')
args('--output')
Modified: trunk/foray/foray-orthography/build.gradle
===================================================================
--- trunk/foray/foray-orthography/build.gradle 2022-01-18 18:17:11 UTC (rev 12426)
+++ trunk/foray/foray-orthography/build.gradle 2022-01-18 18:56:49 UTC (rev 12427)
@@ -38,7 +38,7 @@
outputs.upToDateWhen { false }
description = "Parse and serialize the hyphenation patterns"
classpath = sourceSets.main.runtimeClasspath
- main = 'org.foray.orthography.util.PatternSerializer'
+ mainClass = 'org.foray.orthography.util.PatternSerializer'
args('--input')
args('src/main/data/hyph-patterns')
args('--output')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-18 18:17:12
|
Revision: 12426
http://sourceforge.net/p/foray/code/12426
Author: victormote
Date: 2022-01-18 18:17:11 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Fix the checkstyle configuration.
Modified Paths:
--------------
trunk/foray/build.gradle
trunk/foray/foray-00-master/config/checkstyle/checkstyle-config.xml
Modified: trunk/foray/build.gradle
===================================================================
--- trunk/foray/build.gradle 2022-01-18 18:03:19 UTC (rev 12425)
+++ trunk/foray/build.gradle 2022-01-18 18:17:11 UTC (rev 12426)
@@ -144,7 +144,7 @@
}
checkstyle {
- configFile = new File(rootProject.projectDir.absolutePath + '/config/checkstyle/checkstyle-config.xml')
+ configFile = new File(rootProject.projectDir.absolutePath + '/foray-00-master/config/checkstyle/checkstyle-config.xml')
configProperties.put('foray.root', rootProject.projectDir)
toolVersion = checkstyleVersion
}
Modified: trunk/foray/foray-00-master/config/checkstyle/checkstyle-config.xml
===================================================================
--- trunk/foray/foray-00-master/config/checkstyle/checkstyle-config.xml 2022-01-18 18:03:19 UTC (rev 12425)
+++ trunk/foray/foray-00-master/config/checkstyle/checkstyle-config.xml 2022-01-18 18:17:11 UTC (rev 12426)
@@ -13,7 +13,7 @@
<!-- Reference the file with suppression information. -->
<module name="SuppressionFilter">
- <property name="file" value="${foray.root}/config/checkstyle/checkstyle-suppressions.xml"/>
+ <property name="file" value="${foray.root}/foray-00-master/config/checkstyle/checkstyle-suppressions.xml"/>
</module>
<module name="FileTabCharacter">
@@ -21,7 +21,7 @@
</module>
<module name="RegexpHeader">
- <property name="headerFile" value="${foray.root}/config/checkstyle/checkstyle-header-java.txt"/>
+ <property name="headerFile" value="${foray.root}/foray-00-master/config/checkstyle/checkstyle-header-java.txt"/>
</module>
<!-- Make sure each package has javadoc package.html -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-18 18:03:20
|
Revision: 12425
http://sourceforge.net/p/foray/code/12425
Author: victormote
Date: 2022-01-18 18:03:19 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Rename master project to keep it with the foray projects.
Added Paths:
-----------
trunk/foray/foray-00-master/
Removed Paths:
-------------
trunk/foray/master/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-18 18:00:22
|
Revision: 12424
http://sourceforge.net/p/foray/code/12424
Author: victormote
Date: 2022-01-18 18:00:16 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Progress on Gradle conversion.
Modified Paths:
--------------
trunk/foray/settings.gradle
Added Paths:
-----------
trunk/foray/master/build.gradle
Added: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle (rev 0)
+++ trunk/foray/master/build.gradle 2022-01-18 18:00:16 UTC (rev 12424)
@@ -0,0 +1,7 @@
+description = 'foray-00-master'
+
+dependencies {
+}
+
+
+/* Last line of script. */
Property changes on: trunk/foray/master/build.gradle
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/settings.gradle
===================================================================
--- trunk/foray/settings.gradle 2022-01-18 17:51:05 UTC (rev 12423)
+++ trunk/foray/settings.gradle 2022-01-18 18:00:16 UTC (rev 12424)
@@ -1,4 +1,4 @@
-rootProject.name = 'foray-01-master'
+rootProject.name = 'foray'
include 'foray-app'
include 'foray-areatree'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-18 17:51:08
|
Revision: 12423
http://sourceforge.net/p/foray/code/12423
Author: victormote
Date: 2022-01-18 17:51:05 +0000 (Tue, 18 Jan 2022)
Log Message:
-----------
Move Gradle setup from master up one level to foray.
Added Paths:
-----------
trunk/foray/build.gradle
trunk/foray/gradle/
trunk/foray/gradlew
trunk/foray/gradlew.bat
trunk/foray/settings.gradle
Removed Paths:
-------------
trunk/foray/master/build.gradle
trunk/foray/master/gradle/
trunk/foray/master/gradlew
trunk/foray/master/gradlew.bat
trunk/foray/master/settings.gradle
Copied: trunk/foray/build.gradle (from rev 12422, trunk/foray/master/build.gradle)
===================================================================
--- trunk/foray/build.gradle (rev 0)
+++ trunk/foray/build.gradle 2022-01-18 17:51:05 UTC (rev 12423)
@@ -0,0 +1,321 @@
+/*
+This build file was designed to run with Gradle version 7.3.3.
+
+Important targets to run from the master directory:
+ 1. gradle build
+ Normal build checking for compile errors and test failures.
+ 2. gradle publishToMavenLocal
+ Builds and publishes the artifacts to the local maven repository.
+ 3. gradle zipAllJavadoc
+ Builds the aggregate javadocs for all Java code in foray and puts them in a zip file.
+ 4. gradle zipAllBin
+ Builds a zip file containing FOray executables and all runtime dependencies.
+ 5. gradle zipAllSources
+ Builds a zip file containing all source code.
+ 6. gradle validateWeb
+ Validates the html pages for the web.
+ 7. gradle compileJava compileTestJava test
+ Runs all tests from all projects.
+*/
+
+
+plugins {
+ id 'io.freefair.lombok' version '5.3.0' apply false
+}
+
+def buildDate = new Date().format("yyyy-MM-dd 'at' HH:mm 'GMT'", TimeZone.getTimeZone("GMT"))
+
+allprojects {
+ apply plugin: 'java'
+
+ group = 'org.foray'
+ version = '0.4-SNAPSHOT'
+
+ /******************** See Note 1 below for information about dependency releases. ********************/
+ ext.javaSourceCompatibility = JavaVersion.VERSION_1_7
+ ext.javaTargetCompatibility = JavaVersion.VERSION_1_7
+
+ /* Dependencies related to aXSL. These should be maintained at the same versions used by aXSL. */
+ ext.axslVersion = '0.3-SNAPSHOT' // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
+ ext.svgDomVersion = '1.1' // See aXSL master/build.gradle
+ ext.mathMlDomVersion = '2.0' // See aXSL master/build.gradle
+ /* End of aXSL-related dependencies. */
+
+ ext.slf4jVersion = '1.7.30' // Latest is 1.7.30 as of 2021-01-12.
+ ext.commonsIoVersion = '2.6' // Latest is 2.8.0 as of 2021-01-12. See Note 3.
+ ext.commonsDiscoveryVersion = '0.5' // Latest is 0.5 as of 2021-01-12.
+ ext.commonsCliVersion = '1.4' // Latest is 1.4 as of 2021-01-12.
+ ext.xmlResolverVersion = '1.2' // Latest is 1.2 as of 2021-01-12. See Note 4.
+ ext.antVersion = '1.9.15' // Latest is 1.10.9 as of 2021-01-12. See Note 5.
+ ext.servletApiVersion = '3.1.0' // Latest is 4.0.1 as of 2021-01-12. See Note 6.
+ ext.xmlgraphicsCommonsVersion = '2.6' // Latest is 2.6 as of 2022-01-17.
+ ext.batikVersion = '1.14' // Latest is 1.14 as of 2022-01-17.
+ ext.jeuclidVersion = '3.1.14' // Latest is 3.1.14 as of 2021-01-12. See Note 7.
+ ext.icu4jVersion = '68.2' // Latest is 68.2 as of 2021-01-12.
+
+ ext.junitVersion = '4.13.2' // Latest is 5.8.2 as of 2022-01-17. See Note 8.
+ ext.mockitoVersion = '2.28.2' // Latest is 3.7.0 as of 2021-01-12. See Note 9.
+ ext.logbackClassicVersion = '1.2.3' // Latest is 1.2.3 as of 2021-01-12.
+
+ ext.checkstyleVersion = '8.39' // Latest is 8.39 as of 2021-01-12.
+
+
+/*
+ * Notes on Dependency Releases (See above for references)
+ * ========================================================
+ * 1. Latest release information above is per www.mvnrepository.com, and ignores non-released artifacts (no alpha or
+ * beta releases, except for aXSL).
+ *
+ * 2. At the moment, and for the foreseeable future, aXSL is controlled by FOray, as we attempt to get the module APIs
+ * cleaned up and robust.
+ *
+ * 3. Apache Commons IO releases, starting at 2.7, are compiled with Java 1.8 (major version 52), which produces
+ * compile-time warnings when we try to build with Java 1.7.
+ * We have therefore stayed with the highest version that supports the Java 1.7 compiler, which is 2.6.
+ *
+ * 4. It looks like the catalog resolver code is part of Java 1.9.
+ *
+ * 5. Ant 1.10.9 is compiled with Java 1.8 (major version 52), which produces compile-time warnings when we try to
+ * build with Java 1.7.
+ * We have therefore stayed with the highest version of 1.9, which is 1.9.15.
+ *
+ * 6. Servlet-api 4.0.1 is compiled with Java 1.8 (major version 52), which produces compile-time warnings when we try
+ * to build with Java 1.7.
+ * We have therefore stayed with the highest version of 3.x, which is 3.1.0.
+ *
+ * 7. JEuclid has moved from group net.sourceforge.jeuclid to de.rototor.jeuclid, but continues to use the name
+ * "jeuclid-core" and the same general release numbering sequence.
+ * The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.
+ *
+ * 8. JUnit is compiled with Java 8 (major version 52) starting with release 5.0.0, and the artifact appears to be
+ * named org.junit.jupiter:junit-jupiter-api also starting with that release.
+ * We have therefore stayed with the highest version supporting Java 7, which is 4.13.2 as of Jan. 17, 2022.
+ *
+ * 9. Mockito is compiled with Java 8 (major version 52) starting with release 3.0.0.
+ * We have therefore stayed with the highest version supporting Java 7, which 2.28.2.
+ *
+ */
+
+}
+
+subprojects {
+
+ apply plugin: 'java-library'
+ apply plugin: 'checkstyle'
+ apply plugin: 'maven-publish'
+ apply plugin: 'io.freefair.lombok'
+
+ java {
+ sourceCompatibility = javaSourceCompatibility
+ targetCompatibility = javaTargetCompatibility
+ }
+
+ tasks.withType(JavaCompile) {
+ options.encoding = 'UTF-8'
+
+ /*
+ * We wish to continue building FOray in Java 1.7, primarily to maximize the potential audience.
+ * Some modern compilers will no longer compile to that target, or will log warnings due to its end-of-life or
+ * near-end-of-life status.
+ * Therefore, we need to compile with an older compiler. In your personal gradle.properties file, set
+ * property forayJdkHome to the home directory of the JDK you wish to use for the compile process.
+ * For example:
+ * forayJdkHome = c:/Program Files/Java/jdk1.8.0_162
+ *
+ * If a more recent compiler than 1.7 is used, you will be cross-compiling.
+ * In the example above, we are using a 1.8 compiler to cross-compile to 1.7.
+ * The Java 1.8 compiler will want a boot classpath containing the 1.7 runtime classes, to avoid compiling
+ * against classes and methods that are actually missing in the 1.7 runtime.
+ * You can provide the path to the jar containing those runtime classes by setting, in your personal
+ * gradle.properties file, the property forayTargetRuntimeJar.
+ * For example:
+ * forayTargetRuntimeJar = c:/Program Files/Java/jdk1.7.0_80/jre/lib/rt.jar
+ *
+ * See the following for more information about cross-compiling:
+ * https://stackoverflow.com/questions/15882586/bootstrap-class-path-not-set
+ */
+ compileJava.options.fork = true
+ compileJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
+// options.bootstrapClasspath = files(file(project.property('forayTargetRuntimeJar')))
+
+ /* Set test options also. */
+ compileTestJava.options.fork = true
+ compileTestJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
+ }
+
+ checkstyle {
+ configFile = new File(rootProject.projectDir.absolutePath + '/config/checkstyle/checkstyle-config.xml')
+ configProperties.put('foray.root', rootProject.projectDir)
+ toolVersion = checkstyleVersion
+ }
+
+ task packageSources(type: Jar, dependsOn:classes) {
+ classifier = 'sources'
+ from sourceSets.main.allSource
+ }
+
+ task packageJavadocs(type: Jar, dependsOn:javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+ }
+
+
+ /* Configure the common parts of the project javadocs. */
+ javadoc {
+ failOnError = true
+ options.encoding = 'UTF-8'
+ options.author = false
+ options.version = true
+ options.use = true
+ options.memberLevel = JavadocMemberLevel.PROTECTED
+ options.bottom = "<p>This documentation was created ${buildDate} by <a href=\"http://www.foray.org\"" +
+ "target=\"_new\">The FOray Group</a> and may be freely copied. See license for details.</p>"
+ }
+
+
+ jar {
+ manifest {
+ attributes("Implementation-Title": "${project.name}")
+ attributes("Implementation-Version": "${project.version}")
+ attributes("Implementation-Vendor": "The FOray project http://www.foray.org")
+ }
+ }
+
+
+ artifacts {
+ archives packageSources
+ archives packageJavadocs
+ }
+
+ repositories {
+ mavenLocal()
+ maven { url "https://repo.maven.apache.org/maven2" }
+ }
+
+ publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ from components.java
+ artifact packageSources
+ artifact packageJavadocs
+ }
+ }
+ }
+
+}
+
+
+/* Run all of the tests. */
+task testReport(type: TestReport) {
+ destinationDir = file("$buildDir/reports/allTests")
+ // Include the results from the `test` task in all subprojects
+ reportOn subprojects*.test
+}
+
+
+/* Configure the aggregate javadocs. */
+task allJavadoc(type: Javadoc) {
+ source subprojects.collect {project -> project.sourceSets.main.allJava}
+ classpath = files(subprojects.collect {project -> project.sourceSets.main.compileClasspath})
+ destinationDir = file("${buildDir}/docs/javadoc")
+
+ failOnError = true
+ options.docTitle = 'FOray API'
+ options.windowTitle = 'FOray API'
+ options.author = false
+ options.overview = './doc/javadoc/overview.html'
+ options.memberLevel = JavadocMemberLevel.PROTECTED
+ options.use = true
+ options.header = "FOray API ${version}"
+ options.bottom = "<p>This documentation was created ${buildDate} by <a href=\"http://www.foray.org\"" +
+ "target=\"_new\">The FOray Group</a> and may be freely copied. See license for details.</p>"
+ options.groups.put('The FOray Application', ['org.foray.app', 'org.foray.app.*',
+ 'org.foray.demo', 'org.foray.demo.*' ])
+ options.groups.put('The FOray Core Module', ['org.foray.core', 'org.foray.core.*' ])
+ options.groups.put('The FOray Common Module', ['org.foray.common', 'org.foray.common.*' ])
+ options.groups.put('The FOray FO Tree Module', ['org.foray.fotree', 'org.foray.fotree.*' ])
+ options.groups.put('The FOray PostScript Module', ['org.foray.ps', 'org.foray.ps.*' ])
+ options.groups.put('The FOray Graphic Module', ['org.foray.graphic', 'org.foray.graphic.*' ])
+ options.groups.put('The FOray Font Module', ['org.foray.font', 'org.foray.font.*' ])
+ options.groups.put('The FOray Speech Module', ['org.foray.speech', 'org.foray.speech.*' ])
+ options.groups.put('The FOray Orthography Module', ['org.foray.orthography', 'org.foray.orthography.*' ])
+ options.groups.put('The FOray LineBreak Module', ['org.foray.text', 'org.foray.text.*',
+ 'org.foray.linebreak'])
+ options.groups.put('The FOray Area Tree Module', ['org.foray.area', 'org.foray.area.*' ])
+ options.groups.put('The FOray Layout Module', ['org.foray.layout', 'org.foray.layout.*' ])
+ options.groups.put('The FOray Pioneer Module', ['org.foray.pioneer', 'org.foray.pioneer.*' ])
+ options.groups.put('The FOray Galley Module', ['org.foray.galley', 'org.foray.galley.*' ])
+ options.groups.put('The FOray Output Module', ['org.foray.output', 'org.foray.output.*' ])
+ options.groups.put('The FOray Render Module', ['org.foray.render', 'org.foray.render.*' ])
+ options.groups.put('The FOray PDF Writer Module', ['org.foray.pdf', 'org.foray.pdf.*' ])
+ options.groups.put('The FOray MIF Writer Module', ['org.foray.mif', 'org.foray.mif.*' ])
+ options.groups.put('The FOray Unicode Module', ['org.foray.unicode', 'org.foray.xml.*' ])
+ options.groups.put('The FOray XML Module', ['org.foray.xml', 'org.foray.xml.*' ])
+}
+
+
+task zipAllJavadoc(type: Zip, dependsOn: allJavadoc) {
+ from ("${buildDir}/docs/javadoc")
+ appendix = "all"
+ classifier = "javadoc"
+ destinationDirectory = file("${buildDir}")
+}
+
+
+task validateWeb () {
+ ant.property(name: "docDir", location: "./doc")
+ ant.property(name: "webRoot", location: "${ant.docDir}/web")
+ ant.property(name: "webDtd", location: "${ant.docDir}/dtd/xhtml1-strict.dtd")
+
+ doLast {
+ ant.xmlvalidate(/*warn: false*/) {
+ attribute(name: "http://xml.org/sax/features/namespaces", value: true)
+ dtd(publicid: "-//W3C//DTD XHTML 1.0 Strict//EN", location: "${ant.webDtd}")
+ fileset(dir: "${ant.webRoot}") {
+ include(name: "**/**.htm*")
+ exclude(name: "**/include/**")
+ }
+ }
+ }
+}
+
+
+task zipAllBin(type: Zip, dependsOn: build) {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ archiveBaseName = 'foray-all'
+ archiveClassifier = 'bin'
+ def internalDir = "${archiveBaseName.get()}-${archiveVersion.get()}-${archiveClassifier.get()}"
+
+ from(subprojects.collect {project -> "${project.buildDir}/libs"}) {
+ include '*.jar'
+ exclude '*-javadoc.jar'
+ exclude '*-sources.jar'
+ into "${internalDir}/lib"
+ }
+ from(subprojects.collect {project -> project.sourceSets.main.compileClasspath}) {
+ include '*.jar'
+ into "${internalDir}/lib"
+ }
+ from(project.projectDir.absolutePath + "/dist") {
+ include '**/**'
+ into "${internalDir}"
+ }
+
+ destinationDirectory = file("${buildDir}")
+}
+
+
+task zipAllSources(type: Zip) {
+ duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+ archiveBaseName = 'foray-all'
+ archiveClassifier = 'sources'
+ def internalDir = "${archiveBaseName.get()}-${archiveVersion.get()}-${archiveClassifier.get()}"
+
+ from(subprojects.collect {project -> project.projectDir.absolutePath + "/src"}) {
+ into "${internalDir}/src"
+ }
+
+ destinationDirectory = file("${buildDir}")
+}
+
+/* Last line of script. */
Copied: trunk/foray/gradlew (from rev 12422, trunk/foray/master/gradlew)
===================================================================
--- trunk/foray/gradlew (rev 0)
+++ trunk/foray/gradlew 2022-01-18 17:51:05 UTC (rev 12423)
@@ -0,0 +1,234 @@
+#!/bin/sh
+
+#
+# Copyright \xA9 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions \xAB$var\xBB, \xAB${var}\xBB, \xAB${var:-default}\xBB, \xAB${var+SET}\xBB,
+# \xAB${var#prefix}\xBB, \xAB${var%suffix}\xBB, and \xAB$( cmd )\xBB;
+# * compound commands having a testable exit status, especially \xABcase\xBB;
+# * various built-in commands including \xABcommand\xBB, \xABset\xBB, and \xABulimit\xBB.
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+ echo "$*"
+} >&2
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD=$JAVA_HOME/jre/sh/java
+ else
+ JAVACMD=$JAVA_HOME/bin/java
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD=java
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
+ fi
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
+ done
+fi
+
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
+exec "$JAVACMD" "$@"
Copied: trunk/foray/gradlew.bat (from rev 12422, trunk/foray/master/gradlew.bat)
===================================================================
--- trunk/foray/gradlew.bat (rev 0)
+++ trunk/foray/gradlew.bat 2022-01-18 17:51:05 UTC (rev 12423)
@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
Deleted: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-17 20:14:27 UTC (rev 12422)
+++ trunk/foray/master/build.gradle 2022-01-18 17:51:05 UTC (rev 12423)
@@ -1,321 +0,0 @@
-/*
-This build file was designed to run with Gradle version 7.3.3.
-
-Important targets to run from the master directory:
- 1. gradle build
- Normal build checking for compile errors and test failures.
- 2. gradle publishToMavenLocal
- Builds and publishes the artifacts to the local maven repository.
- 3. gradle zipAllJavadoc
- Builds the aggregate javadocs for all Java code in foray and puts them in a zip file.
- 4. gradle zipAllBin
- Builds a zip file containing FOray executables and all runtime dependencies.
- 5. gradle zipAllSources
- Builds a zip file containing all source code.
- 6. gradle validateWeb
- Validates the html pages for the web.
- 7. gradle compileJava compileTestJava test
- Runs all tests from all projects.
-*/
-
-
-plugins {
- id 'io.freefair.lombok' version '5.3.0' apply false
-}
-
-def buildDate = new Date().format("yyyy-MM-dd 'at' HH:mm 'GMT'", TimeZone.getTimeZone("GMT"))
-
-allprojects {
- apply plugin: 'java'
-
- group = 'org.foray'
- version = '0.4-SNAPSHOT'
-
- /******************** See Note 1 below for information about dependency releases. ********************/
- ext.javaSourceCompatibility = JavaVersion.VERSION_1_7
- ext.javaTargetCompatibility = JavaVersion.VERSION_1_7
-
- /* Dependencies related to aXSL. These should be maintained at the same versions used by aXSL. */
- ext.axslVersion = '0.3-SNAPSHOT' // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
- ext.svgDomVersion = '1.1' // See aXSL master/build.gradle
- ext.mathMlDomVersion = '2.0' // See aXSL master/build.gradle
- /* End of aXSL-related dependencies. */
-
- ext.slf4jVersion = '1.7.30' // Latest is 1.7.30 as of 2021-01-12.
- ext.commonsIoVersion = '2.6' // Latest is 2.8.0 as of 2021-01-12. See Note 3.
- ext.commonsDiscoveryVersion = '0.5' // Latest is 0.5 as of 2021-01-12.
- ext.commonsCliVersion = '1.4' // Latest is 1.4 as of 2021-01-12.
- ext.xmlResolverVersion = '1.2' // Latest is 1.2 as of 2021-01-12. See Note 4.
- ext.antVersion = '1.9.15' // Latest is 1.10.9 as of 2021-01-12. See Note 5.
- ext.servletApiVersion = '3.1.0' // Latest is 4.0.1 as of 2021-01-12. See Note 6.
- ext.xmlgraphicsCommonsVersion = '2.6' // Latest is 2.6 as of 2022-01-17.
- ext.batikVersion = '1.14' // Latest is 1.14 as of 2022-01-17.
- ext.jeuclidVersion = '3.1.14' // Latest is 3.1.14 as of 2021-01-12. See Note 7.
- ext.icu4jVersion = '68.2' // Latest is 68.2 as of 2021-01-12.
-
- ext.junitVersion = '4.13.2' // Latest is 5.8.2 as of 2022-01-17. See Note 8.
- ext.mockitoVersion = '2.28.2' // Latest is 3.7.0 as of 2021-01-12. See Note 9.
- ext.logbackClassicVersion = '1.2.3' // Latest is 1.2.3 as of 2021-01-12.
-
- ext.checkstyleVersion = '8.39' // Latest is 8.39 as of 2021-01-12.
-
-
-/*
- * Notes on Dependency Releases (See above for references)
- * ========================================================
- * 1. Latest release information above is per www.mvnrepository.com, and ignores non-released artifacts (no alpha or
- * beta releases, except for aXSL).
- *
- * 2. At the moment, and for the foreseeable future, aXSL is controlled by FOray, as we attempt to get the module APIs
- * cleaned up and robust.
- *
- * 3. Apache Commons IO releases, starting at 2.7, are compiled with Java 1.8 (major version 52), which produces
- * compile-time warnings when we try to build with Java 1.7.
- * We have therefore stayed with the highest version that supports the Java 1.7 compiler, which is 2.6.
- *
- * 4. It looks like the catalog resolver code is part of Java 1.9.
- *
- * 5. Ant 1.10.9 is compiled with Java 1.8 (major version 52), which produces compile-time warnings when we try to
- * build with Java 1.7.
- * We have therefore stayed with the highest version of 1.9, which is 1.9.15.
- *
- * 6. Servlet-api 4.0.1 is compiled with Java 1.8 (major version 52), which produces compile-time warnings when we try
- * to build with Java 1.7.
- * We have therefore stayed with the highest version of 3.x, which is 3.1.0.
- *
- * 7. JEuclid has moved from group net.sourceforge.jeuclid to de.rototor.jeuclid, but continues to use the name
- * "jeuclid-core" and the same general release numbering sequence.
- * The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.
- *
- * 8. JUnit is compiled with Java 8 (major version 52) starting with release 5.0.0, and the artifact appears to be
- * named org.junit.jupiter:junit-jupiter-api also starting with that release.
- * We have therefore stayed with the highest version supporting Java 7, which is 4.13.2 as of Jan. 17, 2022.
- *
- * 9. Mockito is compiled with Java 8 (major version 52) starting with release 3.0.0.
- * We have therefore stayed with the highest version supporting Java 7, which 2.28.2.
- *
- */
-
-}
-
-subprojects {
-
- apply plugin: 'java-library'
- apply plugin: 'checkstyle'
- apply plugin: 'maven-publish'
- apply plugin: 'io.freefair.lombok'
-
- java {
- sourceCompatibility = javaSourceCompatibility
- targetCompatibility = javaTargetCompatibility
- }
-
- tasks.withType(JavaCompile) {
- options.encoding = 'UTF-8'
-
- /*
- * We wish to continue building FOray in Java 1.7, primarily to maximize the potential audience.
- * Some modern compilers will no longer compile to that target, or will log warnings due to its end-of-life or
- * near-end-of-life status.
- * Therefore, we need to compile with an older compiler. In your personal gradle.properties file, set
- * property forayJdkHome to the home directory of the JDK you wish to use for the compile process.
- * For example:
- * forayJdkHome = c:/Program Files/Java/jdk1.8.0_162
- *
- * If a more recent compiler than 1.7 is used, you will be cross-compiling.
- * In the example above, we are using a 1.8 compiler to cross-compile to 1.7.
- * The Java 1.8 compiler will want a boot classpath containing the 1.7 runtime classes, to avoid compiling
- * against classes and methods that are actually missing in the 1.7 runtime.
- * You can provide the path to the jar containing those runtime classes by setting, in your personal
- * gradle.properties file, the property forayTargetRuntimeJar.
- * For example:
- * forayTargetRuntimeJar = c:/Program Files/Java/jdk1.7.0_80/jre/lib/rt.jar
- *
- * See the following for more information about cross-compiling:
- * https://stackoverflow.com/questions/15882586/bootstrap-class-path-not-set
- */
- compileJava.options.fork = true
- compileJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
-// options.bootstrapClasspath = files(file(project.property('forayTargetRuntimeJar')))
-
- /* Set test options also. */
- compileTestJava.options.fork = true
- compileTestJava.options.forkOptions.javaHome = file(project.property('forayJdkHome'))
- }
-
- checkstyle {
- configFile = new File(rootProject.projectDir.absolutePath + '/config/checkstyle/checkstyle-config.xml')
- configProperties.put('foray.root', rootProject.projectDir)
- toolVersion = checkstyleVersion
- }
-
- task packageSources(type: Jar, dependsOn:classes) {
- classifier = 'sources'
- from sourceSets.main.allSource
- }
-
- task packageJavadocs(type: Jar, dependsOn:javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
- }
-
-
- /* Configure the common parts of the project javadocs. */
- javadoc {
- failOnError = true
- options.encoding = 'UTF-8'
- options.author = false
- options.version = true
- options.use = true
- options.memberLevel = JavadocMemberLevel.PROTECTED
- options.bottom = "<p>This documentation was created ${buildDate} by <a href=\"http://www.foray.org\"" +
- "target=\"_new\">The FOray Group</a> and may be freely copied. See license for details.</p>"
- }
-
-
- jar {
- manifest {
- attributes("Implementation-Title": "${project.name}")
- attributes("Implementation-Version": "${project.version}")
- attributes("Implementation-Vendor": "The FOray project http://www.foray.org")
- }
- }
-
-
- artifacts {
- archives packageSources
- archives packageJavadocs
- }
-
- repositories {
- mavenLocal()
- maven { url "https://repo.maven.apache.org/maven2" }
- }
-
- publishing {
- publications {
- mavenJava(MavenPublication) {
- from components.java
- artifact packageSources
- artifact packageJavadocs
- }
- }
- }
-
-}
-
-
-/* Run all of the tests. */
-task testReport(type: TestReport) {
- destinationDir = file("$buildDir/reports/allTests")
- // Include the results from the `test` task in all subprojects
- reportOn subprojects*.test
-}
-
-
-/* Configure the aggregate javadocs. */
-task allJavadoc(type: Javadoc) {
- source subprojects.collect {project -> project.sourceSets.main.allJava}
- classpath = files(subprojects.collect {project -> project.sourceSets.main.compileClasspath})
- destinationDir = file("${buildDir}/docs/javadoc")
-
- failOnError = true
- options.docTitle = 'FOray API'
- options.windowTitle = 'FOray API'
- options.author = false
- options.overview = './doc/javadoc/overview.html'
- options.memberLevel = JavadocMemberLevel.PROTECTED
- options.use = true
- options.header = "FOray API ${version}"
- options.bottom = "<p>This documentation was created ${buildDate} by <a href=\"http://www.foray.org\"" +
- "target=\"_new\">The FOray Group</a> and may be freely copied. See license for details.</p>"
- options.groups.put('The FOray Application', ['org.foray.app', 'org.foray.app.*',
- 'org.foray.demo', 'org.foray.demo.*' ])
- options.groups.put('The FOray Core Module', ['org.foray.core', 'org.foray.core.*' ])
- options.groups.put('The FOray Common Module', ['org.foray.common', 'org.foray.common.*' ])
- options.groups.put('The FOray FO Tree Module', ['org.foray.fotree', 'org.foray.fotree.*' ])
- options.groups.put('The FOray PostScript Module', ['org.foray.ps', 'org.foray.ps.*' ])
- options.groups.put('The FOray Graphic Module', ['org.foray.graphic', 'org.foray.graphic.*' ])
- options.groups.put('The FOray Font Module', ['org.foray.font', 'org.foray.font.*' ])
- options.groups.put('The FOray Speech Module', ['org.foray.speech', 'org.foray.speech.*' ])
- options.groups.put('The FOray Orthography Module', ['org.foray.orthography', 'org.foray.orthography.*' ])
- options.groups.put('The FOray LineBreak Module', ['org.foray.text', 'org.foray.text.*',
- 'org.foray.linebreak'])
- options.groups.put('The FOray Area Tree Module', ['org.foray.area', 'org.foray.area.*' ])
- options.groups.put('The FOray Layout Module', ['org.foray.layout', 'org.foray.layout.*' ])
- options.groups.put('The FOray Pioneer Module', ['org.foray.pioneer', 'org.foray.pioneer.*' ])
- options.groups.put('The FOray Galley Module', ['org.foray.galley', 'org.foray.galley.*' ])
- options.groups.put('The FOray Output Module', ['org.foray.output', 'org.foray.output.*' ])
- options.groups.put('The FOray Render Module', ['org.foray.render', 'org.foray.render.*' ])
- options.groups.put('The FOray PDF Writer Module', ['org.foray.pdf', 'org.foray.pdf.*' ])
- options.groups.put('The FOray MIF Writer Module', ['org.foray.mif', 'org.foray.mif.*' ])
- options.groups.put('The FOray Unicode Module', ['org.foray.unicode', 'org.foray.xml.*' ])
- options.groups.put('The FOray XML Module', ['org.foray.xml', 'org.foray.xml.*' ])
-}
-
-
-task zipAllJavadoc(type: Zip, dependsOn: allJavadoc) {
- from ("${buildDir}/docs/javadoc")
- appendix = "all"
- classifier = "javadoc"
- destinationDirectory = file("${buildDir}")
-}
-
-
-task validateWeb () {
- ant.property(name: "docDir", location: "./doc")
- ant.property(name: "webRoot", location: "${ant.docDir}/web")
- ant.property(name: "webDtd", location: "${ant.docDir}/dtd/xhtml1-strict.dtd")
-
- doLast {
- ant.xmlvalidate(/*warn: false*/) {
- attribute(name: "http://xml.org/sax/features/namespaces", value: true)
- dtd(publicid: "-//W3C//DTD XHTML 1.0 Strict//EN", location: "${ant.webDtd}")
- fileset(dir: "${ant.webRoot}") {
- include(name: "**/**.htm*")
- exclude(name: "**/include/**")
- }
- }
- }
-}
-
-
-task zipAllBin(type: Zip, dependsOn: build) {
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- archiveBaseName = 'foray-all'
- archiveClassifier = 'bin'
- def internalDir = "${archiveBaseName.get()}-${archiveVersion.get()}-${archiveClassifier.get()}"
-
- from(subprojects.collect {project -> "${project.buildDir}/libs"}) {
- include '*.jar'
- exclude '*-javadoc.jar'
- exclude '*-sources.jar'
- into "${internalDir}/lib"
- }
- from(subprojects.collect {project -> project.sourceSets.main.compileClasspath}) {
- include '*.jar'
- into "${internalDir}/lib"
- }
- from(project.projectDir.absolutePath + "/dist") {
- include '**/**'
- into "${internalDir}"
- }
-
- destinationDirectory = file("${buildDir}")
-}
-
-
-task zipAllSources(type: Zip) {
- duplicatesStrategy = DuplicatesStrategy.EXCLUDE
- archiveBaseName = 'foray-all'
- archiveClassifier = 'sources'
- def internalDir = "${archiveBaseName.get()}-${archiveVersion.get()}-${archiveClassifier.get()}"
-
- from(subprojects.collect {project -> project.projectDir.absolutePath + "/src"}) {
- into "${internalDir}/src"
- }
-
- destinationDirectory = file("${buildDir}")
-}
-
-/* Last line of script. */
Deleted: trunk/foray/master/gradlew
===================================================================
--- trunk/foray/master/gradlew 2022-01-17 20:14:27 UTC (rev 12422)
+++ trunk/foray/master/gradlew 2022-01-18 17:51:05 UTC (rev 12423)
@@ -1,234 +0,0 @@
-#!/bin/sh
-
-#
-# Copyright \xA9 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-##############################################################################
-#
-# Gradle start up script for POSIX generated by Gradle.
-#
-# Important for running:
-#
-# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-# noncompliant, but you have some other compliant shell such as ksh or
-# bash, then to run this script, type that shell name before the whole
-# command line, like:
-#
-# ksh Gradle
-#
-# Busybox and similar reduced shells will NOT work, because this script
-# requires all of these POSIX shell features:
-# * functions;
-# * expansions \xAB$var\xBB, \xAB${var}\xBB, \xAB${var:-default}\xBB, \xAB${var+SET}\xBB,
-# \xAB${var#prefix}\xBB, \xAB${var%suffix}\xBB, and \xAB$( cmd )\xBB;
-# * compound commands having a testable exit status, especially \xABcase\xBB;
-# * various built-in commands including \xABcommand\xBB, \xABset\xBB, and \xABulimit\xBB.
-#
-# Important for patching:
-#
-# (2) This script targets any POSIX shell, so it avoids extensions provided
-# by Bash, Ksh, etc; in particular arrays are avoided.
-#
-# The "traditional" practice of packing multiple parameters into a
-# space-separated string is a well documented source of bugs and security
-# problems, so this is (mostly) avoided, by progressively accumulating
-# options in "$@", and eventually passing that to Java.
-#
-# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-# see the in-line comments for details.
-#
-# There are tweaks for specific operating systems such as AIX, CygWin,
-# Darwin, MinGW, and NonStop.
-#
-# (3) This script is generated from the Groovy template
-# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-# within the Gradle project.
-#
-# You can find Gradle at https://github.com/gradle/gradle/.
-#
-##############################################################################
-
-# Attempt to set APP_HOME
-
-# Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
- APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
- [ -h "$app_path" ]
-do
- ls=$( ls -ld "$app_path" )
- link=${ls#*' -> '}
- case $link in #(
- /*) app_path=$link ;; #(
- *) app_path=$APP_HOME$link ;;
- esac
-done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
-
-warn () {
- echo "$*"
-} >&2
-
-die () {
- echo
- echo "$*"
- echo
- exit 1
-} >&2
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "$( uname )" in #(
- CYGWIN* ) cygwin=true ;; #(
- Darwin* ) darwin=true ;; #(
- MSYS* | MINGW* ) msys=true ;; #(
- NONSTOP* ) nonstop=true ;;
-esac
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
- if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
- # IBM's JDK on AIX uses strange locations for the executables
- JAVACMD=$JAVA_HOME/jre/sh/java
- else
- JAVACMD=$JAVA_HOME/bin/java
- fi
- if [ ! -x "$JAVACMD" ] ; then
- die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
- fi
-else
- JAVACMD=java
- which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
- case $MAX_FD in #(
- max*)
- MAX_FD=$( ulimit -H -n ) ||
- warn "Could not query maximum file descriptor limit"
- esac
- case $MAX_FD in #(
- '' | soft) :;; #(
- *)
- ulimit -n "$MAX_FD" ||
- warn "Could not set maximum file descriptor limit to $MAX_FD"
- esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-# * args from the command line
-# * the main class name
-# * -classpath
-# * -D...appname settings
-# * --module-path (only if needed)
-# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
- APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
- CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
- JAVACMD=$( cygpath --unix "$JAVACMD" )
-
- # Now convert the arguments - kludge to limit ourselves to /bin/sh
- for arg do
- if
- case $arg in #(
- -*) false ;; # don't mess with options #(
- /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
- [ -e "$t" ] ;; #(
- *) false ;;
- esac
- then
- arg=$( cygpath --path --ignore --mixed "$arg" )
- fi
- # Roll the args list around exactly as many times as the number of
- # args, so each arg winds up back in the position where it started, but
- # possibly modified.
- #
- # NB: a `for` loop captures its iteration list before it begins, so
- # changing the positional parameters here affects neither the number of
- # iterations, nor the values presented in `arg`.
- shift # remove old arg
- set -- "$@" "$arg" # push replacement arg
- done
-fi
-
-# Collect all arguments for the java command;
-# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-# shell script including quotes and variable substitutions, so put them in
-# double quotes to make sure that they get re-expanded; and
-# * put everything else in single quotes, so that it's not re-expanded.
-
-set -- \
- "-Dorg.gradle.appname=$APP_BASE_NAME" \
- -classpath "$CLASSPATH" \
- org.gradle.wrapper.GradleWrapperMain \
- "$@"
-
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-# set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
- printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
- xargs -n1 |
- sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
- tr '\n' ' '
- )" '"$@"'
-
-exec "$JAVACMD" "$@"
Deleted: trunk/foray/master/gradlew.bat
===================================================================
--- trunk/foray/master/gradlew.bat 2022-01-17 20:14:27 UTC (rev 12422)
+++ trunk/foray/master/gradlew.bat 2022-01-18 17:51:05 UTC (rev 12423)
@@ -1,89 +0,0 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
Deleted: trunk/foray/master/settings.gradle
===================================================================
--- trunk/foray/master/settings.gradle 2022-01-17 20:14:27 UTC (rev 12422)
+++ trunk/foray/master/settings.gradle 2022-01-18 17:51:05 UTC (rev 12423)
@@ -1,24 +0,0 @@
-rootProject.name = 'foray-01-master'
-
-includeFlat 'foray-app'
-includeFlat 'foray-areatree'
-includeFlat 'foray-common'
-includeFlat 'foray-core'
-includeFlat 'foray-font'
-includeFlat 'foray-fotree'
-includeFlat 'foray-graphic'
-includeFlat 'foray-layout'
-includeFlat 'foray-linebreak'
-includeFlat 'foray-mif'
-includeFlat 'foray-orthography'
-includeFlat 'foray-output'
-includeFlat 'foray-pdf'
-includeFlat 'foray-pioneer'
-includeFlat 'foray-ps'
-includeFlat 'foray-render'
-includeFlat 'foray-speech'
-includeFlat 'foray-unicode'
-includeFlat 'foray-xml'
-includeFlat 'foray-zz-attic'
-
-/* Last line of script. */
Copied: trunk/foray/settings.gradle (from rev 12422, trunk/foray/master/settings.gradle)
===================================================================
--- trunk/foray/settings.gradle (rev 0)
+++ trunk/foray/settings.gradle 2022-01-18 17:51:05 UTC (rev 12423)
@@ -0,0 +1,24 @@
+rootProject.name = 'foray-01-master'
+
+include 'foray-app'
+include 'foray-areatree'
+include 'foray-common'
+include 'foray-core'
+include 'foray-font'
+include 'foray-fotree'
+include 'foray-graphic'
+include 'foray-layout'
+include 'foray-linebreak'
+include 'foray-mif'
+include 'foray-orthography'
+include 'foray-output'
+include 'foray-pdf'
+include 'foray-pioneer'
+include 'foray-ps'
+include 'foray-render'
+include 'foray-speech'
+include 'foray-unicode'
+include 'foray-xml'
+include 'foray-zz-attic'
+
+/* Last line of script. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 20:14:29
|
Revision: 12422
http://sourceforge.net/p/foray/code/12422
Author: victormote
Date: 2022-01-17 20:14:27 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Upgrade Gradle to 7.3.3.
Modified Paths:
--------------
trunk/foray/master/build.gradle
trunk/foray/master/gradle/wrapper/gradle-wrapper.jar
trunk/foray/master/gradle/wrapper/gradle-wrapper.properties
trunk/foray/master/gradlew
trunk/foray/master/gradlew.bat
Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-17 19:27:34 UTC (rev 12421)
+++ trunk/foray/master/build.gradle 2022-01-17 20:14:27 UTC (rev 12422)
@@ -1,5 +1,5 @@
/*
-This build file was designed to run with Gradle version 6.4.1.
+This build file was designed to run with Gradle version 7.3.3.
Important targets to run from the master directory:
1. gradle build
Modified: trunk/foray/master/gradle/wrapper/gradle-wrapper.jar
===================================================================
(Binary files differ)
Modified: trunk/foray/master/gradle/wrapper/gradle-wrapper.properties
===================================================================
--- trunk/foray/master/gradle/wrapper/gradle-wrapper.properties 2022-01-17 19:27:34 UTC (rev 12421)
+++ trunk/foray/master/gradle/wrapper/gradle-wrapper.properties 2022-01-17 20:14:27 UTC (rev 12422)
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Modified: trunk/foray/master/gradlew
===================================================================
--- trunk/foray/master/gradlew 2022-01-17 19:27:34 UTC (rev 12421)
+++ trunk/foray/master/gradlew 2022-01-17 20:14:27 UTC (rev 12422)
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
#
-# Copyright 2015 the original author or authors.
+# Copyright \xA9 2015-2021 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,41 +17,83 @@
#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions \xAB$var\xBB, \xAB${var}\xBB, \xAB${var:-default}\xBB, \xAB${var+SET}\xBB,
+# \xAB${var#prefix}\xBB, \xAB${var%suffix}\xBB, and \xAB$( cmd )\xBB;
+# * compound commands having a testable exit status, especially \xABcase\xBB;
+# * various built-in commands including \xABcommand\xBB, \xABset\xBB, and \xABulimit\xBB.
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
@@ -58,7 +100,7 @@
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
@@ -65,19 +107,11 @@
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
- JAVACMD=`cygpath --unix "$JAVACMD"`
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=`expr $i + 1`
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- 0) set -- ;;
- 1) set -- "$args0" ;;
- 2) set -- "$args0" "$args1" ;;
- 3) set -- "$args0" "$args1" "$args2" ;;
- 4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
+
exec "$JAVACMD" "$@"
Modified: trunk/foray/master/gradlew.bat
===================================================================
--- trunk/foray/master/gradlew.bat 2022-01-17 19:27:34 UTC (rev 12421)
+++ trunk/foray/master/gradlew.bat 2022-01-17 20:14:27 UTC (rev 12422)
@@ -40,7 +40,7 @@
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +54,7 @@
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +64,6 @@
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
@@ -86,7 +71,7 @@
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 19:27:36
|
Revision: 12421
http://sourceforge.net/p/foray/code/12421
Author: victormote
Date: 2022-01-17 19:27:34 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Upgrade junit and checkstyle to latest versions.
Modified Paths:
--------------
trunk/foray/master/build.gradle
Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-17 19:09:00 UTC (rev 12420)
+++ trunk/foray/master/build.gradle 2022-01-17 19:27:34 UTC (rev 12421)
@@ -53,7 +53,7 @@
ext.jeuclidVersion = '3.1.14' // Latest is 3.1.14 as of 2021-01-12. See Note 7.
ext.icu4jVersion = '68.2' // Latest is 68.2 as of 2021-01-12.
- ext.junitVersion = '4.13.1' // Latest is 5.7.0 as of 2021-01-12. See Note 8.
+ ext.junitVersion = '4.13.2' // Latest is 5.8.2 as of 2022-01-17. See Note 8.
ext.mockitoVersion = '2.28.2' // Latest is 3.7.0 as of 2021-01-12. See Note 9.
ext.logbackClassicVersion = '1.2.3' // Latest is 1.2.3 as of 2021-01-12.
@@ -87,8 +87,9 @@
* "jeuclid-core" and the same general release numbering sequence.
* The latest version for group net.sourceforge.jeuclid as of 2021-01-12 is 3.1.9 per www.mvnrepository.com.
*
- * 8. JUnit is compiled with Java 8 (major version 52) starting with release 5.0.0.
- * We have therefore stayed with the highest version supporting Java 7, which is 4.13.1.
+ * 8. JUnit is compiled with Java 8 (major version 52) starting with release 5.0.0, and the artifact appears to be
+ * named org.junit.jupiter:junit-jupiter-api also starting with that release.
+ * We have therefore stayed with the highest version supporting Java 7, which is 4.13.2 as of Jan. 17, 2022.
*
* 9. Mockito is compiled with Java 8 (major version 52) starting with release 3.0.0.
* We have therefore stayed with the highest version supporting Java 7, which 2.28.2.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 19:09:02
|
Revision: 12420
http://sourceforge.net/p/foray/code/12420
Author: victormote
Date: 2022-01-17 19:09:00 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Upgrade batik-related dependencies to latest version.
Modified Paths:
--------------
trunk/foray/master/build.gradle
Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-17 17:09:55 UTC (rev 12419)
+++ trunk/foray/master/build.gradle 2022-01-17 19:09:00 UTC (rev 12420)
@@ -1,4 +1,6 @@
/*
+This build file was designed to run with Gradle version 6.4.1.
+
Important targets to run from the master directory:
1. gradle build
Normal build checking for compile errors and test failures.
@@ -46,8 +48,8 @@
ext.xmlResolverVersion = '1.2' // Latest is 1.2 as of 2021-01-12. See Note 4.
ext.antVersion = '1.9.15' // Latest is 1.10.9 as of 2021-01-12. See Note 5.
ext.servletApiVersion = '3.1.0' // Latest is 4.0.1 as of 2021-01-12. See Note 6.
- ext.xmlgraphicsCommonsVersion = '2.4' // Latest is 2.4 as of 2021-01-12.
- ext.batikVersion = '1.13' // Latest is 1.13 as of 2021-01-12.
+ ext.xmlgraphicsCommonsVersion = '2.6' // Latest is 2.6 as of 2022-01-17.
+ ext.batikVersion = '1.14' // Latest is 1.14 as of 2022-01-17.
ext.jeuclidVersion = '3.1.14' // Latest is 3.1.14 as of 2021-01-12. See Note 7.
ext.icu4jVersion = '68.2' // Latest is 68.2 as of 2021-01-12.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 17:09:57
|
Revision: 12419
http://sourceforge.net/p/foray/code/12419
Author: victormote
Date: 2022-01-17 17:09:55 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Conform to aXSL changes: Replace DataSource with URL. Remove references to jakarta activation.
Modified Paths:
--------------
trunk/foray/foray-common/build.gradle
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
trunk/foray/foray-font/build.gradle
trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java
trunk/foray/foray-font/src/main/java/org/foray/font/config/ConfigGenerator.java
trunk/foray/foray-font/src/main/java/org/foray/font/config/FontConfigParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java
trunk/foray/foray-zz-attic/build.gradle
trunk/foray/master/build.gradle
Modified: trunk/foray/foray-common/build.gradle
===================================================================
--- trunk/foray/foray-common/build.gradle 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-common/build.gradle 2022-01-17 17:09:55 UTC (rev 12419)
@@ -5,8 +5,6 @@
api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
api (group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion) { transitive = false }
api (group: 'com.ibm.icu', name: 'icu4j', version: icu4jVersion) { transitive = false }
- /* TODO: Consider removing dependency on Jakarta Activation, aka javax.activation. */
- api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: jakartaActivationVersion) { transitive = false }
/* Turn transitive resolution OFF for both aXSL and FOray modules, for greater design visibility. */
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -45,8 +45,6 @@
import java.math.BigDecimal;
import java.nio.charset.Charset;
-import javax.activation.DataSource;
-
/**
* Wraps an instance of {@link ByteSequence} and provides methods for parsing that sequence and accessing its content
* using random access.
@@ -68,17 +66,6 @@
}
/**
- * Constructor for a {@link DataSource} instance.
- * @param dataSource The {@link DataSource} whose input stream should be captured as a byte sequence.
- * @throws IOException For errors opening, reading, or closing the input stream.
- */
- public ByteSequenceParser(final DataSource dataSource) throws IOException {
- final ByteArrayBuilder builder = new ByteArrayBuilder();
- builder.append(dataSource.getInputStream());
- this.sequence = builder.asPlus();
- }
-
- /**
* Constructor for an {@link InputStream} instance.
* Reads the content of {@code inputStream} into the parser, then closes it.
* @param inputStream The {@link InputStream} whose content should be captured as a byte sequence.
Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/build.gradle 2022-01-17 17:09:55 UTC (rev 12419)
@@ -6,8 +6,6 @@
api group: 'commons-discovery', name: 'commons-discovery', version: commonsDiscoveryVersion
api group: 'org.apache.ant', name: 'ant-launcher', version: antVersion
api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
- /* TODO: Consider removing dependency on Jakarta Activation, aka javax.activation. */
- api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: jakartaActivationVersion) { transitive = false }
/* Turn transitive resolution OFF for both aXSL and FOray modules, for greater design visibility. */
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FontServer4a.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -66,7 +66,6 @@
import java.util.Map;
import java.util.Map.Entry;
-import javax.activation.DataSource;
import javax.xml.parsers.ParserConfigurationException;
/**
@@ -949,9 +948,9 @@
}
@Override
- public void registerFont(final String fontID, final DataSource fontFileSource,
- final DataSource metricsFileSource, final String collectionID,
- final org.axsl.font.Font.Embedding requestedEmbedding, final String systemName) throws FontException {
+ public void registerFont(final String fontID, final URL fontFileSource, final URL metricsFileSource,
+ final String collectionID, final org.axsl.font.Font.Embedding requestedEmbedding, final String systemName)
+ throws FontException {
if (! isUsableFont(systemName, fontFileSource, metricsFileSource)) {
return;
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/config/ConfigGenerator.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/config/ConfigGenerator.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/config/ConfigGenerator.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -65,7 +65,6 @@
import java.util.List;
import java.util.Map;
-import javax.activation.URLDataSource;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
@@ -300,8 +299,7 @@
}
FontParser reader = null;
try {
- final URLDataSource urlDataSource = new URLDataSource(url);
- reader = new FontParser(this.fontServer, urlDataSource);
+ reader = new FontParser(this.fontServer, url.openStream());
} catch (final IOException e) {
getLogger().error(e.getMessage());
this.failureCount ++;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/config/FontConfigParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/config/FontConfigParser.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/config/FontConfigParser.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -56,8 +56,6 @@
import java.util.Stack;
import java.util.StringTokenizer;
-import javax.activation.DataSource;
-import javax.activation.URLDataSource;
import javax.xml.parsers.ParserConfigurationException;
/**
@@ -440,13 +438,12 @@
* @param attributes The raw parsed attributes.
*/
private void parseElementFont(final Attributes attributes) {
- final String fontFile = replaceParameters(attributes.getValue(
- "font-file"));
+ final String fontFile = replaceParameters(attributes.getValue("font-file"));
String fontID = attributes.getValue("id");
- final String metricsFile = replaceParameters(attributes.getValue(
- "metrics-file"));
+ final String metricsFile = replaceParameters(attributes.getValue("metrics-file"));
final String collectionID = attributes.getValue("collection-id");
final String embedString = attributes.getValue("embed");
+
Font.Embedding embed = null;
if (embedString == null
|| embedString.equals("")) {
@@ -458,34 +455,30 @@
final String systemName = attributes.getValue("system-name");
String refID = attributes.getValue("ref");
- DataSource fontFileSource = null;
+ URL fontFileSource = null;
if (fontFile != null) {
try {
- final URL fontFileURL = UrlFactory.createURL(this.currentXMLBase,
- fontFile);
- fontFileSource = new URLDataSource(fontFileURL);
+ fontFileSource = UrlFactory.createURL(this.currentXMLBase, fontFile);
} catch (final MalformedURLException e) {
- this.logError("Malformed URL in font configuration:\n"
- + " " + fontFile);
+ this.logError("Malformed font file URL in font configuration: " + fontFile);
/* TODO: Just invalidate this one font and warn the user instead
* of invalidating everything. */
this.fontServer.setFatalConfigurationError(true);
}
+ getLogger().debug("Font file: " + fontFileSource.toExternalForm());
}
- DataSource metricsFileSource = null;
+ URL metricsFileSource = null;
if (metricsFile != null) {
try {
- final URL metricsFileURL = UrlFactory.createURL(this.currentXMLBase,
- metricsFile);
- metricsFileSource = new URLDataSource(metricsFileURL);
+ metricsFileSource = UrlFactory.createURL(this.currentXMLBase, metricsFile);
} catch (final MalformedURLException e) {
- this.logError("Malformed URL in font configuration:\n"
- + " " + metricsFile);
+ this.logError("Malformed metrics file URL in font configuration: " + metricsFile);
/* TODO: Just invalidate this one font and warn the user instead
* of invalidating everything. */
this.fontServer.setFatalConfigurationError(true);
}
+ getLogger().debug("Metrics file: " + metricsFileSource.toExternalForm());
}
/* TODO vh: check that if ref is declared, it is alone */
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -50,8 +50,6 @@
import java.io.IOException;
import java.net.URL;
-import javax.activation.DataSource;
-
/**
* <p>Class representing a font that has been registered for use with FOray.
* RegisteredFont is not really a Font, as it is not part of the Font hierarcy
@@ -150,10 +148,10 @@
private FontServer4a fontServer = null;
/** The source of the font file, if any. */
- private DataSource fontFileSource;
+ private URL fontFileSource;
/** The source of the metrics file, if any. */
- private DataSource metricsFileSource;
+ private URL metricsFileSource;
/**
* Constructor useful for registering a Font that has not yet been read.
@@ -169,8 +167,8 @@
* itself as a SystemFont.
* @throws FontException For an error during font registration.
*/
- public RegisteredFont(final FontServer4a server, final String fontName, final DataSource fontFileSource,
- final DataSource metricsFileSource, final String ttcName,
+ public RegisteredFont(final FontServer4a server, final String fontName, final URL fontFileSource,
+ final URL metricsFileSource, final String ttcName,
final Font.Embedding embedding, final String systemName)
throws FontException {
this.fontServer = server;
@@ -272,7 +270,7 @@
public FontParser createFontFileReader() throws FontException {
if (this.fontFileSource != null) {
try {
- return new FontParser(this, this.fontFileSource);
+ return new FontParser(this, this.fontFileSource.openStream());
} catch (final IOException e) {
throw new FontException(e);
}
@@ -299,7 +297,7 @@
public Type1MetricsParser createMetricsFileReader() throws FontException {
if (this.metricsFileSource != null) {
try {
- return new Type1MetricsParser(this.fontServer, this.metricsFileSource);
+ return new Type1MetricsParser(this.fontServer, this.metricsFileSource.openStream());
} catch (final IOException e) {
throw new FontException(e);
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -44,9 +44,8 @@
import org.slf4j.Logger;
import java.io.IOException;
+import java.io.InputStream;
-import javax.activation.DataSource;
-
/**
* Parses a font file.
*/
@@ -119,14 +118,14 @@
/**
* Constructor.
* @param parserClient The font parser client.
- * @param dataSource The description and content to be parsed.
+ * @param inputStream The content to be parsed.
* @throws IOException For errors opening or reading the input stream.
* @throws FontException For an unsupported font format.
*/
- public FontParser(final FontParserClient parserClient, final DataSource dataSource)
+ public FontParser(final FontParserClient parserClient, final InputStream inputStream)
throws IOException, FontException {
this.parserClient = parserClient;
- this.randomInput = new ByteSequenceParser(dataSource);
+ this.randomInput = new ByteSequenceParser(inputStream);
parseFontFileBasics();
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -52,8 +52,6 @@
import java.net.MalformedURLException;
import java.net.URL;
-import javax.activation.URLDataSource;
-
/**
* Tool (with command-line interface) which lists the contents of a TrueType
* collection (ttc) file.
@@ -85,8 +83,7 @@
FontParser reader = null;
try {
final URL url = UrlFactory.createURL(urlPath);
- final URLDataSource urlDataSource = new URLDataSource(url);
- reader = new FontParser(this.parserClient, urlDataSource);
+ reader = new FontParser(this.parserClient, url.openStream());
} catch (final MalformedURLException e) {
logger.error(e.getMessage());
return;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java 2022-01-17 17:09:55 UTC (rev 12419)
@@ -37,9 +37,8 @@
import org.slf4j.Logger;
import java.io.IOException;
+import java.io.InputStream;
-import javax.activation.DataSource;
-
/**
* Parses a font metrics file.
* @see "Adobe Font Metrics File Format Specification"
@@ -87,12 +86,12 @@
/**
* Constructor suitable for reading an input stream.
* @param fontServer The font server.
- * @param dataSource The description and content to be parsed.
+ * @param inputStream The content to be parsed.
* @throws IOException For I/O Error.
*/
- public Type1MetricsParser(final FontServer4a fontServer, final DataSource dataSource) throws IOException {
+ public Type1MetricsParser(final FontServer4a fontServer, final InputStream inputStream) throws IOException {
this.fontServer = fontServer;
- this.randomInput = new ByteSequenceParser(dataSource);
+ this.randomInput = new ByteSequenceParser(inputStream);
parseMetricsFileBasics();
}
Modified: trunk/foray/foray-zz-attic/build.gradle
===================================================================
--- trunk/foray/foray-zz-attic/build.gradle 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/foray-zz-attic/build.gradle 2022-01-17 17:09:55 UTC (rev 12419)
@@ -2,7 +2,7 @@
dependencies {
api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
- api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: jakartaActivationVersion) { transitive = false }
+ api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: '1.2.2') { transitive = false }
api (group: 'org.axsl', name: 'axsl-common', version: axslVersion) { transitive = false }
Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-17 13:57:10 UTC (rev 12418)
+++ trunk/foray/master/build.gradle 2022-01-17 17:09:55 UTC (rev 12419)
@@ -37,7 +37,6 @@
ext.axslVersion = '0.3-SNAPSHOT' // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
ext.svgDomVersion = '1.1' // See aXSL master/build.gradle
ext.mathMlDomVersion = '2.0' // See aXSL master/build.gradle
- ext.jakartaActivationVersion = '1.2.2' // See aXSL master/build.gradle
/* End of aXSL-related dependencies. */
ext.slf4jVersion = '1.7.30' // Latest is 1.7.30 as of 2021-01-12.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 13:57:14
|
Revision: 12418
http://sourceforge.net/p/foray/code/12418
Author: victormote
Date: 2022-01-17 13:57:10 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Replace dependencies on foray.common.io, and move it to the attic.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/OtfLookupGsubTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeCollectionParserTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java
trunk/foray/foray-zz-attic/build.gradle
Added Paths:
-----------
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java
trunk/foray/foray-zz-attic/src/test/java/org/
trunk/foray/foray-zz-attic/src/test/java/org/foray/
trunk/foray/foray-zz-attic/src/test/java/org/foray/common/
trunk/foray/foray-zz-attic/src/test/java/org/foray/common/io/
Removed Paths:
-------------
trunk/foray/foray-common/src/main/java/org/foray/common/io/
trunk/foray/foray-common/src/test/java/org/foray/common/io/
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInput.java
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -78,6 +78,19 @@
this.sequence = builder.asPlus();
}
+ /**
+ * Constructor for an {@link InputStream} instance.
+ * Reads the content of {@code inputStream} into the parser, then closes it.
+ * @param inputStream The {@link InputStream} whose content should be captured as a byte sequence.
+ * @throws IOException For errors reading or closing the input stream.
+ */
+ public ByteSequenceParser(final InputStream inputStream) throws IOException {
+ final ByteArrayBuilder builder = new ByteArrayBuilder();
+ builder.append(inputStream);
+ inputStream.close();
+ this.sequence = builder.asPlus();
+ }
+
@Override
public void seek(final long offset) throws IOException {
this.index = (int) offset;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -28,9 +28,8 @@
package org.foray.font.config;
-import org.foray.common.RandomAccessInput;
-import org.foray.common.io.AbstractRandomAccessInput;
-import org.foray.common.io.SimpleDataSource;
+import org.foray.common.sequence.ByteArray;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.Font4a;
import org.foray.font.FontServer4a;
import org.foray.font.FreeStandingFont;
@@ -48,7 +47,6 @@
import org.slf4j.Logger;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.net.URL;
@@ -282,10 +280,9 @@
if (this.fontFileContents != null) {
try {
- final SimpleDataSource dataSource =
- new SimpleDataSource(null, new ByteArrayInputStream(this.fontFileContents),
- this.fontFileDescription, null);
- return new FontParser(this, dataSource);
+ final ByteArray byteArray = new ByteArray(this.fontFileContents);
+ final ByteSequenceParser bsp = new ByteSequenceParser(byteArray);
+ return new FontParser(this, bsp);
} catch (final IOException e) {
throw new FontException(e);
}
@@ -310,10 +307,9 @@
if (this.metricsFileContents != null) {
try {
- final RandomAccessInput input =
- AbstractRandomAccessInput.createRandomAccessInput(this.metricsFileDescription,
- this.metricsFileContents);
- return new Type1MetricsParser(this.fontServer, input);
+ final ByteArray byteArray = new ByteArray(this.metricsFileContents);
+ final ByteSequenceParser bsp = new ByteSequenceParser(byteArray);
+ return new Type1MetricsParser(this.fontServer, bsp);
} catch (final IOException e) {
throw new FontException(e);
}
@@ -540,4 +536,20 @@
return this.configuredFontName;
}
+ /**
+ * Returns the font file description.
+ * @return The font file description.
+ */
+ public String getFontFileDescription() {
+ return fontFileDescription;
+ }
+
+ /**
+ * Returns the metrics file description.
+ * @return The metrics file description.
+ */
+ public String getMetricsFileDescription() {
+ return metricsFileDescription;
+ }
+
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -131,6 +131,20 @@
}
/**
+ * Constructor.
+ * @param parserClient The font parser client.
+ * @param byteSequenceParser The description and content to be parsed.
+ * @throws IOException For errors opening or reading the input stream.
+ * @throws FontException For an unsupported font format.
+ */
+ public FontParser(final FontParserClient parserClient, final ByteSequenceParser byteSequenceParser)
+ throws IOException, FontException {
+ this.parserClient = parserClient;
+ this.randomInput = byteSequenceParser;
+ parseFontFileBasics();
+ }
+
+ /**
* Parses the font file enough to find the font format and the file
* format. This should only be run once.
* @throws IOException For I/O Error.
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/OtfLookupGsubTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/OtfLookupGsubTests.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/OtfLookupGsubTests.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -29,8 +29,8 @@
package org.foray.font.format.ttf;
import org.foray.common.FontContext4a;
-import org.foray.common.io.SimpleDataSource;
import org.foray.common.primitive.CharSequenceUtils;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.common.sequence.IntArrayBuilder;
import org.foray.font.FontServer4a;
import org.foray.font.format.FontContent;
@@ -51,8 +51,6 @@
import java.util.List;
import java.util.Map;
-import javax.activation.DataSource;
-
/**
* Tests of {@link OtfLookupGsub}.
*/
@@ -75,8 +73,8 @@
final InputStream inputStream = OtfLookupGsubTests.class.getResourceAsStream(path);
Assert.assertNotNull(inputStream);
final FontServer4a fontServer = new FontServer4a();
- final DataSource dataSource = new SimpleDataSource(null, inputStream, path, null);
- final FontParser parser = new FontParser(fontServer, dataSource);
+ final ByteSequenceParser bsp = new ByteSequenceParser(inputStream);
+ final FontParser parser = new FontParser(fontServer, bsp);
final FontContent fontContent = parser.createFontFile();
Assert.assertTrue(fontContent instanceof TrueTypeSingle);
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeCollectionParserTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeCollectionParserTests.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeCollectionParserTests.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.SimpleDataSource;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.foray.font.format.FontContent;
import org.foray.font.format.FontParser;
@@ -41,8 +41,6 @@
import java.io.IOException;
import java.io.InputStream;
-import javax.activation.DataSource;
-
/**
* Tests of our ability to parse a TrueType Collection file.
*/
@@ -61,8 +59,8 @@
final InputStream inputStream = getClass().getResourceAsStream(path);
Assert.assertNotNull(inputStream);
final FontServer4a fontServer = new FontServer4a();
- final DataSource dataSource = new SimpleDataSource(null, inputStream, path, null);
- final FontParser reader = new FontParser(fontServer, dataSource);
+ final ByteSequenceParser bsp = new ByteSequenceParser(inputStream);
+ final FontParser reader = new FontParser(fontServer, bsp);
final FontContent fontContent = reader.createFontFile();
Assert.assertTrue(fontContent instanceof TrueTypeCollection);
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -29,7 +29,7 @@
package org.foray.font.format.ttf;
import org.foray.common.data.BoundingBoxShort;
-import org.foray.common.io.SimpleDataSource;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.foray.font.format.FontContent;
import org.foray.font.format.FontParser;
@@ -44,8 +44,6 @@
import java.io.InputStream;
import java.math.BigDecimal;
-import javax.activation.DataSource;
-
/**
* Tests of our ability to parse a TrueType font.
*/
@@ -103,8 +101,8 @@
final InputStream inputStream = getClass().getResourceAsStream(path);
Assert.assertNotNull(inputStream);
final FontServer4a fontServer = new FontServer4a();
- final DataSource dataSource = new SimpleDataSource(null, inputStream, path, null);
- final FontParser parser = new FontParser(fontServer, dataSource);
+ final ByteSequenceParser bsp = new ByteSequenceParser(inputStream);
+ final FontParser parser = new FontParser(fontServer, bsp);
final FontContent fontContent = parser.createFontFile();
Assert.assertTrue(fontContent instanceof TrueTypeSingle);
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -28,7 +28,7 @@
package org.foray.font.format.type1;
-import org.foray.common.io.SimpleDataSource;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.foray.font.format.FontParser;
@@ -46,8 +46,6 @@
import java.io.InputStream;
import java.math.BigDecimal;
-import javax.activation.DataSource;
-
/**
* JUnit test class for the class {@link Type1FontParserPfaTests}.
*/
@@ -64,8 +62,8 @@
final InputStream inputStream = getClass().getResourceAsStream(path);
Assert.assertNotNull(inputStream);
final FontServer4a fontServer = new FontServer4a();
- final DataSource dataSource = new SimpleDataSource(null, inputStream, path, null);
- final FontParser reader = new FontParser(fontServer, dataSource);
+ final ByteSequenceParser bsp = new ByteSequenceParser(inputStream);
+ final FontParser reader = new FontParser(fontServer, bsp);
Assert.assertNotNull(reader);
final Type1FontParserPfa parser = new Type1FontParserPfa(reader);
Assert.assertNotNull(parser);
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -28,7 +28,7 @@
package org.foray.font.format.type1;
-import org.foray.common.io.SimpleDataSource;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.foray.font.format.FontParser;
@@ -46,8 +46,6 @@
import java.io.InputStream;
import java.math.BigDecimal;
-import javax.activation.DataSource;
-
/**
* JUnit test class for the class {@link Type1FontParserPfbTests}.
*/
@@ -64,8 +62,8 @@
final InputStream inputStream = getClass().getResourceAsStream(path);
Assert.assertNotNull(inputStream);
final FontServer4a fontServer = new FontServer4a();
- final DataSource dataSource = new SimpleDataSource(null, inputStream, path, null);
- final FontParser reader = new FontParser(fontServer, dataSource);
+ final ByteSequenceParser bsp = new ByteSequenceParser(inputStream);
+ final FontParser reader = new FontParser(fontServer, bsp);
Assert.assertNotNull(reader);
final Type1FontParserPfb parser = new Type1FontParserPfb(reader);
Assert.assertNotNull(parser);
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -28,9 +28,7 @@
package org.foray.font.format.type1;
-import org.foray.common.RandomAccessInput;
-import org.foray.common.io.AbstractRandomAccessInput;
-import org.foray.common.io.SimpleDataSource;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.foray.font.FontServer4aTests;
@@ -44,8 +42,6 @@
import java.io.IOException;
import java.io.InputStream;
-import javax.activation.DataSource;
-
/**
* Tests of {@link Type1MetricsParserAfm}.
*/
@@ -61,9 +57,8 @@
final FontServer4a server = FontServer4aTests.getServer();
final InputStream is = new FileInputStream("src/main/data/base-14/Times-Roman.afm");
Assert.assertNotNull(is);
- final DataSource ds = new SimpleDataSource("", is, "", null);
- final RandomAccessInput input = AbstractRandomAccessInput.createRandomAccessInput(ds);
- final Type1MetricsParserAfm parser = new Type1MetricsParserAfm(server, input);
+ final ByteSequenceParser bsp = new ByteSequenceParser(is);
+ final Type1MetricsParserAfm parser = new Type1MetricsParserAfm(server, bsp);
final Type1Metrics metrics = parser.parse();
Assert.assertNotNull(metrics);
Modified: trunk/foray/foray-zz-attic/build.gradle
===================================================================
--- trunk/foray/foray-zz-attic/build.gradle 2022-01-17 13:09:06 UTC (rev 12417)
+++ trunk/foray/foray-zz-attic/build.gradle 2022-01-17 13:57:10 UTC (rev 12418)
@@ -1,7 +1,10 @@
description = 'foray-zz-attic'
dependencies {
- api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
+ api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
+ api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: jakartaActivationVersion) { transitive = false }
+
+ api (group: 'org.axsl', name: 'axsl-common', version: axslVersion) { transitive = false }
api (project(':foray-common')) { transitive = false }
Deleted: trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-15 17:44:53 UTC (rev 12405)
+++ trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -1,185 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common.io;
-
-import org.foray.common.WellKnownConstants;
-import org.foray.common.primitive.CharsetUtils;
-
-import org.apache.commons.io.EndianUtils;
-
-import java.io.EOFException;
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.net.URL;
-import java.nio.charset.Charset;
-
-import javax.activation.DataSource;
-import javax.activation.URLDataSource;
-
-/**
- * Abstract superclass for {@link RandomAccessInput} implementations.
- */
-public abstract class AbstractRandomAccessInput implements RandomAccessInput {
-
- /**
- * Factory method that creates an instance of the best {@link RandomAccessInput} implementation for a given URL.
- * @param url The URL for which a {@link RandomAccessInput} instance is needed.
- * @return The newly-created {@link RandomAccessInput} instance.
- * @throws IOException For errors opening or reading the URL.
- */
- public static RandomAccessInput createRandomAccessInput(final URL url) throws IOException {
- if (url == null) {
- throw new IOException("URL is null.");
- }
- final File file = new File(url.getFile());
- if (! file.canRead()) {
- /* If we can't get a readable file out of it, we need to use the URL
- * implementation instead. */
- return new RandomAccessInputUrl(url);
- }
- return new RandomAccessInputFile(file);
- }
-
- /**
- * Factory method that creates an instance of the best {@link RandomAccessInput} implementation for a given byte
- * array.
- * @param description The description of the byte array.
- * @param byteArray The byte array for which a {@link RandomAccessInput} instance
- * is needed.
- * @return The newly-created {@link RandomAccessInput} instance.
- */
- public static RandomAccessInput createRandomAccessInput(final String description,
- final byte[] byteArray) {
- /* Right now, there is only one available implementation. */
- return new RandomAccessInputArray(description, byteArray);
- }
-
- /**
- * Factory method that creates an instance of the best {@link RandomAccessInput} implementation for a given byte
- * array.
- * @param dataSource The data source containing the description and content.
- * @return The newly-created {@link RandomAccessInput} instance.
- * @throws IOException For errors opening or reading the input stream.
- */
- public static RandomAccessInput createRandomAccessInput(final DataSource dataSource) throws IOException {
- if (dataSource instanceof URLDataSource) {
- final URLDataSource urlDataSource = (URLDataSource) dataSource;
- final URL url = urlDataSource.getURL();
- return AbstractRandomAccessInput.createRandomAccessInput(url);
- }
- return new RandomAccessInputArray(dataSource.getName(), dataSource.getInputStream());
- }
-
- @Override
- public final long readUnsignedInt() throws IOException {
- long ret = readUnsignedByte();
- ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
- ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
- ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
- return ret;
- }
-
- @Override
- public long readUnsignedIntLoHi() throws IOException {
- final int byte1 = readUnsignedByte();
- final int byte2 = readUnsignedByte();
- final int byte3 = readUnsignedByte();
- final int byte4 = readUnsignedByte();
- return (byte4 << WellKnownConstants.SHIFT_3_BYTES)
- + (byte3 << WellKnownConstants.SHIFT_2_BYTES)
- + (byte2 << WellKnownConstants.SHIFT_1_BYTE)
- + byte1;
- }
-
- @Override
- public int readUnsignedShortLoHi() throws IOException {
- final int byte1 = readUnsignedByte();
- final int byte2 = readUnsignedByte();
- return (byte2 << WellKnownConstants.SHIFT_1_BYTE) + byte1;
- }
-
- @Override
- public int readShortLoHi() throws IOException {
- final short beShort = readShort();
- return EndianUtils.swapShort(beShort);
- }
-
- @Override
- public String readString(final int stringSize, final Charset characterSet)
- throws IOException {
- if ((stringSize + getOffset()) > length()) {
- throw new EOFException("Reached EOF, file size="
- + length());
- }
- final byte[] tmp = new byte[stringSize];
- for (int i = 0; i < stringSize; i++) {
- tmp[i] = readByte();
- }
- return new String(tmp, characterSet);
- }
-
- @Override
- public String readStringASCII(final int stringSize) throws IOException {
- return readString(stringSize, CharsetUtils.CHARSET_US_ASCII);
- }
-
- @Override
- public String readTerminatedString(final byte terminatingChar,
- final Charset characterSet) throws IOException {
- // We're going to read ahead here, so save the location
- final long saveLocation = getOffset();
- int stringSize = 0;
- byte inByte = readByte();
- while (inByte != terminatingChar) {
- stringSize ++;
- inByte = readByte();
- }
- /*
- * Return to the saved location so that we can use the normal
- * readString().
- */
- seek(saveLocation);
- return readString(stringSize, characterSet);
- }
-
- @Override
- public String readNullTerminatedString(final Charset characterSet) throws IOException {
- return readTerminatedString((byte) 0x00, characterSet);
- }
-
- @Override
- public BigDecimal readFixed16x16Signed() throws IOException {
- final int highOrder = readShort();
- final long lowOrder = readUnsignedShort();
- final String asString = Integer.toString(highOrder) + "." + Long.toString(lowOrder);
- return new BigDecimal(asString);
- }
-
-}
Copied: trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java (from rev 12415, trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java)
===================================================================
--- trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java (rev 0)
+++ trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -0,0 +1,189 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.common.io;
+
+import org.foray.common.RandomAccessInput;
+import org.foray.common.WellKnownConstants;
+import org.foray.common.primitive.CharsetUtils;
+import org.foray.common.sequence.ByteArrayBuilder;
+import org.foray.common.sequence.ByteSequenceParser;
+
+import org.apache.commons.io.EndianUtils;
+
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.nio.charset.Charset;
+
+import javax.activation.DataSource;
+
+/**
+ * Abstract superclass for {@link RandomAccessInput} implementations.
+ */
+public abstract class AbstractRandomAccessInput implements RandomAccessInput {
+
+ /**
+ * Factory method that creates an instance of the best {@link RandomAccessInput} implementation for a given URL.
+ * @param url The URL for which a {@link RandomAccessInput} instance is needed.
+ * @return The newly-created {@link RandomAccessInput} instance.
+ * @throws IOException For errors opening or reading the URL.
+ */
+ public static InputStream createRandomAccessInput(final URL url) throws IOException {
+ if (url == null) {
+ throw new IOException("URL is null.");
+ }
+ final InputStream inputStream;
+ final File file = new File(url.getFile());
+ if (! file.canRead()) {
+ /* If we can't get a readable file out of it, we need to use the URL implementation instead. */
+ inputStream = url.openStream();
+ } else {
+ inputStream = new FileInputStream(file);
+ }
+ return inputStream;
+ }
+
+ /**
+ * Factory method that creates an instance of the best {@link RandomAccessInput} implementation for a given byte
+ * array.
+ * @param description The description of the byte array.
+ * @param byteArray The byte array for which a {@link RandomAccessInput} instance
+ * is needed.
+ * @return The newly-created {@link RandomAccessInput} instance.
+ */
+ public static RandomAccessInput createRandomAccessInput(final String description,
+ final byte[] byteArray) {
+ /* Right now, there is only one available implementation. */
+ return new RandomAccessInputArray(description, byteArray);
+ }
+
+ /**
+ * Factory method that creates an instance of the best {@link RandomAccessInput} implementation for a given byte
+ * array.
+ * @param dataSource The data source containing the description and content.
+ * @return The newly-created {@link RandomAccessInput} instance.
+ * @throws IOException For errors opening or reading the input stream.
+ */
+ public static ByteSequenceParser createRandomAccessInput(final DataSource dataSource) throws IOException {
+ final ByteArrayBuilder builder = new ByteArrayBuilder();
+ builder.append(dataSource.getInputStream());
+ dataSource.getInputStream().close();
+ return new ByteSequenceParser(builder.toByteArray());
+ }
+
+ @Override
+ public final long readUnsignedInt() throws IOException {
+ long ret = readUnsignedByte();
+ ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
+ ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
+ ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
+ return ret;
+ }
+
+ @Override
+ public long readUnsignedIntLoHi() throws IOException {
+ final int byte1 = readUnsignedByte();
+ final int byte2 = readUnsignedByte();
+ final int byte3 = readUnsignedByte();
+ final int byte4 = readUnsignedByte();
+ return (byte4 << WellKnownConstants.SHIFT_3_BYTES)
+ + (byte3 << WellKnownConstants.SHIFT_2_BYTES)
+ + (byte2 << WellKnownConstants.SHIFT_1_BYTE)
+ + byte1;
+ }
+
+ @Override
+ public int readUnsignedShortLoHi() throws IOException {
+ final int byte1 = readUnsignedByte();
+ final int byte2 = readUnsignedByte();
+ return (byte2 << WellKnownConstants.SHIFT_1_BYTE) + byte1;
+ }
+
+ @Override
+ public int readShortLoHi() throws IOException {
+ final short beShort = readShort();
+ return EndianUtils.swapShort(beShort);
+ }
+
+ @Override
+ public String readString(final int stringSize, final Charset characterSet)
+ throws IOException {
+ if ((stringSize + getOffset()) > length()) {
+ throw new EOFException("Reached EOF, file size="
+ + length());
+ }
+ final byte[] tmp = new byte[stringSize];
+ for (int i = 0; i < stringSize; i++) {
+ tmp[i] = readByte();
+ }
+ return new String(tmp, characterSet);
+ }
+
+ @Override
+ public String readStringASCII(final int stringSize) throws IOException {
+ return readString(stringSize, CharsetUtils.CHARSET_US_ASCII);
+ }
+
+ @Override
+ public String readTerminatedString(final byte terminatingChar,
+ final Charset characterSet) throws IOException {
+ // We're going to read ahead here, so save the location
+ final long saveLocation = getOffset();
+ int stringSize = 0;
+ byte inByte = readByte();
+ while (inByte != terminatingChar) {
+ stringSize ++;
+ inByte = readByte();
+ }
+ /*
+ * Return to the saved location so that we can use the normal
+ * readString().
+ */
+ seek(saveLocation);
+ return readString(stringSize, characterSet);
+ }
+
+ @Override
+ public String readNullTerminatedString(final Charset characterSet) throws IOException {
+ return readTerminatedString((byte) 0x00, characterSet);
+ }
+
+ @Override
+ public BigDecimal readFixed16x16Signed() throws IOException {
+ final int highOrder = readShort();
+ final long lowOrder = readUnsignedShort();
+ final String asString = Integer.toString(highOrder) + "." + Long.toString(lowOrder);
+ return new BigDecimal(asString);
+ }
+
+}
Deleted: trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInput.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInput.java 2022-01-15 17:44:53 UTC (rev 12405)
+++ trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInput.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -1,173 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common.io;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.math.BigDecimal;
-import java.nio.charset.Charset;
-
-/**
- * This interface extends DataInput by adding methods for random access
- * to the contents. The method names and signatures were pulled up from
- * RandomAccessFile. This interface will generally be useful for classes
- * providing random input access to a file or file-like structure, i.e. file
- * readers or parsers.
- *
- * @see java.io.DataInput
- * @see java.io.RandomAccessFile
- */
-public interface RandomAccessInput extends DataInput {
-
- /**
- * <p>Sets the input pointer offset, measured from the beginning of the
- * input, at which the next read occurs.
- * The offset may be set beyond the end of the input.
- * Setting the offset beyond the end of the input does not change the input
- * length.</p>
- * <p>This method is based on {@link RandomAccessFile#seek(long)}.</p>
- * @param offset The offset position, measured in bytes from the beginning of
- * the input, at which to set the input pointer.
- * @throws IOException If {@code pos} is less than {@code 0}, or if an I/O error occurs.
- * @see RandomAccessFile#seek(long)
- */
- void seek(long offset) throws IOException;
-
- /**
- * <p>Returns the current offset in this input.</p>
- * <p>This method is based on {@link RandomAccessFile#getFilePointer()}.</p>
- * @return The offset from the beginning of the input, in bytes, at which
- * the next read occurs.
- * @exception IOException If an I/O error occurs.
- * @see RandomAccessFile#getFilePointer()
- */
- long getOffset() throws IOException;
-
- /**
- * <p>Returns the length of this input.</p>
- * <p>This method is based on {@link RandomAccessFile#length()}.</p>
- * @return The length of the input, measured in bytes.
- * @exception IOException If an I/O error occurs.
- * @see RandomAccessFile#length()
- */
- long length() throws IOException;
-
- /**
- * Provides some kind of description of this item, useful in user messages.
- * @return A description of the contents of this item.
- */
- String getDescription();
-
- /**
- * Return the input as an InputStream.
- * @return An InputStream containing the input contents.
- * @exception IOException If an I/O error occurs.
- */
- InputStream getInputStream() throws IOException;
-
- /**
- * Reads a String of stringSize bytes at the current location.
- * @param stringSize The length, in bytes, of the String to be read.
- * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
- * @return The read String.
- * @throws IOException For reading past the end of the input.
- */
- String readString(int stringSize, Charset characterSet) throws IOException;
-
- /**
- * Reads an ASCII String of stringSize bytes at the current location.
- * @param stringSize The length, in bytes, of the String to be read.
- * @return The read String.
- * @throws IOException For reading past the end of the input.
- */
- String readStringASCII(int stringSize) throws IOException;
-
- /**
- * Reads a string terminated by a specific character, usually the null character, 0x00.
- * @param terminatingChar The value to be used as the terminator for the read String.
- * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
- * @return The string read.
- * @throws IOException For I/O error.
- */
- String readTerminatedString(byte terminatingChar, Charset characterSet) throws IOException;
-
- /**
- * Reads a null-terminated String.
- * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
- * @return The read String.
- * @throws IOException For I/O error.
- */
- String readNullTerminatedString(Charset characterSet) throws IOException;
-
- /**
- * Read 4 unsigned bytes and convert them to a long containing the unsigned value.
- * @return A long containing the unsigned 32-bit value.
- * Returns a long because int is signed, and therefore can't hold 32 unsigned bits.
- * @throws IOException For I/O error.
- */
- long readUnsignedInt() throws IOException;
-
- /**
- * Read an unsigned 4-byte integer, and reverse the byte order, making the
- * lowest-order byte first and the highest-order byte last.
- *
- * @return The unsigned integral.
- * @throws IOException For I/O error.
- */
- long readUnsignedIntLoHi() throws IOException;
-
- /**
- * Read an unsigned 2-byte short, and reverse the byte order, making the
- * low-order byte first and the high-order byte last.
- * @return The unsigned integral.
- * @throws IOException For I/O error.
- */
- int readUnsignedShortLoHi() throws IOException;
-
- /**
- * Read a signed 2-byte short in little-endian order, that is, making the
- * first byte the low-order byte and the second byte the high-order byte.
- * @return The unsigned integral.
- * @throws IOException For I/O error.
- */
- int readShortLoHi() throws IOException;
-
- /**
- * Reads a fixed-length decimal number with a 16-bit signed twos-complement mantissa, followed by a 16-bit unsigned
- * fraction.
- * Note that this format corresponds to a TrueType Font "FIXED" data type, as described in the TTF Spec, Chapter 2
- * (Data Types).
- * @return The parsed value, as a BigDecimal.
- * @throws IOException For I/O Error.
- */
- BigDecimal readFixed16x16Signed() throws IOException;
-
-}
Deleted: trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInputUrl.java 2022-01-15 17:44:53 UTC (rev 12405)
+++ trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -1,199 +0,0 @@
-/*
- * Copyright 2006 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common.io;
-
-import org.foray.common.IoUtil;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-/**
- * Implementation of {@link RandomAccessInput} suitable for URLs that are not local
- * files.
- * It is actually a thin wrapper around a {@link RandomAccessInputArray} instance.
- * The idea here is to allow the encapsulated byte array to be released when it
- * is not used, but to retain the URL in case it needs to be reopened.
- * If it does not need to ever be reopened, just use {@link RandomAccessInputArray}
- * instead.
- */
-public class RandomAccessInputUrl extends AbstractRandomAccessInput {
-
- /** The encapsulated URL. */
- private URL url;
-
- /** The array. */
- private RandomAccessInputArray array;
-
- /**
- * Constructor.
- * @param url The URL which contains the stream to be used.
- */
- public RandomAccessInputUrl(final URL url) {
- this.url = url;
- }
-
- /**
- * Creates the array if it has not already been created.
- * @throws IOException For an error opening or reading the stream.
- */
- private void checkArray() throws IOException {
- if (this.array != null) {
- return;
- }
- final InputStream input = this.getInputStream();
- final byte[] theBytes = IoUtil.toByteArray(input, 20000);
- this.array = new RandomAccessInputArray(this.url.toExternalForm(), theBytes);
- }
-
- @Override
- public void seek(final long offset) throws IOException {
- checkArray();
- this.array.seek(offset);
- }
-
- @Override
- public int skipBytes(final int add) throws IOException {
- checkArray();
- return this.array.skipBytes(add);
- }
-
- @Override
- public long length() throws IOException {
- checkArray();
- return this.array.length();
- }
-
- @Override
- public byte readByte() throws IOException {
- checkArray();
- return this.array.readByte();
- }
-
- @Override
- public final int readUnsignedByte() throws IOException {
- checkArray();
- return this.array.readUnsignedByte();
- }
-
- @Override
- public final short readShort() throws IOException {
- checkArray();
- return this.array.readShort();
- }
-
- @Override
- public final int readUnsignedShort() throws IOException {
- checkArray();
- return this.array.readUnsignedShort();
- }
-
- @Override
- public final double readDouble() throws IOException {
- checkArray();
- return this.array.readDouble();
- }
-
- @Override
- public final boolean readBoolean() throws IOException {
- checkArray();
- return this.array.readBoolean();
- }
-
- @Override
- public final void readFully(final byte[] b) throws IOException {
- checkArray();
- this.array.readFully(b);
- }
-
- @Override
- public final void readFully(final byte[] b, final int off, final int len)
- throws IOException {
- checkArray();
- this.array.readFully(b, off, len);
- }
-
- @Override
- public final long readLong() throws IOException {
- checkArray();
- return this.array.readLong();
- }
-
- @Override
- public final float readFloat() throws IOException {
- checkArray();
- return this.array.readFloat();
- }
-
- @Override
- public final char readChar() throws IOException {
- checkArray();
- return this.array.readChar();
- }
-
- @Override
- public final String readUTF() throws IOException {
- checkArray();
- return this.array.readUTF();
- }
-
- @Override
- public final int readInt() throws IOException {
- checkArray();
- return this.array.readInt();
- }
-
- @Override
- public final String readLine() throws IOException {
- checkArray();
- return this.array.readLine();
- }
-
- @Override
- public long getOffset() throws IOException {
- checkArray();
- return this.array.getOffset();
- }
-
- @Override
- public String getDescription() {
- try {
- checkArray();
- } catch (final IOException e) {
- return this.url.toExternalForm();
- }
- return this.array.getDescription();
- }
-
- @Override
- public InputStream getInputStream() throws IOException {
- return this.url.openStream();
- }
-
-}
Copied: trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java (from rev 12415, trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInputUrl.java)
===================================================================
--- trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java (rev 0)
+++ trunk/foray/foray-zz-attic/src/main/java/org/foray/common/io/RandomAccessInputUrl.java 2022-01-17 13:57:10 UTC (rev 12418)
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2006 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.common.io;
+
+import org.foray.common.IoUtil;
+import org.foray.common.RandomAccessInput;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+
+/**
+ * Implementation of {@link RandomAccessInput} suitable for URLs that are not local
+ * files.
+ * It is actually a thin wrapper around a {@link RandomAccessInputArray} instance.
+ * The idea here is to allow the encapsulated byte array to be released when it
+ * is not used, but to retain the URL in case it needs to be reopened.
+ * If it does not need to ever be reopened, just use {@link RandomAccessInputArray}
+ * instead.
+ */
+public class RandomAccessInputUrl extends AbstractRandomAccessInput {
+
+ /** The encapsulated URL. */
+ private URL url;
+
+ /** The array. */
+ private RandomAccessInputArray array;
+
+ /**
+ * Constructor.
+ * @param url The URL which contains the stream to be used.
+ */
+ public RandomAccessInputUrl(final URL url) {
+ this.url = url;
+ }
+
+ /**
+ * Creates the array if it has not already been created.
+ * @throws IOException For an error opening or reading the stream.
+ */
+ private void checkArray() throws IOException {
+ if (this.array != null) {
+ return;
+ }
+ final InputStream input = this.getInputStream();
+ final byte[] theBytes = IoUtil.toByteArray(input, 20000);
+ this.array = new RandomAccessInputArray(this.url.toExternalForm(), theBytes);
+ }
+
+ @Override
+ public void seek(final long offset) throws IOException {
+ checkArray();
+ this.array.seek(offset);
+ }
+
+ @Override
+ public int skipBytes(final int add) throws IOException {
+ checkArray();
+ return this.array.skipBytes(add);
+ }
+
+ @Override
+ public long length() throws IOException {
+ checkArray();
+ return this.array.length();
+ }
+
+ @Override
+ public byte readByte() throws IOException {
+ checkArray();
+ return this.array.readByte();
+ }
+
+ @Override
+ public final int readUnsignedByte() throws IOException {
+ checkArray();
+ return this.array.readUnsignedByte();
+ }
+
+ @Override
+ public final short readShort() throws IOException {
+ checkArray();
+ return this.array.readShort();
+ }
+
+ @Override
+ public final int readUnsignedShort() throws IOException {
+ checkArray();
+ return this.array.readUnsignedShort();
+ }
+
+ @Override
+ public final double readDouble() throws IOException {
+ checkArray();
+ return this.array.readDouble();
+ }
+
+ @Override
+ public final boolean readBoolean() throws IOException {
+ checkArray();
+ return this.array.readBoolean();
+ }
+
+ @Override
+ public final void readFully(final byte[] b) throws IOException {
+ checkArray();
+ this.array.readFully(b);
+ }
+
+ @Override
+ public final void readFully(final byte[] b, final int off, final int len)
+ throws IOException {
+ checkArray();
+ this.array.readFully(b, off, len);
+ }
+
+ @Override
+ public final long readLong() throws IOException {
+ checkArray();
+ return this.array.readLong();
+ }
+
+ @Override
+ public final float readFloat() throws IOException {
+ checkArray();
+ return this.array.readFloat();
+ }
+
+ @Override
+ public final char readChar() throws IOException {
+ checkArray();
+ return this.array.readChar();
+ }
+
+ @Override
+ public final String readUTF() throws IOException {
+ checkArray();
+ return this.array.readUTF();
+ }
+
+ @Override
+ public final int readInt() throws IOException {
+ checkArray();
+ return this.array.readInt();
+ }
+
+ @Override
+ public final String readLine() throws IOException {
+ checkArray();
+ return this.array.readLine();
+ }
+
+ @Override
+ public long getOffset() throws IOException {
+ checkArray();
+ return this.array.getOffset();
+ }
+
+ @Override
+ public String getDescription() {
+ try {
+ checkArray();
+ } catch (final IOException e) {
+ return this.url.toExternalForm();
+ }
+ return this.array.getDescription();
+ }
+
+ @Override
+ public InputStream getInputStream() throws IOException {
+ return this.url.openStream();
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 13:09:09
|
Revision: 12417
http://sourceforge.net/p/foray/code/12417
Author: victormote
Date: 2022-01-17 13:09:06 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Upgrade Jakarta Activation to 1.2.2.
Modified Paths:
--------------
trunk/foray/foray-common/build.gradle
trunk/foray/foray-font/build.gradle
trunk/foray/master/build.gradle
Modified: trunk/foray/foray-common/build.gradle
===================================================================
--- trunk/foray/foray-common/build.gradle 2022-01-17 12:35:56 UTC (rev 12416)
+++ trunk/foray/foray-common/build.gradle 2022-01-17 13:09:06 UTC (rev 12417)
@@ -5,8 +5,8 @@
api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
api (group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion) { transitive = false }
api (group: 'com.ibm.icu', name: 'icu4j', version: icu4jVersion) { transitive = false }
- /* TODO: Consider removing dependency on javax.activation. */
- api (group: 'javax.activation', name: 'activation', version: javaxActivationVersion) { transitive = false }
+ /* TODO: Consider removing dependency on Jakarta Activation, aka javax.activation. */
+ api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: jakartaActivationVersion) { transitive = false }
/* Turn transitive resolution OFF for both aXSL and FOray modules, for greater design visibility. */
Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle 2022-01-17 12:35:56 UTC (rev 12416)
+++ trunk/foray/foray-font/build.gradle 2022-01-17 13:09:06 UTC (rev 12417)
@@ -6,7 +6,8 @@
api group: 'commons-discovery', name: 'commons-discovery', version: commonsDiscoveryVersion
api group: 'org.apache.ant', name: 'ant-launcher', version: antVersion
api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
- api group: 'javax.activation', name: 'activation', version: javaxActivationVersion
+ /* TODO: Consider removing dependency on Jakarta Activation, aka javax.activation. */
+ api (group: 'jakarta.activation', name: 'jakarta.activation-api', version: jakartaActivationVersion) { transitive = false }
/* Turn transitive resolution OFF for both aXSL and FOray modules, for greater design visibility. */
Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-17 12:35:56 UTC (rev 12416)
+++ trunk/foray/master/build.gradle 2022-01-17 13:09:06 UTC (rev 12417)
@@ -37,7 +37,7 @@
ext.axslVersion = '0.3-SNAPSHOT' // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
ext.svgDomVersion = '1.1' // See aXSL master/build.gradle
ext.mathMlDomVersion = '2.0' // See aXSL master/build.gradle
- ext.javaxActivationVersion = '1.1.1' // See aXSL master/build.gradle
+ ext.jakartaActivationVersion = '1.2.2' // See aXSL master/build.gradle
/* End of aXSL-related dependencies. */
ext.slf4jVersion = '1.7.30' // Latest is 1.7.30 as of 2021-01-12.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 12:35:59
|
Revision: 12416
http://sourceforge.net/p/foray/code/12416
Author: victormote
Date: 2022-01-17 12:35:56 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Use ByteSequenceParser constructor to obtain an instance.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 12:13:38 UTC (rev 12415)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 12:35:56 UTC (rev 12416)
@@ -45,6 +45,8 @@
import java.math.BigDecimal;
import java.nio.charset.Charset;
+import javax.activation.DataSource;
+
/**
* Wraps an instance of {@link ByteSequence} and provides methods for parsing that sequence and accessing its content
* using random access.
@@ -65,6 +67,17 @@
this.sequence = sequence;
}
+ /**
+ * Constructor for a {@link DataSource} instance.
+ * @param dataSource The {@link DataSource} whose input stream should be captured as a byte sequence.
+ * @throws IOException For errors opening, reading, or closing the input stream.
+ */
+ public ByteSequenceParser(final DataSource dataSource) throws IOException {
+ final ByteArrayBuilder builder = new ByteArrayBuilder();
+ builder.append(dataSource.getInputStream());
+ this.sequence = builder.asPlus();
+ }
+
@Override
public void seek(final long offset) throws IOException {
this.index = (int) offset;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 12:13:38 UTC (rev 12415)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 12:35:56 UTC (rev 12416)
@@ -29,7 +29,6 @@
package org.foray.font.format;
import org.foray.common.RandomAccessInput;
-import org.foray.common.io.AbstractRandomAccessInput;
import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.format.ttf.TrueTypeCollection;
import org.foray.font.format.ttf.TrueTypeSingle;
@@ -127,7 +126,7 @@
public FontParser(final FontParserClient parserClient, final DataSource dataSource)
throws IOException, FontException {
this.parserClient = parserClient;
- this.randomInput = AbstractRandomAccessInput.createRandomAccessInput(dataSource);
+ this.randomInput = new ByteSequenceParser(dataSource);
parseFontFileBasics();
}
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java 2022-01-17 12:13:38 UTC (rev 12415)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java 2022-01-17 12:35:56 UTC (rev 12416)
@@ -29,7 +29,7 @@
package org.foray.font.format.type1;
import org.foray.common.RandomAccessInput;
-import org.foray.common.io.AbstractRandomAccessInput;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.axsl.font.FontException;
@@ -92,7 +92,7 @@
*/
public Type1MetricsParser(final FontServer4a fontServer, final DataSource dataSource) throws IOException {
this.fontServer = fontServer;
- this.randomInput = AbstractRandomAccessInput.createRandomAccessInput(dataSource);
+ this.randomInput = new ByteSequenceParser(dataSource);
parseMetricsFileBasics();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-17 12:13:41
|
Revision: 12415
http://sourceforge.net/p/foray/code/12415
Author: victormote
Date: 2022-01-17 12:13:38 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Move interface to more general location.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/ByteSequenceSearcher.java
trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInputUrl.java
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/AbstractOtfLayoutTable.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoverage.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex02.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfFeature.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLanguageSystem.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsub.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x02.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx02x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx03x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx04x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x02.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x03.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x02.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x03.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx07x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx08x01.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfScript.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollection.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtcTableHeader.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTable.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTableRecord.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff2.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCmap.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCvt.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableFpgm.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGasp.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGdef.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGpos.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGsub.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHhea.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHmtx.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableJstf.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableKern.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableLoca.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMath.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMaxp.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableName.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePost.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePrep.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableVorg.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1FontParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserPfm.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java
Added Paths:
-----------
trunk/foray/foray-common/src/main/java/org/foray/common/RandomAccessInput.java
Removed Paths:
-------------
trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInput.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/ByteSequenceSearcher.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/ByteSequenceSearcher.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/ByteSequenceSearcher.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,6 @@
package org.foray.common;
-import org.foray.common.io.RandomAccessInput;
-
import java.io.IOException;
/**
Copied: trunk/foray/foray-common/src/main/java/org/foray/common/RandomAccessInput.java (from rev 12405, trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInput.java)
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/RandomAccessInput.java (rev 0)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/RandomAccessInput.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2004 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.common;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+
+/**
+ * This interface extends DataInput by adding methods for random access
+ * to the contents. The method names and signatures were pulled up from
+ * RandomAccessFile. This interface will generally be useful for classes
+ * providing random input access to a file or file-like structure, i.e. file
+ * readers or parsers.
+ *
+ * @see java.io.DataInput
+ * @see java.io.RandomAccessFile
+ */
+public interface RandomAccessInput extends DataInput {
+
+ /**
+ * <p>Sets the input pointer offset, measured from the beginning of the
+ * input, at which the next read occurs.
+ * The offset may be set beyond the end of the input.
+ * Setting the offset beyond the end of the input does not change the input
+ * length.</p>
+ * <p>This method is based on {@link RandomAccessFile#seek(long)}.</p>
+ * @param offset The offset position, measured in bytes from the beginning of
+ * the input, at which to set the input pointer.
+ * @throws IOException If {@code pos} is less than {@code 0}, or if an I/O error occurs.
+ * @see RandomAccessFile#seek(long)
+ */
+ void seek(long offset) throws IOException;
+
+ /**
+ * <p>Returns the current offset in this input.</p>
+ * <p>This method is based on {@link RandomAccessFile#getFilePointer()}.</p>
+ * @return The offset from the beginning of the input, in bytes, at which
+ * the next read occurs.
+ * @exception IOException If an I/O error occurs.
+ * @see RandomAccessFile#getFilePointer()
+ */
+ long getOffset() throws IOException;
+
+ /**
+ * <p>Returns the length of this input.</p>
+ * <p>This method is based on {@link RandomAccessFile#length()}.</p>
+ * @return The length of the input, measured in bytes.
+ * @exception IOException If an I/O error occurs.
+ * @see RandomAccessFile#length()
+ */
+ long length() throws IOException;
+
+ /**
+ * Provides some kind of description of this item, useful in user messages.
+ * @return A description of the contents of this item.
+ */
+ String getDescription();
+
+ /**
+ * Return the input as an InputStream.
+ * @return An InputStream containing the input contents.
+ * @exception IOException If an I/O error occurs.
+ */
+ InputStream getInputStream() throws IOException;
+
+ /**
+ * Reads a String of stringSize bytes at the current location.
+ * @param stringSize The length, in bytes, of the String to be read.
+ * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
+ * @return The read String.
+ * @throws IOException For reading past the end of the input.
+ */
+ String readString(int stringSize, Charset characterSet) throws IOException;
+
+ /**
+ * Reads an ASCII String of stringSize bytes at the current location.
+ * @param stringSize The length, in bytes, of the String to be read.
+ * @return The read String.
+ * @throws IOException For reading past the end of the input.
+ */
+ String readStringASCII(int stringSize) throws IOException;
+
+ /**
+ * Reads a string terminated by a specific character, usually the null character, 0x00.
+ * @param terminatingChar The value to be used as the terminator for the read String.
+ * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
+ * @return The string read.
+ * @throws IOException For I/O error.
+ */
+ String readTerminatedString(byte terminatingChar, Charset characterSet) throws IOException;
+
+ /**
+ * Reads a null-terminated String.
+ * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
+ * @return The read String.
+ * @throws IOException For I/O error.
+ */
+ String readNullTerminatedString(Charset characterSet) throws IOException;
+
+ /**
+ * Read 4 unsigned bytes and convert them to a long containing the unsigned value.
+ * @return A long containing the unsigned 32-bit value.
+ * Returns a long because int is signed, and therefore can't hold 32 unsigned bits.
+ * @throws IOException For I/O error.
+ */
+ long readUnsignedInt() throws IOException;
+
+ /**
+ * Read an unsigned 4-byte integer, and reverse the byte order, making the
+ * lowest-order byte first and the highest-order byte last.
+ *
+ * @return The unsigned integral.
+ * @throws IOException For I/O error.
+ */
+ long readUnsignedIntLoHi() throws IOException;
+
+ /**
+ * Read an unsigned 2-byte short, and reverse the byte order, making the
+ * low-order byte first and the high-order byte last.
+ * @return The unsigned integral.
+ * @throws IOException For I/O error.
+ */
+ int readUnsignedShortLoHi() throws IOException;
+
+ /**
+ * Read a signed 2-byte short in little-endian order, that is, making the
+ * first byte the low-order byte and the second byte the high-order byte.
+ * @return The unsigned integral.
+ * @throws IOException For I/O error.
+ */
+ int readShortLoHi() throws IOException;
+
+ /**
+ * Reads a fixed-length decimal number with a 16-bit signed twos-complement mantissa, followed by a 16-bit unsigned
+ * fraction.
+ * Note that this format corresponds to a TrueType Font "FIXED" data type, as described in the TTF Spec, Chapter 2
+ * (Data Types).
+ * @return The parsed value, as a BigDecimal.
+ * @throws IOException For I/O Error.
+ */
+ BigDecimal readFixed16x16Signed() throws IOException;
+
+}
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,6 +28,7 @@
package org.foray.common.io;
+import org.foray.common.RandomAccessInput;
import org.foray.common.WellKnownConstants;
import org.foray.common.primitive.CharsetUtils;
import org.foray.common.sequence.ByteArrayBuilder;
Deleted: trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInput.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInput.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInput.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -1,173 +0,0 @@
-/*
- * Copyright 2004 The FOray Project.
- * http://www.foray.org
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This work is in part derived from the following work(s), used with the
- * permission of the licensor:
- * Apache FOP, licensed by the Apache Software Foundation
- *
- */
-
-/*
- * $LastChangedRevision$
- * $LastChangedDate$
- * $LastChangedBy$
- */
-
-package org.foray.common.io;
-
-import java.io.DataInput;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.RandomAccessFile;
-import java.math.BigDecimal;
-import java.nio.charset.Charset;
-
-/**
- * This interface extends DataInput by adding methods for random access
- * to the contents. The method names and signatures were pulled up from
- * RandomAccessFile. This interface will generally be useful for classes
- * providing random input access to a file or file-like structure, i.e. file
- * readers or parsers.
- *
- * @see java.io.DataInput
- * @see java.io.RandomAccessFile
- */
-public interface RandomAccessInput extends DataInput {
-
- /**
- * <p>Sets the input pointer offset, measured from the beginning of the
- * input, at which the next read occurs.
- * The offset may be set beyond the end of the input.
- * Setting the offset beyond the end of the input does not change the input
- * length.</p>
- * <p>This method is based on {@link RandomAccessFile#seek(long)}.</p>
- * @param offset The offset position, measured in bytes from the beginning of
- * the input, at which to set the input pointer.
- * @throws IOException If {@code pos} is less than {@code 0}, or if an I/O error occurs.
- * @see RandomAccessFile#seek(long)
- */
- void seek(long offset) throws IOException;
-
- /**
- * <p>Returns the current offset in this input.</p>
- * <p>This method is based on {@link RandomAccessFile#getFilePointer()}.</p>
- * @return The offset from the beginning of the input, in bytes, at which
- * the next read occurs.
- * @exception IOException If an I/O error occurs.
- * @see RandomAccessFile#getFilePointer()
- */
- long getOffset() throws IOException;
-
- /**
- * <p>Returns the length of this input.</p>
- * <p>This method is based on {@link RandomAccessFile#length()}.</p>
- * @return The length of the input, measured in bytes.
- * @exception IOException If an I/O error occurs.
- * @see RandomAccessFile#length()
- */
- long length() throws IOException;
-
- /**
- * Provides some kind of description of this item, useful in user messages.
- * @return A description of the contents of this item.
- */
- String getDescription();
-
- /**
- * Return the input as an InputStream.
- * @return An InputStream containing the input contents.
- * @exception IOException If an I/O error occurs.
- */
- InputStream getInputStream() throws IOException;
-
- /**
- * Reads a String of stringSize bytes at the current location.
- * @param stringSize The length, in bytes, of the String to be read.
- * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
- * @return The read String.
- * @throws IOException For reading past the end of the input.
- */
- String readString(int stringSize, Charset characterSet) throws IOException;
-
- /**
- * Reads an ASCII String of stringSize bytes at the current location.
- * @param stringSize The length, in bytes, of the String to be read.
- * @return The read String.
- * @throws IOException For reading past the end of the input.
- */
- String readStringASCII(int stringSize) throws IOException;
-
- /**
- * Reads a string terminated by a specific character, usually the null character, 0x00.
- * @param terminatingChar The value to be used as the terminator for the read String.
- * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
- * @return The string read.
- * @throws IOException For I/O error.
- */
- String readTerminatedString(byte terminatingChar, Charset characterSet) throws IOException;
-
- /**
- * Reads a null-terminated String.
- * @param characterSet The encoding scheme to be used for interpreting the characters in the string.
- * @return The read String.
- * @throws IOException For I/O error.
- */
- String readNullTerminatedString(Charset characterSet) throws IOException;
-
- /**
- * Read 4 unsigned bytes and convert them to a long containing the unsigned value.
- * @return A long containing the unsigned 32-bit value.
- * Returns a long because int is signed, and therefore can't hold 32 unsigned bits.
- * @throws IOException For I/O error.
- */
- long readUnsignedInt() throws IOException;
-
- /**
- * Read an unsigned 4-byte integer, and reverse the byte order, making the
- * lowest-order byte first and the highest-order byte last.
- *
- * @return The unsigned integral.
- * @throws IOException For I/O error.
- */
- long readUnsignedIntLoHi() throws IOException;
-
- /**
- * Read an unsigned 2-byte short, and reverse the byte order, making the
- * low-order byte first and the high-order byte last.
- * @return The unsigned integral.
- * @throws IOException For I/O error.
- */
- int readUnsignedShortLoHi() throws IOException;
-
- /**
- * Read a signed 2-byte short in little-endian order, that is, making the
- * first byte the low-order byte and the second byte the high-order byte.
- * @return The unsigned integral.
- * @throws IOException For I/O error.
- */
- int readShortLoHi() throws IOException;
-
- /**
- * Reads a fixed-length decimal number with a 16-bit signed twos-complement mantissa, followed by a 16-bit unsigned
- * fraction.
- * Note that this format corresponds to a TrueType Font "FIXED" data type, as described in the TTF Spec, Chapter 2
- * (Data Types).
- * @return The parsed value, as a BigDecimal.
- * @throws IOException For I/O Error.
- */
- BigDecimal readFixed16x16Signed() throws IOException;
-
-}
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInputUrl.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInputUrl.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/io/RandomAccessInputUrl.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -29,6 +29,7 @@
package org.foray.common.io;
import org.foray.common.IoUtil;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
import java.io.InputStream;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.common.sequence;
+import org.foray.common.RandomAccessInput;
import org.foray.common.WellKnownConstants;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.CharsetUtils;
import org.axsl.common.sequence.ByteSequence;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/config/RegisteredFont.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.config;
+import org.foray.common.RandomAccessInput;
import org.foray.common.io.AbstractRandomAccessInput;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.io.SimpleDataSource;
import org.foray.font.Font4a;
import org.foray.font.FontServer4a;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format;
+import org.foray.common.RandomAccessInput;
import org.foray.common.io.AbstractRandomAccessInput;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.format.ttf.TrueTypeCollection;
import org.foray.font.format.ttf.TrueTypeSingle;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/AbstractOtfLayoutTable.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/AbstractOtfLayoutTable.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/AbstractOtfLayoutTable.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
import java.util.HashMap;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoverage.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoverage.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoverage.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
import java.util.Arrays;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex02.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex02.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfCoveragex02.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfFeature.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfFeature.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfFeature.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLanguageSystem.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLanguageSystem.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLanguageSystem.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsub.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsub.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsub.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x02.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x02.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx01x02.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx02x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx02x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx02x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx03x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx03x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx03x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx04x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx04x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx04x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x02.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x02.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x02.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x03.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x03.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx05x03.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x02.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x02.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x02.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x03.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x03.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx06x03.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx07x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx07x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx07x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx08x01.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx08x01.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfLookupGsubx08x01.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfScript.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfScript.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/OtfScript.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
import java.util.HashMap;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollection.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollection.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollection.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -29,7 +29,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.font.format.FontParser;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.ttf;
+import org.foray.common.RandomAccessInput;
import org.foray.common.WellKnownConstants;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.BitUtils;
import org.foray.font.format.FontParserClient;
import org.foray.font.format.Kerning;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtcTableHeader.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtcTableHeader.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtcTableHeader.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTable.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTable.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTable.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
import java.util.HashMap;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTableRecord.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTableRecord.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfOffsetTableRecord.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.primitive.CharsetUtils;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableBase.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff2.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff2.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCff2.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCmap.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCmap.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCmap.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.axsl.ps.Cmap;
import org.axsl.ps.Cmap04Ttf;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCvt.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCvt.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableCvt.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableFpgm.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableFpgm.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableFpgm.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGasp.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGasp.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGasp.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGdef.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGdef.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGdef.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.ttf;
+import org.foray.common.RandomAccessInput;
import org.foray.common.data.BoundingBoxShort;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.BitUtils;
import org.axsl.ps.BoundingBox;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGpos.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGpos.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGpos.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGsub.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGsub.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGsub.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.font.FontContext;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,9 +28,9 @@
package org.foray.font.format.ttf;
+import org.foray.common.RandomAccessInput;
import org.foray.common.data.BoundingBoxShort;
import org.foray.common.data.BoundingBoxUtils;
-import org.foray.common.io.RandomAccessInput;
import org.axsl.ps.BoundingBox;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHhea.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHhea.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHhea.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHmtx.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHmtx.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHmtx.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableJstf.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableJstf.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableJstf.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableKern.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableKern.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableKern.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.ttf;
+import org.foray.common.RandomAccessInput;
import org.foray.common.WellKnownConstants;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.BitUtils;
import org.foray.font.format.Kerning;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableLoca.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableLoca.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableLoca.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMath.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMath.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMath.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMaxp.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMaxp.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableMaxp.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableName.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableName.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableName.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.primitive.CharsetUtils;
import org.foray.common.primitive.StringUtils;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableOs2.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.font.format.Panose4a;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePclt.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePost.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePost.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePost.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.primitive.CharsetUtils;
import org.axsl.ps.PsEncoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePrep.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePrep.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTablePrep.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableVorg.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableVorg.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableVorg.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.ttf;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1FontParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1FontParser.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1FontParser.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,7 +28,7 @@
package org.foray.font.format.type1;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.ByteArray;
import org.foray.font.format.FontParser;
import org.foray.font.format.FontParserClient;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParser.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.type1;
+import org.foray.common.RandomAccessInput;
import org.foray.common.io.AbstractRandomAccessInput;
-import org.foray.common.io.RandomAccessInput;
import org.foray.font.FontServer4a;
import org.axsl.font.FontException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.type1;
+import org.foray.common.RandomAccessInput;
import org.foray.common.data.BoundingBoxUtils;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.sequence.IntArrayBuilder;
import org.foray.font.FontServer4a;
import org.foray.font.format.Kerning;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserPfm.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserPfm.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserPfm.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.type1;
+import org.foray.common.RandomAccessInput;
import org.foray.common.WellKnownConstants;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.CharsetUtils;
import org.foray.font.FontServer4a;
import org.foray.font.format.Kerning;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -30,7 +30,7 @@
import org.foray.common.ForayConstants;
import org.foray.common.IoUtil;
-import org.foray.common.io.RandomAccessInput;
+import org.foray.common.RandomAccessInput;
import org.foray.common.sequence.ByteArrayBuilder;
import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java 2022-01-17 12:03:30 UTC (rev 12414)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1MetricsParserAfmTests.java 2022-01-17 12:13:38 UTC (rev 12415)
@@ -28,8 +28,8 @@
package org.foray.font.format.type1;
+import org.foray.common.RandomAccessInput;
import org.foray.common.io.AbstractRandomAccessInput;
-import org.foray.common.io.RandomAccessInput;
import org.foray.common.io.SimpleDataSource;
import org.foray.font.FontServer4a;
import org.foray.font.FontServer4aTests;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Sour...
[truncated message content] |
|
From: <vic...@us...> - 2022-01-17 12:03:33
|
Revision: 12414
http://sourceforge.net/p/foray/code/12414
Author: victormote
Date: 2022-01-17 12:03:30 +0000 (Mon, 17 Jan 2022)
Log Message:
-----------
Switch some low-level parsing work over to ByteSequenceParser.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java
Added Paths:
-----------
trunk/foray/foray-zz-attic/src/main/java/org/foray/common/
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-16 21:18:12 UTC (rev 12413)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/io/AbstractRandomAccessInput.java 2022-01-17 12:03:30 UTC (rev 12414)
@@ -30,18 +30,21 @@
import org.foray.common.WellKnownConstants;
import org.foray.common.primitive.CharsetUtils;
+import org.foray.common.sequence.ByteArrayBuilder;
+import org.foray.common.sequence.ByteSequenceParser;
import org.apache.commons.io.EndianUtils;
import java.io.EOFException;
import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.math.BigDecimal;
import java.net.URL;
import java.nio.charset.Charset;
import javax.activation.DataSource;
-import javax.activation.URLDataSource;
/**
* Abstract superclass for {@link RandomAccessInput} implementations.
@@ -54,17 +57,19 @@
* @return The newly-created {@link RandomAccessInput} instance.
* @throws IOException For errors opening or reading the URL.
*/
- public static RandomAccessInput createRandomAccessInput(final URL url) throws IOException {
+ public static InputStream createRandomAccessInput(final URL url) throws IOException {
if (url == null) {
throw new IOException("URL is null.");
}
+ final InputStream inputStream;
final File file = new File(url.getFile());
if (! file.canRead()) {
- /* If we can't get a readable file out of it, we need to use the URL
- * implementation instead. */
- return new RandomAccessInputUrl(url);
+ /* If we can't get a readable file out of it, we need to use the URL implementation instead. */
+ inputStream = url.openStream();
+ } else {
+ inputStream = new FileInputStream(file);
}
- return new RandomAccessInputFile(file);
+ return inputStream;
}
/**
@@ -88,13 +93,11 @@
* @return The newly-created {@link RandomAccessInput} instance.
* @throws IOException For errors opening or reading the input stream.
*/
- public static RandomAccessInput createRandomAccessInput(final DataSource dataSource) throws IOException {
- if (dataSource instanceof URLDataSource) {
- final URLDataSource urlDataSource = (URLDataSource) dataSource;
- final URL url = urlDataSource.getURL();
- return AbstractRandomAccessInput.createRandomAccessInput(url);
- }
- return new RandomAccessInputArray(dataSource.getName(), dataSource.getInputStream());
+ public static ByteSequenceParser createRandomAccessInput(final DataSource dataSource) throws IOException {
+ final ByteArrayBuilder builder = new ByteArrayBuilder();
+ builder.append(dataSource.getInputStream());
+ dataSource.getInputStream().close();
+ return new ByteSequenceParser(builder.toByteArray());
}
@Override
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-16 21:18:12 UTC (rev 12413)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-17 12:03:30 UTC (rev 12414)
@@ -131,18 +131,13 @@
}
@Override
- public final void readFully(final byte[] b, final int off, final int len) throws IOException {
- int lengthToUse = len;
- boolean eofDetected = false;
- if (this.index + lengthToUse > this.sequence.length()) {
- eofDetected = true;
- lengthToUse = this.sequence.length() - this.index;
+ public final void readFully(final byte[] b, final int offset, final int length) {
+ int count = 0;
+ while (count < length) {
+ b[offset + count] = this.sequence.byteAt(this.index);
+ index ++;
+ count ++;
}
- System.arraycopy(this.sequence, this.index, b, off, lengthToUse);
- this.index += lengthToUse;
- if (eofDetected) {
- throw new EOFException();
- }
}
@Override
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-16 21:18:12 UTC (rev 12413)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/FontParser.java 2022-01-17 12:03:30 UTC (rev 12414)
@@ -30,6 +30,7 @@
import org.foray.common.io.AbstractRandomAccessInput;
import org.foray.common.io.RandomAccessInput;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.format.ttf.TrueTypeCollection;
import org.foray.font.format.ttf.TrueTypeSingle;
import org.foray.font.format.ttf.TtfOffsetTable;
@@ -114,7 +115,7 @@
private boolean fontFileCreated = false;
/** The content to be parsed. */
- private RandomAccessInput randomInput;
+ private ByteSequenceParser randomInput;
/**
* Constructor.
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java 2022-01-16 21:18:12 UTC (rev 12413)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsSerializer.java 2022-01-17 12:03:30 UTC (rev 12414)
@@ -30,8 +30,9 @@
import org.foray.common.ForayConstants;
import org.foray.common.IoUtil;
-import org.foray.common.io.AbstractRandomAccessInput;
import org.foray.common.io.RandomAccessInput;
+import org.foray.common.sequence.ByteArrayBuilder;
+import org.foray.common.sequence.ByteSequenceParser;
import org.foray.font.FontServer4a;
import org.axsl.font.FontException;
@@ -51,6 +52,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.io.ObjectOutputStream;
import java.net.MalformedURLException;
import java.net.URL;
@@ -138,7 +140,11 @@
}
Type1Metrics metricsFile = null;
try {
- final RandomAccessInput input = AbstractRandomAccessInput.createRandomAccessInput(inURL);
+ final InputStream is = inURL.openStream();
+ final ByteArrayBuilder builder = new ByteArrayBuilder();
+ builder.append(is);
+ is.close();
+ final RandomAccessInput input = new ByteSequenceParser(builder.toByteArray());
final Type1MetricsParser reader = new Type1MetricsParser(getFontServer(), input);
metricsFile = reader.parse();
} catch (final IOException e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 21:18:15
|
Revision: 12413
http://sourceforge.net/p/foray/code/12413
Author: victormote
Date: 2022-01-16 21:18:12 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Copy functionality of RandomAccessInputArray into new class ByteSequenceParser.
Added Paths:
-----------
trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
Added: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java (rev 0)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java 2022-01-16 21:18:12 UTC (rev 12413)
@@ -0,0 +1,325 @@
+/*
+ * Copyright 2022 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.common.sequence;
+
+import org.foray.common.WellKnownConstants;
+import org.foray.common.io.RandomAccessInput;
+import org.foray.common.primitive.CharsetUtils;
+
+import org.axsl.common.sequence.ByteSequence;
+import org.axsl.common.sequence.ByteSequencePlus;
+
+import org.apache.commons.io.EndianUtils;
+
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigDecimal;
+import java.nio.charset.Charset;
+
+/**
+ * Wraps an instance of {@link ByteSequence} and provides methods for parsing that sequence and accessing its content
+ * using random access.
+ */
+public class ByteSequenceParser implements RandomAccessInput {
+
+ /** The sequence being iterated. */
+ private ByteSequencePlus sequence;
+
+ /** The current location in {@link #sequence}. */
+ private int index;
+
+ /**
+ * Constructor.
+ * @param sequence The sequence being wrapped.
+ */
+ public ByteSequenceParser(final ByteSequencePlus sequence) {
+ this.sequence = sequence;
+ }
+
+ @Override
+ public void seek(final long offset) throws IOException {
+ this.index = (int) offset;
+ }
+
+ @Override
+ public int skipBytes(final int add) throws IOException {
+ return this.index += add;
+ }
+
+ @Override
+ public long length() throws IOException {
+ return this.sequence.length();
+ }
+
+ @Override
+ public byte readByte() throws IOException {
+ if (this.index >= this.sequence.length()) {
+ throw new EOFException();
+ }
+ final byte theByte = this.sequence.byteAt(this.index);
+ this.index ++;
+ return theByte;
+ }
+
+ @Override
+ public final int readUnsignedByte() throws IOException {
+ if (this.index >= this.sequence.length()) {
+ throw new EOFException();
+ }
+ final int i = this.sequence.byteAt(this.index) & WellKnownConstants.MAX_8_BIT_UNSIGNED_INT;
+ this.index ++;
+ return i;
+ }
+
+ @Override
+ public final short readShort() throws IOException {
+ final int byte1 = readUnsignedByte();
+ final int byte2 = readUnsignedByte();
+ return (short) ((byte1 << WellKnownConstants.SHIFT_1_BYTE) + byte2);
+ }
+
+ @Override
+ public final int readUnsignedShort() throws IOException {
+ final int byte1 = readUnsignedByte();
+ final int byte2 = readUnsignedByte();
+ return (byte1 << WellKnownConstants.SHIFT_1_BYTE) + byte2;
+ }
+
+ @Override
+ public final double readDouble() throws IOException {
+ return Double.longBitsToDouble(readLong());
+ }
+
+ @Override
+ public final boolean readBoolean() throws IOException {
+ final int ch = readUnsignedByte();
+ return ch != 0;
+ }
+
+ @Override
+ public final void readFully(final byte[] b) throws IOException {
+ readFully(b, 0, b.length);
+ }
+
+ @Override
+ public final void readFully(final byte[] b, final int off, final int len) throws IOException {
+ int lengthToUse = len;
+ boolean eofDetected = false;
+ if (this.index + lengthToUse > this.sequence.length()) {
+ eofDetected = true;
+ lengthToUse = this.sequence.length() - this.index;
+ }
+ System.arraycopy(this.sequence, this.index, b, off, lengthToUse);
+ this.index += lengthToUse;
+ if (eofDetected) {
+ throw new EOFException();
+ }
+ }
+
+ @Override
+ public final long readLong() throws IOException {
+ final long int1 = (long) (readInt()) << WellKnownConstants.SHIFT_4_BYTES;
+ final long int2 = readInt() & WellKnownConstants.MAX_32_BIT_UNSIGNED_INT;
+ return int1 + int2;
+ }
+
+ @Override
+ public final float readFloat() throws IOException {
+ return Float.intBitsToFloat(readInt());
+ }
+
+ @Override
+ public final char readChar() throws IOException {
+ final int byte1 = this.readUnsignedByte();
+ final int byte2 = this.readUnsignedByte();
+ return (char) ((byte1 << WellKnownConstants.SHIFT_1_BYTE) + byte2);
+ }
+
+ @Override
+ public final String readUTF() throws IOException {
+ return DataInputStream.readUTF(this);
+ }
+
+ @Override
+ public final int readInt() throws IOException {
+ final int byte1 = this.readUnsignedByte();
+ final int byte2 = this.readUnsignedByte();
+ final int byte3 = this.readUnsignedByte();
+ final int byte4 = this.readUnsignedByte();
+ return (byte1 << WellKnownConstants.SHIFT_3_BYTES)
+ + (byte2 << WellKnownConstants.SHIFT_2_BYTES)
+ + (byte3 << WellKnownConstants.SHIFT_1_BYTE)
+ + (byte4 << 0);
+ }
+
+ @Override
+ public final String readLine() throws IOException {
+ final StringBuilder input = new StringBuilder();
+ int byteRead = -1;
+ boolean eol = false;
+
+ while (!eol) {
+ if (this.index >= this.length()) {
+ eol = true;
+ break;
+ }
+ switch (byteRead = this.readUnsignedByte()) {
+ case -1:
+ case '\n': {
+ eol = true;
+ break;
+ }
+ case '\r': {
+ eol = true;
+ final long cur = getOffset();
+ if (this.index >= this.length()) {
+ eol = true;
+ break;
+ }
+ if ((this.readUnsignedByte()) != '\n') {
+ seek(cur);
+ }
+ break;
+ }
+ default: {
+ input.append((char) byteRead);
+ break;
+ }
+ }
+ }
+ if ((byteRead == -1) && (input.length() == 0)) {
+ return null;
+ }
+ return input.toString();
+ }
+
+ @Override
+ public long getOffset() throws IOException {
+ return this.index;
+ }
+
+ @Override
+ public String getDescription() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public InputStream getInputStream() {
+ return new ByteArrayInputStream(this.sequence.toArray());
+ }
+
+ @Override
+ public final long readUnsignedInt() throws IOException {
+ long ret = readUnsignedByte();
+ ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
+ ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
+ ret = (ret << WellKnownConstants.SHIFT_1_BYTE) + readUnsignedByte();
+ return ret;
+ }
+
+ @Override
+ public long readUnsignedIntLoHi() throws IOException {
+ final int byte1 = readUnsignedByte();
+ final int byte2 = readUnsignedByte();
+ final int byte3 = readUnsignedByte();
+ final int byte4 = readUnsignedByte();
+ return (byte4 << WellKnownConstants.SHIFT_3_BYTES)
+ + (byte3 << WellKnownConstants.SHIFT_2_BYTES)
+ + (byte2 << WellKnownConstants.SHIFT_1_BYTE)
+ + byte1;
+ }
+
+ @Override
+ public int readUnsignedShortLoHi() throws IOException {
+ final int byte1 = readUnsignedByte();
+ final int byte2 = readUnsignedByte();
+ return (byte2 << WellKnownConstants.SHIFT_1_BYTE) + byte1;
+ }
+
+ @Override
+ public int readShortLoHi() throws IOException {
+ final short beShort = readShort();
+ return EndianUtils.swapShort(beShort);
+ }
+
+ @Override
+ public String readString(final int stringSize, final Charset characterSet)
+ throws IOException {
+ if ((stringSize + getOffset()) > length()) {
+ throw new EOFException("Reached EOF, file size="
+ + length());
+ }
+ final byte[] tmp = new byte[stringSize];
+ for (int i = 0; i < stringSize; i++) {
+ tmp[i] = readByte();
+ }
+ return new String(tmp, characterSet);
+ }
+
+ @Override
+ public String readStringASCII(final int stringSize) throws IOException {
+ return readString(stringSize, CharsetUtils.CHARSET_US_ASCII);
+ }
+
+ @Override
+ public String readTerminatedString(final byte terminatingChar,
+ final Charset characterSet) throws IOException {
+ // We're going to read ahead here, so save the location
+ final long saveLocation = getOffset();
+ int stringSize = 0;
+ byte inByte = readByte();
+ while (inByte != terminatingChar) {
+ stringSize ++;
+ inByte = readByte();
+ }
+ /*
+ * Return to the saved location so that we can use the normal
+ * readString().
+ */
+ seek(saveLocation);
+ return readString(stringSize, characterSet);
+ }
+
+ @Override
+ public String readNullTerminatedString(final Charset characterSet) throws IOException {
+ return readTerminatedString((byte) 0x00, characterSet);
+ }
+
+ @Override
+ public BigDecimal readFixed16x16Signed() throws IOException {
+ final int highOrder = readShort();
+ final long lowOrder = readUnsignedShort();
+ final String asString = Integer.toString(highOrder) + "." + Long.toString(lowOrder);
+ return new BigDecimal(asString);
+ }
+
+}
Property changes on: trunk/foray/foray-common/src/main/java/org/foray/common/sequence/ByteSequenceParser.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 19:36:29
|
Revision: 12412
http://sourceforge.net/p/foray/code/12412
Author: victormote
Date: 2022-01-16 19:36:27 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Remove dependency on ByteSequenceSearcher.
Modified Paths:
--------------
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java 2022-01-16 19:11:12 UTC (rev 12411)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java 2022-01-16 19:36:27 UTC (rev 12412)
@@ -28,7 +28,6 @@
package org.foray.graphic;
-import org.foray.common.ByteSequenceSearcher;
import org.foray.common.WellKnownConstants;
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.sequence.ByteArray;
@@ -253,18 +252,14 @@
* bounding box information.
*/
private void readBBox(final byte[] fileStart) {
- final byte[] bbxName = "%%BoundingBox:".getBytes();
- boolean found = false;
- int index = 0;
- for (index = 0; index + bbxName.length < fileStart.length && !found;
- index++) {
- found = ByteSequenceSearcher.byteArrayCompare(fileStart, index, bbxName);
- }
- if (!found) {
+ final ByteArray fileStart2 = new ByteArray(fileStart);
+ final String bbxName = "%%BoundingBox:";
+ int index = fileStart2.indexOf(bbxName);
+ if (index < 0) {
return;
}
- // i now holds the index of the *start* of bbxName + 1. Skip past it.
- index += bbxName.length - 1;
+ /* index now holds the index of the start of bbxName. Skip past it. */
+ index += bbxName.length();
final float[] bboxArray = new float[BoundingBox.QTY_ENTRIES];
for (int i = 0; i < BoundingBox.QTY_ENTRIES; i++) {
index += readBBoxString(fileStart, i, index, bboxArray);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 19:11:15
|
Revision: 12411
http://sourceforge.net/p/foray/code/12411
Author: victormote
Date: 2022-01-16 19:11:12 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Remove some transitive dependencies, to enhance design visibility.
Modified Paths:
--------------
trunk/foray/foray-common/build.gradle
Modified: trunk/foray/foray-common/build.gradle
===================================================================
--- trunk/foray/foray-common/build.gradle 2022-01-16 18:42:59 UTC (rev 12410)
+++ trunk/foray/foray-common/build.gradle 2022-01-16 19:11:12 UTC (rev 12411)
@@ -1,18 +1,22 @@
description = 'foray-common'
dependencies {
- api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
- api group: 'commons-io', name: 'commons-io', version: commonsIoVersion
- api group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion
- api group: 'com.ibm.icu', name: 'icu4j', version: icu4jVersion
+ api (group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion) { transitive = false }
+ api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
+ api (group: 'xml-resolver', name: 'xml-resolver', version: xmlResolverVersion) { transitive = false }
+ api (group: 'com.ibm.icu', name: 'icu4j', version: icu4jVersion) { transitive = false }
+ /* TODO: Consider removing dependency on javax.activation. */
+ api (group: 'javax.activation', name: 'activation', version: javaxActivationVersion) { transitive = false }
- api group: 'org.axsl', name: 'axsl-common', version: axslVersion
- api group: 'org.axsl', name: 'axsl-kp-model', version: axslVersion
- api group: 'org.axsl', name: 'axsl-orthography', version: axslVersion
- api group: 'org.axsl', name: 'axsl-ps', version: axslVersion
- api group: 'org.axsl', name: 'axsl-font', version: axslVersion
- api group: 'org.axsl', name: 'axsl-unicode', version: axslVersion
+ /* Turn transitive resolution OFF for both aXSL and FOray modules, for greater design visibility. */
+ api (group: 'org.axsl', name: 'axsl-common', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-kp-model', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-orthography', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-ps', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-font', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-unicode', version: axslVersion) { transitive = false }
+
implementation group:
'ch.qos.logback', name: 'logback-classic', version: logbackClassicVersion
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 18:43:01
|
Revision: 12410
http://sourceforge.net/p/foray/code/12410
Author: victormote
Date: 2022-01-16 18:42:59 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
More setup for zz-attic.
Modified Paths:
--------------
trunk/foray/foray-zz-attic/build.gradle
Added Paths:
-----------
trunk/foray/foray-zz-attic/src/test/
trunk/foray/foray-zz-attic/src/test/java/
Modified: trunk/foray/foray-zz-attic/build.gradle
===================================================================
--- trunk/foray/foray-zz-attic/build.gradle 2022-01-16 18:17:32 UTC (rev 12409)
+++ trunk/foray/foray-zz-attic/build.gradle 2022-01-16 18:42:59 UTC (rev 12410)
@@ -1,6 +1,12 @@
description = 'foray-zz-attic'
dependencies {
+ api (group: 'commons-io', name: 'commons-io', version: commonsIoVersion) { transitive = false }
+
+ api (project(':foray-common')) { transitive = false }
+
+ testImplementation group: 'junit', name: 'junit', version: junitVersion
+ testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
}
javadoc {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 18:17:34
|
Revision: 12409
http://sourceforge.net/p/foray/code/12409
Author: victormote
Date: 2022-01-16 18:17:32 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Add foray-zz-attic project for no-longer-used code that we want to keep for now.
Modified Paths:
--------------
trunk/foray/master/settings.gradle
Added Paths:
-----------
trunk/foray/foray-zz-attic/
trunk/foray/foray-zz-attic/build.gradle
trunk/foray/foray-zz-attic/src/
trunk/foray/foray-zz-attic/src/main/
trunk/foray/foray-zz-attic/src/main/java/
trunk/foray/foray-zz-attic/src/main/java/org/
trunk/foray/foray-zz-attic/src/main/java/org/foray/
Added: trunk/foray/foray-zz-attic/build.gradle
===================================================================
--- trunk/foray/foray-zz-attic/build.gradle (rev 0)
+++ trunk/foray/foray-zz-attic/build.gradle 2022-01-16 18:17:32 UTC (rev 12409)
@@ -0,0 +1,12 @@
+description = 'foray-zz-attic'
+
+dependencies {
+}
+
+javadoc {
+ options.windowTitle = "FOray Attic API"
+ options.docTitle = "FOray Attic API"
+ options.header = "FOray Attic API ${version}"
+}
+
+/* Last line of script. */
Property changes on: trunk/foray/foray-zz-attic/build.gradle
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/master/settings.gradle
===================================================================
--- trunk/foray/master/settings.gradle 2022-01-16 13:45:33 UTC (rev 12408)
+++ trunk/foray/master/settings.gradle 2022-01-16 18:17:32 UTC (rev 12409)
@@ -19,5 +19,6 @@
includeFlat 'foray-speech'
includeFlat 'foray-unicode'
includeFlat 'foray-xml'
+includeFlat 'foray-zz-attic'
/* Last line of script. */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 13:45:36
|
Revision: 12408
http://sourceforge.net/p/foray/code/12408
Author: victormote
Date: 2022-01-16 13:45:33 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Move BoundingBox interface from axsl-common to axsl-ps.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java
trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java
trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java
trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java
trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Bold.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-BoldOblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Oblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Bold.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-BoldOblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Oblique.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Symbol.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Bold.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-BoldItalic.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Italic.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Roman.jbso
trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/ZapfDingbats.jbso
trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java
trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java
trunk/foray/foray-graphic/build.gradle
trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java
trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java
trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java
trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxFloat.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,7 +28,7 @@
package org.foray.common.data;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.Serializable;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxShort.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,7 +28,7 @@
package org.foray.common.data;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.Serializable;
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/BoundingBoxUtils.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -30,7 +30,7 @@
import org.foray.common.primitive.FloatUtils;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
/**
* Utilities related to bounding boxes.
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FreeStandingFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -34,9 +34,9 @@
import org.foray.font.format.Kerning;
import org.foray.font.format.Panose4a;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.Encoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FsTrueTypeFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -37,9 +37,9 @@
import org.foray.font.format.ttf.TrueTypeFont;
import org.foray.font.format.ttf.TtfSubSetFile;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import java.io.IOException;
import java.io.InputStream;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/FsType1Font.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -39,9 +39,9 @@
import org.foray.font.format.type1.Type1Metrics;
import org.foray.font.format.type1.Type1MetricsParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsEncoding;
import org.axsl.ps.PsServer;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/SystemFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -36,8 +36,8 @@
import org.foray.font.format.Kerning;
import org.foray.font.format.Panose4a;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import java.awt.Font;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeCollectionLister.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -35,8 +35,8 @@
import org.foray.font.format.FontParserClient;
import org.foray.font.format.type1.Type1MetricsSerializer;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TrueTypeFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -36,8 +36,8 @@
import org.foray.font.format.Panose4a;
import org.foray.font.output.FontPdfUtilities;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.Cmap;
import org.slf4j.Logger;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfMtxEntry.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -30,7 +30,7 @@
import org.foray.common.data.BoundingBoxUtils;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
/**
* A TTF Font Mtx entry.
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableGlyf.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,7 @@
import org.foray.common.io.RandomAccessInput;
import org.foray.common.primitive.BitUtils;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/ttf/TtfTableHead.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,7 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.io.RandomAccessInput;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.IOException;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1Metrics.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -33,7 +33,7 @@
import org.foray.font.format.Kerning;
import org.foray.font.output.FontPdfUtilities;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.PsEncoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -34,9 +34,9 @@
import org.foray.font.FontServer4a;
import org.foray.font.format.Kerning;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.GlyphList;
import org.axsl.ps.PsEncoding;
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/util/MockFont.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,9 +32,9 @@
import org.foray.font.Font4a;
import org.foray.font.format.Kerning;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.Font;
import org.axsl.font.Panose;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.CharSet;
import org.axsl.ps.Encoding;
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Bold.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-BoldOblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier-Oblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Courier.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Bold.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-BoldOblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica-Oblique.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Helvetica.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Symbol.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Bold.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-BoldItalic.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Italic.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/Times-Roman.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/main/resources/resources/org/foray/font/base14/ZapfDingbats.jbso
===================================================================
(Binary files differ)
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/ttf/TrueTypeFontParserTests.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -34,8 +34,8 @@
import org.foray.font.format.FontContent;
import org.foray.font.format.FontParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.junit.Assert;
import org.junit.Test;
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfaTests.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,8 +32,8 @@
import org.foray.font.FontServer4a;
import org.foray.font.format.FontParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsCharStringsDictionary;
import org.axsl.ps.PsFontDictionary;
import org.axsl.ps.PsFontInfoDictionary;
Modified: trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java
===================================================================
--- trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-font/src/test/java/org/foray/font/format/type1/Type1FontParserPfbTests.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,8 +32,8 @@
import org.foray.font.FontServer4a;
import org.foray.font.format.FontParser;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsCharStringsDictionary;
import org.axsl.ps.PsFontDictionary;
import org.axsl.ps.PsFontInfoDictionary;
Modified: trunk/foray/foray-graphic/build.gradle
===================================================================
--- trunk/foray/foray-graphic/build.gradle 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-graphic/build.gradle 2022-01-16 13:45:33 UTC (rev 12408)
@@ -20,6 +20,7 @@
api (group: 'org.axsl', name: 'axsl-graphic', version: axslVersion) { transitive = false }
api (group: 'org.axsl', name: 'axsl-orthography', version: axslVersion) { transitive = false }
api (group: 'org.axsl', name: 'axsl-pdf', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-ps', version: axslVersion) { transitive = false }
api (project(':foray-common')) { transitive = false }
api (project(':foray-xml')) { transitive = false }
Modified: trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java
===================================================================
--- trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-graphic/src/main/java/org/foray/graphic/EpsGraphic.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -33,10 +33,10 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.sequence.ByteArray;
-import org.axsl.common.data.BoundingBox;
import org.axsl.common.sequence.ByteSequence;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
+import org.axsl.ps.BoundingBox;
import java.awt.Color;
import java.awt.color.ColorSpace;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfFormXobject.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,10 +28,10 @@
package org.foray.pdf.object;
-import org.axsl.common.data.BoundingBox;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
import org.axsl.pdf.PdfException;
+import org.axsl.ps.BoundingBox;
import java.awt.geom.AffineTransform;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfRectangle.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -28,7 +28,7 @@
package org.foray.pdf.object;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import java.io.UnsupportedEncodingException;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformEps.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -31,9 +31,9 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.common.sequence.ByteArray;
-import org.axsl.common.data.BoundingBox;
import org.axsl.graphic.EpsGraphic;
import org.axsl.graphic.GraphicException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsException;
import org.axsl.ps.PsInput;
import org.axsl.ps.PsInterpreter;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformMath.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,6 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.pdf.util.PdfGraphics2D;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontConsumer;
import org.axsl.graphic.GraphicException;
import org.axsl.graphic.MathGraphic;
@@ -39,6 +38,7 @@
import org.axsl.graphic.output.GraphicOutput;
import org.axsl.graphic.output.GraphicPdf;
import org.axsl.orthography.Orthography;
+import org.axsl.ps.BoundingBox;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXformSvg.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -32,7 +32,6 @@
import org.foray.common.data.BoundingBoxUtils;
import org.foray.pdf.util.PdfGraphics2D;
-import org.axsl.common.data.BoundingBox;
import org.axsl.font.FontConsumer;
import org.axsl.graphic.GraphicException;
import org.axsl.graphic.SvgGraphic;
@@ -39,6 +38,7 @@
import org.axsl.graphic.output.GraphicOutput;
import org.axsl.graphic.output.GraphicPdf;
import org.axsl.orthography.Orthography;
+import org.axsl.ps.BoundingBox;
import java.awt.Graphics2D;
import java.awt.geom.AffineTransform;
Modified: trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java
===================================================================
--- trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-pdf/src/main/java/org/foray/pdf/object/PdfXreference.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -30,11 +30,11 @@
import org.foray.common.data.BoundingBoxUtils;
-import org.axsl.common.data.BoundingBox;
import org.axsl.common.sequence.ByteSequence;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
import org.axsl.pdf.PdfException;
+import org.axsl.ps.BoundingBox;
import java.awt.geom.AffineTransform;
import java.awt.geom.Rectangle2D;
Modified: trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java
===================================================================
--- trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-ps/src/main/java/org/foray/ps/type1/PsFontDictionary4a.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -35,7 +35,7 @@
import org.foray.ps.PsInteger;
import org.foray.ps.PsObject;
-import org.axsl.common.data.BoundingBox;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.PsFontDictionary;
/**
Modified: trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
===================================================================
--- trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2022-01-16 13:38:11 UTC (rev 12407)
+++ trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java 2022-01-16 13:45:33 UTC (rev 12408)
@@ -43,7 +43,6 @@
import org.foray.render.PrintRenderer;
import org.axsl.common.Gradient;
-import org.axsl.common.data.BoundingBox;
import org.axsl.common.sequence.ByteSequence;
import org.axsl.common.sequence.IntSequence;
import org.axsl.font.Font;
@@ -67,6 +66,7 @@
import org.axsl.graphic.output.GraphicPs;
import org.axsl.output.DocumentConfiguration;
import org.axsl.output.OutputException;
+import org.axsl.ps.BoundingBox;
import org.axsl.ps.Encoding;
import org.axsl.ps.PsEncoding;
import org.axsl.ps.PsFilterType;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-16 13:38:14
|
Revision: 12407
http://sourceforge.net/p/foray/code/12407
Author: victormote
Date: 2022-01-16 13:38:11 +0000 (Sun, 16 Jan 2022)
Log Message:
-----------
Correct logic to match new signal that the glyph name was not found.
Modified Paths:
--------------
trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
Modified: trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java
===================================================================
--- trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-15 20:16:52 UTC (rev 12406)
+++ trunk/foray/foray-font/src/main/java/org/foray/font/format/type1/Type1MetricsParserAfm.java 2022-01-16 13:38:11 UTC (rev 12407)
@@ -1486,7 +1486,7 @@
private int getCodePointForGlyphName(final PsServer psServer, final String glyphName) {
GlyphList gl = psServer.getPredefinedGlyphList(GlyphList.Predefined.AGL);
int theChar = gl.mapGlyphNameToCodePoint(glyphName);
- if (theChar == Character.MAX_VALUE) {
+ if (theChar < 0) {
gl = psServer.getPredefinedGlyphList(GlyphList.Predefined.ZAPF_DINGBATS);
theChar = gl.mapGlyphNameToCodePoint(glyphName);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-15 20:16:56
|
Revision: 12406
http://sourceforge.net/p/foray/code/12406
Author: victormote
Date: 2022-01-15 20:16:52 +0000 (Sat, 15 Jan 2022)
Log Message:
-----------
Restore DTD that was apparently accidentally deleted.
Added Paths:
-----------
trunk/foray/master/doc/web/dtds/0.1/en/foray-config.dtd
Added: trunk/foray/master/doc/web/dtds/0.1/en/foray-config.dtd
===================================================================
--- trunk/foray/master/doc/web/dtds/0.1/en/foray-config.dtd (rev 0)
+++ trunk/foray/master/doc/web/dtds/0.1/en/foray-config.dtd 2022-01-15 20:16:52 UTC (rev 12406)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id$ -->
+
+<!--
+This file is the XML DTD for a FOray configuration file.
+ For general information about FOray:
+ http://www.foray.org
+ For specific information about FOray configuration:
+ http://www.foray.org/app/using/configuration.html
+
+Use the following public and system IDs for this DTD:
+<!DOCTYPE foray-config
+ PUBLIC "-//FOray//DTD FOray Configuration V0.1//EN"
+ "http://www.foray.org/dtds/0.1/en/foray-config.dtd">
+
+-->
+
+<!ELEMENT foray-config (entry+) >
+<!ELEMENT entry (key, value) >
+<!ELEMENT key (#PCDATA)>
+<!ELEMENT value (#PCDATA)>
+
+<!-- Last line of file. -->
Property changes on: trunk/foray/master/doc/web/dtds/0.1/en/foray-config.dtd
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-15 17:44:56
|
Revision: 12405
http://sourceforge.net/p/foray/code/12405
Author: victormote
Date: 2022-01-15 17:44:53 +0000 (Sat, 15 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Move interface no longer needed in API from aXSL to implementation code.
Modified Paths:
--------------
trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath4a.java
Added Paths:
-----------
trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath.java
Added: trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath.java (rev 0)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath.java 2022-01-15 17:44:53 UTC (rev 12405)
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2019 The FOray Project.
+ * http://www.foray.org
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This work is in part derived from the following work(s), used with the
+ * permission of the licensor:
+ * Apache FOP, licensed by the Apache Software Foundation
+ *
+ */
+
+/*
+ * $LastChangedRevision$
+ * $LastChangedDate$
+ * $LastChangedBy$
+ */
+
+package org.foray.common.data;
+
+/**
+ * <p>Describes a path to a node in a tree of ordered content.</p>
+ * <ul>
+ * <li>Suppose a tree of indexed content whose root is A.</li>
+ * <li>A has two children, B and C.</li>
+ * <li>B has three children, D, E, and F.</li>
+ * <li>C has two children, G and H.</li>
+ * <li>H has two children, I and J.</li>
+ * </ul>
+ *
+ * <p>Since the content in the tree is ordered, each of these nodes can be found by providing a series of indexes into
+ * the content.
+ * Traverse to the desired node as follows:
+ * <ol>
+ * <li>Set the current node to the root</li>
+ * <li>If there are no more indexes, the search is over, the current node is the one described by the path.
+ * <li>If there are more indexes, select the next one, and use it to select a child of the current node.</li>
+ * <li>Set the current node to the child selected above.
+ * <li>Repeat steps 2 through 4 as needed.</li>
+ * </ol>
+ *
+ * <p>The following index sequences can be used to describe the path to each of the elements described above:</p>
+ * <ul>
+ * <li>B: 0</li>
+ * <li>C: 1</li>
+ * <li>D: 0, 0</li>
+ * <li>E: 0, 1</li>
+ * <li>F: 0, 2</li>
+ * <li>G: 1, 0</li>
+ * <li>H: 1, 1</li>
+ * <li>I: 1, 1, 0</li>
+ * <li>J: 1, 1, 1</li>
+ * </ul>
+ * <p>The depth of the node is equal to the number of path segments required to describe it.
+ * In the example above, the depth of B is 1, and the depth of J is 3.</p>
+ */
+public interface OrderedTreePath {
+
+ /**
+ * Returns the depth of the path, that is, the number of elements in the path.
+ * @return The depth of the path.
+ * See the class documentation for a description of the node depth.
+ */
+ int depth();
+
+ /**
+ * Returns the index to the path element at a given depth.
+ * @param index The index to the depth of the path that should be returned.
+ * This is a zero-based index.
+ * If a path has a depth of three, index 0 should be queried first, then 1, then 2.
+ * @return The zero-based index to the path element for the depth described by {@code index}.
+ * If {@code index} is greater than or equal to {@link #depth()}, -1 is returned.
+ */
+ int getPathElement(int index);
+
+}
Property changes on: trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath.java
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev
\ No newline at end of property
Modified: trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath4a.java
===================================================================
--- trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath4a.java 2022-01-15 14:39:44 UTC (rev 12404)
+++ trunk/foray/foray-common/src/main/java/org/foray/common/data/OrderedTreePath4a.java 2022-01-15 17:44:53 UTC (rev 12405)
@@ -30,8 +30,6 @@
import org.foray.common.sequence.IntArray;
-import org.axsl.common.data.OrderedTreePath;
-
/**
* Implementation of {@link OrderedTreePath}.
* Instances of this class are immutable.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <vic...@us...> - 2022-01-15 14:39:49
|
Revision: 12404
http://sourceforge.net/p/foray/code/12404
Author: victormote
Date: 2022-01-15 14:39:44 +0000 (Sat, 15 Jan 2022)
Log Message:
-----------
Conform to aXSL change: Move org.axsl.common.value to new axsl-value project.
Modified Paths:
--------------
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionBodyRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionOuterRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java
trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
trunk/foray/foray-fotree/build.gradle
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoRefinedText4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextCharacters4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/RetrieveMarker4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Table4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/Title4a.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractAbsoluteOffset.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorder.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractPageDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/AbstractRelativeSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdAlignmentBaseline.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPositionHorizontal.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBackgroundPositionVertical.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBlankOrNotBlank.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBlockProgressionDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderAfterWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBeforeWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBottomColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderBottomWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderEndWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderLeftColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderLeftWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderRightColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderRightWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderSeparation.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStartWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderTopColor.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderTopWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdBorderWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdDominantBaseline.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdEndIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdExtent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdInlineProgressionDimension.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterSpacing.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLetterValue.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdLineHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMargin.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginBottom.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginLeft.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginRight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMarginTop.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMaxHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMaxWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMinHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdMinWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdOddOrEven.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPadding.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingBottom.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingLeft.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingRight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingStart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPaddingTop.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageHeight.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPagePosition.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdPageWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSize.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceAfter.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceBefore.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceEnd.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdSpaceStart.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdStartIndent.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdTextShadow.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdVerticalAlign.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWidth.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/prop/PdWordSpacing.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/parse/PropertyParser.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtBorderStyle.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtShadowEffectWrapper.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtSpace.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/DtWritingMode.java
trunk/foray/foray-fotree/src/main/java/org/foray/fotree/value/PropertyCollection.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/AbstractPropertyTest.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/obj/FoRefinedText4aTests.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestForcePageCount.java
trunk/foray/foray-fotree/src/test/java/org/foray/fotree/fo/prop/TestVerticalAlign.java
trunk/foray/foray-linebreak/src/main/java/org/foray/text/line/EagerLineBreaker.java
trunk/foray/foray-linebreak/src/main/java/org/foray/text/line/solitary/SolitaryLineBreaker.java
trunk/foray/foray-orthography/build.gradle
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Punctuation4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentLatin1.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/StringWordSegmentUtf16.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/TokenFlow4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Whitespace4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/Word4a.java
trunk/foray/foray-orthography/src/main/java/org/foray/orthography/WordSegment4a.java
trunk/foray/foray-orthography/src/test/java/org/foray/orthography/TokenFlow4aTests.java
trunk/foray/foray-orthography/src/test/java/org/foray/orthography/Word4aTests.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/OverrideGraftingContext.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/Status.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TablePnr.java
trunk/foray/foray-pioneer/src/main/java/org/foray/pioneer/TableRowPnr.java
trunk/foray/foray-render/src/main/java/org/foray/render/PrintRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/Renderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/awt/AwtRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/pcl/PclRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/pdf/PdfRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/ps/PsRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/svg/SvgRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/txt/TxtRenderer.java
trunk/foray/foray-render/src/main/java/org/foray/render/xml/XmlRenderer.java
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractInlineArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,10 +31,10 @@
import org.foray.common.data.OrderedTreeNode;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.prop.BaselineShiftPa;
import org.axsl.galley.GeneralInlineAreaG5;
+import org.axsl.value.RelativeAxis;
/**
* Common superclass for all areas generated by inline formatting objects.
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AbstractTablePartContainer.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -29,10 +29,10 @@
package org.foray.area;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.fo.TableRow;
import org.axsl.galley.BackgroundAreaG5;
import org.axsl.graphic.Graphic;
+import org.axsl.value.RelativeAxis;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/Area4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -34,16 +34,16 @@
import org.axsl.area.AreaClass;
import org.axsl.area.AreaTreeException;
import org.axsl.area.BlockLevelRa;
-import org.axsl.common.value.AbsoluteAxis;
-import org.axsl.common.value.AbsoluteDirection;
-import org.axsl.common.value.LinkType;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.common.value.WritingMode;
import org.axsl.font.Font;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.BasicLink;
import org.axsl.fotree.fo.prop.IdPa;
import org.axsl.fotree.fo.prop.WritingModePa;
+import org.axsl.value.AbsoluteAxis;
+import org.axsl.value.AbsoluteDirection;
+import org.axsl.value.LinkType;
+import org.axsl.value.RelativeAxis;
+import org.axsl.value.WritingMode;
import java.awt.geom.Rectangle2D;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaFlexible.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,7 +31,7 @@
import org.foray.common.data.AbstractOrderedTreeNode;
import org.foray.common.data.OrderedTreeNode;
-import org.axsl.common.value.RelativeAxis;
+import org.axsl.value.RelativeAxis;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/AreaNode4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -35,9 +35,6 @@
import org.axsl.area.AreaNode;
import org.axsl.area.AreaTreeException;
import org.axsl.area.factory.BlockLevelAreaFactory;
-import org.axsl.common.value.LinefeedTreatment;
-import org.axsl.common.value.TextTransform;
-import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.GraftingPoint;
@@ -47,6 +44,9 @@
import org.axsl.galley.AreaNodeG5;
import org.axsl.galley.Galley;
import org.axsl.orthography.Orthography;
+import org.axsl.value.LinefeedTreatment;
+import org.axsl.value.TextTransform;
+import org.axsl.value.WhiteSpaceTreatment;
import org.slf4j.Logger;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BasicLinkArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,11 +31,11 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.BorderStyle;
import org.axsl.fotree.fo.BasicLink;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GeneralInlineAreaG5;
+import org.axsl.value.BorderStyle;
import java.awt.Color;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BeforeFloatRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,11 +32,11 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.BeforeFloatRa;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.RegionBody;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.RelativeAxis;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -30,8 +30,8 @@
import org.foray.area.link.Link;
-import org.axsl.common.value.LineStackingStrategy;
import org.axsl.fotree.fo.Block;
+import org.axsl.value.LineStackingStrategy;
/**
* Superclass for {@link NormalBlockArea4a} and {@link LineArea4a}.
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/BlockContainerRa.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,10 +31,6 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.AbsolutePosition;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.BorderStyle;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.BlockContainer;
@@ -48,6 +44,10 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.AbsolutePosition;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.BorderStyle;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/FootnoteRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,11 +32,11 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.FootnoteRa;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.RegionBody;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.RelativeAxis;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/InlineArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,13 +31,13 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.BorderStyle;
import org.axsl.fotree.fo.Inline;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.InlineAreaG5;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.BorderStyle;
import java.awt.Color;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LeaderArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,9 +31,6 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.LeaderAlignment;
-import org.axsl.common.value.LeaderPattern;
-import org.axsl.common.value.RuleStyle;
import org.axsl.font.FontUse;
import org.axsl.fotree.fo.Leader;
import org.axsl.fotree.fo.prop.LeaderAlignmentPa;
@@ -42,6 +39,9 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.LeaderAreaG5;
+import org.axsl.value.LeaderAlignment;
+import org.axsl.value.LeaderPattern;
+import org.axsl.value.RuleStyle;
import java.awt.Color;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/LineArea4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -33,13 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.LineArea;
-import org.axsl.common.value.Conditionality;
-import org.axsl.common.value.LineStackingStrategy;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.common.value.RelativeCompass;
-import org.axsl.common.value.TextAlign;
-import org.axsl.common.value.TextAlignLast;
-import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.font.Font;
import org.axsl.font.FontUse;
import org.axsl.fotree.FoContext;
@@ -67,6 +60,13 @@
import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.kpModel.ParaBranch;
import org.axsl.kpModel.ParaLeaf;
+import org.axsl.value.Conditionality;
+import org.axsl.value.LineStackingStrategy;
+import org.axsl.value.RelativeAxis;
+import org.axsl.value.RelativeCompass;
+import org.axsl.value.TextAlign;
+import org.axsl.value.TextAlignLast;
+import org.axsl.value.WhiteSpaceTreatment;
import java.util.ArrayList;
import java.util.Iterator;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListBlockArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,12 +31,12 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.fo.ListBlock;
import org.axsl.fotree.fo.ListItem;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.ListBlockAreaG5;
+import org.axsl.value.RelativeAxis;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/ListItemArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,7 +31,6 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.ListItem;
import org.axsl.fotree.fo.ListItemBody;
@@ -38,6 +37,7 @@
import org.axsl.fotree.fo.ListItemLabel;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.RelativeAxis;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/MainRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,8 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.MainRa;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.common.value.Span;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.BlockContainer;
@@ -40,6 +38,8 @@
import org.axsl.fotree.fo.RegionBody;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.RelativeAxis;
+import org.axsl.value.Span;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalBlockArea4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -34,9 +34,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.NormalBlockArea;
import org.axsl.area.factory.BlockLevelAreaFactory;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.BorderStyle;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.font.FontUse;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Block;
@@ -51,6 +48,9 @@
import org.axsl.graphic.Graphic;
import org.axsl.kpModel.ParaContext;
import org.axsl.kpModel.ParaPenalty;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.BorderStyle;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/NormalFlowRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,7 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.NormalFlowRa;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.BlockContainer;
@@ -44,6 +43,7 @@
import org.axsl.fotree.fo.Table;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.RelativeAxis;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageCollection4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -35,7 +35,6 @@
import org.axsl.area.PageCollection;
import org.axsl.area.PageRa;
import org.axsl.common.PositiveIntegerFormatter;
-import org.axsl.common.value.ForcePageCount;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.fo.FolioPrefix;
import org.axsl.fotree.fo.FolioSuffix;
@@ -45,6 +44,7 @@
import org.axsl.fotree.fo.SimplePageMaster;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.ForcePageCount;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/PageRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -34,12 +34,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.PageCollection.Force;
import org.axsl.area.PageRa;
-import org.axsl.common.value.AbsoluteAxis;
-import org.axsl.common.value.AbsoluteDirection;
-import org.axsl.common.value.Compass;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.common.value.RetrieveBoundary;
-import org.axsl.common.value.RetrievePosition;
import org.axsl.fotree.Fo;
import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.PageSequence;
@@ -53,6 +47,12 @@
import org.axsl.fotree.fo.SimplePageMaster;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.AbsoluteAxis;
+import org.axsl.value.AbsoluteDirection;
+import org.axsl.value.Compass;
+import org.axsl.value.RelativeAxis;
+import org.axsl.value.RetrieveBoundary;
+import org.axsl.value.RetrievePosition;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionBodyRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionBodyRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionBodyRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,14 +32,14 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RegionBodyRa;
-import org.axsl.common.value.AbsoluteDirection;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.fo.RegionBody;
import org.axsl.fotree.fo.SimplePageMaster;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.AbsoluteDirection;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionOuterRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionOuterRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/RegionOuterRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,8 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RegionOuterRa;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.BlockContainer;
import org.axsl.fotree.fo.BlockDiscrete;
@@ -49,6 +47,8 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/SpanRa4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,12 +32,12 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.SpanRa;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.common.value.Span;
import org.axsl.fotree.fo.RegionBody;
import org.axsl.fotree.fo.prop.SpanPa;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
+import org.axsl.value.RelativeAxis;
+import org.axsl.value.Span;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableBodyContainer4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,12 +32,12 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.TableBodyContainer;
-import org.axsl.common.value.BackgroundRepeat;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.TableBody;
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
import java.awt.Color;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableCellRa.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -31,11 +31,6 @@
import org.foray.area.link.Link;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.BorderModel;
-import org.axsl.common.value.BorderStyle;
-import org.axsl.common.value.DisplayAlign;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.fo.Block;
import org.axsl.fotree.fo.BlockContainer;
import org.axsl.fotree.fo.BlockDiscrete;
@@ -48,6 +43,11 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.BorderModel;
+import org.axsl.value.BorderStyle;
+import org.axsl.value.DisplayAlign;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableFooterContainer4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -33,7 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.area.TableFooterContainer;
-import org.axsl.common.value.BackgroundRepeat;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
@@ -41,6 +40,7 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
import java.awt.Color;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableHeaderContainer4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -33,7 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.area.TableHeaderContainer;
-import org.axsl.common.value.BackgroundRepeat;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
@@ -41,6 +40,7 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
import java.awt.Color;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRa.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -33,10 +33,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.RetrieveTableMarkerNode;
import org.axsl.area.TableArea;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.BorderModel;
-import org.axsl.common.value.BorderStyle;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.fo.Marker;
import org.axsl.fotree.fo.RetrieveTableMarker;
@@ -49,6 +45,10 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.BorderModel;
+import org.axsl.value.BorderStyle;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TableRowContainer4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,9 +32,6 @@
import org.axsl.area.AreaTreeException;
import org.axsl.area.TableRowContainer;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.FoPropertyConstants;
-import org.axsl.common.value.RelativeAxis;
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.fotree.fo.TableCell;
import org.axsl.fotree.fo.TableRow;
@@ -41,6 +38,9 @@
import org.axsl.galley.GalleyVisitor;
import org.axsl.galley.GalleyVisitorException;
import org.axsl.graphic.Graphic;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.FoPropertyConstants;
+import org.axsl.value.RelativeAxis;
import java.awt.Color;
import java.util.ArrayList;
Modified: trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java
===================================================================
--- trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-areatree/src/main/java/org/foray/area/TextArea.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,7 +32,6 @@
import org.foray.common.primitive.XmlCharacterUtils;
import org.axsl.area.AreaTreeException;
-import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.font.FontContext;
import org.axsl.font.FontUse;
import org.axsl.fotree.Fo;
@@ -43,6 +42,7 @@
import org.axsl.galley.GalleyVisitorException;
import org.axsl.galley.GlyphAreaSequenceG5;
import org.axsl.unicode.block.Basic_Latin_Block;
+import org.axsl.value.WhiteSpaceTreatment;
import java.awt.Color;
import java.util.Collections;
Modified: trunk/foray/foray-fotree/build.gradle
===================================================================
--- trunk/foray/foray-fotree/build.gradle 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/build.gradle 2022-01-15 14:39:44 UTC (rev 12404)
@@ -14,6 +14,7 @@
api group: 'org.axsl', name: 'axsl-linebreak', version: axslVersion
api group: 'org.axsl', name: 'axsl-kp-model', version: axslVersion
api group: 'org.axsl', name: 'axsl-unicode', version: axslVersion
+ api group: 'org.axsl', name: 'axsl-value', version: axslVersion
api project(':foray-common')
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/FoObj.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -60,71 +60,6 @@
import org.foray.fotree.value.DtWritingMode;
import org.axsl.common.i18n.Script;
-import org.axsl.common.value.AbsoluteDirection;
-import org.axsl.common.value.AbsolutePosition;
-import org.axsl.common.value.ActiveState;
-import org.axsl.common.value.AlignmentBaseline;
-import org.axsl.common.value.BackgroundAttachment;
-import org.axsl.common.value.BackgroundRepeat;
-import org.axsl.common.value.Baseline;
-import org.axsl.common.value.BlankOrNotBlank;
-import org.axsl.common.value.BorderModel;
-import org.axsl.common.value.BorderStyle;
-import org.axsl.common.value.Break;
-import org.axsl.common.value.ChangeBarPlacement;
-import org.axsl.common.value.Clear;
-import org.axsl.common.value.Conditionality;
-import org.axsl.common.value.DisplayAlign;
-import org.axsl.common.value.EmptyCells;
-import org.axsl.common.value.Float;
-import org.axsl.common.value.ForcePageCount;
-import org.axsl.common.value.HyphenationKeep;
-import org.axsl.common.value.IndexMerge;
-import org.axsl.common.value.IntrusionDisplace;
-import org.axsl.common.value.LeaderAlignment;
-import org.axsl.common.value.LeaderPattern;
-import org.axsl.common.value.LetterValue;
-import org.axsl.common.value.LineHeightShiftAdjustment;
-import org.axsl.common.value.LineStackingStrategy;
-import org.axsl.common.value.LinefeedTreatment;
-import org.axsl.common.value.LinkType;
-import org.axsl.common.value.MediaUsage;
-import org.axsl.common.value.OddOrEven;
-import org.axsl.common.value.Overflow;
-import org.axsl.common.value.PageCitationStrategy;
-import org.axsl.common.value.PageNumberTreatment;
-import org.axsl.common.value.PagePosition;
-import org.axsl.common.value.ReferenceOrientation;
-import org.axsl.common.value.RelativeAlign;
-import org.axsl.common.value.RelativeCompass;
-import org.axsl.common.value.RelativePosition;
-import org.axsl.common.value.RenderingIntent;
-import org.axsl.common.value.RetrieveBoundary;
-import org.axsl.common.value.RetrieveBoundaryWithinTable;
-import org.axsl.common.value.RetrievePosition;
-import org.axsl.common.value.RetrievePositionWithinTable;
-import org.axsl.common.value.RuleStyle;
-import org.axsl.common.value.ScaleOption;
-import org.axsl.common.value.Scaling;
-import org.axsl.common.value.ScalingMethod;
-import org.axsl.common.value.ShadowEffect;
-import org.axsl.common.value.ShowDestination;
-import org.axsl.common.value.Span;
-import org.axsl.common.value.Speak;
-import org.axsl.common.value.SpeakHeader;
-import org.axsl.common.value.SpeakNumeral;
-import org.axsl.common.value.SpeakPunctuation;
-import org.axsl.common.value.StartingState;
-import org.axsl.common.value.SuppressAtLineBreak;
-import org.axsl.common.value.SwitchTo;
-import org.axsl.common.value.TableLayout;
-import org.axsl.common.value.TextAlign;
-import org.axsl.common.value.TextAlignLast;
-import org.axsl.common.value.TextTransform;
-import org.axsl.common.value.UnicodeBidi;
-import org.axsl.common.value.Visibility;
-import org.axsl.common.value.WhiteSpaceTreatment;
-import org.axsl.common.value.WrapOption;
import org.axsl.font.Font;
import org.axsl.font.FontConsumer;
import org.axsl.font.FontUse;
@@ -149,6 +84,71 @@
import org.axsl.speech.SpeechException;
import org.axsl.speech.SpeechServer;
import org.axsl.speech.Voice;
+import org.axsl.value.AbsoluteDirection;
+import org.axsl.value.AbsolutePosition;
+import org.axsl.value.ActiveState;
+import org.axsl.value.AlignmentBaseline;
+import org.axsl.value.BackgroundAttachment;
+import org.axsl.value.BackgroundRepeat;
+import org.axsl.value.Baseline;
+import org.axsl.value.BlankOrNotBlank;
+import org.axsl.value.BorderModel;
+import org.axsl.value.BorderStyle;
+import org.axsl.value.Break;
+import org.axsl.value.ChangeBarPlacement;
+import org.axsl.value.Clear;
+import org.axsl.value.Conditionality;
+import org.axsl.value.DisplayAlign;
+import org.axsl.value.EmptyCells;
+import org.axsl.value.Float;
+import org.axsl.value.ForcePageCount;
+import org.axsl.value.HyphenationKeep;
+import org.axsl.value.IndexMerge;
+import org.axsl.value.IntrusionDisplace;
+import org.axsl.value.LeaderAlignment;
+import org.axsl.value.LeaderPattern;
+import org.axsl.value.LetterValue;
+import org.axsl.value.LineHeightShiftAdjustment;
+import org.axsl.value.LineStackingStrategy;
+import org.axsl.value.LinefeedTreatment;
+import org.axsl.value.LinkType;
+import org.axsl.value.MediaUsage;
+import org.axsl.value.OddOrEven;
+import org.axsl.value.Overflow;
+import org.axsl.value.PageCitationStrategy;
+import org.axsl.value.PageNumberTreatment;
+import org.axsl.value.PagePosition;
+import org.axsl.value.ReferenceOrientation;
+import org.axsl.value.RelativeAlign;
+import org.axsl.value.RelativeCompass;
+import org.axsl.value.RelativePosition;
+import org.axsl.value.RenderingIntent;
+import org.axsl.value.RetrieveBoundary;
+import org.axsl.value.RetrieveBoundaryWithinTable;
+import org.axsl.value.RetrievePosition;
+import org.axsl.value.RetrievePositionWithinTable;
+import org.axsl.value.RuleStyle;
+import org.axsl.value.ScaleOption;
+import org.axsl.value.Scaling;
+import org.axsl.value.ScalingMethod;
+import org.axsl.value.ShadowEffect;
+import org.axsl.value.ShowDestination;
+import org.axsl.value.Span;
+import org.axsl.value.Speak;
+import org.axsl.value.SpeakHeader;
+import org.axsl.value.SpeakNumeral;
+import org.axsl.value.SpeakPunctuation;
+import org.axsl.value.StartingState;
+import org.axsl.value.SuppressAtLineBreak;
+import org.axsl.value.SwitchTo;
+import org.axsl.value.TableLayout;
+import org.axsl.value.TextAlign;
+import org.axsl.value.TextAlignLast;
+import org.axsl.value.TextTransform;
+import org.axsl.value.UnicodeBidi;
+import org.axsl.value.Visibility;
+import org.axsl.value.WhiteSpaceTreatment;
+import org.axsl.value.WrapOption;
import org.slf4j.Logger;
@@ -2415,7 +2415,7 @@
}
@Override
- public org.axsl.common.value.Float traitFloat(final FoContext context) {
+ public org.axsl.value.Float traitFloat(final FoContext context) {
final FoValue foValue = getPropertyList().traitFloat(this, context);
return convertFloat(foValue);
}
@@ -3578,9 +3578,9 @@
}
@Override
- public org.axsl.common.value.ScalingMethod traitScalingMethod() {
+ public org.axsl.value.ScalingMethod traitScalingMethod() {
/* TODO: Implement this. */
- return org.axsl.common.value.ScalingMethod.AUTO;
+ return org.axsl.value.ScalingMethod.AUTO;
}
@Override
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/PropertyList.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -231,24 +231,24 @@
import org.foray.fotree.xml.XmlProperty;
import org.foray.fotree.xml.prop.Lang;
-import org.axsl.common.value.AbsoluteAxis;
-import org.axsl.common.value.AbsoluteCompass;
-import org.axsl.common.value.AbsoluteDirection;
-import org.axsl.common.value.AlignmentBaseline;
-import org.axsl.common.value.Baseline;
-import org.axsl.common.value.BlankOrNotBlank;
-import org.axsl.common.value.Compass;
-import org.axsl.common.value.Conditionality;
-import org.axsl.common.value.LetterValue;
-import org.axsl.common.value.OddOrEven;
-import org.axsl.common.value.PagePosition;
-import org.axsl.common.value.RelativeAxis;
-import org.axsl.common.value.RelativeCompass;
-import org.axsl.common.value.ShadowEffect;
import org.axsl.font.Font;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoInlineContext;
import org.axsl.graphic.Graphic;
+import org.axsl.value.AbsoluteAxis;
+import org.axsl.value.AbsoluteCompass;
+import org.axsl.value.AbsoluteDirection;
+import org.axsl.value.AlignmentBaseline;
+import org.axsl.value.Baseline;
+import org.axsl.value.BlankOrNotBlank;
+import org.axsl.value.Compass;
+import org.axsl.value.Conditionality;
+import org.axsl.value.LetterValue;
+import org.axsl.value.OddOrEven;
+import org.axsl.value.PagePosition;
+import org.axsl.value.RelativeAxis;
+import org.axsl.value.RelativeCompass;
+import org.axsl.value.ShadowEffect;
import java.awt.Shape;
import java.util.ArrayList;
@@ -2443,7 +2443,7 @@
* @param direction The direction for which the border-style is needed.
* @return The specified border-style property.
*/
- public org.axsl.common.value.BorderStyle getBorderStyle(final FoObj fobj, final FoContext context,
+ public org.axsl.value.BorderStyle getBorderStyle(final FoObj fobj, final FoContext context,
final Compass direction) {
AbstractBorderStyle abstractBorderStyle = null;
/* Try the most explicit setting first, e.g "border-top-style". */
@@ -2492,7 +2492,7 @@
public int getBorderWidth(final FoObj fobj, final FoContext context, final RelativeCompass direction) {
/* If the border-style is "none", the width is zero. */
if (getBorderStyle(fobj, context, direction)
- == org.axsl.common.value.BorderStyle.NONE) {
+ == org.axsl.value.BorderStyle.NONE) {
return 0;
}
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/axsl/obj/Metadata4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -39,13 +39,13 @@
import org.foray.fotree.fo.obj.Declarations4a;
import org.foray.fotree.fo.obj.FoTextCharacters4a;
-import org.axsl.common.value.LinefeedTreatment;
-import org.axsl.common.value.TextTransform;
-import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
import org.axsl.fotree.axsl.Metadata;
+import org.axsl.value.LinefeedTreatment;
+import org.axsl.value.TextTransform;
+import org.axsl.value.WhiteSpaceTreatment;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/AbstractFoProperty.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -169,7 +169,7 @@
* @param value The property value to be tested.
* @return The property value's underlying BorderStyle value.
*/
- protected org.axsl.common.value.BorderStyle evalBorderStyle(
+ protected org.axsl.value.BorderStyle evalBorderStyle(
final PropertyValue value) {
final FoValue foValue = this.convertValueToFoValue(value);
final DtBorderStyle borderStyle = DtBorderStyle.getInstance(
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/AbstractCharacterSequence.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,8 +32,6 @@
import org.foray.common.i18n.Language4a;
import org.foray.fotree.FoObj;
-import org.axsl.common.TextModifiers;
-import org.axsl.common.value.WrapOption;
import org.axsl.font.Font;
import org.axsl.font.FontContext;
import org.axsl.font.FontServer;
@@ -43,6 +41,8 @@
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.orthography.Orthography;
import org.axsl.text.line.LineText;
+import org.axsl.value.WrapOption;
+import org.axsl.value.group.TextModifiers;
/**
* Abstract superclass for representations of characters.
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/BookmarkTitle4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -34,13 +34,13 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.common.value.LinefeedTreatment;
-import org.axsl.common.value.TextTransform;
-import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
import org.axsl.fotree.fo.BookmarkTitle;
+import org.axsl.value.LinefeedTreatment;
+import org.axsl.value.TextTransform;
+import org.axsl.value.WhiteSpaceTreatment;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ConditionalPageMasterReference4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,13 +32,13 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.common.value.BlankOrNotBlank;
-import org.axsl.common.value.OddOrEven;
-import org.axsl.common.value.PagePosition;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.FoVisitor;
import org.axsl.fotree.fo.ConditionalPageMasterReference;
+import org.axsl.value.BlankOrNotBlank;
+import org.axsl.value.OddOrEven;
+import org.axsl.value.PagePosition;
import java.util.ArrayList;
import java.util.List;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/ExternalGraphic4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -33,7 +33,6 @@
import org.foray.fotree.Namespace;
import org.foray.fotree.PropertyList;
-import org.axsl.common.value.FoPropertyConstants;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoLineNonText;
import org.axsl.fotree.FoTreeException;
@@ -42,6 +41,7 @@
import org.axsl.fotree.fo.GraftingPoint;
import org.axsl.graphic.Graphic;
import org.axsl.graphic.GraphicException;
+import org.axsl.value.FoPropertyConstants;
import java.util.List;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoRefinedText4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoRefinedText4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoRefinedText4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -33,8 +33,8 @@
import org.foray.common.sequence.IntArrayBuilder;
import org.axsl.common.sequence.IntSequencePlus;
-import org.axsl.common.value.LinefeedTreatment;
-import org.axsl.common.value.TextTransform;
+import org.axsl.value.LinefeedTreatment;
+import org.axsl.value.TextTransform;
/**
* Wraps a sequence of characters and overlays it with the changes needed to convert it to the "refined" values for
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoScaled4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -32,9 +32,9 @@
import org.foray.fotree.FoObj;
import org.foray.fotree.PropertyList;
-import org.axsl.common.value.FoPropertyConstants;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoScaled;
+import org.axsl.value.FoPropertyConstants;
/**
* Abstract base class for inline FOs that are scaleable. This currently
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java
===================================================================
--- trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-01-15 01:32:47 UTC (rev 12403)
+++ trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoText4a.java 2022-01-15 14:39:44 UTC (rev 12404)
@@ -34,13 +34,13 @@
import org.foray.fotree.PropertyList;
import org.foray.fotree.fo.FoValue;
-import org.axsl.common.value.LinefeedTreatment;
-import org.axsl.common.value.TextTransform;
-import org.axsl.common.value.WhiteSpaceTreatment;
import org.axsl.fotree.FoContext;
import org.axsl.fotree.FoTreeException;
import org.axsl.fotree.fo.FoText;
import org.axsl.unicode.block.Basic_Latin_Block;
+import org.axsl.value.LinefeedTreatment;
+import org.axsl.value.TextTransform;
+import org.axsl.value.WhiteSpaceTreatment;
import java.util.List;
Modified: trunk/foray/foray-fotree/src/main/java/org/foray/fotree/fo/obj/FoTextCharacters4a.java
===================================================================
--- trunk...
[truncated message content] |
|
From: <vic...@us...> - 2022-01-15 01:32:49
|
Revision: 12403
http://sourceforge.net/p/foray/code/12403
Author: victormote
Date: 2022-01-15 01:32:47 +0000 (Sat, 15 Jan 2022)
Log Message:
-----------
Turn transitive resolution off for more dependencies.
Modified Paths:
--------------
trunk/foray/foray-font/build.gradle
trunk/foray/master/build.gradle
Modified: trunk/foray/foray-font/build.gradle
===================================================================
--- trunk/foray/foray-font/build.gradle 2022-01-15 01:19:03 UTC (rev 12402)
+++ trunk/foray/foray-font/build.gradle 2022-01-15 01:32:47 UTC (rev 12403)
@@ -1,25 +1,28 @@
description = 'foray-font'
dependencies {
- api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
- api group: 'commons-io', name: 'commons-io', version: commonsIoVersion
- api group: 'commons-discovery', name: 'commons-discovery', version: commonsDiscoveryVersion
- api group: 'org.apache.ant', name: 'ant-launcher', version: antVersion
- api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
+ api group: 'org.slf4j', name: 'slf4j-api', version: slf4jVersion
+ api group: 'commons-io', name: 'commons-io', version: commonsIoVersion
+ api group: 'commons-discovery', name: 'commons-discovery', version: commonsDiscoveryVersion
+ api group: 'org.apache.ant', name: 'ant-launcher', version: antVersion
+ api group: 'commons-cli', name: 'commons-cli', version: commonsCliVersion
+ api group: 'javax.activation', name: 'activation', version: javaxActivationVersion
- api group: 'org.axsl', name: 'axsl-common', version: axslVersion
- api group: 'org.axsl', name: 'axsl-font', version: axslVersion
- api group: 'org.axsl', name: 'axsl-ps', version: axslVersion
- api group: 'org.axsl', name: 'axsl-orthography', version: axslVersion
- api group: 'org.axsl', name: 'axsl-unicode', version: axslVersion
+ /* Turn transitive resolution OFF for both aXSL and FOray modules, for greater design visibility. */
- api project(':foray-common')
- api project(':foray-ps')
+ api (group: 'org.axsl', name: 'axsl-common', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-font', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-ps', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-orthography', version: axslVersion) { transitive = false }
+ api (group: 'org.axsl', name: 'axsl-unicode', version: axslVersion) { transitive = false }
- implementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackClassicVersion
+ api (project(':foray-common')) { transitive = false }
+ api (project(':foray-ps')) { transitive = false }
- testImplementation group: 'junit', name: 'junit', version: junitVersion
- testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
+ implementation group: 'ch.qos.logback', name: 'logback-classic', version: logbackClassicVersion
+
+ testImplementation group: 'junit', name: 'junit', version: junitVersion
+ testImplementation group: 'org.mockito', name: 'mockito-core', version: mockitoVersion
}
Modified: trunk/foray/master/build.gradle
===================================================================
--- trunk/foray/master/build.gradle 2022-01-15 01:19:03 UTC (rev 12402)
+++ trunk/foray/master/build.gradle 2022-01-15 01:32:47 UTC (rev 12403)
@@ -37,6 +37,7 @@
ext.axslVersion = '0.3-SNAPSHOT' // Latest is 0.3-SNAPSHOT as of 2021-01-12. See Note 2.
ext.svgDomVersion = '1.1' // See aXSL master/build.gradle
ext.mathMlDomVersion = '2.0' // See aXSL master/build.gradle
+ ext.javaxActivationVersion = '1.1.1' // See aXSL master/build.gradle
/* End of aXSL-related dependencies. */
ext.slf4jVersion = '1.7.30' // Latest is 1.7.30 as of 2021-01-12.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
10 messages has been excluded from this view by a project administrator.
