summaryrefslogtreecommitdiff
path: root/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB
diff options
context:
space:
mode:
Diffstat (limited to 'macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB')
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf71
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/11-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/10-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/14-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/20-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/23-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/25-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/26-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/31-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/33-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/36-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/35-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/37-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/42-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/38-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/44-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/45-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/48-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/49-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/50-f--ile.png)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/53-f--ile.e--xt (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.png (renamed from macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.e--xt)0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png0
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css8
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js39
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml70
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml31
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml1
-rw-r--r--macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.xhtml1
40 files changed, 141 insertions, 87 deletions
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
index 94fa5a55a6..075d3baed5 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/formatting.opf
@@ -18,41 +18,46 @@
<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/10-f--ile.e--xt"/>
- <item id="image2" media-type="image/png" href="images/14-f--ile.png"/>
- <item id="image3" media-type="image/png" href="images/15-f--ile.png"/>
- <item id="image4" media-type="e--xt/image" href="images/16-f--ile.e--xt"/>
- <item id="image5" media-type="image/png" href="images/17-f--ile.png"/>
- <item id="image6" media-type="image/png" href="images/18-f--ile.png"/>
- <item id="image7" media-type="e--xt/image" href="images/19-f--ile.e--xt"/>
- <item id="image8" media-type="e--xt/image" href="images/21-f--ile.e--xt"/>
- <item id="image9" media-type="image/png" href="images/25-f--ile.png"/>
- <item id="image10" media-type="image/png" href="images/26-f--ile.png"/>
- <item id="image11" media-type="e--xt/image" href="images/27-f--ile.e--xt"/>
- <item id="image12" media-type="image/png" href="images/28-f--ile.png"/>
- <item id="image13" media-type="image/png" href="images/29-f--ile.png"/>
- <item id="image14" media-type="image/png" href="images/3-f--ile.png"/>
- <item id="image15" media-type="e--xt/image" href="images/30-f--ile.e--xt"/>
+ <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"/>
+ <item id="image4" media-type="e--xt/image" href="images/17-f--ile.e--xt"/>
+ <item id="image5" media-type="image/png" href="images/18-f--ile.png"/>
+ <item id="image6" media-type="image/png" href="images/19-f--ile.png"/>
+ <item id="image7" media-type="e--xt/image" href="images/20-f--ile.e--xt"/>
+ <item id="image8" media-type="image/png" href="images/21-f--ile.png"/>
+ <item id="image9" media-type="e--xt/image" href="images/23-f--ile.e--xt"/>
+ <item id="image10" media-type="image/png" href="images/27-f--ile.png"/>
+ <item id="image11" media-type="image/png" href="images/28-f--ile.png"/>
+ <item id="image12" media-type="e--xt/image" href="images/29-f--ile.e--xt"/>
+ <item id="image13" media-type="image/png" href="images/3-f--ile.png"/>
+ <item id="image14" media-type="image/png" href="images/30-f--ile.png"/>
+ <item id="image15" media-type="image/png" href="images/31-f--ile.png"/>
<item id="image16" media-type="e--xt/image" href="images/32-f--ile.e--xt"/>
- <item id="image17" media-type="image/png" href="images/36-f--ile.png"/>
- <item id="image18" media-type="image/png" href="images/37-f--ile.png"/>
- <item id="image19" media-type="e--xt/image" href="images/38-f--ile.e--xt"/>
- <item id="image20" media-type="image/png" href="images/39-f--ile.png"/>
- <item id="image21" media-type="image/png" href="images/4-f--ile.png"/>
- <item id="image22" media-type="image/png" href="images/40-f--ile.png"/>
- <item id="image23" media-type="e--xt/image" href="images/41-f--ile.e--xt"/>
- <item id="image24" media-type="e--xt/image" href="images/43-f--ile.e--xt"/>
- <item id="image25" media-type="image/png" href="images/47-f--ile.png"/>
- <item id="image26" media-type="image/png" href="images/48-f--ile.png"/>
- <item id="image27" media-type="e--xt/image" href="images/49-f--ile.e--xt"/>
+ <item id="image17" media-type="image/png" href="images/33-f--ile.png"/>
+ <item id="image18" media-type="e--xt/image" href="images/35-f--ile.e--xt"/>
+ <item id="image19" media-type="image/png" href="images/39-f--ile.png"/>
+ <item id="image20" media-type="image/png" href="images/4-f--ile.png"/>
+ <item id="image21" media-type="image/png" href="images/40-f--ile.png"/>
+ <item id="image22" media-type="e--xt/image" href="images/41-f--ile.e--xt"/>
+ <item id="image23" media-type="image/png" href="images/42-f--ile.png"/>
+ <item id="image24" media-type="image/png" href="images/43-f--ile.png"/>
+ <item id="image25" media-type="e--xt/image" href="images/44-f--ile.e--xt"/>
+ <item id="image26" media-type="image/png" href="images/45-f--ile.png"/>
+ <item id="image27" media-type="e--xt/image" href="images/47-f--ile.e--xt"/>
<item id="image28" media-type="e--xt/image" href="images/5-f--ile.e--xt"/>
- <item id="image29" media-type="image/png" href="images/50-f--ile.png"/>
- <item id="image30" media-type="image/png" href="images/51-f--ile.png"/>
- <item id="image31" media-type="e--xt/image" href="images/52-f--ile.e--xt"/>
- <item id="image32" media-type="e--xt/image" href="images/54-f--ile.e--xt"/>
- <item id="image33" media-type="image/png" href="images/6-f--ile.png"/>
- <item id="image34" media-type="image/png" href="images/7-f--ile.png"/>
- <item id="image35" media-type="e--xt/image" href="images/8-f--ile.e--xt"/>
+ <item id="image29" media-type="image/png" href="images/51-f--ile.png"/>
+ <item id="image30" media-type="image/png" href="images/52-f--ile.png"/>
+ <item id="image31" media-type="e--xt/image" href="images/53-f--ile.e--xt"/>
+ <item id="image32" media-type="image/png" href="images/54-f--ile.png"/>
+ <item id="image33" media-type="image/png" href="images/55-f--ile.png"/>
+ <item id="image34" media-type="e--xt/image" href="images/56-f--ile.e--xt"/>
+ <item id="image35" media-type="image/png" href="images/57-f--ile.png"/>
+ <item id="image36" media-type="e--xt/image" href="images/59-f--ile.e--xt"/>
+ <item id="image37" media-type="image/png" href="images/6-f--ile.png"/>
+ <item id="image38" media-type="image/png" href="images/7-f--ile.png"/>
+ <item id="image39" media-type="e--xt/image" href="images/8-f--ile.e--xt"/>
+ <item id="image40" media-type="image/png" href="images/9-f--ile.png"/>
<item id="infojs1" media-type="text/css" href="js/info.css"/>
<item id="infojs2" media-type="text/javascript" href="js/info.js"/>
<item id="infojs3" media-type="text/javascript" href="js/modernizr.js"/>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/10-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/11-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/10-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/11-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/14-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/14-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/16-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/17-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/20-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/19-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/20-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/21-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/25-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/23-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/25-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/23-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/26-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/26-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/27-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/29-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/31-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/30-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/31-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/36-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/33-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/36-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/33-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/37-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/35-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/37-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/35-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/38-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/42-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/38-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/42-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/43-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/44-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/44-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/48-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/45-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/48-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/45-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/49-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/49-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/47-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/50-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/50-f--ile.png
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/53-f--ile.e--xt
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/52-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/53-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.png
index e69de29bb2..e69de29bb2 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.e--xt
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/54-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/55-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/56-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/57-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/59-f--ile.e--xt
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/images/9-f--ile.png
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css
index 14537b67ad..ac0e596484 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.css
@@ -141,6 +141,10 @@ div.toc ul ul {
margin-left: 1em;
}
+div.toc-sidebar a {
+ text-decoration: none;
+}
+
div.toc a[toc-current] {
font-weight: bold
}
@@ -226,6 +230,10 @@ table#keyboard-shortcuts th {
right: 0;
}
+.text-input input {
+ width: 25em;
+}
+
.error {
background-color: orange;
padding: 5px;
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js
index 69c5ad95f3..521d14ed68 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/js/info.js
@@ -1,5 +1,5 @@
/* info.js - Javascript UI for Texinfo manuals
- Copyright (C) 2017-2019 Free Software Foundation, Inc.
+ Copyright (C) 2017-2022 Free Software Foundation, Inc.
This file is part of GNU Texinfo.
@@ -35,7 +35,7 @@
SCREEN_MIN_WIDTH: 700,
LOCAL_HTML_PAGE_PATTERN: "^([^:/]*[.](html|htm|xhtml))?([#].*)?$",
SHOW_SIDEBAR_HTML: '<span class="hide-icon">&#x21db;</span>',
- HIDE_SIDEBAR_HTML: '<span class="hide-icon">&#x21da;</span><span class="hide-text">Hide sidebar</span>',
+ HIDE_SIDEBAR_HTML: '<span class="hide-icon">&#x21da;</span><span class="hide-text"></span>',
SHOW_SIDEBAR_TOOLTIP: 'Show navigation sidebar',
HIDE_SIDEBAR_TOOLTIP: 'Hide navigation sidebar',
@@ -120,7 +120,7 @@
@arg {string} linkid - link identifier
@arg {string|false} [history] - method name that will be applied on
the 'window.history' object. */
- set_current_url: function (linkid, history, clicked = false) {
+ set_current_url: function (linkid, history, clicked) {
if (undef_or_null (history))
history = "pushState";
return { type: "current-url", url: linkid,
@@ -146,10 +146,32 @@
/** @arg {NodeListOf<Element>} links */
cache_index_links: function (links) {
var dict = {};
+ var text0 = "", text1 = ""; // for subentries
for (var i = 0; i < links.length; i += 1)
{
var link = links[i];
- dict[link.textContent] = href_hash (link_href (link));
+ var link_cl = link.classList;
+ var text = link.textContent;
+ if (link_cl.contains("index-entry-level-2"))
+ {
+ text = text0 + "; " + text1 + "; " + text;
+ }
+ else if (link_cl.contains("index-entry-level-1"))
+ {
+ text1 = text;
+ text = text0 + "; " + text;
+ }
+ else
+ {
+ text0 = text;
+ }
+
+ if ((link = link.parentElement.parentElement.lastChild)
+ && link.classList.contains("printindex-index-section")
+ && (link = link.firstChild))
+ {
+ dict[text] = href_hash (link_href (link));
+ }
}
return { type: "cache-index-links", links: dict };
},
@@ -1177,7 +1199,7 @@
store.dispatch ({ type: "iframe-ready", id: config.INDEX_ID });
store.dispatch ({
type: "echo",
- msg: "Welcome to Texinfo documentation viewer 6.1, type '?' for help."
+ msg: "Welcome to Texinfo documentation viewer 7.0.1, type '?' for help."
});
/* Call user hook. */
@@ -1356,6 +1378,8 @@
add_header (elem)
{
var h1 = document.querySelector ("h1.settitle");
+ if (!h1)
+ h1 = document.querySelector ("h1.top");
if (h1)
{
var a = document.createElement ("a");
@@ -1455,8 +1479,9 @@
if (linkid_contains_index (linkid))
{
/* Scan links that should be added to the index. */
- var index_links = document.querySelectorAll ("td[valign=top] a");
- store.dispatch (actions.cache_index_links (index_links));
+ var index_entries = document.querySelectorAll
+ ("td.printindex-index-entry a");
+ store.dispatch (actions.cache_index_links (index_entries));
}
add_icons ();
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
index 3c9e9e3233..0c07ea4173 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
@@ -1838,19 +1839,20 @@ html ''
<code class="code">@image{,,2--xt}</code>
<code class="code">@image{,,,3--xt}</code>
</p>
-<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/23-f-ilejpg" alt="a&#8211;lt"/>
-<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/24-f-ilejpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/25-f-ilejpg" alt="a&#8211;lt"/>
+<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/26-f-ilejpg" alt="altjk _&quot; %@"/>
</p>
-<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/25-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/26-f--ile.png" alt="alt"/>
-<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/27-f--ile.e--xt" alt="f--ile"/>
-<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/28-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/29-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/30-f--ile.e--xt" alt="alt"/>
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/31-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
+<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/27-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/28-f--ile.png" alt="alt"/>
+<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/29-f--ile.e--xt" alt="f--ile"/>
+<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/30-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/31-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/32-f--ile.e--xt" alt="alt"/>
+<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/33-f--ile.png" alt="alt"/>
+<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/34-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
</p>
-<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/32-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/33-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/35-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/36-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
</p>
@@ -2913,19 +2915,20 @@ html ''
<code class="code">@image{,,2--xt}</code>
<code class="code">@image{,,,3--xt}</code>
</p>
-<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/34-f-ilejpg" alt="a&#8211;lt"/>
-<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/35-f-ilejpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/37-f-ilejpg" alt="a&#8211;lt"/>
+<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/38-f-ilejpg" alt="altjk _&quot; %@"/>
</p>
-<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/36-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/37-f--ile.png" alt="alt"/>
-<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/38-f--ile.e--xt" alt="f--ile"/>
-<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/39-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/40-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/41-f--ile.e--xt" alt="alt"/>
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/42-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
+<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/39-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/40-f--ile.png" alt="alt"/>
+<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/41-f--ile.e--xt" alt="f--ile"/>
+<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/42-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/43-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/44-f--ile.e--xt" alt="alt"/>
+<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/45-f--ile.png" alt="alt"/>
+<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/46-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
</p>
-<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/43-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/44-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/47-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/48-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
</p>
@@ -4130,19 +4133,20 @@ Invalid use of @':
<code class="code">@image{,,2--xt}</code>
<code class="code">@image{,,,3--xt}</code>
-<code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/45-f-ilejpg" alt="a&#8211;lt"/>
-<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/46-f-ilejpg" alt="altjk _&quot; %@"/>
+<code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/49-f-ilejpg" alt="a&#8211;lt"/>
+<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/50-f-ilejpg" alt="altjk _&quot; %@"/>
-<code class="code">@image{f--ile}</code> <img class="image" src="../images/47-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/48-f--ile.png" alt="alt"/>
-<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/49-f--ile.e--xt" alt="f--ile"/>
-<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/50-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/51-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/52-f--ile.e--xt" alt="alt"/>
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/53-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
+<code class="code">@image{f--ile}</code> <img class="image" src="../images/51-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/52-f--ile.png" alt="alt"/>
+<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/53-f--ile.e--xt" alt="f--ile"/>
+<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/54-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/55-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/56-f--ile.e--xt" alt="alt"/>
+<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/57-f--ile.png" alt="alt"/>
+<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/58-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
-<code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/54-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/55-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
+<code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/59-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/60-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
index d858fa979c..7cc0bbe4ff 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/chapter2.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
index 5237bf3ea6..8af4b5d722 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
@@ -1835,10 +1836,11 @@ html ''
<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/6-f--ile.png" alt="f--ile"/>
<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/7-f--ile.png" alt="f--ile"/>
<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/8-f--ile.e--xt" alt="alt"/>
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/9-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
+<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/9-f--ile.png" alt="alt"/>
+<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/10-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
</p>
-<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/10-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/11-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/11-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/12-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
</p>
<strong class="author">author</strong><br/>
@@ -2903,19 +2905,20 @@ html ''
<code class="code">@image{,,2--xt}</code>
<code class="code">@image{,,,3--xt}</code>
</p>
-<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/12-f-ilejpg" alt="a&#8211;lt"/>
-<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/13-f-ilejpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f-ile,aze,,a--lt}</code> <img class="image" src="../images/13-f-ilejpg" alt="a&#8211;lt"/>
+<code class="code">@image{f-ile,,,alt@verb{:jk _&quot; %}}</code> <img class="image" src="../images/14-f-ilejpg" alt="altjk _&quot; %@"/>
</p>
-<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/14-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/15-f--ile.png" alt="alt"/>
-<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/16-f--ile.e--xt" alt="f--ile"/>
-<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/17-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/18-f--ile.png" alt="f--ile"/>
-<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/19-f--ile.e--xt" alt="alt"/>
-<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/20-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
+<p><code class="code">@image{f--ile}</code> <img class="image" src="../images/15-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,,alt}</code> <img class="image" src="../images/16-f--ile.png" alt="alt"/>
+<code class="code">@image{f--ile,,,,.e-d-xt}</code> <img class="image" src="../images/17-f--ile.e--xt" alt="f--ile"/>
+<code class="code">@image{f--ile,l--i}</code> <img class="image" src="../images/18-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,,l--e}</code> <img class="image" src="../images/19-f--ile.png" alt="f--ile"/>
+<code class="code">@image{f--ile,aze,az,alt,.e--xt}</code> <img class="image" src="../images/20-f--ile.e--xt" alt="alt"/>
+<code class="code">@image{f--ile,aze,az,alt,</code> <img class="image" src="../images/21-f--ile.png" alt="alt"/>
+<code class="code">@image{@file{f--ile}@@@.,aze,az,alt,@file{.file ext} e--xt@}</code> <img class="image" src="../images/22-f--ile_0040..file-ext-e--xt_007d" alt="alt"/>
</p>
-<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/21-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
-<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/22-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
+<p><code class="code">@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b &quot;},e--xt}</code> <img class="image" src="../images/23-f--ile.e--xt" alt="jk _&quot; %@ in b &quot;"/>
+<code class="code">@image{file@verb{:jk _&quot; %@:},,,alt@verb{:jk _&quot; %@:}}</code> <img class="image" src="../images/24-filejk-__0022-_0025_0040jpg" alt="altjk _&quot; %@"/>
</p>
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
index 5667d09fd9..a48b59e231 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_abt.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
index 6858c07d69..055f5a7576 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_fot.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
index e2bce7d4dd..666cabe9b1 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_ovr.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
index 435c4bd0df..6284272b7c 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/formatting_toc.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
index 8ad0ed307a..812e907f47 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/s_002d_002dect_002cion.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
index 8058f19b99..08efc54868 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsection.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
index 070dba5776..e99a64defd 100644
--- a/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
+++ b/macros/texinfo/texinfo/tp/tests/layout/res_parser/formatting_epub_nodes/formatting_epub_package/EPUB/xhtml/subsubsection-_0060_0060simple_002ddouble_002d_002d.xhtml
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile
diff --git a/macros/texinfo/texinfo/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/macros/texinfo/texinfo/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 f5e5e1842b..c6968d2247 100644
--- a/macros/texinfo/texinfo/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/macros/texinfo/texinfo/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
@@ -743,6 +743,7 @@ Invalid use of @':
@image{f-ile,l-i} f-ile
@image{f-ile,,l-e} f-ile
@image{f-ile,aze,az,alt,.e-xt} f-ile
+@image{f-ile,aze,az,alt, f-ile
@image{@file{f-ile}@@@.,aze,az,alt,@file{.file ext} e-xt@} f-ile@.
@image{f-ile,aze,az,@verb{:jk _" %@:} @b{in b "},e-xt} f-ile