texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[8237] move a test


From: gavinsmith0123
Subject: [8237] move a test
Date: Mon, 24 Sep 2018 14:50:53 -0400 (EDT)

Revision: 8237
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8237
Author:   gavin
Date:     2018-09-24 14:50:53 -0400 (Mon, 24 Sep 2018)
Log Message:
-----------
move a test

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/tests/layout/list-of-tests
    trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
    trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
    trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
    trunk/tp/tests/tex_html/list-of-tests

Added Paths:
-----------
    trunk/tp/tests/layout/f--ile.e--xt
    trunk/tp/tests/layout/f--ile.jpg
    trunk/tp/tests/layout/formatting.texi
    trunk/tp/tests/layout/simplest.texi

Removed Paths:
-------------
    trunk/tp/tests/coverage/f--ile.e--xt
    trunk/tp/tests/coverage/f--ile.jpg
    trunk/tp/tests/coverage/formatting.texi
    trunk/tp/tests/coverage/simplest.texi
    trunk/tp/tests/layout/f--ile.gif
    trunk/tp/tests/layout/f--ile.jpeg

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-24 17:06:51 UTC (rev 8236)
+++ trunk/ChangeLog     2018-09-24 18:50:53 UTC (rev 8237)
@@ -1,5 +1,21 @@
 2018-09-24  Gavin Smith  <address@hidden>
 
+       * tp/tests/coverage/formatting.texi
+       * tp/tests/coverage/simplest.texi
+       * tp/tests/coverage/f--ile.e--xt,
+       * tp/tests/coverage/f--ile.jpg: Move to t/tests/layout.
+       * tp/tests/layout/list-of-tests: Reference formatting.texi in 
+       new location.
+       * tp/tests/layout/f--ile.gif,
+       * tp/tests/layout/f--ile.jpeg: Remove.
+
+       This leads to "simplest.texi" being included in the output of 
+       some the 'formatting_regions' test, and different image files 
+       being referenced in 'formatting_regions' and 
+       'formatting_docbook'.
+
+2018-09-24  Gavin Smith  <address@hidden>
+
        * tp/tests/coverage/list-of-tests (formatting): Test moved from 
        here, to:
        * tp/tests/layout/list-of-tests (formatting): Here.

Deleted: trunk/tp/tests/coverage/f--ile.e--xt
===================================================================
Deleted: trunk/tp/tests/coverage/f--ile.jpg
===================================================================
(Binary files differ)

