From ccb821f83ede52f4150d19f9f8ed559609ebdab2 Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Fri, 2 Oct 2020 12:44:15 +0200 Subject: [PATCH 1/6] Adding section describing marking of capital letters attribute. --- src/obfl-specification.html | 68 +++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/src/obfl-specification.html b/src/obfl-specification.html index d364a10..8d876d6 100644 --- a/src/obfl-specification.html +++ b/src/obfl-specification.html @@ -2759,6 +2759,74 @@

Example

+

mark-capital-letters

+ +

The overall policy for marking capital letters should be determined by the +implementing application, for example per job or in a system setting. A user's +preference should be respected, unless doing so would render the text difficult +to read or interpret for some reason. The hyphenate attribute can be used when +detailed control over hyphenation is required, e.g. to ensure proper rendering of +content that may be difficult to interpret if capital markings are used.

+ +

The marking of capital letters specified by mark-capital-letters +applies to all elements in its content unless overridden with another instance of +mark-capital-letters. In particular, the empty value of +mark-capital-letters is used on an element B to override a +specification of mark-capital-letters on an enclosing element A, +without specifying another marking policy. Within B, the user's +preference for marking capital letters should be applied.

+ +

The value of the mark-capital-letters attribute can either be 'true' or 'false'. +The value 'true' indicates that a text algorithm add capital markings to the +text contents. The value 'false' indicates that a text algorithm should +NOT add capital markings text contents.

+ +

Example

+ +

The following table illustrates the output for different combinations of +input text and capital letters marking attribute value:

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
inputmark-capital-lettersoutput
Exampletrue_example
falseexample
EXAMPLEtrue__example
falseexample
THIS IS AN EXAMPLEtrue___this is an example___
falsethis is an example
+ + +

page-number-counter

Specifies a name for a page number counter to use.

From b2d996fb2c1b1bc86cc0a9461f623b1b3d31167a Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Mon, 5 Oct 2020 07:14:50 +0200 Subject: [PATCH 2/6] Changes after code review. --- src/obfl-specification.html | 58 ++++--------------------------------- 1 file changed, 5 insertions(+), 53 deletions(-) diff --git a/src/obfl-specification.html b/src/obfl-specification.html index 8d876d6..8189ce8 100644 --- a/src/obfl-specification.html +++ b/src/obfl-specification.html @@ -1858,7 +1858,8 @@

toc-sequence

of the XML 1.0 Recommendation [XML].
hyphenate [optional]
-
Whether or not to hyphenate text descendants.
+
Whether or not to + text descendants.
One of 'true' or 'false'.
See the attribute description for more information.
@@ -2763,10 +2764,7 @@

mark-capital-letters

The overall policy for marking capital letters should be determined by the implementing application, for example per job or in a system setting. A user's -preference should be respected, unless doing so would render the text difficult -to read or interpret for some reason. The hyphenate attribute can be used when -detailed control over hyphenation is required, e.g. to ensure proper rendering of -content that may be difficult to interpret if capital markings are used.

+preference should be respected.

The marking of capital letters specified by mark-capital-letters applies to all elements in its content unless overridden with another instance of @@ -2777,56 +2775,10 @@

mark-capital-letters

preference for marking capital letters should be applied.

The value of the mark-capital-letters attribute can either be 'true' or 'false'. -The value 'true' indicates that a text algorithm add capital markings to the -text contents. The value 'false' indicates that a text algorithm should +The value 'true' indicates that we add capital markings to the +text contents. The value 'false' indicates we should NOT add capital markings text contents.

-

Example

- -

The following table illustrates the output for different combinations of -input text and capital letters marking attribute value:

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
inputmark-capital-lettersoutput
Exampletrue_example
falseexample
EXAMPLEtrue__example
falseexample
THIS IS AN EXAMPLEtrue___this is an example___
falsethis is an example
- - -

page-number-counter

Specifies a name for a page number counter to use.

