[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Gavin D. Smith |
Date: |
Sun, 20 Nov 2022 15:14:33 -0500 (EST) |
branch: master
commit 16ca2d6bc96e427637f1404e0e8da9094ecc1d12
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Sun Nov 20 20:14:02 2022 +0000
* tp/tests/layout/list-of-tests (formatting_epub_nodes):
Set INFO_JS_DIR in order to exercise code. From Patrice.
---
ChangeLog | 5 +++++
tp/tests/layout/list-of-tests | 2 +-
.../formatting_epub_package/EPUB/formatting.opf | 16 +++++++++-------
.../formatting_epub_package/EPUB/xhtml/chapter.xhtml | 6 ++++--
.../formatting_epub_package/EPUB/xhtml/chapter2.xhtml | 6 ++++--
.../formatting_epub_package/EPUB/xhtml/formatting.xhtml | 6 ++++--
.../EPUB/xhtml/formatting_abt.xhtml | 6 ++++--
.../EPUB/xhtml/formatting_fot.xhtml | 6 ++++--
.../EPUB/xhtml/formatting_ovr.xhtml | 6 ++++--
.../EPUB/xhtml/formatting_toc.xhtml | 6 ++++--
.../EPUB/xhtml/s_002d_002dect_002cion.xhtml | 6 ++++--
.../formatting_epub_package/EPUB/xhtml/subsection.xhtml | 6 ++++--
...ubsection-_0060_0060simple_002ddouble_002d_002d.xhtml | 6 ++++--
...02d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml | 6 ++++--
14 files changed, 59 insertions(+), 30 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 772a8b20e0..5057369f34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2022-11-20 Gavin Smith <gavinsmith0123@gmail.com>
+
+ * tp/tests/layout/list-of-tests (formatting_epub_nodes):
+ Set INFO_JS_DIR in order to exercise code. From Patrice.
+
2022-11-20 Gavin Smith <gavinsmith0123@gmail.com>
* tp/Texinfo/Convert/HTML.pm (output) <INFO_JS_DIR>:
diff --git a/tp/tests/layout/list-of-tests b/tp/tests/layout/list-of-tests
index e228292e30..4308266eb3 100644
--- a/tp/tests/layout/list-of-tests
+++ b/tp/tests/layout/list-of-tests
@@ -43,7 +43,7 @@ formatting_inline_css formatting.texi -c 'INLINE_CSS_STYLE 1'
-c DOCTYPE='<!DOCT
formatting_fr_icons formatting.texi --document-language fr --init icons.init
formatting_chm formatting.texi -c FORMAT_MENU=nomenu --init chm.pm
formatting_epub formatting.texi --epub3 -c 'EPUB_CREATE_CONTAINER_FILE 0'
-formatting_epub_nodes formatting.texi --split node --init epub3.pm -c
'EPUB_CREATE_CONTAINER_FILE 0'
+formatting_epub_nodes formatting.texi --split node --init epub3.pm -c
'EPUB_CREATE_CONTAINER_FILE 0' -c INFO_JS_DIR=js
formatting formatting.texi
--internal-links=@OUT_DIR@internal_links_formatting.txt
#lightweight_markups_mediawiki lightweight_markups.texi --init mediawiki.pm
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
index fbc56b25b1..64a97cfd1e 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
@@ -10,13 +10,14 @@
</metadata>
<manifest>
<item id="nav" properties="nav" media-type="application/xhtml+xml"
href="xhtml/nav_toc.xhtml"/>
- <item id="unit1" media-type="application/xhtml+xml"
href="xhtml/formatting.xhtml"/>
- <item id="unit2" media-type="application/xhtml+xml"
href="xhtml/chapter.xhtml"/>
- <item id="unit3" media-type="application/xhtml+xml"
href="xhtml/s_002d_002dect_002cion.xhtml"/>
- <item id="unit4" media-type="application/xhtml+xml"
href="xhtml/subsection.xhtml"/>
- <item id="unit5" media-type="application/xhtml+xml"
href="xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml"/>
- <item id="unit6" media-type="application/xhtml+xml"
href="xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml"/>
- <item id="unit7" media-type="application/xhtml+xml"
href="xhtml/chapter2.xhtml"/>
+ <item id="unit1" media-type="application/xhtml+xml"
href="xhtml/formatting.xhtml" properties="scripted"/>
+ <item id="unit2" media-type="application/xhtml+xml"
href="xhtml/chapter.xhtml" properties="scripted"/>
+ <item id="unit3" media-type="application/xhtml+xml"
href="xhtml/s_002d_002dect_002cion.xhtml" properties="scripted"/>
+ <item id="unit4" media-type="application/xhtml+xml"
href="xhtml/subsection.xhtml" properties="scripted"/>
+ <item id="unit5" media-type="application/xhtml+xml"
href="xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml"
properties="scripted"/>
+ <item id="unit6" media-type="application/xhtml+xml"
href="xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml"
properties="scripted"/>
+ <item id="unit7" media-type="application/xhtml+xml"
href="xhtml/chapter2.xhtml" properties="scripted"/>
+ <item id="jsweblabels" media-type="application/xhtml+xml"
href="xhtml/js_licenses.xhtml"/>
<item id="image1" media-type="e--xt/image"
href="images/11-f--ile.e--xt"/>
<item id="image2" media-type="image/png" href="images/15-f--ile.png"/>
<item id="image3" media-type="image/png" href="images/16-f--ile.png"/>
@@ -66,5 +67,6 @@
<itemref idref="unit5"/>
<itemref idref="unit6"/>
<itemref idref="unit7"/>
+ <itemref idref="jsweblabels" linear="no"/>
</spine>
</package>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index c188030c5f..cd7948ab94 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -882,7 +882,9 @@ ul.mark-none {list-style-type: none}
-->
</style>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -4953,6 +4955,6 @@ Invalid use of @':
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index 1b05d296c4..70c1ff5c29 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -868,7 +868,9 @@ th.sections-header-printindex {text-align:left;
padding-left: 1em}
-->
</style>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -1427,6 +1429,6 @@ th.sections-header-printindex {text-align:left;
padding-left: 1em}
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index d03f4f924d..5a03c5f11e 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -875,7 +875,9 @@ ul.mark-none {list-style-type: none}
-->
</style>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -3066,6 +3068,6 @@ html ''
<a class="node" id="Top"></a><a class="top" id="Top-section"></a>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 9657add853..b1c1c44c4e 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -861,7 +861,9 @@ td.name-direction-about {text-align:center}
-->
</style>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -969,6 +971,6 @@ td.name-direction-about {text-align:center}
</ul>
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 8e14d0a256..50a119cf7b 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -855,7 +855,9 @@ g-roupe
<meta name="viewport" content="width=device-width,initial-scale=1"/>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -895,6 +897,6 @@ g-roupe
<p>in footnote</p>
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index 88a0c2913d..472ee1de10 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -860,7 +860,9 @@ ul.toc-numbered-mark {list-style: none}
-->
</style>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -875,6 +877,6 @@ ul.toc-numbered-mark {list-style: none}
</div>
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 89f74a41d0..4f4f3d8007 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -860,7 +860,9 @@ ul.toc-numbered-mark {list-style: none}
-->
</style>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -886,6 +888,6 @@ ul.toc-numbered-mark {list-style: none}
</div>
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index c1cead2b0d..121f92c575 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -855,7 +855,9 @@ g-roupe
<meta name="viewport" content="width=device-width,initial-scale=1"/>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -866,6 +868,6 @@ g-roupe
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index 9bd9709eea..429dc405c8 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -855,7 +855,9 @@ g-roupe
<meta name="viewport" content="width=device-width,initial-scale=1"/>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -867,6 +869,6 @@ g-roupe
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 515ec33787..a819214db1 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -855,7 +855,9 @@ g-roupe
<meta name="viewport" content="width=device-width,initial-scale=1"/>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -865,6 +867,6 @@ g-roupe
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>
diff --git
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
index e7dc3d49b0..fcf6516aa3 100644
---
a/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
+++
b/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml
@@ -855,7 +855,9 @@ g-roupe
<meta name="viewport" content="width=device-width,initial-scale=1"/>
-
+<link rel="stylesheet" type="text/css" href="../js/info.css"/>
+<script src="../js/modernizr.js" type="text/javascript"></script>
+<script src="../js/info.js" type="text/javascript"></script>
</head>
<body lang="en">
@@ -865,6 +867,6 @@ g-roupe
</div>
-
+<a href="js_licenses.xhtml" rel="jslicense"><small>JavaScript license
information</small></a>
</body>
</html>