21 files changed, 774 insertions, 0 deletions
diff --git a/t/fmt/xhtml/basic.html b/t/fmt/xhtml/basic.html
new file mode 100644
index 0000000..98eb2ff
--- /dev/null
+++ b/t/fmt/xhtml/basic.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    <!--#set var="blah" value="1" -->
+    <!--#include virtual="header.shtml"-->
+    <title>Title string</title>
+  </head>
+
+  <body>
+    <div class="content">
+	    <h1>Header</h1>
+		<img src="somepicture.jpg" class="left"
+                alt="Some text" title="My picture" />
+
+              <p><strong>Strong</strong>not strong</p>
+              <p><strong>Another line</strong> with space and no closing.</p>
+              <p>
+                <a href="somelink.html">My link</a>,
+                <a href="nextline.html">link on next line</a>, <a href="sameline.html">line on same line</a>.
+      </p>
+
+      <img src="picture.jpg" alt="picture" />
+
+      and some text without a paragraph mark.
+    </div>
+    <div class="content">
+      <p>A paragraph with an
+         <!--#include virtual="header.shtml"-->
+         SSI statement inside</p>
+    </div>
+  </body>
+</html>
+
diff --git a/t/fmt/xhtml/basic.norm b/t/fmt/xhtml/basic.norm
new file mode 100644
index 0000000..2673d28
--- /dev/null
+++ b/t/fmt/xhtml/basic.norm
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    
+    
+    <!--#set var="blah" value="1" -->
+<!--#include virtual="header.shtml"-->
+<title>Title string</title>
+  </head>
+
+  <body>
+    <div class="content">
+	    <h1>Header</h1>
+		<img src="somepicture.jpg" class="left"
+                alt="Some text" title="My picture" />
+
+              <p><strong>Strong</strong>not strong</p>
+              <p><strong>Another line</strong> with space and no closing.</p>
+              <p>
+                <a href="somelink.html">My link</a>, <a href="nextline.html">link on next
+line</a>, <a href="sameline.html">line on same line</a>.
+      </p>
+
+      <img src="picture.jpg" alt="picture" />
+
+      and some text without a paragraph mark.
+    </div>
+    <div class="content">
+      <p><!--#include virtual="header.shtml"-->
+A paragraph with an SSI statement inside</p>
+    </div>
+  </body>
+</html>
+
diff --git a/t/fmt/xhtml/basic.po b/t/fmt/xhtml/basic.po
new file mode 100644
index 0000000..48bdfbf
--- /dev/null
+++ b/t/fmt/xhtml/basic.po
@@ -0,0 +1,72 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2006-06-14  0:50+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head><title>
+#: basic.html:8
+msgid "Title string"
+msgstr "TITLE STRING"
+
+#. type: Content of: <html><body><div><h1>
+#: basic.html:13
+msgid "Header"
+msgstr "HEADER"
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: basic.html:15
+msgid "Some text"
+msgstr "SOME TEXT"
+
+#. type: Attribute 'title' of: <html><body><div><img>
+#: basic.html:15
+msgid "My picture"
+msgstr "MY PICTURE"
+
+#. type: Content of: <html><body><div><p>
+#: basic.html:17
+msgid "<strong>Strong</strong>not strong"
+msgstr "<strong>STRONG</strong>NOT STRONG"
+
+#. type: Content of: <html><body><div><p>
+#: basic.html:18
+msgid "<strong>Another line</strong> with space and no closing."
+msgstr "<strong>ANOTHER LINE</strong> WITH SPACE AND NO CLOSING."
+
+#. type: Content of: <html><body><div><p>
+#: basic.html:20
+msgid ""
+"<a href=\"somelink.html\">My link</a>, <a href=\"nextline.html\">link on "
+"next line</a>, <a href=\"sameline.html\">line on same line</a>."
+msgstr ""
+"<a href=\"somelink.html\">MY LINK</a>, <a href=\"nextline.html\">LINK ON "
+"NEXT LINE</a>, <a href=\"sameline.html\">LINE ON SAME LINE</a>."
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: basic.html:24
+msgid "picture"
+msgstr "PICTURE"
+
+#. type: Content of: <html><body><div>
+#: basic.html:26
+msgid "and some text without a paragraph mark."
+msgstr "AND SOME TEXT WITHOUT A PARAGRAPH MARK."
+
+#. #include virtual="header.shtml"
+#. type: Content of: <html><body><div><p>
+#: basic.html:29
+msgid "A paragraph with an SSI statement inside"
+msgstr "A PARAGRAPH WITH AN SSI STATEMENT INSIDE"
diff --git a/t/fmt/xhtml/basic.pot b/t/fmt/xhtml/basic.pot
new file mode 100644
index 0000000..a5cd2fd
--- /dev/null
+++ b/t/fmt/xhtml/basic.pot
@@ -0,0 +1,70 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2006-06-14  0:50+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head><title>
+#: basic.html:8
+msgid "Title string"
+msgstr ""
+
+#. type: Content of: <html><body><div><h1>
+#: basic.html:13
+msgid "Header"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: basic.html:15
+msgid "Some text"
+msgstr ""
+
+#. type: Attribute 'title' of: <html><body><div><img>
+#: basic.html:15
+msgid "My picture"
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: basic.html:17
+msgid "<strong>Strong</strong>not strong"
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: basic.html:18
+msgid "<strong>Another line</strong> with space and no closing."
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: basic.html:20
+msgid ""
+"<a href=\"somelink.html\">My link</a>, <a href=\"nextline.html\">link on "
+"next line</a>, <a href=\"sameline.html\">line on same line</a>."
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: basic.html:24
+msgid "picture"
+msgstr ""
+
+#. type: Content of: <html><body><div>
+#: basic.html:26
+msgid "and some text without a paragraph mark."
+msgstr ""
+
+#. #include virtual="header.shtml"
+#. type: Content of: <html><body><div><p>
+#: basic.html:29
+msgid "A paragraph with an SSI statement inside"
+msgstr ""
diff --git a/t/fmt/xhtml/basic.trans b/t/fmt/xhtml/basic.trans
new file mode 100644
index 0000000..a267590
--- /dev/null
+++ b/t/fmt/xhtml/basic.trans
@@ -0,0 +1,36 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    
+    
+    <!--#set var="blah" value="1" -->
+<!--#include virtual="header.shtml"-->
+<title>TITLE STRING</title>
+  </head>
+
+  <body>
+    <div class="content">
+	    <h1>HEADER</h1>
+		<img src="somepicture.jpg" class="left"
+                alt="SOME TEXT" title="MY PICTURE" />
+
+              <p><strong>STRONG</strong>NOT STRONG</p>
+              <p><strong>ANOTHER LINE</strong> WITH SPACE AND NO CLOSING.</p>
+              <p>
+                <a href="somelink.html">MY LINK</a>, <a href="nextline.html">LINK ON NEXT
+LINE</a>, <a href="sameline.html">LINE ON SAME LINE</a>.
+      </p>
+
+      <img src="picture.jpg" alt="PICTURE" />
+
+      AND SOME TEXT WITHOUT A PARAGRAPH MARK.
+    </div>
+    <div class="content">
+      <p><!--#include virtual="header.shtml"-->
+A PARAGRAPH WITH AN SSI STATEMENT INSIDE</p>
+    </div>
+  </body>
+</html>
+
diff --git a/t/fmt/xhtml/closing-tag.html b/t/fmt/xhtml/closing-tag.html
new file mode 100644
index 0000000..a67767e
--- /dev/null
+++ b/t/fmt/xhtml/closing-tag.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Video</title>
+</head>
+<body class="en">
+ <video width="640" height="360" poster="https://tails.boum.org/install/inc/videos/boot-menu-key.png">
+  <source src="https://tails.boum.org/install/inc/videos/boot-menu-key.webm" type="video/webm">
+ </video>
+</body>
+\ No newline at end of file
diff --git a/t/fmt/xhtml/closing-tag.norm b/t/fmt/xhtml/closing-tag.norm
new file mode 100644
index 0000000..a67767e
--- /dev/null
+++ b/t/fmt/xhtml/closing-tag.norm
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>Video</title>
+</head>
+<body class="en">
+ <video width="640" height="360" poster="https://tails.boum.org/install/inc/videos/boot-menu-key.png">
+  <source src="https://tails.boum.org/install/inc/videos/boot-menu-key.webm" type="video/webm">
+ </video>
+</body>
+\ No newline at end of file
diff --git a/t/fmt/xhtml/closing-tag.po b/t/fmt/xhtml/closing-tag.po
new file mode 100644
index 0000000..32a0688
--- /dev/null
+++ b/t/fmt/xhtml/closing-tag.po
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2020-04-22 02:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Attribute 'lang' of: <html>
+#: closing-tag.html:2
+msgid "en"
+msgstr "EN"
+
+#. type: Content of: <html><head><title>
+#: closing-tag.html:4
+msgid "Video"
+msgstr "VIDEO"
diff --git a/t/fmt/xhtml/closing-tag.pot b/t/fmt/xhtml/closing-tag.pot
new file mode 100644
index 0000000..dd59d7a
--- /dev/null
+++ b/t/fmt/xhtml/closing-tag.pot
@@ -0,0 +1,27 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2020-04-22 02:25+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Attribute 'lang' of: <html>
+#: closing-tag.html:2
+msgid "en"
+msgstr ""
+
+#. type: Content of: <html><head><title>
+#: closing-tag.html:4
+msgid "Video"
+msgstr ""
diff --git a/t/fmt/xhtml/closing-tag.trans b/t/fmt/xhtml/closing-tag.trans
new file mode 100644
index 0000000..f3534de
--- /dev/null
+++ b/t/fmt/xhtml/closing-tag.trans
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="EN" dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <title>VIDEO</title>
+</head>
+<body class="en">
+ <video width="640" height="360" poster="https://tails.boum.org/install/inc/videos/boot-menu-key.png">
+  <source src="https://tails.boum.org/install/inc/videos/boot-menu-key.webm" type="video/webm">
+ </video>
+</body>
+\ No newline at end of file
diff --git a/t/fmt/xhtml/includessi.desc b/t/fmt/xhtml/includessi.desc
new file mode 100644
index 0000000..4afe385
--- /dev/null
+++ b/t/fmt/xhtml/includessi.desc
@@ -0,0 +1 @@
+-o includessi
diff --git a/t/fmt/xhtml/includessi.html b/t/fmt/xhtml/includessi.html
new file mode 100644
index 0000000..c585502
--- /dev/null
+++ b/t/fmt/xhtml/includessi.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    <!--#set var="BLAH" value="1" -->
+    <!--#include virtual="header.shtml"-->
+    <title>Title string</title>
+  </head>
+
+  <body>
+    <div class="content">
+	    <h1>Header</h1>
+		<img src="somepicture.jpg" class="left"
+                alt="Some text" title="My picture" />
+
+              <p><strong>Strong</strong>not strong</p>
+              <p><strong>Another line</strong> with space and no closing.</p>
+              <p>
+                <a href="somelink.html">My link</a>,
+                <a href="nextline.html">link on next line</a>, <a href="sameline.html">line on same line</a>.
+      </p>
+
+      <img src="picture.jpg" alt="picture" />
+
+      and some text without a paragraph mark.
+    </div>
+    <div class="content">
+      <p>A paragraph with an
+         <!--#include virtual="header.shtml"-->
+         SSI statement inside</p>
+    </div>
+  </body>
+</html>
+
diff --git a/t/fmt/xhtml/includessi.norm b/t/fmt/xhtml/includessi.norm
new file mode 100644
index 0000000..6954544
--- /dev/null
+++ b/t/fmt/xhtml/includessi.norm
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    <!--#set var="BLAH" value="1" --> <!--#include virtual="header.shtml"-->
+    <title>Title string</title>
+  </head>
+
+  <body>
+    <div class="content">
+	    <h1>Header</h1>
+		<img src="somepicture.jpg" class="left"
+                alt="Some text" title="My picture" />
+
+              <p><strong>Strong</strong>not strong</p>
+              <p><strong>Another line</strong> with space and no closing.</p>
+              <p>
+                <a href="somelink.html">My link</a>, <a href="nextline.html">link on next
+line</a>, <a href="sameline.html">line on same line</a>.
+      </p>
+
+      <img src="picture.jpg" alt="picture" />
+
+      and some text without a paragraph mark.
+    </div>
+    <div class="content">
+      <p>A paragraph with an <!--#include virtual="header.shtml"--> SSI statement
+inside</p>
+    </div>
+  </body>
+</html>
+
diff --git a/t/fmt/xhtml/includessi.po b/t/fmt/xhtml/includessi.po
new file mode 100644
index 0000000..ca2fc9f
--- /dev/null
+++ b/t/fmt/xhtml/includessi.po
@@ -0,0 +1,84 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2008-03-15 01:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head>
+#: includessi.html:6
+msgid ""
+"<!--#set var=\"BLAH\" value=\"1\" --> <!--#include "
+"virtual=\"header.shtml\"-->"
+msgstr ""
+"<!--#set var=\"BLAH\" value=\"1\" --> <!--#include "
+"virtual=\"HEADER.SHTML\"-->"
+
+#. type: Content of: <html><head><title>
+#: includessi.html:8
+msgid "Title string"
+msgstr "TITLE STRING"
+
+#. type: Content of: <html><body><div><h1>
+#: includessi.html:13
+msgid "Header"
+msgstr "HEADER"
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: includessi.html:15
+msgid "Some text"
+msgstr "SOME TEXT"
+
+#. type: Attribute 'title' of: <html><body><div><img>
+#: includessi.html:15
+msgid "My picture"
+msgstr "MY PICTURE"
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:17
+msgid "<strong>Strong</strong>not strong"
+msgstr "<strong>STRONG</strong>NOT STRONG"
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:18
+msgid "<strong>Another line</strong> with space and no closing."
+msgstr "<strong>ANOTHER LINE</strong> WITH SPACE AND NO CLOSING."
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:20
+msgid ""
+"<a href=\"somelink.html\">My link</a>, <a href=\"nextline.html\">link on "
+"next line</a>, <a href=\"sameline.html\">line on same line</a>."
+msgstr ""
+"<a href=\"somelink.html\">MY LINK</a>, <a href=\"nextline.html\">LINK ON "
+"NEXT LINE</a>, <a href=\"sameline.html\">LINE ON SAME LINE</a>."
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: includessi.html:24
+msgid "picture"
+msgstr "PICTURE"
+
+#. type: Content of: <html><body><div>
+#: includessi.html:26
+msgid "and some text without a paragraph mark."
+msgstr "AND SOME TEXT WITHOUT A PARAGRAPH MARK."
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:29
+msgid ""
+"A paragraph with an <!--#include virtual=\"header.shtml\"--> SSI statement "
+"inside"
+msgstr ""
+"A PARAGRAPH WITH AN <!--#include virtual=\"HEADER.SHTML\"--> SSI STATEMENT "
+"INSIDE"
diff --git a/t/fmt/xhtml/includessi.pot b/t/fmt/xhtml/includessi.pot
new file mode 100644
index 0000000..5b28adb
--- /dev/null
+++ b/t/fmt/xhtml/includessi.pot
@@ -0,0 +1,78 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2008-03-15 01:36+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head>
+#: includessi.html:6
+msgid ""
+"<!--#set var=\"BLAH\" value=\"1\" --> <!--#include "
+"virtual=\"header.shtml\"-->"
+msgstr ""
+
+#. type: Content of: <html><head><title>
+#: includessi.html:8
+msgid "Title string"
+msgstr ""
+
+#. type: Content of: <html><body><div><h1>
+#: includessi.html:13
+msgid "Header"
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: includessi.html:15
+msgid "Some text"
+msgstr ""
+
+#. type: Attribute 'title' of: <html><body><div><img>
+#: includessi.html:15
+msgid "My picture"
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:17
+msgid "<strong>Strong</strong>not strong"
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:18
+msgid "<strong>Another line</strong> with space and no closing."
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:20
+msgid ""
+"<a href=\"somelink.html\">My link</a>, <a href=\"nextline.html\">link on "
+"next line</a>, <a href=\"sameline.html\">line on same line</a>."
+msgstr ""
+
+#. type: Attribute 'alt' of: <html><body><div><img>
+#: includessi.html:24
+msgid "picture"
+msgstr ""
+
+#. type: Content of: <html><body><div>
+#: includessi.html:26
+msgid "and some text without a paragraph mark."
+msgstr ""
+
+#. type: Content of: <html><body><div><p>
+#: includessi.html:29
+msgid ""
+"A paragraph with an <!--#include virtual=\"header.shtml\"--> SSI statement "
+"inside"
+msgstr ""
diff --git a/t/fmt/xhtml/includessi.trans b/t/fmt/xhtml/includessi.trans
new file mode 100644
index 0000000..88ae965
--- /dev/null
+++ b/t/fmt/xhtml/includessi.trans
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html>
+  <head>
+    <!--#set var="BLAH" value="1" --> <!--#include virtual="HEADER.SHTML"-->
+    <title>TITLE STRING</title>
+  </head>
+
+  <body>
+    <div class="content">
+	    <h1>HEADER</h1>
+		<img src="somepicture.jpg" class="left"
+                alt="SOME TEXT" title="MY PICTURE" />
+
+              <p><strong>STRONG</strong>NOT STRONG</p>
+              <p><strong>ANOTHER LINE</strong> WITH SPACE AND NO CLOSING.</p>
+              <p>
+                <a href="somelink.html">MY LINK</a>, <a href="nextline.html">LINK ON NEXT
+LINE</a>, <a href="sameline.html">LINE ON SAME LINE</a>.
+      </p>
+
+      <img src="picture.jpg" alt="PICTURE" />
+
+      AND SOME TEXT WITHOUT A PARAGRAPH MARK.
+    </div>
+    <div class="content">
+      <p>A PARAGRAPH WITH AN <!--#include virtual="HEADER.SHTML"--> SSI STATEMENT
+INSIDE</p>
+    </div>
+  </body>
+</html>
+
diff --git a/t/fmt/xhtml/table.html b/t/fmt/xhtml/table.html
new file mode 100644
index 0000000..ae4be2d
--- /dev/null
+++ b/t/fmt/xhtml/table.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>Simple test table</title>
+  </head>
+
+  <body>
+    <table id="ref1">
+      <caption>The table caption</caption>
+      <colgroup>
+	<col id="group"/> <col id="code"/> <col id="params"/> <col id="description"/>
+      </colgroup>
+      <tbody>
+	<tr id="titlerow"> <th>Code </th><th>Parameters </th><th>Description </th></tr>
+	<tr><th>Group</th><td colspan="2">Group note</td></tr>
+	<tr><td>Term</td><td/><td>Description</td></tr>
+      </tbody>
+    </table>
+  </body>
+</html>
diff --git a/t/fmt/xhtml/table.norm b/t/fmt/xhtml/table.norm
new file mode 100644
index 0000000..ae4be2d
--- /dev/null
+++ b/t/fmt/xhtml/table.norm
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>Simple test table</title>
+  </head>
+
+  <body>
+    <table id="ref1">
+      <caption>The table caption</caption>
+      <colgroup>
+	<col id="group"/> <col id="code"/> <col id="params"/> <col id="description"/>
+      </colgroup>
+      <tbody>
+	<tr id="titlerow"> <th>Code </th><th>Parameters </th><th>Description </th></tr>
+	<tr><th>Group</th><td colspan="2">Group note</td></tr>
+	<tr><td>Term</td><td/><td>Description</td></tr>
+      </tbody>
+    </table>
+  </body>
+</html>
diff --git a/t/fmt/xhtml/table.po b/t/fmt/xhtml/table.po
new file mode 100644
index 0000000..a3960c4
--- /dev/null
+++ b/t/fmt/xhtml/table.po
@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2022-07-09 09:42+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head><title>
+#: table.html:5
+msgid "Simple test table"
+msgstr "SIMPLE TEST TABLE"
+
+#. type: Content of: <html><body><table><caption>
+#: table.html:10
+msgid "The table caption"
+msgstr "THE TABLE CAPTION"
+
+#. type: Content of: <html><body><table><tbody><tr><th>
+#: table.html:15
+msgid "Code"
+msgstr "CODE"
+
+#. type: Content of: <html><body><table><tbody><tr><th>
+#: table.html:15
+msgid "Parameters"
+msgstr "PARAMETERS"
+
+#. type: Content of: <html><body><table><tbody><tr><td>
+#: table.html:15 table.html:17
+msgid "Description"
+msgstr "DESCRIPTION"
+
+#. type: Content of: <html><body><table><tbody><tr><th>
+#: table.html:16
+msgid "Group"
+msgstr "GROUP"
+
+#. type: Content of: <html><body><table><tbody><tr><td>
+#: table.html:16
+msgid "Group note"
+msgstr "GROUP NOTE"
+
+#. type: Content of: <html><body><table><tbody><tr><td>
+#: table.html:17
+msgid "Term"
+msgstr "TERM"
diff --git a/t/fmt/xhtml/table.pot b/t/fmt/xhtml/table.pot
new file mode 100644
index 0000000..129fd6f
--- /dev/null
+++ b/t/fmt/xhtml/table.pot
@@ -0,0 +1,57 @@
+# SOME DESCRIPTIVE TITLE
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2022-07-09 09:45+0200\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. type: Content of: <html><head><title>
+#: table.html:5
+msgid "Simple test table"
+msgstr ""
+
+#. type: Content of: <html><body><table><caption>
+#: table.html:10
+msgid "The table caption"
+msgstr ""
+
+#. type: Content of: <html><body><table><tbody><tr><th>
+#: table.html:15
+msgid "Code"
+msgstr ""
+
+#. type: Content of: <html><body><table><tbody><tr><th>
+#: table.html:15
+msgid "Parameters"
+msgstr ""
+
+#. type: Content of: <html><body><table><tbody><tr><td>
+#: table.html:15 table.html:17
+msgid "Description"
+msgstr ""
+
+#. type: Content of: <html><body><table><tbody><tr><th>
+#: table.html:16
+msgid "Group"
+msgstr ""
+
+#. type: Content of: <html><body><table><tbody><tr><td>
+#: table.html:16
+msgid "Group note"
+msgstr ""
+
+#. type: Content of: <html><body><table><tbody><tr><td>
+#: table.html:17
+msgid "Term"
+msgstr ""
diff --git a/t/fmt/xhtml/table.trans b/t/fmt/xhtml/table.trans
new file mode 100644
index 0000000..3f1d490
--- /dev/null
+++ b/t/fmt/xhtml/table.trans
@@ -0,0 +1,21 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html>
+  <head>
+    <title>SIMPLE TEST TABLE</title>
+  </head>
+
+  <body>
+    <table id="ref1">
+      <caption>THE TABLE CAPTION</caption>
+      <colgroup>
+	<col id="group"/> <col id="code"/> <col id="params"/> <col id="description"/>
+      </colgroup>
+      <tbody>
+	<tr id="titlerow"> <th>CODE </th><th>PARAMETERS </th><th>DESCRIPTION </th></tr>
+	<tr><th>GROUP</th><td colspan="2">GROUP NOTE</td></tr>
+	<tr><td>TERM</td><td/><td>DESCRIPTION</td></tr>
+      </tbody>
+    </table>
+  </body>
+</html>