From 3746c47f20a393cc63aa1dfe6ea6506970a30565 Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Mon, 5 Oct 2020 07:30:57 +0200 Subject: [PATCH 3/6] Update schema. --- src/validation/obfl.rng | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/validation/obfl.rng b/src/validation/obfl.rng index b505281..2e28d87 100644 --- a/src/validation/obfl.rng +++ b/src/validation/obfl.rng @@ -38,6 +38,15 @@ + + + + true + false + + + + @@ -549,6 +558,15 @@ + + + + true + false + + + + From 5d5ef85e2928cb33ed63b3aced05c864988705a5 Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Mon, 5 Oct 2020 13:20:34 +0200 Subject: [PATCH 4/6] No whitespace changes --- src/obfl-specification.html | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/src/obfl-specification.html b/src/obfl-specification.html index 8189ce8..d5aa5af 100644 --- a/src/obfl-specification.html +++ b/src/obfl-specification.html @@ -1858,8 +1858,7 @@

toc-sequence

of the XML 1.0 Recommendation [XML].
hyphenate [optional]
-
Whether or not to - text descendants.
+
Whether or not to hyphenate text descendants.
One of 'true' or 'false'.
See the attribute description for more information.
@@ -2762,23 +2761,18 @@

Example

mark-capital-letters

-

The overall policy for marking capital letters should be determined by the -implementing application, for example per job or in a system setting. A user's -preference should be respected.

- -

The marking of capital letters specified by mark-capital-letters -applies to all elements in its content unless overridden with another instance of -mark-capital-letters. In particular, the empty value of -mark-capital-letters is used on an element B to override a -specification of mark-capital-letters on an enclosing element A, -without specifying another marking policy. Within B, the user's -preference for marking capital letters should be applied.

-

The value of the mark-capital-letters attribute can either be 'true' or 'false'. -The value 'true' indicates that we add capital markings to the -text contents. The value 'false' indicates we should +The value 'true' indicates that the braille translator should add capital markings to the +text contents. The value 'false' indicates the braille translator should NOT add capital markings text contents.

+

The overall policy for marking capital letters should be determined by the +implementing application, for example per job or in a system setting.

+ +

This attribute will override that policy, using the mark-capital-letters +attribute on an element tells the braille translator that this element and child elements +should have another policy for marking capital letters.

+

page-number-counter

Specifies a name for a page number counter to use.

From a855571ae23acce41b6d4ed5ba6bab897cca2383 Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Tue, 6 Oct 2020 09:50:07 +0200 Subject: [PATCH 5/6] Moved duplicated variables to textModificationAtts --- src/validation/obfl.rng | 49 ++++++++++------------------------------- 1 file changed, 12 insertions(+), 37 deletions(-) diff --git a/src/validation/obfl.rng b/src/validation/obfl.rng index 2e28d87..6f17c9d 100644 --- a/src/validation/obfl.rng +++ b/src/validation/obfl.rng @@ -22,13 +22,8 @@ - - - - - - - + + @@ -60,6 +55,15 @@ + + + + + + + + + @@ -549,36 +553,7 @@ - - - - true - false - - - - - - - - true - false - - - - - - - - - pre-translated - grade0 - grade1 - grade2 - grade3 - - - + From 2fa93be67af2b1f6d9ec1c080f5cd7570606380e Mon Sep 17 00:00:00 2001 From: Daniel Persson Date: Tue, 6 Oct 2020 12:43:40 +0200 Subject: [PATCH 6/6] More true? --- src/obfl-specification.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/obfl-specification.html b/src/obfl-specification.html index d5aa5af..6fb35c2 100644 --- a/src/obfl-specification.html +++ b/src/obfl-specification.html @@ -2767,7 +2767,7 @@

mark-capital-letters

NOT add capital markings text contents.

The overall policy for marking capital letters should be determined by the -implementing application, for example per job or in a system setting.

+implementing application or language policy, for example per job or in a system setting.

This attribute will override that policy, using the mark-capital-letters attribute on an element tells the braille translator that this element and child elements