texinfo-commits
[Top][All Lists]
Advanced

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

[8277] move tests to t


From: gavinsmith0123
Subject: [8277] move tests to t
Date: Sat, 13 Oct 2018 11:39:22 -0400 (EDT)

Revision: 8277
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8277
Author:   gavin
Date:     2018-10-13 11:39:22 -0400 (Sat, 13 Oct 2018)
Log Message:
-----------
move tests to t

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Makefile.am
    trunk/tp/t/92formatting.t
    trunk/tp/tests/formatting/list-of-tests

Added Paths:
-----------
    trunk/tp/t/input_files/defxcond.texi
    trunk/tp/t/results/formatting/defcondx_Dbar/
    trunk/tp/t/results/formatting/defcondx_Dbar/res_html/
    trunk/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
    trunk/tp/t/results/formatting/defcondx_Dbar.pl
    trunk/tp/t/results/formatting/defcondx_Ubar/
    trunk/tp/t/results/formatting/defcondx_Ubar/res_html/
    trunk/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
    trunk/tp/t/results/formatting/defcondx_Ubar.pl

Removed Paths:
-------------
    trunk/tp/tests/formatting/defxcond.texi

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-13 15:13:26 UTC (rev 8276)
+++ trunk/ChangeLog     2018-10-13 15:39:22 UTC (rev 8277)
@@ -1,4 +1,10 @@
 2018-10-13  Gavin Smith  <address@hidden>
+
+       * tp/tests/formatting/list-of-tests (defcondx_Dbar, defcondx_Ubar):
+       Remove.
+       * tp/t/92formatting.t (defcondx_Dbar, defcondx_Ubar): Add.
+
+2018-10-13  Gavin Smith  <address@hidden>
        
        * tp/Texinfo/Parser.pm (%default_customization_values): Remove
        'GLOBAL_COMMANDS' array as it is not used anywhere.

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2018-10-13 15:13:26 UTC (rev 8276)
+++ trunk/tp/Makefile.am        2018-10-13 15:39:22 UTC (rev 8277)
@@ -175,6 +175,7 @@
  t/input_files/contents_in_document.texi \
  t/input_files/contents_no_section.texi \
  t/input_files/cpp_lines.texi \
+ t/input_files/defxcond.texi \
  t/input_files/delcomment.texi \
  t/input_files/east_asian_in_w.texi \
  t/input_files/empty.texi \

Modified: trunk/tp/t/92formatting.t
===================================================================
--- trunk/tp/t/92formatting.t   2018-10-13 15:13:26 UTC (rev 8276)
+++ trunk/tp/t/92formatting.t   2018-10-13 15:39:22 UTC (rev 8277)
@@ -64,6 +64,16 @@
   },
   {'expanded_formats' => ['info', 'html', 'tex'],}
 ],
