diff --git a/bom/pom.xml b/bom/pom.xml index 39b6a0387d..0dcddf0a45 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -117,7 +117,7 @@ org.daisy.pipeline.modules common-utils - 2.1.0-SNAPSHOT + 3.0.0-SNAPSHOT org.daisy.pipeline.modules @@ -127,7 +127,7 @@ org.daisy.pipeline.modules fileset-utils - 5.2.1 + 5.3.0-SNAPSHOT org.daisy.pipeline.modules @@ -152,7 +152,7 @@ org.daisy.pipeline.modules validation-utils - 1.0.10 + 2.0.0-SNAPSHOT org.daisy.pipeline.modules @@ -230,12 +230,12 @@ org.daisy.pipeline.modules dtbook-utils - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT org.daisy.pipeline.modules epub-utils - 1.2.5-SNAPSHOT + 2.0.0-SNAPSHOT org.daisy.pipeline.modules @@ -250,7 +250,7 @@ org.daisy.pipeline.modules smil-utils - 3.0.0 + 3.0.1-SNAPSHOT org.daisy.pipeline.modules @@ -265,7 +265,7 @@ org.daisy.pipeline.modules zedai-utils - 1.1.3 + 1.2.0-SNAPSHOT - - - - - - + + + + + @@ -135,13 +133,11 @@ - + - - diff --git a/common/common-utils/src/main/resources/xml/xproc/error.xpl b/common/common-utils/src/main/resources/xml/xproc/error.xpl index d7693c04dd..2ee14f4355 100644 --- a/common/common-utils/src/main/resources/xml/xproc/error.xpl +++ b/common/common-utils/src/main/resources/xml/xproc/error.xpl @@ -16,30 +16,37 @@ + + +

Documents on this port will be ignored.

+
+ +
-

If a c:errors document is supplied on this port, the errors will be - reported and the last error will be raised.

+

If one or more c:errors documents are supplied on this port, the errors + will be reported and the last error will be raised.

+ +

Nothing can ever appear on this port since the step will always fail.

+
- + - Must be set if there is a document on the "error" port. Must not be set if there is no - document on the "error" port. + Must be set if there are no documents on the "error" port. Must not be set if there are + documents on the "error" port. - - - + Description of the error that occured. $1, $2 etc will be replaced with the contents of optios "param1", "param2", etc. Must be set if there is a document on the "error" - port. Must not be set if there is no document on the "error" port. + port. Must not be set if there are documents on the "error" port. @@ -54,9 +61,9 @@ - + -

A c:errors document.

+

One or more c:errors documents.

@@ -68,26 +75,19 @@
- - - - Not more than one document allowed on the "error" port. - - - - + - + - "message" option must not be set if there is a document on the "error" port. + "message" option must not be set if there are documents on the "error" port. - + - "code" option must not be set if there is a document on the "error" port. + "code" option must not be set if there are documents on the "error" port. @@ -100,14 +100,14 @@ - + "message" option must be set - + "code" option must be set @@ -115,8 +115,6 @@ - - MESSAGE @@ -136,44 +134,13 @@ '\$9',replace($param9,'\$','\\\$')), '"')"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + diff --git a/common/common-utils/src/main/resources/xml/xproc/log-error.xpl b/common/common-utils/src/main/resources/xml/xproc/log-error.xpl index ca99c4e329..4a6b1caf74 100644 --- a/common/common-utils/src/main/resources/xml/xproc/log-error.xpl +++ b/common/common-utils/src/main/resources/xml/xproc/log-error.xpl @@ -1,12 +1,13 @@ -

Log a caught XProc error.

-

Logs a message in the job execution log and prints the stack trace in the detailed +

Log caught XProc errors.

+

Logs messages in the job execution log and prints the stack trace in the detailed log.

@@ -15,19 +16,20 @@

Any document sequence.

- + -

A c:errors document.

+

Zero or more c:errors documents.

- + -

Severity of the log message

+

Severity of the log messages

-

Copy of source.

+

Copy of source.

diff --git a/common/common-utils/src/test/xprocspec/error.xprocspec b/common/common-utils/src/test/xprocspec/error.xprocspec index 14c6af677a..895c2e508b 100644 --- a/common/common-utils/src/test/xprocspec/error.xprocspec +++ b/common/common-utils/src/test/xprocspec/error.xprocspec @@ -15,14 +15,12 @@ - + foobar - - - + - + diff --git a/common/fileset-utils/pom.xml b/common/fileset-utils/pom.xml index 6c7a59a263..7ef3883b09 100644 --- a/common/fileset-utils/pom.xml +++ b/common/fileset-utils/pom.xml @@ -11,7 +11,7 @@ fileset-utils - 5.2.2-SNAPSHOT + 5.3.0-SNAPSHOT bundle DAISY Pipeline 2 module :: File Set Utilities diff --git a/common/fileset-utils/src/main/resources/xml/xproc/fileset-load.xpl b/common/fileset-utils/src/main/resources/xml/xproc/fileset-load.xpl index 779062fdd3..d8574db299 100644 --- a/common/fileset-utils/src/main/resources/xml/xproc/fileset-load.xpl +++ b/common/fileset-utils/src/main/resources/xml/xproc/fileset-load.xpl @@ -25,9 +25,9 @@

The filtered and loaded fileset.

-

All files are loaded into memory, unless if the "load-if-not-in-memory" option is set, then - the "result" port will only contain documents that were already present in the "in-memory" - input.

+

Files are loaded into memory, unless a file can not be loaded and the + "fail-on-not-found" option is not set, or a file is not already loaded in memory and the + "load-if-not-in-memory" option is set to false.

The fileset ("xml:base" and "href" attributes and base URIs of documents) is normalized.

"original-href" attributes are removed from the manifest.

@@ -290,21 +290,9 @@ - - - + - - - - - - - - - - - + diff --git a/common/fileset-utils/src/main/resources/xml/xproc/fileset-purge.xpl b/common/fileset-utils/src/main/resources/xml/xproc/fileset-purge.xpl index 050d612160..356dba4f02 100644 --- a/common/fileset-utils/src/main/resources/xml/xproc/fileset-purge.xpl +++ b/common/fileset-utils/src/main/resources/xml/xproc/fileset-purge.xpl @@ -16,8 +16,19 @@ - + + + + + + + + +

Files without a original-href attribute are considered to not exist on + disk when the detect-existing option is set to false.

+
+

Whether to raise warnings for files that exist neither on disk or in memory.

@@ -25,12 +36,25 @@
+ - + - + + + + + + + + + + + + +
diff --git a/common/fileset-utils/src/test/mock/xproc/common-utils.xpl b/common/fileset-utils/src/test/mock/xproc/common-utils.xpl index 05b48ad984..8a7728fda2 100644 --- a/common/fileset-utils/src/test/mock/xproc/common-utils.xpl +++ b/common/fileset-utils/src/test/mock/xproc/common-utils.xpl @@ -27,8 +27,6 @@ - - @@ -52,8 +50,6 @@ - - diff --git a/common/validation-utils/pom.xml b/common/validation-utils/pom.xml index def2ae444a..e1859a455b 100644 --- a/common/validation-utils/pom.xml +++ b/common/validation-utils/pom.xml @@ -11,7 +11,7 @@ validation-utils - 1.0.11-SNAPSHOT + 2.0.0-SNAPSHOT bundle DAISY Pipeline 2 module :: validation-utils diff --git a/common/validation-utils/src/main/resources/xml/xproc/check-files-exist.xpl b/common/validation-utils/src/main/resources/xml/xproc/check-files-exist.xpl index 36cc39780b..5ef7815e14 100644 --- a/common/validation-utils/src/main/resources/xml/xproc/check-files-exist.xpl +++ b/common/validation-utils/src/main/resources/xml/xproc/check-files-exist.xpl @@ -6,170 +6,84 @@ xmlns:cx="http://xmlcalabash.com/ns/extensions" xmlns:xs="http://www.w3.org/2001/XMLSchema" exclude-inline-prefixes="#all" - type="px:check-files-exist"> + type="px:check-files-exist" name="main"> -

Check that files exist on disk

-

Given a list of files, ensure that each exists on disk.

+

Check that files exist

+

Given a list of files, ensure that each exists.

- - - - - + -