Deleted: trunk/tp/tests/coverage/formatting.texi
===================================================================
--- trunk/tp/tests/coverage/formatting.texi     2018-09-24 17:06:51 UTC (rev 
8236)
+++ trunk/tp/tests/coverage/formatting.texi     2018-09-24 18:50:53 UTC (rev 
8237)
@@ -1,137 +0,0 @@
-\input texinfo @c -*-texinfo-*-
address@hidden formatting.info
-
address@hidden Formatting @'e @code{@@ @TeX{}} test
address@hidden
-* Truc: (formatting).           The GNU documentation truc.
-* @code{@@ @'e @equiv{}}: (formatting).  address@hidden something}'' 
-                           @command{cmd} @`a
address@hidden direntry
address@hidden Top
address@hidden Top section
-
address@hidden
-* chapter::               chapter
-
-Menu comment
-
-* description:chapter2.   Chapter 2
address@hidden menu
-
address@hidden coverage_macro.texi
-
address@hidden
-In copying
address@hidden
address@hidden copying
-
address@hidden
address@hidden title --a
address@hidden formatting subtitle --a
address@hidden subtitle 2 --a
address@hidden author1 --a with accents in name T@'e@,ca
address@hidden author2 --a
-In titlepage
address@hidden
-
-Insercopying in titlepage
address@hidden
address@hidden titlepage
-
-Insertcopying in normal text
address@hidden
-
-Normal text
address@hidden
-
-In example.
address@hidden
address@hidden
address@hidden example
-
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
-
-
-cp
address@hidden cp
-
-fn
address@hidden fn
-
-vr
address@hidden vr
-
-ky
address@hidden ky
-
-pg
address@hidden pg
-
-tp
address@hidden tp
-
-
-
address@hidden chapter
address@hidden chapter
-
address@hidden footnote}
-
address@hidden
address@hidden 
-* address@hidden:: address@hidden
-
-Menu comment
-``simple-double--three---four----''@*
-
address@hidden menu
address@hidden format
-
address@hidden address@hidden
address@hidden A section
-
address@hidden
-* subsection:: 
-
address@hidden
-In detailmenu
-
-* subsubsection ``simple-double--::
-* subsubsection three---four----''::
address@hidden detailmenu
address@hidden menu
-
address@hidden subsection
address@hidden subsection
-
address@hidden
-* subsubsection ``simple-double--::
-* subsubsection three---four----''::
address@hidden menu
-
address@hidden
-
address@hidden subsubsection ``simple-double--
address@hidden subsubsection ``simple-double--
-
address@hidden subsubsection three---four----''
address@hidden three---four----''
-
address@hidden chapter2
address@hidden chapter 2
-
address@hidden cp
address@hidden fn
-
address@hidden
address@hidden
address@hidden

Deleted: trunk/tp/tests/coverage/simplest.texi
===================================================================
--- trunk/tp/tests/coverage/simplest.texi       2018-09-24 17:06:51 UTC (rev 
8236)
+++ trunk/tp/tests/coverage/simplest.texi       2018-09-24 18:50:53 UTC (rev 
8237)
@@ -1,9 +0,0 @@
-\input texinfo @c -*-texinfo-*-
-
address@hidden simplest.info
-
address@hidden Top
-
-This is a very simple texi manual @  <>.
-
address@hidden

Copied: trunk/tp/tests/layout/f--ile.e--xt (from rev 8232, 
trunk/tp/tests/coverage/f--ile.e--xt)
===================================================================
Deleted: trunk/tp/tests/layout/f--ile.gif
===================================================================
(Binary files differ)

Deleted: trunk/tp/tests/layout/f--ile.jpeg
===================================================================
(Binary files differ)

Added: trunk/tp/tests/layout/f--ile.jpg
===================================================================
Copied: trunk/tp/tests/layout/formatting.texi (from rev 8232, 
trunk/tp/tests/coverage/formatting.texi)
===================================================================
--- trunk/tp/tests/layout/formatting.texi                               (rev 0)
+++ trunk/tp/tests/layout/formatting.texi       2018-09-24 18:50:53 UTC (rev 
8237)
@@ -0,0 +1,137 @@
+\input texinfo @c -*-texinfo-*-
address@hidden formatting.info
+
address@hidden Formatting @'e @code{@@ @TeX{}} test
address@hidden
+* Truc: (formatting).           The GNU documentation truc.
+* @code{@@ @'e @equiv{}}: (formatting).  address@hidden something}'' 
+                           @command{cmd} @`a
address@hidden direntry
address@hidden Top
address@hidden Top section
+
address@hidden
+* chapter::               chapter
+
+Menu comment
+
+* description:chapter2.   Chapter 2
address@hidden menu
+
address@hidden coverage_macro.texi
+
address@hidden
+In copying
address@hidden
address@hidden copying
+
address@hidden
address@hidden title --a
address@hidden formatting subtitle --a
address@hidden subtitle 2 --a
address@hidden author1 --a with accents in name T@'e@,ca
address@hidden author2 --a
+In titlepage
address@hidden
+
+Insercopying in titlepage
address@hidden
address@hidden titlepage
+
+Insertcopying in normal text
address@hidden
+
+Normal text
address@hidden
+
+In example.
address@hidden
address@hidden
address@hidden example
+
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
address@hidden t--ruc
address@hidden T--ruc
address@hidden .
address@hidden ?
address@hidden a
+
+
+cp
address@hidden cp
+
+fn
address@hidden fn
+
+vr
address@hidden vr
+
+ky
address@hidden ky
+
+pg
address@hidden pg
+
+tp
address@hidden tp
+
+
+
address@hidden chapter
address@hidden chapter
+
address@hidden footnote}
+
address@hidden
address@hidden 
+* address@hidden:: address@hidden
+
+Menu comment
+``simple-double--three---four----''@*
+
address@hidden menu
address@hidden format
+
address@hidden address@hidden
address@hidden A section
+
address@hidden
+* subsection:: 
+
address@hidden
+In detailmenu
+
+* subsubsection ``simple-double--::
+* subsubsection three---four----''::
address@hidden detailmenu
address@hidden menu
+
address@hidden subsection
address@hidden subsection
+
address@hidden
+* subsubsection ``simple-double--::
+* subsubsection three---four----''::
address@hidden menu
+
address@hidden
+
address@hidden subsubsection ``simple-double--
address@hidden subsubsection ``simple-double--
+
address@hidden subsubsection three---four----''
address@hidden three---four----''
+
address@hidden chapter2
address@hidden chapter 2
+
address@hidden cp
address@hidden fn
+
address@hidden
address@hidden
address@hidden

