Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix endnotes issue #561

Merged
merged 6 commits into from
May 9, 2023
Merged

Fix endnotes issue #561

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b043251
Initial commit.
kalaspuffar Apr 26, 2023
5bc4044
Fixing testcase to conform to the 2020-1 guideline for package to con…
kalaspuffar Apr 27, 2023
4b9ab39
Only validate the first main title against other content documents.
kalaspuffar May 8, 2023
5020657
Small indent fix.
kalaspuffar May 8, 2023
27aff4f
Changed to check for refined as well.
kalaspuffar May 8, 2023
927ab80
Get package file.
kalaspuffar May 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-01-cover.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:nordic="http://www.mtm.se/epub/" xml:lang="en" lang="en" epub:prefix="z3998: http://www.daisy.org/z3998/2012/vocab/structure/#">
<head>
<meta charset="UTF-8"/>
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier"/>
<meta name="viewport" content="width=device-width"/>
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-02-toc.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:nordic="http://www.mtm.se/epub/" xml:lang="en" lang="en" epub:prefix="z3998: http://www.daisy.org/z3998/2012/vocab/structure/#">
<head>
<meta charset="UTF-8"/>
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier"/>
<meta name="viewport" content="width=device-width"/>
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-03-frontmatter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-04-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<meta name="a11y:certifiedBy" content="Certifying Organization"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-05-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-06-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-07-rearnotes.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-08-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-09-part.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-10-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-11-conclusion.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<style type="text/css" xml:space="preserve">
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-12-toc.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xml:lang="en" lang="en">
<head xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/">
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta name="dc:identifier" content="C00000" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" type="text/css" href="css/default.css" />
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-13-part.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-14-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-15-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-16-part.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion client/src/test/resources/valid2020/EPUB/C00000-17-chapter.xhtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:nordic="http://www.mtm.se/epub/">
<head>
<meta charset="UTF-8" />
<title>Valentin Haüy - the father of the education for the blind</title>
<title>Valentin Haüy</title>
<meta content="C00000" name="dc:identifier" />
<meta name="viewport" content="width=device-width" />
<link rel="stylesheet" type="text/css" href="css/accessibility.css"/>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/xml/schema/2020-1/nordic2020-1.opf-and-html.sch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
<p>The HTML title element must be the same as the OPF publication dc:title</p>
<rule context="html:title">
<let name="context" value="concat('(&lt;', name(), string-join(for $a in (@*) return concat(' ', $a/name(), '=&quot;', $a, '&quot;'), ''), '&gt;)')"/>
<let name="fulltitle" value="string-join(/*/opf:package/opf:metadata/dc:title[not(@refines)]/text(), ' - ')"/>
<let name="fulltitle" value="//opf:package/opf:metadata/dc:title[1]/text()"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you still should have the not(@refines). It would be rare that the first dc:title has a refines-attribute, but I think we should still check for it. So dc:title[not(@refines) and position()=1].

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @josteinaj

Seems reasonable; I agree that it's unlikely but for completeness.

Changed the rule to the check you suggested.

Best regards
Daniel

<assert test="text() = $fulltitle">[nordic_opf_and_html_28] The HTML title element in <value-of select="replace(base-uri(.),'.*/','')"/>
must contain the same text as the dc:title element in the OPF metadata. The HTML title element contains "<value-of select="."/>" while the dc:title element in the OPF contains
"<value-of select="$fulltitle"/>".</assert>
Expand Down