A list of files, formatted as a FileSet (http://code.google.com/p/daisy-pipeline/wiki/FileSetUtils).

+

Input fileset.

+ + + - + -

List of existing files, formatted as a DAISY Pipeline FileSet.

+

Output fileset of files that exist in memory or on disk.

- + +
+ +

List of missing files, formatted as <d:error> elements, or an empty d:errors element if nothing is missing.

- +

Validation status (http://daisy.github.io/pipeline/StatusXML) of the file check.

- +
- Utilities for representing a fileset. + + px:fileset-purge + - - - For manipulating files. + + + pxi:create-validation-report-error-for-file + + + + + px:validation-status + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - - - - - - - - - - + + + + + + + + + + + + + +
diff --git a/common/validation-utils/src/main/resources/xml/xproc/check-files-wellformed.xpl b/common/validation-utils/src/main/resources/xml/xproc/check-files-wellformed.xpl index a7d48f7f21..d227e779d7 100644 --- a/common/validation-utils/src/main/resources/xml/xproc/check-files-wellformed.xpl +++ b/common/validation-utils/src/main/resources/xml/xproc/check-files-wellformed.xpl @@ -3,173 +3,140 @@ xmlns:px="http://www.daisy.org/ns/pipeline/xproc" xmlns:pxi="http://www.daisy.org/ns/pipeline/xproc/internal" xmlns:d="http://www.daisy.org/ns/pipeline/data" + xmlns:c="http://www.w3.org/ns/xproc-step" exclude-inline-prefixes="#all" - type="px:check-files-wellformed"> + type="px:check-files-wellformed" name="main">

Check that files exist and are well-formed XML

Given a list of files, ensure that each exists and is well-formed XML.

- - - - - + -

A list of files, formatted as a FileSet - (http://code.google.com/p/daisy-pipeline/wiki/FileSetUtils).

+

Input fileset

+ + + - + -

List of well-formed files, formatted as a DAISY Pipeline FileSet.

+

Output fileset which contains the well-formed files from source.

- + +
+ + -

List of malformed files, formatted as <d:error> elements, or an - empty d:errors element if nothing is missing.

+

List of malformed files, formatted as d:error elements, or an empty + d:errors element if nothing is missing.

- +

Validation status (http://daisy.github.io/pipeline/StatusXML) of the file check.

- +
- + - Utilities for representing a fileset. + + px:fileset-load + px:fileset-purge + - - - For manipulating files. + + + px:check-files-exist + + + + + pxi:create-validation-report-error-for-file + + + + + px:validation-status + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - + - - - - - - - - + - - - - - - - - + + diff --git a/common/validation-utils/src/main/resources/xml/xproc/create-validation-report-error-for-file.xpl b/common/validation-utils/src/main/resources/xml/xproc/create-validation-report-error-for-file.xpl index fbbff7f209..8e1f73b12f 100644 --- a/common/validation-utils/src/main/resources/xml/xproc/create-validation-report-error-for-file.xpl +++ b/common/validation-utils/src/main/resources/xml/xproc/create-validation-report-error-for-file.xpl @@ -1,22 +1,18 @@ - +

Create d:error element(s) for the given file.

-

Based on the input d:file element (from - http://code.google.com/p/daisy-pipeline/wiki/FileSetUtils), create one or more d:error - elements, to be used in validation reports (http://code.google.com/p/daisy-pipeline/wiki/ValidationReportXML).

+

Based on the input d:file element, create one or more d:error + elements.

-

d:file element. See - http://code.google.com/p/daisy-pipeline/wiki/FileSetUtils.

+

d:file element

@@ -43,7 +39,7 @@ - + diff --git a/common/validation-utils/src/main/resources/xml/xproc/report-errors.xpl b/common/validation-utils/src/main/resources/xml/xproc/report-errors.xpl index 08b5841f05..8743af7d32 100644 --- a/common/validation-utils/src/main/resources/xml/xproc/report-errors.xpl +++ b/common/validation-utils/src/main/resources/xml/xproc/report-errors.xpl @@ -3,84 +3,72 @@ xmlns:cx="http://xmlcalabash.com/ns/extensions" xmlns:c="http://www.w3.org/ns/xproc-step" type="px:report-errors" - name="report-errors"> + name="main"> - - - - - - + + + +

Zero or more c:errors documents.

+
+
+ + +

Copy of source

+
+
+ + +

Select the method used for reporting validation issues:

+
+
log
+
Issues are reported through warning messages.
+
error
+
Issues are reported through error messages and also trigger an XProc error.
+
+
+
- - - cx:report-errors - - + + + px:error + px:log-error + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/common/validation-utils/src/main/resources/xml/xproc/validate-with-relax-ng-and-report.xpl b/common/validation-utils/src/main/resources/xml/xproc/validate-with-relax-ng-and-report.xpl deleted file mode 100644 index 2c51d40e0c..0000000000 --- a/common/validation-utils/src/main/resources/xml/xproc/validate-with-relax-ng-and-report.xpl +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - l:relax-ng-report - - - - - px:report-errors - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/validation-utils/src/main/resources/xml/xproc/validation-utils-library.xpl b/common/validation-utils/src/main/resources/xml/xproc/validation-utils-library.xpl index 6cbd31b61a..1612fe85dd 100755 --- a/common/validation-utils/src/main/resources/xml/xproc/validation-utils-library.xpl +++ b/common/validation-utils/src/main/resources/xml/xproc/validation-utils-library.xpl @@ -44,12 +44,10 @@ Performs RELAX NG validation, returning two results: the source document (validated, if validation succeeds) and a report of the validation errors (if any).
- - Performs RELAX NG validation, and if there are validation errors, sends them to the error listener as warnings. If 'assert-valid' is true, also raises an error. - - Extracts embedded Schematron rules from a RELAX NG schema (not in compact syntax). + + diff --git a/scripts-utils/dtbook-utils/pom.xml b/scripts-utils/dtbook-utils/pom.xml index d085998e35..0b3890eb95 100644 --- a/scripts-utils/dtbook-utils/pom.xml +++ b/scripts-utils/dtbook-utils/pom.xml @@ -11,7 +11,7 @@ dtbook-utils - 3.1.1-SNAPSHOT + 4.0.0-SNAPSHOT bundle DAISY Pipeline 2 module :: DTBook Utils @@ -60,6 +60,11 @@ mathml-utils runtime
+ + org.daisy.pipeline.modules + css-speech + runtime + diff --git a/scripts-utils/dtbook-utils/src/main/resources/META-INF/catalog.xml b/scripts-utils/dtbook-utils/src/main/resources/META-INF/catalog.xml index 28834f1056..d2a2adee9d 100755 --- a/scripts-utils/dtbook-utils/src/main/resources/META-INF/catalog.xml +++ b/scripts-utils/dtbook-utils/src/main/resources/META-INF/catalog.xml @@ -29,4 +29,5 @@ + diff --git a/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-load.xpl b/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-load.xpl index 2482e0f842..d4ea261045 100755 --- a/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-load.xpl +++ b/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-load.xpl @@ -1,6 +1,8 @@ @@ -13,8 +15,32 @@ - - + + +

Whether to perform validation of the input.

+
+
+ + + +

Version of MathML in the DTBook file

+
+
+ + +

Check to see that referenced images exist on disk

+
+
+ + +

Validate against NIMAS 1.1

+
+
+ + + + +

Fileset containing all the DTBook files and any resources they reference (images etc.). Only contains resources that actually exist on disk. The DTBooks are loaded into @@ -24,9 +50,28 @@ + + +

The validation report

+

Can contain as many report documents as there are DTBook files in the input.

+

The port is empty if the validation option is set to false or if the + input contains no invalid DTBook files.

+
+ +
+ + + +

The validation status + document

+

'ok' if the input does not contain invalid DTBook files, 'error' otherwise.

+
+ +
+ - px:message + px:assert px:parse-xml-stylesheet-instructions @@ -36,6 +81,7 @@ px:fileset-join px:fileset-load px:fileset-purge + px:fileset-filter @@ -48,6 +94,11 @@ px:css-to-fileset + + + px:dtbook-validate + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-utils-library.xpl b/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-utils-library.xpl index c6e6145e35..6af5511af1 100755 --- a/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-utils-library.xpl +++ b/scripts-utils/dtbook-utils/src/main/resources/xml/dtbook-utils-library.xpl @@ -20,7 +20,6 @@ - diff --git a/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.check-images.xpl b/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.check-images.xpl index f9b5588227..0925122887 100644 --- a/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.check-images.xpl +++ b/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.check-images.xpl @@ -8,7 +8,7 @@ xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:tmp="http://www.daisy.org/ns/pipeline/tmp" xmlns:d="http://www.daisy.org/ns/pipeline/data" - type="pxi:dtbook-validator.check-images" name="dtbook-validator.check-images" + type="pxi:dtbook-validator.check-images" name="main" exclude-inline-prefixes="#all"> @@ -20,25 +20,20 @@ - + + -

A valid DTBook document.

+

Input fileset

-

List of missing images, or an empty sequence if nothing is missing.

+

List of missing images referenced from the DTBook(s), or an empty sequence if nothing is missing.

- - - px:message - - - px:check-files-exist @@ -47,23 +42,26 @@ + px:fileset-load px:fileset-add-entry px:fileset-add-ref - px:fileset-create px:fileset-join + px:fileset-interset - + + + + + - - + - @@ -71,9 +69,7 @@ - - - + @@ -87,9 +83,7 @@ - - - + @@ -99,23 +93,21 @@ + - - - - - + + - + - + - - + + - + diff --git a/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.select-schema.xpl b/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.select-schema.xpl index 12fdda594d..7fcd4277d7 100644 --- a/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.select-schema.xpl +++ b/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/dtbook-validator.select-schema.xpl @@ -27,13 +27,13 @@ - + -

Version of MathML in the DTBook file.

+

DTBook version.

- +

Version of MathML in the DTBook file.

@@ -85,9 +85,8 @@
- - + diff --git a/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/validate-dtbook.xpl b/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/validate-dtbook.xpl index 3091796fd4..5611185d72 100644 --- a/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/validate-dtbook.xpl +++ b/scripts-utils/dtbook-utils/src/main/resources/xml/validate-dtbook/validate-dtbook.xpl @@ -2,10 +2,13 @@ + +

Input fileset

+

Should contain a single DTBook file.

+

May contain referenced images, but if it doesn't and images are stored on disk the + validator will find them too.

+
-

Copy of input document

-

A copy of the input document; may include PSVI annotations.

+

The DTBook document, or a dummy tmp:error document if the input does + not contain a DTBook or it is not well-formed.

- + + +

Select the method used for reporting validation issues:

+
+
port
+
Issues are reported only on the xml-report and html-report output ports.
+
log
+
In addition to the xml-report and html-report output ports, issues are also + reported through warning messages.
+
error
+
Issues are reported through error messages and also trigger an XProc + error. (Note that an error is always thrown when a DTBook has an unexpected + version.)
+
+
+
+ +

XML Reports

Raw output from all types of validation used (RelaxNG, Schematron, custom).

@@ -56,7 +82,7 @@

HTML Report

-

An HTML-formatted version of the validation report.

+

A single HTML-formatted version of the validation report.

@@ -69,9 +95,34 @@
- - - + + +

Version of MathML in the DTBook file

+
+
+ + +

Check to see that referenced images exist on disk

+
+
+ + +

Validate against NIMAS 1.1

+
+
+ + +

Skip Schematron validation

+

Should not be set when nimas is also set as NIMAS validation happens + with Schematron.

+
+
+ + +

Whether the input contains aural CSS attributes (attributes with namespace + "http://www.daisy.org/ns/pipeline/tts").

+
+
@@ -86,12 +137,19 @@ + l:relax-ng-report + px:report-errors px:check-files-wellformed px:combine-validation-reports px:validation-status px:validation-report-to-html + + + px:css-speech-clean + + pxi:dtbook-validator.check-images @@ -113,22 +171,24 @@ - - - - + + + + + + - @@ -136,35 +196,52 @@ - + - + + - - - - + + + + Remove aural CSS attributes before validation + + + + + + + + + + - - - + + + + + + + + @@ -175,21 +252,20 @@ - - - + - + + - + RelaxNG validation doesn't always produce a report, so this serves as a test to see if there was a document produced. @@ -197,22 +273,36 @@ + + + + + + + + + + + + + + + + + + - - - - - + + - - - + + @@ -221,61 +311,180 @@ + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -298,25 +507,65 @@ - - - + - + - - - + - + + + + + + + + + + + + + + + : + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - +
diff --git a/scripts-utils/dtbook-utils/src/test/java/XProcSpecTest.java b/scripts-utils/dtbook-utils/src/test/java/XProcSpecTest.java index 20026bb176..186d4307d9 100644 --- a/scripts-utils/dtbook-utils/src/test/java/XProcSpecTest.java +++ b/scripts-utils/dtbook-utils/src/test/java/XProcSpecTest.java @@ -13,6 +13,7 @@ protected String[] testDependencies() { pipelineModule("css-utils"), pipelineModule("metadata-utils"), pipelineModule("mathml-utils"), + pipelineModule("css-speech"), }; } } diff --git a/scripts-utils/dtbook-utils/src/test/xprocspec/test_load.xprocspec b/scripts-utils/dtbook-utils/src/test/xprocspec/test_load.xprocspec index 3a2f86aa87..2cda782e33 100644 --- a/scripts-utils/dtbook-utils/src/test/xprocspec/test_load.xprocspec +++ b/scripts-utils/dtbook-utils/src/test/xprocspec/test_load.xprocspec @@ -28,7 +28,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -92,7 +92,7 @@ - + diff --git a/scripts-utils/dtbook-utils/src/test/xprocspec/test_validate.xprocspec b/scripts-utils/dtbook-utils/src/test/xprocspec/test_validate.xprocspec index 9b65367702..8b90cd1699 100644 --- a/scripts-utils/dtbook-utils/src/test/xprocspec/test_validate.xprocspec +++ b/scripts-utils/dtbook-utils/src/test/xprocspec/test_validate.xprocspec @@ -2,6 +2,8 @@ @@ -57,27 +59,123 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts-utils/epub-utils/pom.xml b/scripts-utils/epub-utils/pom.xml index f8827624ce..6c0d370b9a 100644 --- a/scripts-utils/epub-utils/pom.xml +++ b/scripts-utils/epub-utils/pom.xml @@ -11,7 +11,7 @@ epub-utils - 1.2.5-SNAPSHOT + 2.0.0-SNAPSHOT bundle DAISY Pipeline 2 module :: EPUB Utilities diff --git a/scripts-utils/epub-utils/src/main/resources/xml/ocf/load.xpl b/scripts-utils/epub-utils/src/main/resources/xml/ocf/load.xpl index 07216a03e5..3fd41a5923 100644 --- a/scripts-utils/epub-utils/src/main/resources/xml/ocf/load.xpl +++ b/scripts-utils/epub-utils/src/main/resources/xml/ocf/load.xpl @@ -33,17 +33,9 @@ directory.

- + -

Whether to perform validation of the input:

-
-
off
-
No validation
-
report
-
Report validation issues
-
abort
-
Abort on validation issues
-
+

Whether to perform validation of the input.

@@ -67,8 +59,8 @@

The validation report

-

The port is empty if the validation option is 'off' or if the input is a - valid EPUB.

+

The port is empty if the validation option is set to 'false' or if the + input is a valid EPUB.

@@ -76,8 +68,7 @@

The validation status document

-

'ok' if the validation option not 'abort' or if the input is a valid - EPUB, 'error' otherwise.

+

'ok' if the input is a valid EPUB, 'error' otherwise.

@@ -312,7 +303,7 @@ - + @@ -359,30 +350,12 @@ - - - - - - - - - - - - - - - - - + - + diff --git a/scripts-utils/epub-utils/src/test/xprocspec/ocf/test_load.xprocspec b/scripts-utils/epub-utils/src/test/xprocspec/ocf/test_load.xprocspec index e211bd7b8c..ba81394d0e 100644 --- a/scripts-utils/epub-utils/src/test/xprocspec/ocf/test_load.xprocspec +++ b/scripts-utils/epub-utils/src/test/xprocspec/ocf/test_load.xprocspec @@ -197,7 +197,7 @@ - + diff --git a/scripts-utils/smil-utils/src/main/resources/xml/upgrade-smil.xpl b/scripts-utils/smil-utils/src/main/resources/xml/upgrade-smil.xpl index 048507c3ea..cb2ce832b6 100755 --- a/scripts-utils/smil-utils/src/main/resources/xml/upgrade-smil.xpl +++ b/scripts-utils/smil-utils/src/main/resources/xml/upgrade-smil.xpl @@ -2,6 +2,7 @@ @@ -63,7 +64,7 @@ - diff --git a/scripts-utils/zedai-utils/pom.xml b/scripts-utils/zedai-utils/pom.xml index e60096408b..0458020730 100644 --- a/scripts-utils/zedai-utils/pom.xml +++ b/scripts-utils/zedai-utils/pom.xml @@ -11,7 +11,7 @@ zedai-utils - 1.1.4-SNAPSHOT + 1.2.0-SNAPSHOT bundle DAISY Pipeline 2 module :: ZedAI Utilities @@ -40,6 +40,11 @@ validation-utils runtime
+ + org.daisy.pipeline.modules + css-speech + runtime + diff --git a/scripts-utils/zedai-utils/src/main/resources/META-INF/catalog.xml b/scripts-utils/zedai-utils/src/main/resources/META-INF/catalog.xml index 6988806748..4f6d9729ba 100755 --- a/scripts-utils/zedai-utils/src/main/resources/META-INF/catalog.xml +++ b/scripts-utils/zedai-utils/src/main/resources/META-INF/catalog.xml @@ -6,4 +6,5 @@ + diff --git a/scripts-utils/zedai-utils/src/main/resources/xml/xproc/zedai-validate.xpl b/scripts-utils/zedai-utils/src/main/resources/xml/xproc/zedai-validate.xpl index 693023fa03..98d0347fed 100644 --- a/scripts-utils/zedai-utils/src/main/resources/xml/xproc/zedai-validate.xpl +++ b/scripts-utils/zedai-utils/src/main/resources/xml/xproc/zedai-validate.xpl @@ -1,27 +1,156 @@ + type="px:zedai-validate" name="main">

Validate a ZedAI (ANSI/NISO Z39.98-2012 Authoring and Interchange) document.

-

Does not throw errors. Validation issues are reported through messages.

+

Does not throw errors. Validation issues are reported through log messages.

- + + + + +

Select the method used for reporting validation issues:

+
+
port
+
Issues are reported on the xml-report and html-report output ports.
+
log
+
Issues are reported through warning messages.
+
error
+
Issues are reported through error messages and also trigger an XProc error.
+
+
+
+ + +

Whether the input contains aural CSS attributes (attributes with namespace + "http://www.daisy.org/ns/pipeline/tts").

+
+
+ + + +

XML Report

+

Raw output from the RelaxNG validation.

+
+ +
+ + +

HTML Report

+

A single HTML-formatted version of the validation report.

+
+ +
+ + +

Validation status

+

Validation status (http://daisy.github.io/pipeline/StatusXML).

+
+ +
- px:validate-with-relax-ng-and-report + l:relax-ng-report + px:report-errors + px:combine-validation-reports + px:validation-status + px:validation-report-to-html + + + + + px:css-speech-clean - + + + + Remove aural CSS attributes before validation + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/scripts/common-options.xpl b/scripts/common-options.xpl index bf9083776d..4e70bdd134 100644 --- a/scripts/common-options.xpl +++ b/scripts/common-options.xpl @@ -10,6 +10,10 @@ epub2-to-epub3 epub3-to-daisy202 epub3-to-daisy3 + daisy3-to-epub3 + dtbook-to-epub3 + dtbook-to-html + dtbook-to-epub3 dtbook-to-zedai --> @@ -36,13 +40,49 @@ epub2-to-epub3 epub3-to-daisy202 epub3-to-daisy3 + dtbook-to-html + dtbook-to-zedai --> -

Input validation report

+

Validation reports

+ + + + + + 3.0 + 2.0 + + + + + + +

MathML version

+

Version of MathML in the DTBook file(s).

+
+
+ + + + +

NIMAS input

+

Whether the input DTBook is a NIMAS 1.1-conformant XML content file.

+
+
+ @@ -197,7 +202,7 @@ - + diff --git a/scripts/daisy3-to-epub3/src/main/resources/xml/xproc/daisy3-to-epub3.xpl b/scripts/daisy3-to-epub3/src/main/resources/xml/xproc/daisy3-to-epub3.xpl index 14cf8d4734..81369878b1 100755 --- a/scripts/daisy3-to-epub3/src/main/resources/xml/xproc/daisy3-to-epub3.xpl +++ b/scripts/daisy3-to-epub3/src/main/resources/xml/xproc/daisy3-to-epub3.xpl @@ -52,13 +52,9 @@ (true or false).

- - -

Assert validity

-

Whether to stop processing and raise an error on validation issues.

-
+ + - @@ -107,7 +103,7 @@ - + diff --git a/scripts/daisy3-to-epub3/src/test/xprocspec/test_daisy3-to-epub3.xprocspec b/scripts/daisy3-to-epub3/src/test/xprocspec/test_daisy3-to-epub3.xprocspec index da48e2e432..0dc8e9f710 100644 --- a/scripts/daisy3-to-epub3/src/test/xprocspec/test_daisy3-to-epub3.xprocspec +++ b/scripts/daisy3-to-epub3/src/test/xprocspec/test_daisy3-to-epub3.xprocspec @@ -21,7 +21,7 @@ - + diff --git a/scripts/dtbook-to-daisy3/src/main/resources/xml/dtbook-to-daisy3.xpl b/scripts/dtbook-to-daisy3/src/main/resources/xml/dtbook-to-daisy3.xpl index 81eb631d6e..ae4754aff4 100755 --- a/scripts/dtbook-to-daisy3/src/main/resources/xml/dtbook-to-daisy3.xpl +++ b/scripts/dtbook-to-daisy3/src/main/resources/xml/dtbook-to-daisy3.xpl @@ -106,10 +106,10 @@ reading systems can't handle the word tags.

- + - + diff --git a/scripts/dtbook-to-epub3/pom.xml b/scripts/dtbook-to-epub3/pom.xml index fd4301c62d..b4e1a4b8c7 100644 --- a/scripts/dtbook-to-epub3/pom.xml +++ b/scripts/dtbook-to-epub3/pom.xml @@ -11,7 +11,7 @@ dtbook-to-epub3 - 2.2.4-SNAPSHOT + 2.3.0-SNAPSHOT bundle DAISY Pipeline 2 module :: DTBook to EPUB 3 @@ -83,7 +83,8 @@ org.daisy.pipeline.modules.impl.Module_dtbook_to_epub3, - org.daisy.pipeline.script.impl.XProcScript_dtbook_to_epub3 + org.daisy.pipeline.script.impl.XProcScript_dtbook_to_epub3, + org.daisy.pipeline.datatypes.impl.Datatype_px_dtbook_to_epub3_script_validation diff --git a/scripts/dtbook-to-epub3/src/main/resources/xml/convert.xpl b/scripts/dtbook-to-epub3/src/main/resources/xml/convert.xpl index 64a858ef3b..c895b7692f 100644 --- a/scripts/dtbook-to-epub3/src/main/resources/xml/convert.xpl +++ b/scripts/dtbook-to-epub3/src/main/resources/xml/convert.xpl @@ -23,7 +23,22 @@ - + + +

Whether to stop processing and raise an error on validation issues (abort), only + report them (report), or to ignore any validation issues (off).

+
+
+ + +

Whether the input is a valid DTBook.

+
+
+ + +

Whether the input is NIMAS.

+
+
@@ -58,7 +73,7 @@ - + @@ -86,7 +101,7 @@ - + @@ -96,7 +111,15 @@ - + + + + + + @@ -106,7 +129,7 @@ 'image/svg+xml','application/pls+xml', 'audio/mpeg','audio/mp4','text/javascript'))]"/> - + diff --git a/scripts/dtbook-to-epub3/src/main/resources/xml/dtbook-to-epub3.xpl b/scripts/dtbook-to-epub3/src/main/resources/xml/dtbook-to-epub3.xpl index f599fd4139..98c45cfbdb 100755 --- a/scripts/dtbook-to-epub3/src/main/resources/xml/dtbook-to-epub3.xpl +++ b/scripts/dtbook-to-epub3/src/main/resources/xml/dtbook-to-epub3.xpl @@ -1,9 +1,12 @@ @@ -23,15 +26,9 @@
- - - - - - + @@ -52,11 +49,23 @@ - - -

Assert validity

-

Whether to stop processing and raise an error on validation issues.

-
+ + + + + + + + + + + + + + + + @@ -81,68 +90,122 @@ - - + + + px:dtbook-load + + px:epub3-store - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + pf:normalize-uri + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.script.xprocspec b/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.script.xprocspec index f4d4707024..5cb0743894 100644 --- a/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.script.xprocspec +++ b/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.script.xprocspec @@ -51,11 +51,11 @@ - + - + @@ -77,24 +77,31 @@ - + - - - + + + - - + + + + + + + + + + - - + - + - - - + + + @@ -105,7 +112,7 @@ - + @@ -121,7 +128,7 @@ - + @@ -139,7 +146,7 @@ - + @@ -168,7 +175,7 @@ - + diff --git a/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.xprocspec b/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.xprocspec index 6ff7d911bb..754a11dbe2 100644 --- a/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.xprocspec +++ b/scripts/dtbook-to-epub3/src/test/xprocspec/test_dtbook-to-epub3.xprocspec @@ -34,7 +34,7 @@
- + diff --git a/scripts/dtbook-to-html/pom.xml b/scripts/dtbook-to-html/pom.xml index bc8ab0f037..d7ad5218ad 100644 --- a/scripts/dtbook-to-html/pom.xml +++ b/scripts/dtbook-to-html/pom.xml @@ -11,7 +11,7 @@ dtbook-to-html - 3.0.2-SNAPSHOT + 4.0.0-SNAPSHOT bundle DAISY Pipeline 2 module :: DTBook to HTML @@ -60,7 +60,8 @@ org.daisy.pipeline.modules.impl.Module_dtbook_to_html, - org.daisy.pipeline.script.impl.XProcScript_dtbook_to_html + org.daisy.pipeline.script.impl.XProcScript_dtbook_to_html, + org.daisy.pipeline.datatypes.impl.Datatype_px_dtbook_to_html_script_validation diff --git a/scripts/dtbook-to-html/src/main/resources/xml/convert.xpl b/scripts/dtbook-to-html/src/main/resources/xml/convert.xpl index 4685a0a992..20c9359c14 100644 --- a/scripts/dtbook-to-html/src/main/resources/xml/convert.xpl +++ b/scripts/dtbook-to-html/src/main/resources/xml/convert.xpl @@ -1,6 +1,8 @@ @@ -29,7 +31,17 @@ - + + + +

Whether the input is a valid DTBook.

+
+
+ + +

Whether the input is NIMAS.

+
+
@@ -59,7 +71,15 @@ - + + + + + + diff --git a/scripts/dtbook-to-html/src/main/resources/xml/dtbook-to-html.xpl b/scripts/dtbook-to-html/src/main/resources/xml/dtbook-to-html.xpl index 8ae6cc1a18..c6aac6f481 100755 --- a/scripts/dtbook-to-html/src/main/resources/xml/dtbook-to-html.xpl +++ b/scripts/dtbook-to-html/src/main/resources/xml/dtbook-to-html.xpl @@ -1,9 +1,11 @@ +

DTBook file(s)

@@ -31,6 +34,24 @@
+ + + + + + + + + + + + + + + + + +

HTML

@@ -42,14 +63,6 @@
- - -

Assert validity

-

Whether to stop processing and raise an error on validation - issues.

-
-
- @@ -75,44 +88,91 @@ - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.script.xprocspec b/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.script.xprocspec index 53cb1aeb53..a8021e6ba9 100644 --- a/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.script.xprocspec +++ b/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.script.xprocspec @@ -1,7 +1,7 @@ @@ -9,9 +9,18 @@ + + + + + + + + + diff --git a/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.xprocspec b/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.xprocspec index ac5f7d22b1..dbdfa52077 100644 --- a/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.xprocspec +++ b/scripts/dtbook-to-html/src/test/xprocspec/test_dtbook-to-html.xprocspec @@ -15,7 +15,7 @@ - + diff --git a/scripts/dtbook-to-odt/src/main/resources/xml/dtbook-to-odt.xpl b/scripts/dtbook-to-odt/src/main/resources/xml/dtbook-to-odt.xpl index cc27c8a8b3..cd58f9f08b 100755 --- a/scripts/dtbook-to-odt/src/main/resources/xml/dtbook-to-odt.xpl +++ b/scripts/dtbook-to-odt/src/main/resources/xml/dtbook-to-odt.xpl @@ -143,10 +143,10 @@ See [Templating](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/dtb - + - + diff --git a/scripts/dtbook-to-pef/src/main/resources/xml/xproc/dtbook-to-pef.xpl b/scripts/dtbook-to-pef/src/main/resources/xml/xproc/dtbook-to-pef.xpl index e610578731..b19369ab8f 100644 --- a/scripts/dtbook-to-pef/src/main/resources/xml/xproc/dtbook-to-pef.xpl +++ b/scripts/dtbook-to-pef/src/main/resources/xml/xproc/dtbook-to-pef.xpl @@ -168,7 +168,7 @@ sheet modules) are available for use in Sass style sheets: - + diff --git a/scripts/dtbook-to-rtf/src/main/resources/xml/dtbook-to-rtf.xpl b/scripts/dtbook-to-rtf/src/main/resources/xml/dtbook-to-rtf.xpl index 5315d8da7b..2c1d656323 100644 --- a/scripts/dtbook-to-rtf/src/main/resources/xml/dtbook-to-rtf.xpl +++ b/scripts/dtbook-to-rtf/src/main/resources/xml/dtbook-to-rtf.xpl @@ -95,7 +95,7 @@ - + diff --git a/scripts/dtbook-to-zedai/pom.xml b/scripts/dtbook-to-zedai/pom.xml index bfe686de08..4d999acf19 100644 --- a/scripts/dtbook-to-zedai/pom.xml +++ b/scripts/dtbook-to-zedai/pom.xml @@ -30,11 +30,6 @@ common-utils runtime
- - org.daisy.pipeline.modules - css-speech - runtime - org.daisy.pipeline.modules dtbook-utils @@ -60,11 +55,6 @@ mediatype-utils runtime - - org.daisy.pipeline.modules - validation-utils - runtime - diff --git a/scripts/dtbook-to-zedai/src/main/resources/META-INF/catalog.xml b/scripts/dtbook-to-zedai/src/main/resources/META-INF/catalog.xml index 2078f25005..04f2287065 100755 --- a/scripts/dtbook-to-zedai/src/main/resources/META-INF/catalog.xml +++ b/scripts/dtbook-to-zedai/src/main/resources/META-INF/catalog.xml @@ -6,9 +6,7 @@ - - diff --git a/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.convert.xpl b/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.convert.xpl index 9b4ef7209c..40f6d8d9e4 100755 --- a/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.convert.xpl +++ b/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.convert.xpl @@ -7,6 +7,7 @@ xmlns:z="http://www.daisy.org/ns/z3998/authoring/" xmlns:d="http://www.daisy.org/ns/pipeline/data" xmlns:c="http://www.w3.org/ns/xproc-step" + xmlns:l="http://xproc.org/library" xmlns:cx="http://xmlcalabash.com/ns/extensions" xmlns:xs="http://www.w3.org/2001/XMLSchema" type="px:dtbook-to-zedai" name="main" @@ -29,6 +30,7 @@ While all resources are referenced in the fileset on the `fileset` output port, the `in-memory`-port can contain pre-loaded documents so that they won't have to be loaded from disk. This means that the input documents does not have to be stored to disk - they could have been generated by a preceding conversion, allowing for easy chaining of scripts. + DTBook documents may contain aural CSS (tts:*) attributes and they will be preserved in the output. @@ -81,17 +83,47 @@ Language code of the input document. - + Whether to stop processing and raise an error on validation issues (abort), only report - them (report), or to ignore any validation issues (off). + them (report), or to ignore any validation issues (off). If validation is enabled and + the input DTBook is valid, processing will stop on any invalid intermediary result. - + + + Determines whether to validate the ZedAI output and what to do on validation + errors. When not specified, follows the validation option. + + + Whether or not to include any referenced external resources like images and CSS-files in the output. + + + Whether the input is a valid DTBook. + + + + + Whether the input is NIMAS. + + + + + + HTML-formatted report of the ZedAI validation. Empty if validation is disabled. + + + + + + Status of the ZedAI validation. + + + @@ -110,10 +142,10 @@ + px:dtbook-validate px:dtbook-to-mods-meta px:dtbook-upgrade px:dtbook-merge - px:dtbook-validator.select-schema @@ -137,16 +169,6 @@ px:mediatype-detect - - - px:validate-with-relax-ng-and-report - - - - - px:css-speech-clean - - px:set-base-uri @@ -202,58 +224,73 @@ - Validate the DTBook input - - - - - - - - - - Remove the Aural CSS attributes before validation - - - - - - - - - - - - - - - - - - - - - - Schema selector for DTBook validation - - + Validate the DTBook input (after the upgrade) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + If there is more than one input DTBook document, merge them into a single document. - - - - - + + @@ -261,22 +298,34 @@ - - - - Remove the Aural CSS attributes before validation - - - - - - + + - - - + + + - + + + + + + + + + + + + + + + + + + + @@ -312,7 +361,7 @@ Convert DTBook 2005-3 to ZedAI - + @@ -413,25 +462,52 @@ Generate MODS metadata - - - - - - - - - + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + Generate ZedAI metadata @@ -441,7 +517,7 @@ - + Insert metadata into the head of ZedAI @@ -456,32 +532,38 @@ - Create a meta element for the MODS file reference - - - - - - - - - - - - - Insert the MODS file reference metadata into the head of - ZedAI - - - - - - - - + Create a meta element for the MODS file reference and insert it into the head + of the ZedAI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -513,7 +595,66 @@ Validate the final ZedAI output. - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -599,15 +740,30 @@ + Add the MODS document to the fileset. - - - - - - - + + + + + + + + + + + + + + + + + + + + + This normalizes the fileset @@ -615,7 +771,7 @@ - + Determine the media type of files @@ -634,7 +790,7 @@ - + diff --git a/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.xpl b/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.xpl index 53b12dadba..e54e1d550f 100755 --- a/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.xpl +++ b/scripts/dtbook-to-zedai/src/main/resources/xml/dtbook-to-zedai.xpl @@ -1,7 +1,10 @@ + + + + + + + + + + + +

MODS filename

@@ -72,6 +87,7 @@

Include any referenced external resources like images and CSS-files to the output.

+ px:dtbook-load @@ -88,25 +104,83 @@ - + + + + + + - - - + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/dtbook-to-zedai/src/test/java/XProcSpecTest.java b/scripts/dtbook-to-zedai/src/test/java/XProcSpecTest.java index b5451c84fe..47b865119f 100644 --- a/scripts/dtbook-to-zedai/src/test/java/XProcSpecTest.java +++ b/scripts/dtbook-to-zedai/src/test/java/XProcSpecTest.java @@ -6,13 +6,11 @@ public class XProcSpecTest extends AbstractXSpecAndXProcSpecTest { protected String[] testDependencies() { return new String[] { pipelineModule("common-utils"), - pipelineModule("css-speech"), pipelineModule("dtbook-utils"), pipelineModule("zedai-utils"), pipelineModule("fileset-utils"), pipelineModule("file-utils"), pipelineModule("mediatype-utils"), - pipelineModule("validation-utils"), }; } diff --git a/scripts/dtbook-to-zedai/src/test/xprocspec/test_dtbook-to-zedai.script.xprocspec b/scripts/dtbook-to-zedai/src/test/xprocspec/test_dtbook-to-zedai.script.xprocspec index 1df03bbf0a..b32ee7952d 100644 --- a/scripts/dtbook-to-zedai/src/test/xprocspec/test_dtbook-to-zedai.script.xprocspec +++ b/scripts/dtbook-to-zedai/src/test/xprocspec/test_dtbook-to-zedai.script.xprocspec @@ -58,7 +58,7 @@ - + diff --git a/scripts/dtbook-validator/src/main/resources/META-INF/catalog.xml b/scripts/dtbook-validator/src/main/resources/META-INF/catalog.xml index 138894b0f7..3d319acac0 100755 --- a/scripts/dtbook-validator/src/main/resources/META-INF/catalog.xml +++ b/scripts/dtbook-validator/src/main/resources/META-INF/catalog.xml @@ -1,6 +1,7 @@ - + diff --git a/scripts/dtbook-validator/src/main/resources/xml/dtbook-validator.xpl b/scripts/dtbook-validator/src/main/resources/xml/dtbook-validator.xpl index 426f742444..961b527868 100755 --- a/scripts/dtbook-validator/src/main/resources/xml/dtbook-validator.xpl +++ b/scripts/dtbook-validator/src/main/resources/xml/dtbook-validator.xpl @@ -66,21 +66,8 @@
- - - - - 3.0 - 2.0 - 1.01 - 1.0 - - - - -

MathML version

-

Version of MathML in the DTBook file.

-
+ + @@ -90,18 +77,14 @@ - + +

Validate against NIMAS 1.1

Validate using NIMAS 1.1 rules for DTBook.

- - - px:message - - px:fileset-add-entry @@ -118,15 +101,7 @@ - - - - - - - - - + @@ -137,8 +112,8 @@ - - + + diff --git a/scripts/epub-to-daisy/src/main/resources/xml/epub-to-daisy.script.xpl b/scripts/epub-to-daisy/src/main/resources/xml/epub-to-daisy.script.xpl index 024a1ccce4..624ab4b19f 100644 --- a/scripts/epub-to-daisy/src/main/resources/xml/epub-to-daisy.script.xpl +++ b/scripts/epub-to-daisy/src/main/resources/xml/epub-to-daisy.script.xpl @@ -105,7 +105,7 @@ This will remove any existing media overlays in the EPUB.

- + @@ -115,8 +115,25 @@ This will remove any existing media overlays in the EPUB.

- + + + + + + + + + + + + + + + + @@ -214,7 +231,7 @@ This will remove any existing media overlays in the EPUB.

- + diff --git a/scripts/epub2-to-epub3/src/main/resources/xml/epub2-to-epub3.script.xpl b/scripts/epub2-to-epub3/src/main/resources/xml/epub2-to-epub3.script.xpl index 10381456de..6cc727fc04 100644 --- a/scripts/epub2-to-epub3/src/main/resources/xml/epub2-to-epub3.script.xpl +++ b/scripts/epub2-to-epub3/src/main/resources/xml/epub2-to-epub3.script.xpl @@ -64,7 +64,7 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e - + @@ -74,8 +74,25 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e - + + + + + + + + + + + + + + + + @@ -103,7 +120,7 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e - + diff --git a/scripts/epub3-to-daisy202/src/main/resources/xml/xproc/epub3-to-daisy202.xpl b/scripts/epub3-to-daisy202/src/main/resources/xml/xproc/epub3-to-daisy202.xpl index 37c2538439..d3e09e2a26 100644 --- a/scripts/epub3-to-daisy202/src/main/resources/xml/xproc/epub3-to-daisy202.xpl +++ b/scripts/epub3-to-daisy202/src/main/resources/xml/xproc/epub3-to-daisy202.xpl @@ -48,7 +48,7 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e

Input validation status

-

An XML document describing, briefly, whether the input validation was successful. +

An XML document describing whether the conversion was successful. [More details on the file format](http://daisy.github.io/pipeline/StatusXML).

@@ -86,7 +86,7 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e - + @@ -94,8 +94,25 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e - + + + + + + + + + + + + + + + + @@ -128,7 +145,7 @@ You may alternatively use the "mimetype" document if your input is a unzipped/"e - + diff --git a/scripts/epub3-to-daisy3/pom.xml b/scripts/epub3-to-daisy3/pom.xml index d04a0e1ac9..54e0506ee0 100644 --- a/scripts/epub3-to-daisy3/pom.xml +++ b/scripts/epub3-to-daisy3/pom.xml @@ -44,6 +44,11 @@ epub-utils runtime
+ + org.daisy.pipeline.modules + dtbook-utils + runtime + org.daisy.pipeline.modules daisy3-utils diff --git a/scripts/epub3-to-daisy3/src/main/resources/META-INF/catalog.xml b/scripts/epub3-to-daisy3/src/main/resources/META-INF/catalog.xml index 6a1f63e138..c80acf1000 100755 --- a/scripts/epub3-to-daisy3/src/main/resources/META-INF/catalog.xml +++ b/scripts/epub3-to-daisy3/src/main/resources/META-INF/catalog.xml @@ -9,6 +9,7 @@ + diff --git a/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.script.xpl b/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.script.xpl index 7a579e5bbc..cea6d3b984 100644 --- a/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.script.xpl +++ b/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.script.xpl @@ -66,7 +66,7 @@ You may alternatively use the EPUB package document (the OPF-file) if your input - + @@ -76,8 +76,25 @@ You may alternatively use the EPUB package document (the OPF-file) if your input - + + + + + + + + + + + + + + + + @@ -102,7 +119,7 @@ You may alternatively use the EPUB package document (the OPF-file) if your input - + diff --git a/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.xpl b/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.xpl index fa83ee63ac..f561563187 100644 --- a/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.xpl +++ b/scripts/epub3-to-daisy3/src/main/resources/xml/epub3-to-daisy3.xpl @@ -488,7 +488,7 @@ - + diff --git a/scripts/epub3-to-daisy3/src/test/java/XProcSpecTest.java b/scripts/epub3-to-daisy3/src/test/java/XProcSpecTest.java index b94aead5a3..0396982cb9 100644 --- a/scripts/epub3-to-daisy3/src/test/java/XProcSpecTest.java +++ b/scripts/epub3-to-daisy3/src/test/java/XProcSpecTest.java @@ -9,6 +9,7 @@ protected String[] testDependencies() { pipelineModule("epub3-to-html"), pipelineModule("epub-utils"), pipelineModule("html-utils"), + pipelineModule("dtbook-utils"), pipelineModule("daisy3-utils"), pipelineModule("fileset-utils"), pipelineModule("common-utils"), diff --git a/scripts/nimas-fileset-validator/pom.xml b/scripts/nimas-fileset-validator/pom.xml index 11d52e569c..e23494faa9 100644 --- a/scripts/nimas-fileset-validator/pom.xml +++ b/scripts/nimas-fileset-validator/pom.xml @@ -17,7 +17,7 @@ DAISY Pipeline 2 module :: NIMAS Fileset Validator - + org.daisy.pipeline framework-core @@ -58,7 +58,8 @@ org.daisy.pipeline.modules.impl.Module_nimas_fileset_validator, - org.daisy.pipeline.script.impl.XProcScript_nimas_fileset_validator + org.daisy.pipeline.script.impl.XProcScript_nimas_fileset_validator, + org.daisy.pipeline.datatypes.impl.Datatype_px_nimas_fileset_validator_script_mathml_version diff --git a/scripts/nimas-fileset-validator/src/main/resources/META-INF/catalog.xml b/scripts/nimas-fileset-validator/src/main/resources/META-INF/catalog.xml index aea2d62b76..e5c7ed78be 100755 --- a/scripts/nimas-fileset-validator/src/main/resources/META-INF/catalog.xml +++ b/scripts/nimas-fileset-validator/src/main/resources/META-INF/catalog.xml @@ -1,6 +1,8 @@ - + diff --git a/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate-package-doc.xpl b/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate-package-doc.xpl index ba241102b7..aaa900302d 100644 --- a/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate-package-doc.xpl +++ b/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate-package-doc.xpl @@ -176,12 +176,7 @@ - - - - - - + diff --git a/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate.xpl b/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate.xpl index 6329cae666..f14459c71b 100644 --- a/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate.xpl +++ b/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.validate.xpl @@ -2,6 +2,8 @@ - - + + @@ -165,7 +167,7 @@ - + diff --git a/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.xpl b/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.xpl index aed7799e10..9e8aa805a3 100755 --- a/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.xpl +++ b/scripts/nimas-fileset-validator/src/main/resources/xml/nimas-fileset-validator.xpl @@ -75,11 +75,8 @@ - - -

MathML version

-

Version of MathML in the DTBook file(s).

-
+ + @@ -115,7 +112,7 @@ - + diff --git a/scripts/nimas-fileset-validator/src/main/resources/xml/schema/sch/mod/package-doc-common.sch b/scripts/nimas-fileset-validator/src/main/resources/xml/schema/sch/mod/package-doc-common.sch index a9bf0e5880..d210420ff2 100644 --- a/scripts/nimas-fileset-validator/src/main/resources/xml/schema/sch/mod/package-doc-common.sch +++ b/scripts/nimas-fileset-validator/src/main/resources/xml/schema/sch/mod/package-doc-common.sch @@ -12,6 +12,8 @@ dc:Format metadata must equal NIMAS 1.1 dc:Subject is required by NIMAS. + + DCTERMS.created metadata is required by NIMAS. @@ -47,7 +49,6 @@ DCTERMS.date.dateCopyrighted metadata is required by NIMAS. DCTERMS.description.version metadata is required by NIMAS. DCTERMS.audience.educationLevel metadata is required by NIMAS. - DCTERMS.created metadata is required by NIMAS. DCTERMS.publisher.place metadata is required by NIMAS. DCTERMS.date.issued metadata is required by NIMAS. + + + + + The Great Depression + John Smith + Jane Doe + + i +

The Great Depression

+

by John Smith and Jane Doe

+ Black and white photo of a mother and her children in a makeshift home during the depression + + +

© 2020 CAST, Inc.

+

NIMAS Social Studies Textbook Exemplar, 2nd Edition

+

ISBN: 9781122334455

+ +
+ + + ii +

Table of Contents

+ + The Great Depression +
  • + + + + Overview + + + 1 + +
  • + +
  • + + Troubled Times + + + 3 + + +
  • + + + Farm Life and the Dust Bowl + + + 5 + + + +
  • + + The Dust Bowl Migration + + + 5 + +
  • +
  • + + Farm Tenants + + + 7 + +
  • +
  • + + Electric Farms + + + 9 + +
  • +
  • + + Dorothea Lange, Photographer of the Great Depression + + + 9 + +
  • +
  • + + Keeping Spirits Up + + + 10 + +
  • +
    + + + +
  • + + Review + + + 12 + + +
  • + + Review Questions + + + 12 + +
  • +
  • + + Key Words + + + 12 + + +
  • + + + +
    +
    +
    + + + +

    The Great Depression

    + 1 + +

    Overview

    +

    + During the 1920s, the United States saw a time of great prosperity. However, that would all + change with the stock market crash of 1929. The country and the world would be plunged into an + economic and social depression. +

    +

    + Companies were going bankrupt, banks were shutting down, and unemployment was skyrocketing. +

    +

    + One president would ignore the problem, another would radically alter the powers of government + to help the nation. People were starving both in the cities and on the farms of America. +

    +

    + Throughout the 1930s and into the 1940s, the people of the United States faced some of their + toughest years. Only the Second World War would put an end to The Great Depression. +

    + 2 + + Black and white photo of a makeshift home during the Depression + + This black and white photo shows a makeshift home during the Depression. A young mother and her two children stand barefoot in front of a makeshift home made from scraps of wood, fabric and metal. In the foreground a few blankets are placed on top of a bed frame missing its mattress. A clothesline in the background has some of the family's clothing strung across it. + + + The Great Depression caused immediate hardship on everyday life. Hundreds of thousands + of people lost their homes, their jobs, and their dignity. Families, like the one shown + above, were forced to live in make-shift camps that were overcrowded and unsanitary. + + + + KEY POINTS +
  • + The causes of the Great Depression, culminating in the stock market crash of 1929. +
  • +
  • + Herbert Hoover's presidency and ineffective actions toward the economic crisis. +
  • +
  • + The New Deal and the challenges of FDR's presidency. +
  • +
  • + Life during the Great Depression in cities, on farms, and in the entertainment industry. +
  • +
    +
    + 3 + +

    + Troubled Times +

    +

    + Cities were hard hit by the Great Depression. By March of 1930, more than 3.2 million people + were unemployed. Since most people lost their homes, homelessness ran rampant. People were + living literally "in the streets." Whole families were living in boxes, under bridges and + overpasses, and in alleys. The street corners of New York City were packed with people selling + anything and everything to try and make money. + "Desperate times began to put into question the old American notion that if a man worked hard + enough, he could always take care of himself and his family. The effect of the Depression on + poor children was particularly severe.... Most elderly Americans did not have personal + savings or retirement pensions to support them in normal times, let alone during a national + economic crisis.... Even skilled workers, business owners, successful farmers, and + professionals of all kinds found themselves in severe economic difficulty as one out of four + in the labor force lost their jobs." (CRF, www.crf-usa.org.) + +

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    YearU.S. PopulationUnemployment Percentage
    192988,010,0003.14
    193089,550,0008.67
    193190,710,00015.82
    193291,810,00023.53
    193392,950,00024.75
    193494,190,00021.60
    193595,460,00019.97
    193696,700,00016.80
    193797,870,00014.18
    193899,120,00018.91
    1939100,360,00017.05
    1940101,560,00014.45
    1941102,700,0009.66
    + Source: U.S. Bureau of the Census, Historical Statistics of the United States, Colonial + Times to 1957 + (Washington, D.C., 1960), p. 70. + +

    + People were living in the streets and they were starving. They were becoming angry and + desperate. Food riots broke out across the nation. In Minneapolis, people smashed the windows of + a store and stole fruit, canned goods, bacon, and ham. When one of the shop owners tried to stop + them at gunpoint, one of the looters broke his arm. It took 100 police officers to bring the + riot under control. Seven people were arrested. +

    +

    + Some cities tried to control the problem by distributing + food to people who waited in + bread lines + to get a meal. In New York City, there were 82 different + bread lines located in different stations around the city. + In 1931, each of these lines averaged 85,000 meals a day. + A typical meal consisted of bread, soup, and stew. People + would stand in these lines for days waiting for one meal. + Many people fainted while standing in line from exhaustion, + fatigue, and hunger. +

    +

    + New York also tried to provide citywide relief to its homeless, + jobless masses. But by April of 1932, more than 750,000 New + Yorkers were dependent on city relief with a waiting list of + 160,000 people. The people on relief began to outnumber the + people working. The city could not support this relief much longer. +

    +

    Franklin Delano Roosevelt was elected in 1933 on his "new deal" platform of recovery and reform. + His inauguration speech contained the now-famous quote: "Let me assert my firm belief that the + only thing we have to fear is fear itself; needless, unreasoning, unjustified terror which + paralyzes needed efforts to convert retreat into advance." +

    +
    +

    + FDR's Inaugural Address, 1933: +
    + President Hoover, Mr. Chief Justice, my friends: This is a day of national consecration, and + I am certain that my fellow Americans expect that on my induction into the Presidency I will + address them with a candor and a decision which the present situation of our nation impels. + This is pre-eminently the time to speak the truth, the whole truth, frankly and boldly. Nor + need we shrink from honestly facing conditions in our country today. This great nation will + endure as it has endured, will revive and will prosper. So first of all let me assert my + firm belief that the only thing we have to fear is fear itself—nameless, unreasoning, + unjustified terror which paralyzes needed efforts to convert retreat into advance. In every + dark hour of our national life a leadership of frankness and vigor has met with that + understanding and support of the people themselves which is essential to victory. I am + convinced that you will again give that support to leadership in these critical days. +

    +

    In such a spirit on my part and on yours we face our common difficulties. They concern, thank + God, only material things. Values have shrunken to fantastic levels: taxes have risen, our + ability to pay has fallen, government of all kinds is faced by serious curtailment of + income, the means of exchange are frozen in the currents of trade, the withered leaves of + industrial enterprise lie on every side, farmers find no markets for their produce, the + savings of many years in thousands of families are gone. +

    +

    More important, a host of unemployed citizens face the grim problem of existence, and an + equally great number toil with little return. Only a foolish optimist can deny the dark + realities of the moment. +

    +

    Yet our distress comes from no failure of substance. We are stricken by no plague of locusts. + Compared with the perils which our forefathers conquered because they believed and were not + afraid, we have still much to be thankful for. Nature still offers her bounty and human + efforts have multiplied it. Plenty is at our doorstep, but a generous use of it languishes + in the very sight of the supply. Primarily, this is because the rulers of the exchange of + mankind's goods have failed through their own stubbornness and their own incompetence, have + admitted their failures and abdicated. Practices of the unscrupulous money changers stand + indicted in the court of public opinion, rejected by the hearts and minds of men. +

    +

    True, they have tried, but their efforts have been cast in the pattern of an outworn + tradition. Faced by failure of credit, they have proposed only the lending of more money. + Stripped of the lure of profit by which to induce our people to follow their false + leadership, they have resorted to exhortations, pleading tearfully for restored conditions. + They know only the rules of a generation of self-seekers. They have no vision, and when + there is no vision the people perish. +

    +

    The money changers have fled their high seats in the temple of our civilization. We may now + restore that temple to the ancient truths. The measure of the restoration lies in the extent + to which we apply social values more noble than mere monetary profit. +

    +

    Happiness lies not in the mere possession of money, it lies in the joy of achievement, in the + thrill of creative effort. The joy and moral stimulation of work no longer must be forgotten + in the mad chase of evanescent profits. These dark days will be worth all they cost us if + they teach us that our true destiny is not to be ministered unto but to minister to + ourselves and to our fellow-men. +

    +

    Recognition of the falsity of material wealth as the standard of success goes hand in hand + with the abandonment of the false belief that public office and high political position are + to be values only by the standards of pride of place and personal profit, and there must be + an end to a conduct in banking and in business which too often has given to a sacred trust + the likeness of callous and selfish wrongdoing. Small wonder that confidence languishes, for + it thrives only on honesty, on honor, on the sacredness of obligations, on faithful + protection, on unselfish performance. Without them it cannot live. +

    +

    Restoration calls, however, not for changes in ethics alone. This nation asks for action, and + action now. +

    +

    Our greatest primary task is to put people to work. This is no unsolvable problem if we face + it wisely and courageously. It can be accompanied in part by direct recruiting by the + government itself, treating the task as we would treat the emergency of a war, but at the + same time, through this employment, accomplishing greatly needed projects to stimulate and + reorganize the use of our national resources. +

    +

    Hand in hand with this, we must frankly recognize the over-balance of population in our + industrial centers and, by engaging on a national scale in a redistribution, endeavor to + provide a better use of the land for those best fitted for the land. The task can be helped + by definite efforts to raise the values of agricultural products and with this the power to + purchase the output of our cities. It can be helped by preventing realistically the tragedy + of the growing loss, through foreclosure, of our small homes and our farms. It can be helped + by insistence that the Federal, State, and local governments act forthwith on the demand + that their cost be drastically reduced. It can be helped by the unifying of relief + activities which today are often scattered, uneconomical, and unequal. It can be helped by + national planning for and supervision of all forms of transportation and of communications + and other utilities which have a definitely public character. There are many ways in which + it can be helped, but it can never be helped merely by talking about it. We must act, and + act quickly. +

    +

    Finally, in our progress toward a resumption of work we require two safeguards against a + return of the evils of the old order: there must be a strict supervision of all banking and + credits and investments; there must be an end to speculation with other people's money, and + there must be provision for an adequate but sound currency. +

    +

    These are the lines of attack. I shall presently urge upon a new Congress in special session + detailed measures for their fulfillment, and I shall seek the immediate assistance of the + several States. +

    +

    Through this program of action we address ourselves to putting our own national house in + order and making income balance outgo. Our international trade relations, though vastly + important, are, to point in time and necessity, secondary to the establishment of a sound + national economy. I favor as a practical policy the putting of first things first. I shall + spare no effort to restore world trade by international economic readjustment, but the + emergency at home cannot wait on that accomplishment. +

    +

    The basic thought that guides these specific means of national recovery is not narrowly + nationalistic. It is the insistence, as a first consideration, upon the interdependence of + the various elements in and parts of the United States ... a recognition of the old and + permanently important manifestation of the American spirit of the pioneer. It is the way to + recovery. It is the immediate way. It is the strongest assurance that the recovery will + endure. +

    +

    In the field of world policy I would dedicate this nation to the policy of the good neighbor; + the neighbor who resolutely respects himself and, because he does so, respects the rights of + others; the neighbor who respects his obligations and respects the sanctity of his + agreements in and with a world of neighbors. +

    +

    If I read the temper of our people correctly, we now realize, as we have never realized + before, our interdependence on each other: that we cannot merely take, but we must give as + well, that if we are to go forward we must move as a trained and loyal army willing to + sacrifice for the good of a common discipline, because without such discipline, no progress + is made, no leadership becomes effective. We are, I know, ready and willing to submit our + lives and property to such discipline because it makes possible a leadership which aims at a + larger good. This I propose to offer, pledging that the larger purposes will bind upon us + all as a sacred obligation with a unity of duty hitherto evoked only in time of armed + strife. +

    +

    With this pledge taken, I assume unhesitatingly the leadership of this great army of our + people, dedicated to a disciplined attack upon our common problems. +

    +

    Action in this image and to this end is feasible under the form of government which we have + inherited from our ancestors. Our Constitution is so simple and practical that it is + possible always to meet extraordinary needs by changes in emphasis and arrangement without + loss of essential form. That is why our constitutional system has proved itself the most + superbly enduring political mechanism the modern world has produced. It has met every stress + of vast expansion of territory, of foreign wars, of bitter internal strife, of world + relations. +

    +

    It is to be hoped that the normal balance of executive and legislative authority may be + wholly adequate to meet the unprecedented task before us. But it may be that an + unprecedented demand and need for undelayed action may call for temporary departure from + that normal balance of public procedure. +

    +

    I am prepared under my constitutional duty to recommend the measures that a stricken nation + in the midst of a stricken world may require. But in the event that the Congress shall fail + to take one of these courses, and in the event that the national emergency is still + critical, I shall not evade the clear course of duty that will then confront me. I shall ask + the Congress for the one remaining instrument to meet the crisis—broad executive power to + wage a war against the emergency as great as the power that would be given to me if we were + in fact invaded by a foreign foe. +

    +

    For the trust reposed in me I will return the courage and the devotion that befit the time. I + can do no less. +

    +

    We face the arduous days that lie before us in the warm courage of national unity, with the + clear consciousness of seeking old and precious moral values, with the clean satisfaction + that comes from the stern performance of duty by old and young alike. We aim at the + assurance of a rounded and permanent national life. +

    +

    We do not distrust the future of essential democracy. The people of the United States have + not failed. In their need they have registered a mandate that they want direct, vigorous + action. They have asked for discipline and direction under leadership. They have made me the + present instrument of their wishes. In the spirit of the gift I take it. +

    +

    In this dedication of a nation we humbly ask the blessing of God. May He protect each and + every one of us. May He guide me in the days to come. +

    +

    + FDR +

    +
    + 4 +

    + Despite the election of FDR and all his New Deal programs, + unemployment in cities remained high and began to take its + toll on society. Unemployed men felt a loss of status because + they could not provide for their families. They became easily + agitated and irritable which resulted in many fights and + quarrels in public places. Women who had jobs suddenly + came under immense social pressure to give their jobs to + unemployed men. Women were told that men "deserved" the job + more than they did. Almost all married women lost their jobs, + even if they were the only person in the family working. + Women were relegated to servant positions that society saw + as more suited to women than men. These jobs usually paid + much less than the jobs they had to give up. +

    +

    + Children were also put to work. Boys and girls by the + hundreds dropped out of school and either began working + low-paying jobs or staying home to look after younger + siblings while both their parents worked. Teenagers + dropped out of school and frequently left their families. + Most could not find jobs and their families could not + support them. Many city youth ran away from the city and + "rode the rails," or roamed the country by railroad. These + youth would sneak onto trains, beg for food, and live + in squatter camps along the railroad routes. +

    + + + Summary icon + +

    + Cities were full of unemployed, homeless, starving people + who could not find work despite FDR's New Deal programs. + This chaos led to food riots and strain on city budgets. + Society pressured women out of jobs, children into jobs, + and teenagers to ride the rails. +

    +
    + 5 + +

    + Farm Life and the Dust Bowl +

    +

    + The Depression attacked farms as quickly and as + destructively as it did the cities. The problems + facing farmers were numerous and complex and could + not be fixed with a single solution. +

    + +

    + The Dust Bowl Migration +

    +

    + During the 1920s, farms were prospering and there was + such an abundance of rainfall that farmers all across + the western United States had become careless in their + farming techniques and soil preparation. Farmers + over-grazed livestock and over-plowed fields to make + more money. This damaged the land and destroyed the + regenerative properties of the soil. During the 1930s, + there was a large drought in the West, causing crops + to shrivel, cattle to die, and the topsoil to blow + away. This turned the West into one large + dust bowl. +

    +

    + The states in the dust bowl region were Kansas, Oklahoma, + Texas, Colorado, and New Mexico. This region was called + the dust bowl because of the large numbers of dust + storms that occurred there. However, other states + like Arkansas and the Dakotas were also plagued by dust + storms. +

    +

    + What is a dust storm? Dust storms are storms that last + for several days, driven by high winds. The winds blow + dust, creating huge dark, yellowish clouds that, at times, + can block out the light of the sun. Sometimes, these dust + clouds can get up to 8,000 feet high and be accompanied + by thunder and lightning. Two massive and highly + destructive dust storms occurred in the 1930s. The first + was in May of 1934. +

    + 6 +

    + A dust storm lasting three days blew across the West + and Southwest, pulling up over 350 million tons of soil + and dropping it as far east as New York City, New York + and Boston, Massachusetts. It was reported that these + cities had to turn on streetlamps in the daytime just + to be able to see through the blowing dust. The second + storm occurred in March of 1935 in the Dakotas and + Nebraska. It destroyed the entire wheat crop for both + states and swept away as much dirt as workers dug up + when they constructed the Panama Canal. +

    + + Black and white photo of a two-wheeled wagon from the 1930s + + This black and white photo shows a two-wheeled wagon + piled high with cloth sacks filled with goods. Another + sack lies on the grass next to the wagon. The wagon + has the thin tires and criss-cross pattern of spokes + on the wheels that are characteristic of the 1930s. + + + People living in the dust bowl states packed up + everything they owned and migrated west. They + pulled wagons filled with their personal goods behind their cars + or trucks. + + +

    + Not only were these dust storms economically damaging, + they were a danger to the people living in these states. + People caught outside in dust storms could suffocate and + die from dust inhalation. Because of the havoc these + storms wreaked on the land and the people living on it, + people were forced to migrate to find + work or a new place to farm. Many packed up everything + they owned into trucks, cars, and wagons and began to + travel further west to California and other Pacific States. + Over 2.5 million people fled to California during the + Great Depression. The migrants began to gather nicknames + based on where they were migrating from such as "Oakies" + if they were from Oklahoma and "Arkies" if they were + from Arkansas. These people pushed west into Texas, Kansas, + Nebraska, and the Dakotas, and finding no relief in these + dust bowl-burdened states, pushed on to California. +

    + 7 +

    + Unfortunately, California could not support the huge + influx of people that began to pour into the state. + California was not a huge farming state, and the small + farm towns it did have quickly became overcrowded and + overrun with migrants looking for work and land to farm. + By 1939, the problem had gotten so bad that the California + state government passed a law forbidding entry of any + new people into the state. The Supreme Court overturned + this law as unconstitutional, and people continued + to flood the state. +

    +

    + The federal government in the 1930s tried to alleviate + the crisis by taking measures to salvage the land that + had been destroyed by the dust storms and poor farming + techniques. In 1933, the government created the Soil + Erosion Service. This was a commission that taught + terracing and contour farming techniques to farmers to + help them preserve the soil. In 1936, the government + passed the Soil Conservation Act, which tried to reduce + farm surpluses and promote soil conservation. The + government also planted over 200 million trees in + the most ravaged parts of the dust bowl from the Dakotas + to Texas. These trees took to the soil and began to grow, + providing "shelter belts" along the West and conserving + water to help hold down the topsoil. The dust bowl was + slowly beginning to replenish itself. +

    +
    + +

    Farm Tenants

    +

    + Aside from the growing dust storms and bad soil, there + was another class of farmers affected by the Great + Depression. These farmers were tenant farmers or + sharecroppers. After the Civil War, + sharecroppers replaced slaves on many farms. Some + sharecroppers were former slaves, while others were + poor white farmers. Sharecroppers, or tenant farmers, + did not own their land. They were not paid any wages. + Someone else owned the land they farmed and the + sharecroppers rented it. They paid these landowners + with a "share" of the crops and other goods produced + on that farm. Most of these farmers could only obtain + the seed, food, and clothes they needed each year by + pledging their harvest in advance. +

    + 8 +

    + When the Great Depression hit these farms, not to mention + the dust storms, most sharecroppers had already pledged + their crops and other goods in advance. The dying crops + and bad soil could not produce enough for the farmers + to live off of, so they were unable to pay their share + to the landowners. As a result, they were forced to + leave the land, burdened with huge debts they had no + hope of paying. +

    +

    + The federal government, again, tried to help, by passing + the Federal Emergency Relief Act to help tenant farmers. + This act gave money, seeds, and equipment to these farmers + and tried to relocate them to better land. It helped + some, but not all sharecroppers, escape total poverty. +

    + + Map of dust storm damage in the United States, 1930 to 1940 + + This is a map showing dust storm damage between 1930 + and 1940. It shows the 48 contiguous United States. + In the center of the map, states impacted by the dust storm + are labeled. They are, from north to south, North Dakota, South Dakota, + Montana, Wyoming, Nebraska, Colorado, Kansas, Oklahoma, + New Mexico, and Texas. The storm was most intense along the borders + of New Mexico, Texas, Okalahoma, Kansas, and Colorado. + + + This map shows the states that were considered dust + bowl states and the areas affected by dust storms. + Notice that many states not considered dust bowl + states were still damaged by dust storms. The whole + middle of the United States was literally blowing away. + + +
    + 9 + +

    Electric Farms

    +

    + Another major problem that farmers faced during the Great + Depression was lack of electricity. Before the depression hit, + only one in ten farms had electricity. After the depression + and the major dust storms, it became apparent that more + farms needed electricity and quickly! So the federal + government formed the Rural Electrification Administration + to bring electricity to farms in the West. The REA had + the power to loan money to farmers and small towns to help + them build generators and install power lines. This action + was one of the most revolutionary and successful actions + during the Great Depression. By 1941, four out of five + American farms now had electricity. +

    + + + Summary icon + +

    + Powerful dust storms in the 1930s created a dust bowl + in the middle of the United States. Farmers and their + families were forced to migrate in droves to California + and other points west. Sharecroppers faced debt from + lack of crops, and farms in the West needed electricity. + The federal government set up programs to help, and + were, for the most part, successful. +

    +
    +
    + + +

    Dorothea Lange, Photographer of the Great + Depression +

    +

    Dorothea Lange decided to travel the world at age 20, taking pictures and selling her + photographs. By the time she settled down in San Francisco, California in 1916, she had + gathered a reputation as an innovative, talented documentary photographer. +

    +

    During the Great Depression, she wanted to expand her talents and began by photographing + the homeless men in the cities around the country. One of those photographs, White Angel + Breadline, gained the attention of not only her colleagues, but also the federal + government. The government hired her to work with the Resettlement Association of the + 1930s to bring the conditions of the poor to the attention of the public. She traveled + with and photographed hundreds of migrant workers. Her photographs directly contributed + to the establishment of better housing camps for migrant workers in California. +

    + 10 + + Black and white photo of a migrant mother and her children + + + Dorothea Lange's most famous photograph is entitled + Migrant Mother, taken in Nipomo, California + in 1936. The blank, flat prairie behind them seem to add a + sense of bleakness and isolation. Lange was famous for + capturing the hardship, anguish, and the humanity of the Great Depression. + + +
    + +

    + Keeping Spirits Up +

    +

    + During the Great Depression, not only was the economy + depressed, but also were the people. The morale of + American society was down and out. The country and + its people needed hope, and the entertainment + industry tried hard to keep America's spirits up. +

    + 11 +

    + Books, movies, and music were dedicated to bringing up + American morale. Most of the books were reality-based books + about the state of affairs such as Let Us Now Praise + Famous Men + by James Agee and Walker Evans, that told + the story of tenant farmers, and The Grapes of + Wrath + by John Steinbeck, that fictionalized the + story of a dust bowl family's migration west. Both of + these novels were extremely popular because they told + the truth and gave a voice to the people of the nation + who felt like no one was listening. +

    +

    + Movies took a different tack. Some studios projected the + image of the ideal life or a hopeful future, such as many + of the Shirley Temple movies of the 1930s. Other films + were pure escapism, like The Wizard of Oz. People flocked + to the movies either to be encouraged by the future or to + forget the present. +

    +

    + Also during this time, comics were introduced with + superhero characters such as Superman. These comics + had characters with extraordinary powers that helped + the poor, downtrodden, and innocent. +

    +

    + The music industry also worked hard to raise people's + spirits. Many parlor songs of the time were uplifting, + with messages of hope for the future with titles such + as "When the Shepherd Leads the Sheep Back Home" (1931) + and "The Clouds Will Soon Roll By" (1932). Some songs + took on a more humorous and whimsical tone to help + refocus people's attention away from the bad times, + such as "Here It is Monday and I've Still Got A Dollar" + (1932). +

    +

    One of the most popular songs of the era was "Pennies from Heaven":

    + + A long time ago + A million years B.C. + The best things in life + Were absolutely free + But no one appreciated + A sky that was always blue + And no one congratulated + A moon that was always new + So it was planned that they would vanish now and then + And you must pay before you get them back again + That's what storms were made for + And you shouldn't be afraid, for + Every time it rains it rains + Pennies from heaven + Don't you know each cloud contains + Pennies from heaven + You'll find your fortune falling + All over town + Be sure that your umbrella is upside down + Trade them for a package of sunshine and flowers + If you want the things you love + You must have showers + So when you hear it thunder + Don't run under a tree + There'll be pennies from heaven for you and me + + Written by Johnny Burke and Arthur Johnston (www.lyrics007.com). +

    + Other types of entertainment slipped in to help society + refocus. In 1930, the first pinball machine hit the scene, + and in 1935, Parker Brothers distributed the first version + of the board game Monopoly. People took to these + distractions, and they helped to pass what was one of + the hardest times in American history. +

    + + + Summary icon + +

    + The morale of the American people fell rapidly during + the Great Depression. Books, movies, and music worked + overtime to keep people hopeful and happy. These types + of entertainment gave people hope and joy in a very + tough time. +

    +
    +
    +
    + 12 +
    + + +

    Review

    + +

    Review Questions

    + +
  • How did the high unemployment rate effect society?
  • +
  • What were three of the main problems facing farmers?
  • +
  • What ways did the government try to help farmers? Were + they successful? Why or why not?
  • +
  • Why do you think the Supreme Court declared the 1939 + California law forbidding state entry unconstitutional?
  • +
  • Why do you think comic books with superheroes were so + popular during the Great Depression?
  • +
  • Write an essay that analyzes and assesses the overall + effects of the Great Depression on cities, farms, and + society. Discuss the major problems and how people coped, + how the government acted, and how the entertainment industry + tried to help.
  • +
    +
    + +

    Key Words

    +
    +
    bread lines
    +
    lines at food distribution centers where people often faced long waits to get a meal during the Great Depression
    +
    dust bowl
    +
    section of the Great Plains of the United States where a severe drought took place in the early 1930s
    +
    dust storms
    +
    strong storms that blew large amounts of dust from the bare, dry soil in the Dust Bowl across a number of U.S. states
    +
    migrate
    +
    to move from one region to another
    +
    share cropper
    +
    a farmer who provides a portion of each crop to the owner of the land as rent
    +
    squatter
    +
    a person who lives on land he or she does not own or rent
    +
    +
    +

    To learn more about the USA during the Depression era, read The Great Depression: + America 1929–1941 by Robert S. McElvaine, or + The Hungry Years: A Narrative History of the Great Depression in America by T. H. Watkins. +

    +
    +
    +
    + + +

    Copyright, 2020 CAST, Inc. +
    + This exemplar is provided so that publishers, conversion houses, developers, and others may enhance + their understanding of NIMAS XML source files. The content was authored and is copyrighted by CAST, + Inc., and it may not be reproduced, redistributed, sold, or transmitted without the express consent + of CAST. CAST makes no representation that the enclosed NIMAS-conformant files are without error, + nor that they include all of the elements listed in the NIMAS DTD. Please email feedback and comments to aem@cast.org. +

    +
    +
    +
    + \ No newline at end of file diff --git a/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U00/cover.jpg b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U00/cover.jpg new file mode 100644 index 0000000000..f62a3f0b17 Binary files /dev/null and b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U00/cover.jpg differ diff --git a/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/icon.jpg b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/icon.jpg new file mode 100644 index 0000000000..e6bf167438 Binary files /dev/null and b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/icon.jpg differ diff --git a/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p002-001.jpg b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p002-001.jpg new file mode 100644 index 0000000000..3912af63f3 Binary files /dev/null and b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p002-001.jpg differ diff --git a/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p006-001.jpg b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p006-001.jpg new file mode 100644 index 0000000000..03c346cb06 Binary files /dev/null and b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p006-001.jpg differ diff --git a/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p008-001.jpg b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p008-001.jpg new file mode 100644 index 0000000000..57f8ebcfdd Binary files /dev/null and b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p008-001.jpg differ diff --git a/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p010-001.jpg b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p010-001.jpg new file mode 100644 index 0000000000..6b469abb1a Binary files /dev/null and b/scripts/nimas-fileset-validator/src/test/resources/9781122334455NIMAS/images/U01C01/p010-001.jpg differ