Modified: trunk/tp/tests/layout/list-of-tests
===================================================================
--- trunk/tp/tests/layout/list-of-tests 2018-09-24 17:06:51 UTC (rev 8236)
+++ trunk/tp/tests/layout/list-of-tests 2018-09-24 18:50:53 UTC (rev 8237)
@@ -19,20 +19,20 @@
 navigation_node_no_header_vertical navigation.texi 
--set-customization-variable 'VERTICAL_HEAD_NAVIGATION 1' --split node 
--set-customization-variable HEADERS=0
 navigation_test_misc_file_collision navigation.texi --split node --init 
misc_file_collision.init
 
-formatting_docbook ../coverage/formatting.texi --docbook -U texi2html
-formatting_xml ../coverage/formatting.texi --xml -U texi2html
-formatting_weird_quotes ../coverage/formatting.texi 
--set-customization-variable 'OPEN_QUOTE_SYMBOL @' --set-customization-variable 
"CLOSE_QUOTE_SYMBOL '&lsquo;"
+formatting_docbook formatting.texi --docbook -U texi2html
+formatting_xml formatting.texi --xml -U texi2html
+formatting_weird_quotes formatting.texi --set-customization-variable 
'OPEN_QUOTE_SYMBOL @' --set-customization-variable "CLOSE_QUOTE_SYMBOL '&lsquo;"
 #lightweight_markups_mediawiki lightweight_markups.texi --init mediawiki.pm
-formatting_html ../coverage/formatting.texi --html --no-split
-formatting_html_nodes ../coverage/formatting.texi --html --split node 
--node-files --set-customization-variable 'TOP_FILE index.html'
-formatting_plaintext ../coverage/formatting.texi --plaintext -U texi2html
-#formatting_mediawiki ../coverage/formatting.texi --init mediawiki.pm
-formatting_html32 ../coverage/formatting.texi --init html32.pm
+formatting_html formatting.texi --html --no-split
+formatting_html_nodes formatting.texi --html --split node --node-files 
--set-customization-variable 'TOP_FILE index.html'
+formatting_plaintext formatting.texi --plaintext -U texi2html
+#formatting_mediawiki formatting.texi --init mediawiki.pm
+formatting_html32 formatting.texi --init html32.pm
 formatting_regions formatting_regions.texi
-formatting_exotic ../coverage/formatting.texi --split section --no-header 
--no-number-sections --set-customization-variable 'TOC_LINKS 1' 
--set-customization-variable 'DEF_TABLE 1' --set-customization-variable 
'XREF_USE_NODE_NAME_ARG 1' --footnote-style=end --css-ref 
http://www.environnement.ens.fr/perso/dumas/background-color.css 
--internal-links=/dev/null --set-customization-variable 
'USE_TITLEPAGE_FOR_TITLE 0'
-formatting_fr_icons ../coverage/formatting.texi --document-language fr --init 
icons.init
-#formatting_makeinfo ../coverage/formatting.texi --init makeinfo.pm --no-warn
-formatting_chm ../coverage/formatting.texi --init chm.pm
-formatting_nodes ../coverage/formatting.texi --split node
-formatting ../coverage/formatting.texi 
address@hidden@internal_links_formatting.txt
+formatting_exotic formatting.texi --split section --no-header 
--no-number-sections --set-customization-variable 'TOC_LINKS 1' 
--set-customization-variable 'DEF_TABLE 1' --set-customization-variable 
'XREF_USE_NODE_NAME_ARG 1' --footnote-style=end --css-ref 
http://www.environnement.ens.fr/perso/dumas/background-color.css 
--internal-links=/dev/null --set-customization-variable 
'USE_TITLEPAGE_FOR_TITLE 0'
+formatting_fr_icons formatting.texi --document-language fr --init icons.init
+#formatting_makeinfo formatting.texi --init makeinfo.pm --no-warn
+formatting_chm formatting.texi --init chm.pm
+formatting_nodes formatting.texi --split node
+formatting formatting.texi address@hidden@internal_links_formatting.txt
 

Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2018-09-24 17:06:51 UTC (rev 8236)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2018-09-24 18:50:53 UTC (rev 8237)
@@ -204,17 +204,17 @@
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
 </para>