+['defcondx_Dbar',
+  undef, {'test_file' => 'defxcond.texi',
+   'test_formats' => ['file_html'],
+  'values' => {'bar' => 1}}
+],
+['defcondx_Ubar',
+  undef, {'test_file' => 'defxcond.texi',
+   'test_formats' => ['file_html'],
+  'values' => {}}
+],
 ['unknown_nodes_renamed',
   undef, {'test_file' => 'unknown_nodes_renamed.texi', 
    'test_formats' => ['file_html']

Copied: trunk/tp/t/input_files/defxcond.texi (from rev 8255, 
trunk/tp/tests/formatting/defxcond.texi)
===================================================================
--- trunk/tp/t/input_files/defxcond.texi                                (rev 0)
+++ trunk/tp/t/input_files/defxcond.texi        2018-10-13 15:39:22 UTC (rev 
8277)
@@ -0,0 +1,18 @@
+\input texinfo
address@hidden defxcond.info
+
address@hidden set this from the command line.
address@hidden set bar
+
address@hidden deffnx inside conditional.
address@hidden foo
+
address@hidden bar
address@hidden bar
address@hidden ifset
+
+Documentation.
+
address@hidden deffn
+
address@hidden

Added: trunk/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
===================================================================
--- trunk/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html          
                (rev 0)
+++ trunk/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html  
2018-10-13 15:39:22 UTC (rev 8277)
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
+
+<dl>
+<dt>foo: <strong></strong></dt>
+<dt>bar: <strong></strong></dt>
+<dd>
+<p>Documentation.
+</p>
+</dd></dl>
+
+<hr>
+<p><font size="-1">
+  This document was generated on <em>a sunny day</em>.
+</font></p>
+
+
+</body>
+</html>

Added: trunk/tp/t/results/formatting/defcondx_Dbar.pl
===================================================================
--- trunk/tp/t/results/formatting/defcondx_Dbar.pl                              
(rev 0)
+++ trunk/tp/t/results/formatting/defcondx_Dbar.pl      2018-10-13 15:39:22 UTC 
(rev 8277)
@@ -0,0 +1,411 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'defcondx_Dbar'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '\\input texinfo
+',
+              'type' => 'preamble_text'
+            }
+          ],
+          'parent' => {},
+          'type' => 'preamble'
+        }
+      ],
+      'parent' => {},
+      'type' => 'preamble_before_setfilename'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'defxcond.info'
+            }
+          ],
+          'extra' => {
+            'spaces_after_argument' => '
+'
+          },
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'setfilename',
+      'extra' => {
+        'spaces_before_argument' => ' ',
+        'text_arg' => 'defxcond.info'
+      },
+      'line_nr' => {
+        'file_name' => 'defxcond.texi',
+        'line_nr' => 2,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' set this from the command line.
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'extra' => {
+        'misc_args' => [
+          ' set this from the command line.
+'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' set bar
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'extra' => {
+        'misc_args' => [
+          ' set bar
+'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' deffnx inside conditional.
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'extra' => {
+        'misc_args' => [
+          ' deffnx inside conditional.
+'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'cmdname' => 'deffn',
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'def_role' => 'category'
+                  },
+                  'parent' => {},
+                  'text' => 'foo'
+                },
+                {
+                  'extra' => {
+                    'def_role' => 'spaces'
+                  },
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'block_line_arg'
+            }
+          ],
+          'extra' => {
+            'def_command' => 'deffn',
+            'def_parsed_hash' => {
+              'category' => {}
+            },
+            'original_def_cmdname' => 'deffn'
+          },
+          'line_nr' => {
+            'file_name' => 'defxcond.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'def_line'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line'
+            }
+          ],
+          'parent' => {},
+          'type' => 'inter_def_item'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'def_role' => 'category'
+                  },
+                  'parent' => {},
+                  'text' => 'bar'
+                },
+                {
+                  'extra' => {
+                    'def_role' => 'spaces'
+                  },
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'deffnx',
+          'extra' => {
+            'def_command' => 'deffn',
+            'def_parsed_hash' => {
+              'category' => {}
+            },
+            'original_def_cmdname' => 'deffnx',
+            'spaces_before_argument' => ' '
+          },
+          'line_nr' => {
+            'file_name' => 'defxcond.texi',
+            'line_nr' => 11,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'def_line'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'Documentation.
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'paragraph'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line'
+            }
+          ],
+          'parent' => {},
+          'type' => 'def_item'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'deffn'
+                }
+              ],
+              'extra' => {
+                'spaces_after_argument' => '
+'
+              },
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'deffn',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'deffn'
+          },
+          'line_nr' => {
+            'file_name' => 'defxcond.texi',
+            'line_nr' => 16,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_before_argument' => ' '
+      },
+      'line_nr' => {},
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye',
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[1]{'args'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[1];
+$result_trees{'defcondx_Dbar'}{'contents'}[1]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[2]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[3];
+$result_trees{'defcondx_Dbar'}{'contents'}[3]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[4];
+$result_trees{'defcondx_Dbar'}{'contents'}[4]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[5]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[6];
+$result_trees{'defcondx_Dbar'}{'contents'}[6]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[1];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'args'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'args'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[2]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3]{'contents'}[1];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3]{'contents'}[1]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3]{'contents'}[2]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[3]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[4]{'args'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[4]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[4];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[4]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'extra'}{'end_command'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[4];
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'line_nr'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[7]{'contents'}[0]{'line_nr'};
+$result_trees{'defcondx_Dbar'}{'contents'}[7]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[8]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+$result_trees{'defcondx_Dbar'}{'contents'}[9]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Dbar'}{'contents'}[9];
+$result_trees{'defcondx_Dbar'}{'contents'}[9]{'parent'} = 
$result_trees{'defcondx_Dbar'};
+
+$result_texis{'defcondx_Dbar'} = '\\input texinfo
address@hidden defxcond.info
+
address@hidden set this from the command line.
address@hidden set bar
+
address@hidden deffnx inside conditional.
address@hidden foo
+
address@hidden bar
+
+Documentation.
+
address@hidden deffn
+
address@hidden
+';
+
+
+$result_texts{'defcondx_Dbar'} = '
+
+foo: 
+
+bar: 
+
+Documentation.
+
+
+';
+
+$result_errors{'defcondx_Dbar'} = [
+  {
+    'error_line' => 'defxcond.texi:8: warning: missing name for @deffn
+',
+    'file_name' => 'defxcond.texi',
+    'line_nr' => 8,
+    'macro' => '',
+    'text' => 'missing name for @deffn',
+    'type' => 'warning'
+  },
+  {
+    'error_line' => 'defxcond.texi:11: warning: missing name for @deffnx
+',
+    'file_name' => 'defxcond.texi',
+    'line_nr' => 11,
+    'macro' => '',
+    'text' => 'missing name for @deffnx',
+    'type' => 'warning'
+  }
+];
+
+
+$result_converted_errors{'file_html'}->{'defcondx_Dbar'} = [
+  {
+    'error_line' => 'defxcond.texi: warning: must specify a title with a title 
command or @top
+',
+    'text' => 'must specify a title with a title command or @top',
+    'type' => 'warning'
+  }
+];
+
+
+1;

Added: trunk/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
===================================================================
--- trunk/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html          
                (rev 0)
+++ trunk/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html  
2018-10-13 15:39:22 UTC (rev 8277)
@@ -0,0 +1,61 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+
+
+<dl>
+<dt>foo: <strong></strong></dt>
+<dd>
+
+<p>Documentation.
+</p>
+</dd></dl>
+
+<hr>
+<p><font size="-1">
+  This document was generated on <em>a sunny day</em>.
+</font></p>
+
+
+</body>
+</html>

Added: trunk/tp/t/results/formatting/defcondx_Ubar.pl
===================================================================
--- trunk/tp/t/results/formatting/defcondx_Ubar.pl                              
(rev 0)
+++ trunk/tp/t/results/formatting/defcondx_Ubar.pl      2018-10-13 15:39:22 UTC 
(rev 8277)
@@ -0,0 +1,346 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'defcondx_Ubar'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '\\input texinfo
+',
+              'type' => 'preamble_text'
+            }
+          ],
+          'parent' => {},
+          'type' => 'preamble'
+        }
+      ],
+      'parent' => {},
+      'type' => 'preamble_before_setfilename'
+    },
+    {
+      'args' => [
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => 'defxcond.info'
+            }
+          ],
+          'extra' => {
+            'spaces_after_argument' => '
+'
+          },
+          'parent' => {},
+          'type' => 'misc_line_arg'
+        }
+      ],
+      'cmdname' => 'setfilename',
+      'extra' => {
+        'spaces_before_argument' => ' ',
+        'text_arg' => 'defxcond.info'
+      },
+      'line_nr' => {
+        'file_name' => 'defxcond.texi',
+        'line_nr' => 2,
+        'macro' => ''
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' set this from the command line.
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'extra' => {
+        'misc_args' => [
+          ' set this from the command line.
+'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' set bar
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'extra' => {
+        'misc_args' => [
+          ' set bar
+'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => ' deffnx inside conditional.
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'c',
+      'extra' => {
+        'misc_args' => [
+          ' deffnx inside conditional.
+'
+        ]
+      },
+      'parent' => {}
+    },
+    {
+      'cmdname' => 'deffn',
+      'contents' => [
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'extra' => {
+                    'def_role' => 'category'
+                  },
+                  'parent' => {},
+                  'text' => 'foo'
+                },
+                {
+                  'extra' => {
+                    'def_role' => 'spaces'
+                  },
+                  'parent' => {},
+                  'text' => '
+',
+                  'type' => 'spaces_at_end'
+                }
+              ],
+              'parent' => {},
+              'type' => 'block_line_arg'
+            }
+          ],
+          'extra' => {
+            'def_command' => 'deffn',
+            'def_parsed_hash' => {
+              'category' => {}
+            },
+            'original_def_cmdname' => 'deffn'
+          },
+          'line_nr' => {
+            'file_name' => 'defxcond.texi',
+            'line_nr' => 8,
+            'macro' => ''
+          },
+          'parent' => {},
+          'type' => 'def_line'
+        },
+        {
+          'contents' => [
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line'
+            },
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'Documentation.
+'
+                }
+              ],
+              'parent' => {},
+              'type' => 'paragraph'
+            },
+            {
+              'parent' => {},
+              'text' => '
+',
+              'type' => 'empty_line'
+            }
+          ],
+          'parent' => {},
+          'type' => 'def_item'
+        },
+        {
+          'args' => [
+            {
+              'contents' => [
+                {
+                  'parent' => {},
+                  'text' => 'deffn'
+                }
+              ],
+              'extra' => {
+                'spaces_after_argument' => '
+'
+              },
+              'parent' => {},
+              'type' => 'misc_line_arg'
+            }
+          ],
+          'cmdname' => 'end',
+          'extra' => {
+            'command_argument' => 'deffn',
+            'spaces_before_argument' => ' ',
+            'text_arg' => 'deffn'
+          },
+          'line_nr' => {
+            'file_name' => 'defxcond.texi',
+            'line_nr' => 16,
+            'macro' => ''
+          },
+          'parent' => {}
+        }
+      ],
+      'extra' => {
+        'end_command' => {},
+        'spaces_before_argument' => ' '
+      },
+      'line_nr' => {},
+      'parent' => {}
+    },
+    {
+      'parent' => {},
+      'text' => '
+',
+      'type' => 'empty_line'
+    },
+    {
+      'args' => [
+        {
+          'parent' => {},
+          'text' => '
+',
+          'type' => 'misc_arg'
+        }
+      ],
+      'cmdname' => 'bye',
+      'parent' => {}
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[1]{'args'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[1];
+$result_trees{'defcondx_Ubar'}{'contents'}[1]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[2]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[3]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[3];
+$result_trees{'defcondx_Ubar'}{'contents'}[3]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[4]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[4];
+$result_trees{'defcondx_Ubar'}{'contents'}[4]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[5]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[6]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[6];
+$result_trees{'defcondx_Ubar'}{'contents'}[6]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[1]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
 = 
$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[7];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'contents'}[1]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'contents'}[2];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'contents'}[2]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'contents'}[3]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[1]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[7];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[2]{'args'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
 = $result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[2];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[2]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[7];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'extra'}{'end_command'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[2];
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'line_nr'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[7]{'contents'}[0]{'line_nr'};
+$result_trees{'defcondx_Ubar'}{'contents'}[7]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[8]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+$result_trees{'defcondx_Ubar'}{'contents'}[9]{'args'}[0]{'parent'} = 
$result_trees{'defcondx_Ubar'}{'contents'}[9];
+$result_trees{'defcondx_Ubar'}{'contents'}[9]{'parent'} = 
$result_trees{'defcondx_Ubar'};
+
+$result_texis{'defcondx_Ubar'} = '\\input texinfo
address@hidden defxcond.info
+
address@hidden set this from the command line.
address@hidden set bar
+
address@hidden deffnx inside conditional.
address@hidden foo
+
+
+Documentation.
+
address@hidden deffn
+
address@hidden
+';
+
+
+$result_texts{'defcondx_Ubar'} = '
+
+foo: 
+
+
+Documentation.
+
+
+';
+
+$result_errors{'defcondx_Ubar'} = [
+  {
+    'error_line' => 'defxcond.texi:8: warning: missing name for @deffn
+',
+    'file_name' => 'defxcond.texi',
+    'line_nr' => 8,
+    'macro' => '',
+    'text' => 'missing name for @deffn',
+    'type' => 'warning'
+  }
+];
+
+
+$result_converted_errors{'file_html'}->{'defcondx_Ubar'} = [
+  {
+    'error_line' => 'defxcond.texi: warning: must specify a title with a title 
command or @top
+',
+    'text' => 'must specify a title with a title command or @top',
+    'type' => 'warning'
+  }
+];
+
+
+1;

Deleted: trunk/tp/tests/formatting/defxcond.texi
===================================================================
--- trunk/tp/tests/formatting/defxcond.texi     2018-10-13 15:13:26 UTC (rev 
8276)
+++ trunk/tp/tests/formatting/defxcond.texi     2018-10-13 15:39:22 UTC (rev 
8277)
@@ -1,18 +0,0 @@
-\input texinfo
address@hidden defxcond.info
-
address@hidden set this from the command line.
address@hidden set bar
-
address@hidden deffnx inside conditional.
address@hidden foo
-
address@hidden bar
address@hidden bar
address@hidden ifset
-
-Documentation.
-
address@hidden deffn
-
address@hidden

Modified: trunk/tp/tests/formatting/list-of-tests
===================================================================
--- trunk/tp/tests/formatting/list-of-tests     2018-10-13 15:13:26 UTC (rev 
8276)
+++ trunk/tp/tests/formatting/list-of-tests     2018-10-13 15:39:22 UTC (rev 
8277)
@@ -1,7 +1,3 @@
-# conditionals and macros
-defcondx_Dbar defxcond.texi -D bar
-defcondx_Ubar defxcond.texi -U bar
-
 # api
 texi_ignore_and_comments ignore_and_comments.texi --init 
ignore_and_comments_output.init -c TEXINFO_OUTPUT_FORMAT=plaintexinfo
 ignore_and_comments_output ignore_and_comments.texi --init 
ignore_and_comments_output.init




reply via email to

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