-<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
 <literal>@image{f-ile,aze,,a--lt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
 <literal>@address@hidden@@@.,aze,az,alt,@file{file ext} 
address@hidden</literal> <inlinemediaobject><imageobject><imagedata 
fileref="address@hidden" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
@@ -704,17 +704,17 @@
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
 </para>
-<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
 <literal>@image{f-ile,aze,,a--lt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
 <literal>@address@hidden@@@.,aze,az,alt,@file{file ext} 
address@hidden</literal> <inlinemediaobject><imageobject><imagedata 
fileref="address@hidden" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
@@ -1205,17 +1205,17 @@
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
 </para>
-<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
 <literal>@image{f-ile,aze,,a--lt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
 <literal>@address@hidden@@@.,aze,az,alt,@file{file ext} 
address@hidden</literal> <inlinemediaobject><imageobject><imagedata 
fileref="address@hidden" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
@@ -1707,17 +1707,17 @@
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
 </para>
-<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
 <literal>@image{f-ile,aze,,a--lt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
 <literal>@address@hidden@@@.,aze,az,alt,@file{file ext} 
address@hidden</literal> <inlinemediaobject><imageobject><imagedata 
fileref="address@hidden" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
@@ -2208,17 +2208,17 @@
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
 </para>
-<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<para><literal>@image{f--ile}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
 <literal>@image{f-ile,aze,,a--lt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
 <literal>@address@hidden@@@.,aze,az,alt,@file{file ext} 
address@hidden</literal> <inlinemediaobject><imageobject><imagedata 
fileref="address@hidden" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
@@ -2704,17 +2704,17 @@
 <literal>@footnote{in footnote}</literal> <footnote><para>in 
footnote</para></footnote>
 <literal>@footnote{in footnote2}</literal> <footnote><para>in 
footnote2</para></footnote>
 
-<literal>@image{f--ile}</literal> <inlinemediaobject><imageobject><imagedata 
fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile}</literal> <inlinemediaobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,l--i}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,l--e}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,alt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,,,,e-d-xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
-<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.gif" 
format="GIF"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.jpeg" 
format="JPEG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
+<literal>@image{f--ile,aze,az,alt,e--xt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f--ile.jpg" 
format="JPG"></imagedata></imageobject><imageobject><imagedata 
fileref="f--ile.png" 
format="PNG"></imagedata></imageobject><textobject><literallayout>ggg
 aaa</literallayout></textobject></inlinemediaobject>
 <literal>@image{f-ile,aze,,a--lt}</literal> 
<inlinemediaobject><imageobject><imagedata fileref="f-ile.jpg" 
format="JPG"></imagedata></imageobject></inlinemediaobject>
 <literal>@address@hidden@@@.,aze,az,alt,@file{file ext} 
address@hidden</literal> <inlinemediaobject><imageobject><imagedata 
fileref="address@hidden" 
format="JPG"></imagedata></imageobject></inlinemediaobject>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2    
2018-09-24 17:06:51 UTC (rev 8236)
+++ trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2    
2018-09-24 18:50:53 UTC (rev 8237)
@@ -199,29 +199,23 @@
 formatting_regions.texi:49: @ref reference to nonexistent node `node' 
(possibly involving @mymacro)
 formatting_regions.texi:49: @ref reference to nonexistent node `node' 
(possibly involving @mymacro)
 formatting_regions.texi:49: @ref reference to nonexistent node `node' 
(possibly involving @mymacro)
-formatting_regions.texi:28: @verbatiminclude: could not find simplest.texi 
(possibly involving @mymacro)
 formatting_regions.texi:39: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:39: warning: @image file address@hidden' (for HTML) 
not found, using address@hidden ext e--xt}' (possibly involving @mymacro)
-formatting_regions.texi:39: @verbatiminclude: could not find simplest.texi 
(possibly involving @mymacro)
 formatting_regions.texi:39: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:39: warning: @image file `filejk _" %@' (for HTML) not 
found, using `filejk _" address@hidden' (possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file address@hidden' (for HTML) 
not found, using address@hidden ext e--xt}' (possibly involving @mymacro)
-formatting_regions.texi:28: @verbatiminclude: could not find simplest.texi 
(possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file `filejk _" %@' (for HTML) not 
found, using `filejk _" address@hidden' (possibly involving @mymacro)
 formatting_regions.texi:46: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:46: warning: @image file address@hidden' (for HTML) 
not found, using address@hidden ext e--xt}' (possibly involving @mymacro)
-formatting_regions.texi:46: @verbatiminclude: could not find simplest.texi 
(possibly involving @mymacro)
 formatting_regions.texi:46: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:46: warning: @image file `filejk _" %@' (for HTML) not 
found, using `filejk _" address@hidden' (possibly involving @mymacro)
 formatting_regions.texi:49: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:49: warning: @image file address@hidden' (for HTML) 
not found, using address@hidden ext e--xt}' (possibly involving @mymacro)
-formatting_regions.texi:49: @verbatiminclude: could not find simplest.texi 
(possibly involving @mymacro)
 formatting_regions.texi:49: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:49: warning: @image file `filejk _" %@' (for HTML) not 
found, using `filejk _" address@hidden' (possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file address@hidden' (for HTML) 
not found, using address@hidden ext e--xt}' (possibly involving @mymacro)
-formatting_regions.texi:28: @verbatiminclude: could not find simplest.texi 
(possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file `f-ile' (for HTML) not found, 
using `f-ile.jpg' (possibly involving @mymacro)
 formatting_regions.texi:28: warning: @image file `filejk _" %@' (for HTML) not 
found, using `filejk _" address@hidden' (possibly involving @mymacro)

Modified: 
trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
2018-09-24 17:06:51 UTC (rev 8236)
+++ trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
2018-09-24 18:50:53 UTC (rev 8237)
@@ -466,7 +466,16 @@
 
 ce-ntered line
 
+\input texinfo @c -*-texinfo-*-
 
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  <>.
+
address@hidden
+
 in verbatim ''
 
 
@@ -829,8 +838,8 @@
 <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
-<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.png" alt="f--ile">
-<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
 <code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
 <code>@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden</code> 
<img src="address@hidden ext e--xt}" alt="alt">
 </p>
@@ -1232,7 +1241,16 @@
 </p>
 <div align="center">ce&ndash;ntered line
 </div>
+<pre class="verbatim">\input texinfo @c -*-texinfo-*-
 
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  &lt;&gt;.
+
address@hidden
+</pre>
 <pre class="verbatim">in verbatim ''
 </pre>
 
@@ -1263,7 +1281,7 @@
 <p><code>@address@hidden {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
 </p>
 <p><code>@image{f-ile,,,address@hidden:jk _&quot; %}}</code> <img 
src="f-ile.jpg" alt="altjk _&quot; %@">
-<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.png" alt="jk _&quot; %@ in b &quot;">
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&quot; %@ in b &quot;">
 <code>@address@hidden:jk _&quot; %@:},,,address@hidden:jk _&quot; %@:}}</code> 
<img src="filejk _&quot; address@hidden" alt="altjk _&quot; %@">
 </p>
 
@@ -1550,8 +1568,8 @@
 <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
-<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.png" alt="f--ile">
-<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
 <code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
 <code>@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden</code> 
<img src="address@hidden ext e--xt}" alt="alt">
 </p>
@@ -1953,7 +1971,16 @@
 </p>
 <div align="center">ce&ndash;ntered line
 </div>
+<pre class="verbatim">\input texinfo @c -*-texinfo-*-
 
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  &lt;&gt;.
+
address@hidden
+</pre>
 <pre class="verbatim">in verbatim ''
 </pre>
 
@@ -1984,7 +2011,7 @@
 <p><code>@address@hidden {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
 </p>
 <p><code>@image{f-ile,,,address@hidden:jk _&quot; %}}</code> <img 
src="f-ile.jpg" alt="altjk _&quot; %@">
-<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.png" alt="jk _&quot; %@ in b &quot;">
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&quot; %@ in b &quot;">
 <code>@address@hidden:jk _&quot; %@:},,,address@hidden:jk _&quot; %@:}}</code> 
<img src="filejk _&quot; address@hidden" alt="altjk _&quot; %@">
 </p>
 
@@ -2317,8 +2344,8 @@
 <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
-<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.png" alt="f--ile">
-<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
 <code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
 <code>@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden</code> 
<img src="address@hidden ext e--xt}" alt="alt">
 </p>
@@ -2720,7 +2747,16 @@
 </p>
 <div align="center">ce&ndash;ntered line
 </div>
+<pre class="verbatim">\input texinfo @c -*-texinfo-*-
 
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  &lt;&gt;.
+
address@hidden
+</pre>
 <pre class="verbatim">in verbatim ''
 </pre>
 
@@ -2751,7 +2787,7 @@
 <p><code>@address@hidden {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
 </p>
 <p><code>@image{f-ile,,,address@hidden:jk _&quot; %}}</code> <img 
src="f-ile.jpg" alt="altjk _&quot; %@">
-<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.png" alt="jk _&quot; %@ in b &quot;">
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&quot; %@ in b &quot;">
 <code>@address@hidden:jk _&quot; %@:},,,address@hidden:jk _&quot; %@:}}</code> 
<img src="filejk _&quot; address@hidden" alt="altjk _&quot; %@">
 </p>
 
@@ -3512,6 +3548,15 @@
 </pre><div align="center">ce--ntered line
 </div><pre class="example">
 
+</pre><pre class="verbatim">\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  &lt;&gt;.
+
address@hidden
 </pre><pre class="example">
 
 </pre><pre class="verbatim">in verbatim ''
@@ -3845,8 +3890,8 @@
 <code>@image{f--ile,l--i}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,l--e}</code> <img src="f--ile.png" alt="f--ile">
 <code>@image{f--ile,,,alt}</code> <img src="f--ile.png" alt="alt">
-<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.png" alt="f--ile">
-<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.png" alt="alt">
+<code>@image{f--ile,,,,e-d-xt}</code> <img src="f--ile.e--xt" alt="f--ile">
+<code>@image{f--ile,aze,az,alt,e--xt}</code> <img src="f--ile.e--xt" alt="alt">
 <code>@image{f-ile,aze,,a--lt}</code> <img src="f-ile.jpg" alt="a&ndash;lt">
 <code>@address@hidden@@@.,aze,az,alt,@file{file ext} address@hidden</code> 
<img src="address@hidden ext e--xt}" alt="alt">
 </p>
@@ -4248,7 +4293,16 @@
 </p>
 <div align="center">ce&ndash;ntered line
 </div>
+<pre class="verbatim">\input texinfo @c -*-texinfo-*-
 
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  &lt;&gt;.
+
address@hidden
+</pre>
 <pre class="verbatim">in verbatim ''
 </pre>
 
@@ -4279,7 +4333,7 @@
 <p><code>@address@hidden {\frac{1}{2}}}</code> <em>--a- {\frac{1}{2}}</em>
 </p>
 <p><code>@image{f-ile,,,address@hidden:jk _&quot; %}}</code> <img 
src="f-ile.jpg" alt="altjk _&quot; %@">
-<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.png" alt="jk _&quot; %@ in b &quot;">
+<code>@image{f--ile,aze,az,@verb{:jk _&quot; %@:} @b{in b 
&quot;},e--xt}</code> <img src="f--ile.e--xt" alt="jk _&quot; %@ in b &quot;">
 <code>@address@hidden:jk _&quot; %@:},,,address@hidden:jk _&quot; %@:}}</code> 
<img src="filejk _&quot; address@hidden" alt="altjk _&quot; %@">
 </p>
 

Copied: trunk/tp/tests/layout/simplest.texi (from rev 8232, 
trunk/tp/tests/coverage/simplest.texi)
===================================================================
--- trunk/tp/tests/layout/simplest.texi                         (rev 0)
+++ trunk/tp/tests/layout/simplest.texi 2018-09-24 18:50:53 UTC (rev 8237)
@@ -0,0 +1,9 @@
+\input texinfo @c -*-texinfo-*-
+
address@hidden simplest.info
+
address@hidden Top
+
+This is a very simple texi manual @  <>.
+
address@hidden

Modified: trunk/tp/tests/tex_html/list-of-tests
===================================================================
--- trunk/tp/tests/tex_html/list-of-tests       2018-09-24 17:06:51 UTC (rev 
8236)
+++ trunk/tp/tests/tex_html/list-of-tests       2018-09-24 18:50:53 UTC (rev 
8237)
@@ -15,4 +15,4 @@
 math_not_closed math_not_closed.texi --set-customization-variable 'L2H 1' 
--iftex
 tex_not_closed tex_not_closed.texi --set-customization-variable 'L2H 1' --iftex
 tex_in_copying tex_in_copying.texi --set-customization-variable 'L2H 1' --iftex
-formatting_singular ../coverage/formatting.texi --init-file t2h_singular.init 
--set-customization-variable 'L2H 1' --set-customization-variable 'SHORTEXTN 1' 
--set-customization-variable 'PREFIX sing' --set-customization-variable 
'TOP_FILE index.htm' --no-verbose
+formatting_singular ../layout/formatting.texi --init-file t2h_singular.init 
--set-customization-variable 'L2H 1' --set-customization-variable 'SHORTEXTN 1' 
--set-customization-variable 'PREFIX sing' --set-customization-variable 
'TOP_FILE index.htm' --no-verbose




reply via email to

[Prev in Thread] Current Thread [Next in Thread]