texinfo-commits
[Top][All Lists]
Advanced

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

[8364] remove @ctrl


From: gavinsmith0123
Subject: [8364] remove @ctrl
Date: Sun, 21 Oct 2018 10:02:43 -0400 (EDT)

Revision: 8364
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8364
Author:   gavin
Date:     2018-10-21 10:02:40 -0400 (Sun, 21 Oct 2018)
Log Message:
-----------
remove @ctrl

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/Texinfo/Convert/Plaintext.pm
    trunk/tp/Texinfo/Parser.pm
    trunk/tp/t/03coverage_braces.t
    trunk/tp/tests/coverage_macro.texi
    trunk/tp/tests/layout/res_parser/formatting/formatting.2
    trunk/tp/tests/layout/res_parser/formatting/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_chm/index.html
    trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
    trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/index.html
    
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_html/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_html/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_html32/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html
    
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/index.html
    
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
    trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html
    
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
    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/layout/res_parser/formatting_weird_quotes/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
    trunk/tp/tests/layout/res_parser/formatting_xml/formatting.2
    trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml

Removed Paths:
-------------
    trunk/tp/t/results/coverage_braces/ctrl.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/ChangeLog     2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,3 +1,17 @@
+2018-10-21  Gavin Smith  <address@hidden>
+
+       * NEWS: @ctrl removed.
+
+       * tp/Texinfo/Common.pm (%brace_commands, %deprecated_commands):
+       Remove @ctrl.
+       * tp/Texinfo/Convert/HTML.pm (_convert_ctrl_command): Remove.
+       * tp/Texinfo/Convert/Plaintext.pm (@asis_commands): Remove @ctrl.
+
+       * tp/t/03coverage_braces.t (ctrl): Remove test.
+       * tp/tests/coverage_macro.texi: Remove test of @ctrl.
+
+       (Karl, bug-texinfo 2012-04-01).
+
 2018-10-20  Gavin Smith  <address@hidden>
 
        * tp/Texinfo/Common.pm (%line_commands): Change a comment.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/NEWS  2018-10-21 14:02:40 UTC (rev 8364)
@@ -14,15 +14,18 @@
   . New commands @&, @ampchar{}.
 
 * texi2any
+  . extension modules fixed to work with the "thread-safe locales" of
+    Perl 5.28 and newer
+  . some code changed to stop warnings being given by newer versions of Perl
   . the newline after an @insertcopying is not output
   . warning given for @multitable prototypes not in braces
+  . @ctrl is no longer recognised (it was a way to insert literal
+    control characters in Info files, but deprecated since about the 
+    time of Texinfo version 2)
   . @quote-arg and @allow-recursion are not recognised (these two used
     to be recognised by makeinfo in macro definitions but were never 
     implemented in texinfo.tex).
   . `FIX_TEXINFO' removed as a customization variable
-  . extension modules fixed to work with the "thread-safe locales" of
-    Perl 5.28 and newer
-  . some code changed to stop warnings being given by newer versions of Perl
 
 
 6.5 (12 September 2017)

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/Texinfo/Common.pm  2018-10-21 14:02:40 UTC (rev 8364)
@@ -599,7 +599,7 @@
   $style_commands{$command} = 1;
 }
 
-foreach my $one_arg_command ('U', 'ctrl', 'dmn', 'w', 'key',
+foreach my $one_arg_command ('U', 'dmn', 'w', 'key',
     'titlefont', 'hyphenation', 'anchor', 'errormsg', 'sortas') {
   $brace_commands{$one_arg_command} = 1;
 }
@@ -866,8 +866,6 @@
 }
 
 our %deprecated_commands = (
-  'ctrl' => '',
-
   'setcontentsaftertitlepage' =>
 N__('move your @contents command if you want the contents after the title 
page'),
 

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,8 +1,7 @@
 # $Id$
 # HTML.pm: output tree as HTML.
 #
-# Copyright 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018 Free Software 
-# Foundation, Inc.
+# Copyright 2011-2018 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -1839,24 +1838,6 @@
 $default_commands_conversion{'indicateurl'} = \&_convert_indicateurl_command;
 
 
-
-sub _convert_ctrl_command($$$$)
-{
-  my $self = shift;
-  my $cmdname = shift;
-  my $command = shift;
-  my $args = shift;
-
-  my $text = $args->[0]->{'normal'};
-  if (!defined($text)) {
-    # happens with bogus @-commands without argument, like @strong something
-    return '';
-  }
-  return $self->protect_text('^') .$text;
-}
-
-$default_commands_conversion{'ctrl'} = \&_convert_ctrl_command;
-
 sub _convert_titlefont_command($$$$)
 {
   my $self = shift;

Modified: trunk/tp/Texinfo/Convert/Plaintext.pm
===================================================================
--- trunk/tp/Texinfo/Convert/Plaintext.pm       2018-10-21 11:50:22 UTC (rev 
8363)
+++ trunk/tp/Texinfo/Convert/Plaintext.pm       2018-10-21 14:02:40 UTC (rev 
8364)
@@ -1,8 +1,7 @@
 # $Id$
 # Plaintext.pm: output tree as text with filling.
 #
-# Copyright 2010, 2011, 2012, 2013, 2014, 2015,
-# 2016, 2017, 2018 Free Software Foundation, Inc.
+# Copyright 2010-2018 Free Software Foundation, Inc.
 # 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -271,7 +270,7 @@
 }
 
 # math is special
-my @asis_commands = ('asis', 'w', 'b', 'ctrl', 'i', 'sc', 't', 'r',
+my @asis_commands = ('asis', 'w', 'b', 'i', 'sc', 't', 'r',
   'slanted', 'sansserif', 'var', 'verb', 'clicksequence',
   'headitemfont', 'dmn');
 

Modified: trunk/tp/Texinfo/Parser.pm
===================================================================
--- trunk/tp/Texinfo/Parser.pm  2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/Texinfo/Parser.pm  2018-10-21 14:02:40 UTC (rev 8364)
@@ -322,16 +322,17 @@
 foreach my $no_paragraph_command (keys(%line_commands),
                                   keys(%other_commands)) {
   $default_no_paragraph_commands{$no_paragraph_command} = 1;
+}
+
+foreach my $no_paragraph_command (keys(%line_commands)) {
   $begin_line_commands{$no_paragraph_command} = 1;
 }
 
 # verbatiminclude is not said to begin at the beginning of the line
 # in the manual
-foreach my $misc_not_begin_line ('comment', 'c', 'sp', 'refill', 
-                                'noindent', 'indent', 'columnfractions',
-                                'tab', 'item', 'headitem', 'verbatiminclude',
-                                'set', 'clear',
-                                'vskip', keys(%in_heading_commands)) {
+foreach my $misc_not_begin_line ('comment', 'c', 'sp', 'columnfractions',
+                                 'item', 'verbatiminclude',
+                                 'set', 'clear', 'vskip') {
   delete $begin_line_commands{$misc_not_begin_line};
 }
 

Modified: trunk/tp/t/03coverage_braces.t
===================================================================
--- trunk/tp/t/03coverage_braces.t      2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/t/03coverage_braces.t      2018-10-21 14:02:40 UTC (rev 8364)
@@ -122,12 +122,6 @@
 ['space_in_anchor',
 '@anchor{   anchor  name   }.
 '],
-['ctrl',
-'
address@hidden
-
-With @ctrl{B}.
-'],
 ['test_w',
 '@w{aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa bbbbbbbbbbbbb bbbbb bbb 
b b b b b b b b b bb .
 ccc dddd}.

Deleted: trunk/tp/t/results/coverage_braces/ctrl.pl
===================================================================
--- trunk/tp/t/results/coverage_braces/ctrl.pl  2018-10-21 11:50:22 UTC (rev 
8363)
+++ trunk/tp/t/results/coverage_braces/ctrl.pl  2018-10-21 14:02:40 UTC (rev 
8364)
@@ -1,157 +0,0 @@
-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{'ctrl'} = {
-  'contents' => [
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
-      'contents' => [
-        {
-          'args' => [
-            {
-              'contents' => [
-                {
-                  'parent' => {},
-                  'text' => 'A'
-                }
-              ],
-              'parent' => {},
-              'type' => 'brace_command_arg'
-            }
-          ],
-          'cmdname' => 'ctrl',
-          'contents' => [],
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 2,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
-          'parent' => {},
-          'text' => '
-'
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
-    },
-    {
-      'parent' => {},
-      'text' => '
-',
-      'type' => 'empty_line'
-    },
-    {
-      'contents' => [
-        {
-          'parent' => {},
-          'text' => 'With '
-        },
-        {
-          'args' => [
-            {
-              'contents' => [
-                {
-                  'parent' => {},
-                  'text' => 'B'
-                }
-              ],
-              'parent' => {},
-              'type' => 'brace_command_arg'
-            }
-          ],
-          'cmdname' => 'ctrl',
-          'contents' => [],
-          'line_nr' => {
-            'file_name' => '',
-            'line_nr' => 4,
-            'macro' => ''
-          },
-          'parent' => {}
-        },
-        {
-          'parent' => {},
-          'text' => '.
-'
-        }
-      ],
-      'parent' => {},
-      'type' => 'paragraph'
-    }
-  ],
-  'type' => 'text_root'
-};
-$result_trees{'ctrl'}{'contents'}[0]{'parent'} = $result_trees{'ctrl'};
-$result_trees{'ctrl'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ctrl'}{'contents'}[1]{'contents'}[0]{'args'}[0];
-$result_trees{'ctrl'}{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[1]{'contents'}[0];
-$result_trees{'ctrl'}{'contents'}[1]{'contents'}[0]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[1];
-$result_trees{'ctrl'}{'contents'}[1]{'contents'}[1]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[1];
-$result_trees{'ctrl'}{'contents'}[1]{'parent'} = $result_trees{'ctrl'};
-$result_trees{'ctrl'}{'contents'}[2]{'parent'} = $result_trees{'ctrl'};
-$result_trees{'ctrl'}{'contents'}[3]{'contents'}[0]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[3];
-$result_trees{'ctrl'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
 = $result_trees{'ctrl'}{'contents'}[3]{'contents'}[1]{'args'}[0];
-$result_trees{'ctrl'}{'contents'}[3]{'contents'}[1]{'args'}[0]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[3]{'contents'}[1];
-$result_trees{'ctrl'}{'contents'}[3]{'contents'}[1]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[3];
-$result_trees{'ctrl'}{'contents'}[3]{'contents'}[2]{'parent'} = 
$result_trees{'ctrl'}{'contents'}[3];
-$result_trees{'ctrl'}{'contents'}[3]{'parent'} = $result_trees{'ctrl'};
-
-$result_texis{'ctrl'} = '
address@hidden
-
-With @ctrl{B}.
-';
-
-
-$result_texts{'ctrl'} = '
-A
-
-With B.
-';
-
-$result_errors{'ctrl'} = [
-  {
-    'error_line' => ':2: warning: @ctrl is obsolete.
-',
-    'file_name' => '',
-    'line_nr' => 2,
-    'macro' => '',
-    'text' => '@ctrl is obsolete.',
-    'type' => 'warning'
-  },
-  {
-    'error_line' => ':4: warning: @ctrl is obsolete.
-',
-    'file_name' => '',
-    'line_nr' => 4,
-    'macro' => '',
-    'text' => '@ctrl is obsolete.',
-    'type' => 'warning'
-  }
-];
-
-
-
-$result_converted{'plaintext'}->{'ctrl'} = 'A
-
-   With B.
-';
-
-
-$result_converted{'html_text'}->{'ctrl'} = '
-<p>^A
-</p>
-<p>With ^B.
-</p>';
-
-1;

Modified: trunk/tp/tests/coverage_macro.texi
===================================================================
--- trunk/tp/tests/coverage_macro.texi  2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/coverage_macro.texi  2018-10-21 14:02:40 UTC (rev 8364)
@@ -127,7 +127,6 @@
 @code{@@address@hidden@}} @cite{--a}
 @code{@@address@hidden@}} @code{--a}
 @code{@@address@hidden@}} @command{--a}
address@hidden@@address@hidden@}} @ctrl{--a}
 @code{@@address@hidden@}} @dfn{--a}
 @code{@@address@hidden@}} @dmn{--a}
 @code{@@address@hidden,address@hidden @email{--a,--b}

Modified: trunk/tp/tests/layout/res_parser/formatting/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting/formatting.2    2018-10-21 
11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting/formatting.2    2018-10-21 
14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting/formatting.html 2018-10-21 
11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting/formatting.html 2018-10-21 
14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2262,7 +2259,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2992,7 +2988,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3728,7 +3723,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html 2018-10-21 
11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/anchor.html 2018-10-21 
14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/chapter.html        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/chapter2.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting.2        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting.2        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html     
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting.html     
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2245,7 +2242,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2975,7 +2971,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3711,7 +3706,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting_abt.html 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting_ovr.html 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/formatting_toc.html 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/index.html  2018-10-21 
11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/index.html  2018-10-21 
14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/s_002d_002dect_002cion.html 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html     
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_chm/subsection.html     
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
    2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
   2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_chm/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
   2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.2    
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.2    
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -9,7 +8,6 @@
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:25: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -20,7 +18,6 @@
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:35: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -31,7 +28,6 @@
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:45: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_docbook/formatting.xml  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -146,7 +146,6 @@
 <literal>@cite{--a}</literal> <citetitle>&#8211;a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
-<literal>@ctrl{--a}</literal> 
 <literal>@dfn{--a}</literal> <firstterm>&#8211;a</firstterm>
 <literal>@dmn{--a}</literal> &#8211;a
 <literal>@email{--a,--b}</literal> <ulink url="mailto:--a";>&#8211;b</ulink>
@@ -646,7 +645,6 @@
 <literal>@cite{--a}</literal> <citetitle>&#8211;a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
-<literal>@ctrl{--a}</literal> 
 <literal>@dfn{--a}</literal> <firstterm>&#8211;a</firstterm>
 <literal>@dmn{--a}</literal> &#8211;a
 <literal>@email{--a,--b}</literal> <ulink url="mailto:--a";>&#8211;b</ulink>
@@ -1147,7 +1145,6 @@
 <literal>@cite{--a}</literal> <citetitle>&#8211;a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
-<literal>@ctrl{--a}</literal> 
 <literal>@dfn{--a}</literal> <firstterm>&#8211;a</firstterm>
 <literal>@dmn{--a}</literal> &#8211;a
 <literal>@email{--a,--b}</literal> <ulink url="mailto:--a";>&#8211;b</ulink>
@@ -1648,7 +1645,6 @@
 <literal>@cite{--a}</literal> <citetitle>&#8211;a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
-<literal>@ctrl{--a}</literal> 
 <literal>@dfn{--a}</literal> <firstterm>&#8211;a</firstterm>
 <literal>@dmn{--a}</literal> &#8211;a
 <literal>@email{--a,--b}</literal> <ulink url="mailto:--a";>&#8211;b</ulink>
@@ -2148,7 +2144,6 @@
 <literal>@cite{--a}</literal> <citetitle>&#8211;a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
-<literal>@ctrl{--a}</literal> 
 <literal>@dfn{--a}</literal> <firstterm>&#8211;a</firstterm>
 <literal>@dmn{--a}</literal> &#8211;a
 <literal>@email{--a,--b}</literal> <ulink url="mailto:--a";>&#8211;b</ulink>
@@ -2644,7 +2639,6 @@
 <literal>@cite{--a}</literal> <citetitle>--a</citetitle>
 <literal>@code{--a}</literal> <literal>--a</literal>
 <literal>@command{--a}</literal> <command>--a</command>
-<literal>@ctrl{--a}</literal> 
 <literal>@dfn{--a}</literal> <firstterm>--a</firstterm>
 <literal>@dmn{--a}</literal> --a
 <literal>@email{--a,--b}</literal> <ulink url="mailto:--a";>--b</ulink>

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/anchor.html      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html     
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/chapter.html     
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html    
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/chapter2.html    
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting.2     
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting.2     
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_abt.html      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_ovr.html      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/formatting_toc.html      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/index.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/index.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -788,7 +787,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1518,7 +1516,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2254,7 +2251,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html  
    2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_exotic/s_002d_002dect_002cion.html  
    2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_exotic/subsection.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
 2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
        2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_exotic/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
        2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2   
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.2   
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_fr_icons/formatting.html        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2262,7 +2259,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2992,7 +2988,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3728,7 +3723,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_html/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html/formatting.2       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html/formatting.2       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_html/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html/formatting.html    
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html/formatting.html    
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2262,7 +2259,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2992,7 +2988,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3728,7 +3723,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_html32/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html32/formatting.2     
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html32/formatting.2     
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html32/formatting.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -747,7 +746,6 @@
 <code>@cite{--a}</code> <cite>-a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^-a
 <code>@dfn{--a}</code> <em>-a</em>
 <code>@dmn{--a}</code> -a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>-b</a>
@@ -1470,7 +1468,6 @@
 <code>@cite{--a}</code> <cite>-a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^-a
 <code>@dfn{--a}</code> <em>-a</em>
 <code>@dmn{--a}</code> -a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>-b</a>
@@ -2219,7 +2216,6 @@
 <code>@cite{--a}</code> <cite>-a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^-a
 <code>@dfn{--a}</code> <em>-a</em>
 <code>@dmn{--a}</code> -a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>-b</a>
@@ -2941,7 +2937,6 @@
 <code>@cite{--a}</code> <cite>-a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^-a
 <code>@dfn{--a}</code> <em>-a</em>
 <code>@dmn{--a}</code> -a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>-b</a>
@@ -3668,7 +3663,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/anchor.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter.html 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/chapter2.html        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2 
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting.2 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_abt.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_fot.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_ovr.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/formatting_toc.html  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html   
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/index.html   
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2263,7 +2260,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2993,7 +2989,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3729,7 +3724,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
  2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/s_002d_002dect_002cion.html
  2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsection.html      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
     2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
     2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_html_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
    2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/anchor.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/chapter.html      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html     
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/chapter2.html     
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting.2      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting.2      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_abt.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_fot.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_ovr.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/formatting_toc.html       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/index.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/index.html        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/index.html        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2263,7 +2260,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2993,7 +2989,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3729,7 +3724,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: 
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html   
    2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_nodes/s_002d_002dect_002cion.html   
    2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html   
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_nodes/subsection.html   
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
  2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-_0060_0060simple_002ddouble_002d_002d.html
  2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
===================================================================
--- 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 2018-10-21 11:50:22 UTC (rev 8363)
+++ 
trunk/tp/tests/layout/res_parser/formatting_nodes/subsubsection-three_002d_002d_002dfour_002d_002d_002d_002d_0027_0027.html
 2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b

Modified: trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.2  
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.2  
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -9,7 +8,6 @@
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:25: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -20,7 +18,6 @@
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:35: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -31,7 +28,6 @@
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:45: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_plaintext/formatting.txt        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -40,14 +40,13 @@
    '@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
 '@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
 '@abbr{@'E--. @comma{}A.}' E'-. ,A. '@asis{--a}' -a '@b{--a}' -a
-'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@ctrl{--a}'
--a '@dfn{--a}' "-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a>
-'@email{,--b}' -b '@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}'
-'--a' '@file{--a}' '--a' '@i{--a}' -a '@kbd{--a}' '--a' '@key{--a}'
-<--a> '@math{--a {\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} -
-'@option{--a}' '--a' '@r{--a}' -a '@samp{--a}' '--a' '@sc{--a}' -A
-'@strong{--a}' *-a* '@t{--a}' --a '@sansserif{--a}' -a '@slanted{--a}'
--a '@titlefont{--a}'
+'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@dfn{--a}'
+"-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a> '@email{,--b}' -b
+'@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}' '--a' '@file{--a}'
+'--a' '@i{--a}' -a '@kbd{--a}' '--a' '@key{--a}' <--a> '@math{--a
+{\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} - '@option{--a}' '--a'
+'@r{--a}' -a '@samp{--a}' '--a' '@sc{--a}' -A '@strong{--a}' *-a*
+'@t{--a}' --a '@sansserif{--a}' -a '@slanted{--a}' -a '@titlefont{--a}'
 -a
 **
    '@indicateurl{--a}' '--a' '@uref{--a,--b}' -b (--a) '@uref{--a}'
@@ -388,14 +387,13 @@
    '@acronym{--a,an accronym}' -a (an accronym) '@acronym{--a}' -a
 '@abbr{@'E--. @comma{}A., @'Etude Autonome }' E'-. ,A. (E'tude Autonome)
 '@abbr{@'E--. @comma{}A.}' E'-. ,A. '@asis{--a}' -a '@b{--a}' -a
-'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@ctrl{--a}'
--a '@dfn{--a}' "-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a>
-'@email{,--b}' -b '@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}'
-'--a' '@file{--a}' '--a' '@i{--a}' -a '@kbd{--a}' '--a' '@key{--a}'
-<--a> '@math{--a {\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} -
-'@option{--a}' '--a' '@r{--a}' -a '@samp{--a}' '--a' '@sc{--a}' -A
-'@strong{--a}' *-a* '@t{--a}' --a '@sansserif{--a}' -a '@slanted{--a}'
--a '@titlefont{--a}'
+'@cite{--a}' '-a' '@code{--a}' '--a' '@command{--a}' '--a' '@dfn{--a}'
+"-a" '@dmn{--a}' -a '@email{--a,--b}' -b <--a> '@email{,--b}' -b
+'@email{--a}' <--a> '@emph{--a}' _-a_ '@env{--a}' '--a' '@file{--a}'
+'--a' '@i{--a}' -a '@kbd{--a}' '--a' '@key{--a}' <--a> '@math{--a
+{\frac{1}{2}} @minus{}}' --a {\frac{1}{2}} - '@option{--a}' '--a'
+'@r{--a}' -a '@samp{--a}' '--a' '@sc{--a}' -A '@strong{--a}' *-a*
+'@t{--a}' --a '@sansserif{--a}' -a '@slanted{--a}' -a '@titlefont{--a}'
 -a
 **
    '@indicateurl{--a}' '--a' '@uref{--a,--b}' -b (--a) '@uref{--a}'
@@ -830,7 +828,6 @@
      @cite{--a} '--a'
      @code{--a} --a
      @command{--a} --a
-     @ctrl{--a} --a
      @dfn{--a} "--a"
      @dmn{--a} --a
      @email{--a,--b} --b <--a>
@@ -1203,28 +1200,28 @@
 * Menu:
 
 * ":                                     Top.                (line   16)
-* " <1>:                                 Top.                (line  365)
-* " <2>:                                 Top.                (line  725)
+* " <1>:                                 Top.                (line  364)
+* " <2>:                                 Top.                (line  723)
 * -option:                               Top.                (line   16)
-* -option <1>:                           Top.                (line  365)
-* -option <2>:                           Top.                (line  725)
-* .:                                     Top.                (line 1202)
-* ?:                                     Top.                (line 1202)
-* a:                                     Top.                (line 1202)
-* index entry between item and itemx:    Top.                (line  313)
-* index entry between item and itemx <1>: Top.               (line  662)
-* index entry between item and itemx <2>: Top.               (line 1149)
-* index entry within deffn:              Top.                (line  159)
-* index entry within deffn <1>:          Top.                (line  508)
-* index entry within deffn <2>:          Top.                (line  995)
-* index entry within itemize:            Top.                (line  121)
-* index entry within itemize <1>:        Top.                (line  470)
-* index entry within itemize <2>:        Top.                (line  957)
-* index entry within multitable:         Top.                (line  129)
-* index entry within multitable <1>:     Top.                (line  478)
-* index entry within multitable <2>:     Top.                (line  966)
-* t-ruc:                                 Top.                (line 1202)
-* T-ruc:                                 Top.                (line 1202)
+* -option <1>:                           Top.                (line  364)
+* -option <2>:                           Top.                (line  723)
+* .:                                     Top.                (line 1199)
+* ?:                                     Top.                (line 1199)
+* a:                                     Top.                (line 1199)
+* index entry between item and itemx:    Top.                (line  312)
+* index entry between item and itemx <1>: Top.               (line  660)
+* index entry between item and itemx <2>: Top.               (line 1146)
+* index entry within deffn:              Top.                (line  158)
+* index entry within deffn <1>:          Top.                (line  506)
+* index entry within deffn <2>:          Top.                (line  992)
+* index entry within itemize:            Top.                (line  120)
+* index entry within itemize <1>:        Top.                (line  468)
+* index entry within itemize <2>:        Top.                (line  954)
+* index entry within multitable:         Top.                (line  128)
+* index entry within multitable <1>:     Top.                (line  476)
+* index entry within multitable <2>:     Top.                (line  963)
+* t-ruc:                                 Top.                (line 1199)
+* T-ruc:                                 Top.                (line 1199)
 
    fn
 
@@ -1231,144 +1228,144 @@
 * Menu:
 
 * --foption:                             Top.                (line   16)
-* --foption <1>:                         Top.                (line  365)
-* --foption <2>:                         Top.                (line  725)
-* .:                                     Top.                (line 1202)
-* ?:                                     Top.                (line 1202)
+* --foption <1>:                         Top.                (line  364)
+* --foption <2>:                         Top.                (line  723)
+* .:                                     Top.                (line 1199)
+* ?:                                     Top.                (line 1199)
 * ``:                                    Top.                (line   16)
-* `` <1>:                                Top.                (line  365)
-* `` <2>:                                Top.                (line  725)
-* a:                                     Top.                (line  176)
-* a <1>:                                 Top.                (line  312)
-* a <2>:                                 Top.                (line  525)
-* a <3>:                                 Top.                (line  661)
-* a <4>:                                 Top.                (line 1012)
-* a <5>:                                 Top.                (line 1148)
-* a <6>:                                 Top.                (line 1202)
-* b:                                     Top.                (line  313)
-* b <1>:                                 Top.                (line  662)
-* b <2>:                                 Top.                (line 1149)
-* bidule machin:                         Top.                (line  170)
-* bidule machin <1>:                     Top.                (line  519)
-* bidule machin <2>:                     Top.                (line 1006)
-* d--effn_name:                          Top.                (line  151)
-* d--effn_name <1>:                      Top.                (line  500)
-* d--effn_name <2>:                      Top.                (line  987)
-* d--efmac_name:                         Top.                (line  212)
-* d--efmac_name <1>:                     Top.                (line  561)
-* d--efmac_name <2>:                     Top.                (line 1048)
-* d--efmethod_name on c--lass:           Top.                (line  236)
-* d--efmethod_name on c--lass <1>:       Top.                (line  585)
-* d--efmethod_name on c--lass <2>:       Top.                (line 1072)
-* d--efop_name on c--lass:               Top.                (line  203)
-* d--efop_name on c--lass <1>:           Top.                (line  552)
-* d--efop_name on c--lass <2>:           Top.                (line 1039)
-* d--efspec_name:                        Top.                (line  215)
-* d--efspec_name <1>:                    Top.                (line  564)
-* d--efspec_name <2>:                    Top.                (line 1051)
-* d--eftypefn_name:                      Top.                (line  191)
-* d--eftypefn_name <1>:                  Top.                (line  540)
-* d--eftypefn_name <2>:                  Top.                (line 1027)
-* d--eftypefun_name:                     Top.                (line  224)
-* d--eftypefun_name <1>:                 Top.                (line  573)
-* d--eftypefun_name <2>:                 Top.                (line 1060)
-* d--eftypemethod_name on c--lass:       Top.                (line  239)
-* d--eftypemethod_name on c--lass <1>:   Top.                (line  588)
-* d--eftypemethod_name on c--lass <2>:   Top.                (line 1075)
-* d--eftypeop_name on c--lass:           Top.                (line  194)
-* d--eftypeop_name on c--lass <1>:       Top.                (line  543)
-* d--eftypeop_name on c--lass <2>:       Top.                (line 1030)
-* d--efun_name:                          Top.                (line  209)
-* d--efun_name <1>:                      Top.                (line  558)
-* d--efun_name <2>:                      Top.                (line 1045)
-* de--ffn_name:                          Top.                (line  154)
-* de--ffn_name <1>:                      Top.                (line  503)
-* de--ffn_name <2>:                      Top.                (line  990)
-* deffn:                                 Top.                (line  179)
-* deffn <1>:                             Top.                (line  181)
-* deffn <2>:                             Top.                (line  528)
-* deffn <3>:                             Top.                (line  530)
-* deffn <4>:                             Top.                (line 1015)
-* deffn <5>:                             Top.                (line 1017)
-* deffnx:                                Top.                (line  177)
-* deffnx <1>:                            Top.                (line  182)
-* deffnx <2>:                            Top.                (line  526)
-* deffnx <3>:                            Top.                (line  531)
-* deffnx <4>:                            Top.                (line 1013)
-* deffnx <5>:                            Top.                (line 1018)
-* followed:                              Top.                (line  173)
-* followed <1>:                          Top.                (line  522)
-* followed <2>:                          Top.                (line 1009)
-* I:                                     Top.                (line  158)
-* I <1>:                                 Top.                (line  184)
-* I <2>:                                 Top.                (line  507)
-* I <3>:                                 Top.                (line  533)
-* I <4>:                                 Top.                (line  994)
-* I <5>:                                 Top.                (line 1020)
-* id i ule:                              Top.                (line  164)
-* id i ule <1>:                          Top.                (line  513)
-* id i ule <2>:                          Top.                (line 1000)
-* id ule:                                Top.                (line  163)
-* id ule <1>:                            Top.                (line  512)
-* id ule <2>:                            Top.                (line  999)
-* log trap:                              Top.                (line  160)
-* log trap <1>:                          Top.                (line  509)
-* log trap <2>:                          Top.                (line  996)
-* log trap1:                             Top.                (line  161)
-* log trap1 <1>:                         Top.                (line  510)
-* log trap1 <2>:                         Top.                (line  997)
-* log trap2:                             Top.                (line  162)
-* log trap2 <1>:                         Top.                (line  511)
-* log trap2 <2>:                         Top.                (line  998)
-* machin:                                Top.                (line  169)
-* machin <1>:                            Top.                (line  171)
-* machin <2>:                            Top.                (line  518)
-* machin <3>:                            Top.                (line  520)
-* machin <4>:                            Top.                (line 1005)
-* machin <5>:                            Top.                (line 1007)
-* t--ruc:                                Top.                (line 1202)
-* T--ruc:                                Top.                (line 1202)
-* truc:                                  Top.                (line  159)
-* truc <1>:                              Top.                (line  185)
-* truc <2>:                              Top.                (line  508)
-* truc <3>:                              Top.                (line  534)
-* truc <4>:                              Top.                (line  995)
-* truc <5>:                              Top.                (line 1021)
+* `` <1>:                                Top.                (line  364)
+* `` <2>:                                Top.                (line  723)
+* a:                                     Top.                (line  175)
+* a <1>:                                 Top.                (line  311)
+* a <2>:                                 Top.                (line  523)
+* a <3>:                                 Top.                (line  659)
+* a <4>:                                 Top.                (line 1009)
+* a <5>:                                 Top.                (line 1145)
+* a <6>:                                 Top.                (line 1199)
+* b:                                     Top.                (line  312)
+* b <1>:                                 Top.                (line  660)
+* b <2>:                                 Top.                (line 1146)
+* bidule machin:                         Top.                (line  169)
+* bidule machin <1>:                     Top.                (line  517)
+* bidule machin <2>:                     Top.                (line 1003)
+* d--effn_name:                          Top.                (line  150)
+* d--effn_name <1>:                      Top.                (line  498)
+* d--effn_name <2>:                      Top.                (line  984)
+* d--efmac_name:                         Top.                (line  211)
+* d--efmac_name <1>:                     Top.                (line  559)
+* d--efmac_name <2>:                     Top.                (line 1045)
+* d--efmethod_name on c--lass:           Top.                (line  235)
+* d--efmethod_name on c--lass <1>:       Top.                (line  583)
+* d--efmethod_name on c--lass <2>:       Top.                (line 1069)
+* d--efop_name on c--lass:               Top.                (line  202)
+* d--efop_name on c--lass <1>:           Top.                (line  550)
+* d--efop_name on c--lass <2>:           Top.                (line 1036)
+* d--efspec_name:                        Top.                (line  214)
+* d--efspec_name <1>:                    Top.                (line  562)
+* d--efspec_name <2>:                    Top.                (line 1048)
+* d--eftypefn_name:                      Top.                (line  190)
+* d--eftypefn_name <1>:                  Top.                (line  538)
+* d--eftypefn_name <2>:                  Top.                (line 1024)
+* d--eftypefun_name:                     Top.                (line  223)
+* d--eftypefun_name <1>:                 Top.                (line  571)
+* d--eftypefun_name <2>:                 Top.                (line 1057)
+* d--eftypemethod_name on c--lass:       Top.                (line  238)
+* d--eftypemethod_name on c--lass <1>:   Top.                (line  586)
+* d--eftypemethod_name on c--lass <2>:   Top.                (line 1072)
+* d--eftypeop_name on c--lass:           Top.                (line  193)
+* d--eftypeop_name on c--lass <1>:       Top.                (line  541)
+* d--eftypeop_name on c--lass <2>:       Top.                (line 1027)
+* d--efun_name:                          Top.                (line  208)
+* d--efun_name <1>:                      Top.                (line  556)
+* d--efun_name <2>:                      Top.                (line 1042)
+* de--ffn_name:                          Top.                (line  153)
+* de--ffn_name <1>:                      Top.                (line  501)
+* de--ffn_name <2>:                      Top.                (line  987)
+* deffn:                                 Top.                (line  178)
+* deffn <1>:                             Top.                (line  180)
+* deffn <2>:                             Top.                (line  526)
+* deffn <3>:                             Top.                (line  528)
+* deffn <4>:                             Top.                (line 1012)
+* deffn <5>:                             Top.                (line 1014)
+* deffnx:                                Top.                (line  176)
+* deffnx <1>:                            Top.                (line  181)
+* deffnx <2>:                            Top.                (line  524)
+* deffnx <3>:                            Top.                (line  529)
+* deffnx <4>:                            Top.                (line 1010)
+* deffnx <5>:                            Top.                (line 1015)
+* followed:                              Top.                (line  172)
+* followed <1>:                          Top.                (line  520)
+* followed <2>:                          Top.                (line 1006)
+* I:                                     Top.                (line  157)
+* I <1>:                                 Top.                (line  183)
+* I <2>:                                 Top.                (line  505)
+* I <3>:                                 Top.                (line  531)
+* I <4>:                                 Top.                (line  991)
+* I <5>:                                 Top.                (line 1017)
+* id i ule:                              Top.                (line  163)
+* id i ule <1>:                          Top.                (line  511)
+* id i ule <2>:                          Top.                (line  997)
+* id ule:                                Top.                (line  162)
+* id ule <1>:                            Top.                (line  510)
+* id ule <2>:                            Top.                (line  996)
+* log trap:                              Top.                (line  159)
+* log trap <1>:                          Top.                (line  507)
+* log trap <2>:                          Top.                (line  993)
+* log trap1:                             Top.                (line  160)
+* log trap1 <1>:                         Top.                (line  508)
+* log trap1 <2>:                         Top.                (line  994)
+* log trap2:                             Top.                (line  161)
+* log trap2 <1>:                         Top.                (line  509)
+* log trap2 <2>:                         Top.                (line  995)
+* machin:                                Top.                (line  168)
+* machin <1>:                            Top.                (line  170)
+* machin <2>:                            Top.                (line  516)
+* machin <3>:                            Top.                (line  518)
+* machin <4>:                            Top.                (line 1002)
+* machin <5>:                            Top.                (line 1004)
+* t--ruc:                                Top.                (line 1199)
+* T--ruc:                                Top.                (line 1199)
+* truc:                                  Top.                (line  158)
+* truc <1>:                              Top.                (line  184)
+* truc <2>:                              Top.                (line  506)
+* truc <3>:                              Top.                (line  532)
+* truc <4>:                              Top.                (line  992)
+* truc <5>:                              Top.                (line 1018)
 
    vr
 
 * Menu:
 
-* a:                                     Top.                (line  308)
-* a <1>:                                 Top.                (line  657)
-* a <2>:                                 Top.                (line 1144)
-* b:                                     Top.                (line  309)
-* b <1>:                                 Top.                (line  658)
-* b <2>:                                 Top.                (line 1145)
-* d--efcv_name:                          Top.                (line  200)
-* d--efcv_name <1>:                      Top.                (line  549)
-* d--efcv_name <2>:                      Top.                (line 1036)
-* d--efivar_name of c--lass:             Top.                (line  230)
-* d--efivar_name of c--lass <1>:         Top.                (line  579)
-* d--efivar_name of c--lass <2>:         Top.                (line 1066)
-* d--efopt_name:                         Top.                (line  221)
-* d--efopt_name <1>:                     Top.                (line  570)
-* d--efopt_name <2>:                     Top.                (line 1057)
-* d--eftypeivar_name of c--lass:         Top.                (line  233)
-* d--eftypeivar_name of c--lass <1>:     Top.                (line  582)
-* d--eftypeivar_name of c--lass <2>:     Top.                (line 1069)
-* d--eftypevar_name:                     Top.                (line  227)
-* d--eftypevar_name <1>:                 Top.                (line  576)
-* d--eftypevar_name <2>:                 Top.                (line 1063)
-* d--eftypevr_name:                      Top.                (line  197)
-* d--eftypevr_name <1>:                  Top.                (line  546)
-* d--eftypevr_name <2>:                  Top.                (line 1033)
-* d--efvar_name:                         Top.                (line  218)
-* d--efvar_name <1>:                     Top.                (line  567)
-* d--efvar_name <2>:                     Top.                (line 1054)
-* d--efvr_name:                          Top.                (line  188)
-* d--efvr_name <1>:                      Top.                (line  537)
-* d--efvr_name <2>:                      Top.                (line 1024)
+* a:                                     Top.                (line  307)
+* a <1>:                                 Top.                (line  655)
+* a <2>:                                 Top.                (line 1141)
+* b:                                     Top.                (line  308)
+* b <1>:                                 Top.                (line  656)
+* b <2>:                                 Top.                (line 1142)
+* d--efcv_name:                          Top.                (line  199)
+* d--efcv_name <1>:                      Top.                (line  547)
+* d--efcv_name <2>:                      Top.                (line 1033)
+* d--efivar_name of c--lass:             Top.                (line  229)
+* d--efivar_name of c--lass <1>:         Top.                (line  577)
+* d--efivar_name of c--lass <2>:         Top.                (line 1063)
+* d--efopt_name:                         Top.                (line  220)
+* d--efopt_name <1>:                     Top.                (line  568)
+* d--efopt_name <2>:                     Top.                (line 1054)
+* d--eftypeivar_name of c--lass:         Top.                (line  232)
+* d--eftypeivar_name of c--lass <1>:     Top.                (line  580)
+* d--eftypeivar_name of c--lass <2>:     Top.                (line 1066)
+* d--eftypevar_name:                     Top.                (line  226)
+* d--eftypevar_name <1>:                 Top.                (line  574)
+* d--eftypevar_name <2>:                 Top.                (line 1060)
+* d--eftypevr_name:                      Top.                (line  196)
+* d--eftypevr_name <1>:                  Top.                (line  544)
+* d--eftypevr_name <2>:                  Top.                (line 1030)
+* d--efvar_name:                         Top.                (line  217)
+* d--efvar_name <1>:                     Top.                (line  565)
+* d--efvar_name <2>:                     Top.                (line 1051)
+* d--efvr_name:                          Top.                (line  187)
+* d--efvr_name <1>:                      Top.                (line  535)
+* d--efvr_name <2>:                      Top.                (line 1021)
 
    ky
 
@@ -1378,9 +1375,9 @@
 
 * Menu:
 
-* d--eftp_name:                          Top.                (line  206)
-* d--eftp_name <1>:                      Top.                (line  555)
-* d--eftp_name <2>:                      Top.                (line 1042)
+* d--eftp_name:                          Top.                (line  205)
+* d--eftp_name <1>:                      Top.                (line  553)
+* d--eftp_name <2>:                      Top.                (line 1039)
 
    ---------- Footnotes ----------
 
@@ -1424,135 +1421,135 @@
 * Menu:
 
 * ":                                     Top.                (line   16)
-* " <1>:                                 Top.                (line  365)
-* " <2>:                                 Top.                (line  725)
+* " <1>:                                 Top.                (line  364)
+* " <2>:                                 Top.                (line  723)
 * -option:                               Top.                (line   16)
-* -option <1>:                           Top.                (line  365)
-* -option <2>:                           Top.                (line  725)
-* .:                                     Top.                (line 1202)
-* ?:                                     Top.                (line 1202)
-* a:                                     Top.                (line 1202)
-* index entry between item and itemx:    Top.                (line  313)
-* index entry between item and itemx <1>: Top.               (line  662)
-* index entry between item and itemx <2>: Top.               (line 1149)
-* index entry within deffn:              Top.                (line  159)
-* index entry within deffn <1>:          Top.                (line  508)
-* index entry within deffn <2>:          Top.                (line  995)
-* index entry within itemize:            Top.                (line  121)
-* index entry within itemize <1>:        Top.                (line  470)
-* index entry within itemize <2>:        Top.                (line  957)
-* index entry within multitable:         Top.                (line  129)
-* index entry within multitable <1>:     Top.                (line  478)
-* index entry within multitable <2>:     Top.                (line  966)
-* t-ruc:                                 Top.                (line 1202)
-* T-ruc:                                 Top.                (line 1202)
+* -option <1>:                           Top.                (line  364)
+* -option <2>:                           Top.                (line  723)
+* .:                                     Top.                (line 1199)
+* ?:                                     Top.                (line 1199)
+* a:                                     Top.                (line 1199)
+* index entry between item and itemx:    Top.                (line  312)
+* index entry between item and itemx <1>: Top.               (line  660)
+* index entry between item and itemx <2>: Top.               (line 1146)
+* index entry within deffn:              Top.                (line  158)
+* index entry within deffn <1>:          Top.                (line  506)
+* index entry within deffn <2>:          Top.                (line  992)
+* index entry within itemize:            Top.                (line  120)
+* index entry within itemize <1>:        Top.                (line  468)
+* index entry within itemize <2>:        Top.                (line  954)
+* index entry within multitable:         Top.                (line  128)
+* index entry within multitable <1>:     Top.                (line  476)
+* index entry within multitable <2>:     Top.                (line  963)
+* t-ruc:                                 Top.                (line 1199)
+* T-ruc:                                 Top.                (line 1199)
 
 * Menu:
 
 * --foption:                             Top.                (line   16)
-* --foption <1>:                         Top.                (line  365)
-* --foption <2>:                         Top.                (line  725)
-* .:                                     Top.                (line 1202)
-* ?:                                     Top.                (line 1202)
+* --foption <1>:                         Top.                (line  364)
+* --foption <2>:                         Top.                (line  723)
+* .:                                     Top.                (line 1199)
+* ?:                                     Top.                (line 1199)
 * ``:                                    Top.                (line   16)
-* `` <1>:                                Top.                (line  365)
-* `` <2>:                                Top.                (line  725)
-* a:                                     Top.                (line  176)
-* a <1>:                                 Top.                (line  312)
-* a <2>:                                 Top.                (line  525)
-* a <3>:                                 Top.                (line  661)
-* a <4>:                                 Top.                (line 1012)
-* a <5>:                                 Top.                (line 1148)
-* a <6>:                                 Top.                (line 1202)
-* b:                                     Top.                (line  313)
-* b <1>:                                 Top.                (line  662)
-* b <2>:                                 Top.                (line 1149)
-* bidule machin:                         Top.                (line  170)
-* bidule machin <1>:                     Top.                (line  519)
-* bidule machin <2>:                     Top.                (line 1006)
-* d--effn_name:                          Top.                (line  151)
-* d--effn_name <1>:                      Top.                (line  500)
-* d--effn_name <2>:                      Top.                (line  987)
-* d--efmac_name:                         Top.                (line  212)
-* d--efmac_name <1>:                     Top.                (line  561)
-* d--efmac_name <2>:                     Top.                (line 1048)
-* d--efmethod_name on c--lass:           Top.                (line  236)
-* d--efmethod_name on c--lass <1>:       Top.                (line  585)
-* d--efmethod_name on c--lass <2>:       Top.                (line 1072)
-* d--efop_name on c--lass:               Top.                (line  203)
-* d--efop_name on c--lass <1>:           Top.                (line  552)
-* d--efop_name on c--lass <2>:           Top.                (line 1039)
-* d--efspec_name:                        Top.                (line  215)
-* d--efspec_name <1>:                    Top.                (line  564)
-* d--efspec_name <2>:                    Top.                (line 1051)
-* d--eftypefn_name:                      Top.                (line  191)
-* d--eftypefn_name <1>:                  Top.                (line  540)
-* d--eftypefn_name <2>:                  Top.                (line 1027)
-* d--eftypefun_name:                     Top.                (line  224)
-* d--eftypefun_name <1>:                 Top.                (line  573)
-* d--eftypefun_name <2>:                 Top.                (line 1060)
-* d--eftypemethod_name on c--lass:       Top.                (line  239)
-* d--eftypemethod_name on c--lass <1>:   Top.                (line  588)
-* d--eftypemethod_name on c--lass <2>:   Top.                (line 1075)
-* d--eftypeop_name on c--lass:           Top.                (line  194)
-* d--eftypeop_name on c--lass <1>:       Top.                (line  543)
-* d--eftypeop_name on c--lass <2>:       Top.                (line 1030)
-* d--efun_name:                          Top.                (line  209)
-* d--efun_name <1>:                      Top.                (line  558)
-* d--efun_name <2>:                      Top.                (line 1045)
-* de--ffn_name:                          Top.                (line  154)
-* de--ffn_name <1>:                      Top.                (line  503)
-* de--ffn_name <2>:                      Top.                (line  990)
-* deffn:                                 Top.                (line  179)
-* deffn <1>:                             Top.                (line  181)
-* deffn <2>:                             Top.                (line  528)
-* deffn <3>:                             Top.                (line  530)
-* deffn <4>:                             Top.                (line 1015)
-* deffn <5>:                             Top.                (line 1017)
-* deffnx:                                Top.                (line  177)
-* deffnx <1>:                            Top.                (line  182)
-* deffnx <2>:                            Top.                (line  526)
-* deffnx <3>:                            Top.                (line  531)
-* deffnx <4>:                            Top.                (line 1013)
-* deffnx <5>:                            Top.                (line 1018)
-* followed:                              Top.                (line  173)
-* followed <1>:                          Top.                (line  522)
-* followed <2>:                          Top.                (line 1009)
-* I:                                     Top.                (line  158)
-* I <1>:                                 Top.                (line  184)
-* I <2>:                                 Top.                (line  507)
-* I <3>:                                 Top.                (line  533)
-* I <4>:                                 Top.                (line  994)
-* I <5>:                                 Top.                (line 1020)
-* id i ule:                              Top.                (line  164)
-* id i ule <1>:                          Top.                (line  513)
-* id i ule <2>:                          Top.                (line 1000)
-* id ule:                                Top.                (line  163)
-* id ule <1>:                            Top.                (line  512)
-* id ule <2>:                            Top.                (line  999)
-* log trap:                              Top.                (line  160)
-* log trap <1>:                          Top.                (line  509)
-* log trap <2>:                          Top.                (line  996)
-* log trap1:                             Top.                (line  161)
-* log trap1 <1>:                         Top.                (line  510)
-* log trap1 <2>:                         Top.                (line  997)
-* log trap2:                             Top.                (line  162)
-* log trap2 <1>:                         Top.                (line  511)
-* log trap2 <2>:                         Top.                (line  998)
-* machin:                                Top.                (line  169)
-* machin <1>:                            Top.                (line  171)
-* machin <2>:                            Top.                (line  518)
-* machin <3>:                            Top.                (line  520)
-* machin <4>:                            Top.                (line 1005)
-* machin <5>:                            Top.                (line 1007)
-* t--ruc:                                Top.                (line 1202)
-* T--ruc:                                Top.                (line 1202)
-* truc:                                  Top.                (line  159)
-* truc <1>:                              Top.                (line  185)
-* truc <2>:                              Top.                (line  508)
-* truc <3>:                              Top.                (line  534)
-* truc <4>:                              Top.                (line  995)
-* truc <5>:                              Top.                (line 1021)
+* `` <1>:                                Top.                (line  364)
+* `` <2>:                                Top.                (line  723)
+* a:                                     Top.                (line  175)
+* a <1>:                                 Top.                (line  311)
+* a <2>:                                 Top.                (line  523)
+* a <3>:                                 Top.                (line  659)
+* a <4>:                                 Top.                (line 1009)
+* a <5>:                                 Top.                (line 1145)
+* a <6>:                                 Top.                (line 1199)
+* b:                                     Top.                (line  312)
+* b <1>:                                 Top.                (line  660)
+* b <2>:                                 Top.                (line 1146)
+* bidule machin:                         Top.                (line  169)
+* bidule machin <1>:                     Top.                (line  517)
+* bidule machin <2>:                     Top.                (line 1003)
+* d--effn_name:                          Top.                (line  150)
+* d--effn_name <1>:                      Top.                (line  498)
+* d--effn_name <2>:                      Top.                (line  984)
+* d--efmac_name:                         Top.                (line  211)
+* d--efmac_name <1>:                     Top.                (line  559)
+* d--efmac_name <2>:                     Top.                (line 1045)
+* d--efmethod_name on c--lass:           Top.                (line  235)
+* d--efmethod_name on c--lass <1>:       Top.                (line  583)
+* d--efmethod_name on c--lass <2>:       Top.                (line 1069)
+* d--efop_name on c--lass:               Top.                (line  202)
+* d--efop_name on c--lass <1>:           Top.                (line  550)
+* d--efop_name on c--lass <2>:           Top.                (line 1036)
+* d--efspec_name:                        Top.                (line  214)
+* d--efspec_name <1>:                    Top.                (line  562)
+* d--efspec_name <2>:                    Top.                (line 1048)
+* d--eftypefn_name:                      Top.                (line  190)
+* d--eftypefn_name <1>:                  Top.                (line  538)
+* d--eftypefn_name <2>:                  Top.                (line 1024)
+* d--eftypefun_name:                     Top.                (line  223)
+* d--eftypefun_name <1>:                 Top.                (line  571)
+* d--eftypefun_name <2>:                 Top.                (line 1057)
+* d--eftypemethod_name on c--lass:       Top.                (line  238)
+* d--eftypemethod_name on c--lass <1>:   Top.                (line  586)
+* d--eftypemethod_name on c--lass <2>:   Top.                (line 1072)
+* d--eftypeop_name on c--lass:           Top.                (line  193)
+* d--eftypeop_name on c--lass <1>:       Top.                (line  541)
+* d--eftypeop_name on c--lass <2>:       Top.                (line 1027)
+* d--efun_name:                          Top.                (line  208)
+* d--efun_name <1>:                      Top.                (line  556)
+* d--efun_name <2>:                      Top.                (line 1042)
+* de--ffn_name:                          Top.                (line  153)
+* de--ffn_name <1>:                      Top.                (line  501)
+* de--ffn_name <2>:                      Top.                (line  987)
+* deffn:                                 Top.                (line  178)
+* deffn <1>:                             Top.                (line  180)
+* deffn <2>:                             Top.                (line  526)
+* deffn <3>:                             Top.                (line  528)
+* deffn <4>:                             Top.                (line 1012)
+* deffn <5>:                             Top.                (line 1014)
+* deffnx:                                Top.                (line  176)
+* deffnx <1>:                            Top.                (line  181)
+* deffnx <2>:                            Top.                (line  524)
+* deffnx <3>:                            Top.                (line  529)
+* deffnx <4>:                            Top.                (line 1010)
+* deffnx <5>:                            Top.                (line 1015)
+* followed:                              Top.                (line  172)
+* followed <1>:                          Top.                (line  520)
+* followed <2>:                          Top.                (line 1006)
+* I:                                     Top.                (line  157)
+* I <1>:                                 Top.                (line  183)
+* I <2>:                                 Top.                (line  505)
+* I <3>:                                 Top.                (line  531)
+* I <4>:                                 Top.                (line  991)
+* I <5>:                                 Top.                (line 1017)
+* id i ule:                              Top.                (line  163)
+* id i ule <1>:                          Top.                (line  511)
+* id i ule <2>:                          Top.                (line  997)
+* id ule:                                Top.                (line  162)
+* id ule <1>:                            Top.                (line  510)
+* id ule <2>:                            Top.                (line  996)
+* log trap:                              Top.                (line  159)
+* log trap <1>:                          Top.                (line  507)
+* log trap <2>:                          Top.                (line  993)
+* log trap1:                             Top.                (line  160)
+* log trap1 <1>:                         Top.                (line  508)
+* log trap1 <2>:                         Top.                (line  994)
+* log trap2:                             Top.                (line  161)
+* log trap2 <1>:                         Top.                (line  509)
+* log trap2 <2>:                         Top.                (line  995)
+* machin:                                Top.                (line  168)
+* machin <1>:                            Top.                (line  170)
+* machin <2>:                            Top.                (line  516)
+* machin <3>:                            Top.                (line  518)
+* machin <4>:                            Top.                (line 1002)
+* machin <5>:                            Top.                (line 1004)
+* t--ruc:                                Top.                (line 1199)
+* T--ruc:                                Top.                (line 1199)
+* truc:                                  Top.                (line  158)
+* truc <1>:                              Top.                (line  184)
+* truc <2>:                              Top.                (line  506)
+* truc <3>:                              Top.                (line  532)
+* truc <4>:                              Top.                (line  992)
+* truc <5>:                              Top.                (line 1018)
 
 Top section
 1 chapter

Modified: 
trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2    
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.2    
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting_regions.texi:28: warning: @ctrl is obsolete. (possibly involving 
@mymacro)
 formatting_regions.texi:28: warning: missing name for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:28: warning: missing category for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:28: warning: missing name for @deffnx (possibly 
involving @mymacro)
@@ -44,7 +43,6 @@
 formatting_regions.texi:28: warning: command @ref missing a node or external 
manual argument (possibly involving @mymacro)
 formatting_regions.texi:28: warning: command @inforef missing a node or 
external manual argument (possibly involving @mymacro)
 formatting_regions.texi:28: warning: command @inforef missing a node or 
external manual argument (possibly involving @mymacro)
-formatting_regions.texi:39: warning: @ctrl is obsolete. (possibly involving 
@mymacro)
 formatting_regions.texi:39: warning: missing name for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:39: warning: missing category for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:39: warning: missing name for @deffnx (possibly 
involving @mymacro)
@@ -90,7 +88,6 @@
 formatting_regions.texi:39: warning: command @ref missing a node or external 
manual argument (possibly involving @mymacro)
 formatting_regions.texi:39: warning: command @inforef missing a node or 
external manual argument (possibly involving @mymacro)
 formatting_regions.texi:39: warning: command @inforef missing a node or 
external manual argument (possibly involving @mymacro)
-formatting_regions.texi:46: warning: @ctrl is obsolete. (possibly involving 
@mymacro)
 formatting_regions.texi:46: warning: missing name for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:46: warning: missing category for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:46: warning: missing name for @deffnx (possibly 
involving @mymacro)
@@ -136,7 +133,6 @@
 formatting_regions.texi:46: warning: command @ref missing a node or external 
manual argument (possibly involving @mymacro)
 formatting_regions.texi:46: warning: command @inforef missing a node or 
external manual argument (possibly involving @mymacro)
 formatting_regions.texi:46: warning: command @inforef missing a node or 
external manual argument (possibly involving @mymacro)
-formatting_regions.texi:49: warning: @ctrl is obsolete. (possibly involving 
@mymacro)
 formatting_regions.texi:49: warning: missing name for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:49: warning: missing category for @deffnx (possibly 
involving @mymacro)
 formatting_regions.texi:49: warning: missing name for @deffnx (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-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_regions/formatting_regions.html 
2018-10-21 14:02:40 UTC (rev 8364)
@@ -131,7 +131,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1504,7 +1502,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2279,7 +2276,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3014,7 +3010,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>
@@ -3825,7 +3820,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2       
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.2       
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -44,7 +43,6 @@
 formatting.texi:25: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:25: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -90,7 +88,6 @@
 formatting.texi:35: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:35: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -136,7 +133,6 @@
 formatting.texi:45: warning: command @ref missing a node or external manual 
argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
 formatting.texi:45: warning: command @inforef missing a node or external 
manual argument (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: 
trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html    
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_weird_quotes/formatting.html    
2018-10-21 14:02:40 UTC (rev 8364)
@@ -132,7 +132,6 @@
 @cite{-a} -a
 @code{-a} -a
 @command{-a} -a
address@hidden -a
 @dfn{-a} -a
 @dmn{-a} -a
 @email{-a,-b} -b
@@ -774,7 +773,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -1505,7 +1503,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2262,7 +2259,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -2992,7 +2988,6 @@
 <code>@cite{--a}</code> <cite>&ndash;a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^&ndash;a
 <code>@dfn{--a}</code> <em>&ndash;a</em>
 <code>@dmn{--a}</code> &ndash;a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>&ndash;b</a>
@@ -3728,7 +3723,6 @@
 <code>@cite{--a}</code> <cite>--a</cite>
 <code>@code{--a}</code> <code>--a</code>
 <code>@command{--a}</code> <code>--a</code>
-<code>@ctrl{--a}</code> ^--a
 <code>@dfn{--a}</code> <em>--a</em>
 <code>@dmn{--a}</code> --a
 <code>@email{--a,--b}</code> <a href="mailto:--a";>--b</a>

Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.2
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.2        
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.2        
2018-10-21 14:02:40 UTC (rev 8364)
@@ -1,4 +1,3 @@
-formatting.texi:25: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -9,7 +8,6 @@
 formatting.texi:25: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:25: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:25: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:35: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -20,7 +18,6 @@
 formatting.texi:35: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:35: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:35: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:45: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
@@ -31,7 +28,6 @@
 formatting.texi:45: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:45: command @bullet not accepting argument in brace should not 
be on @table line (possibly involving @mymacro)
 formatting.texi:45: command @minus not accepting argument in brace should not 
be on @ftable line (possibly involving @mymacro)
-formatting.texi:49: warning: @ctrl is obsolete. (possibly involving @mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing category for @deffnx (possibly involving 
@mymacro)
 formatting.texi:49: warning: missing name for @deffnx (possibly involving 
@mymacro)

Modified: trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml
===================================================================
--- trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml      
2018-10-21 11:50:22 UTC (rev 8363)
+++ trunk/tp/tests/layout/res_parser/formatting_xml/formatting.xml      
2018-10-21 14:02:40 UTC (rev 8364)
@@ -150,7 +150,6 @@
 @code{@@address@hidden@}} @cite{--a}
 @code{@@address@hidden@}} @code{--a}
 @code{@@address@hidden@}} @command{--a}
address@hidden@@address@hidden@}} @ctrl{--a}
 @code{@@address@hidden@}} @dfn{--a}
 @code{@@address@hidden@}} @dmn{--a}
 @code{@@address@hidden,address@hidden @email{--a,--b}
@@ -887,7 +886,6 @@
 <code>&arobase;cite&lbrace;--a&rbrace;</code> <cite>&textndash;a</cite>
 <code>&arobase;code&lbrace;--a&rbrace;</code> <code>--a</code>
 <code>&arobase;command&lbrace;--a&rbrace;</code> <command>--a</command>
-<code>&arobase;ctrl&lbrace;--a&rbrace;</code> <ctrl>&textndash;a</ctrl>
 <code>&arobase;dfn&lbrace;--a&rbrace;</code> <dfn>&textndash;a</dfn>
 <code>&arobase;dmn&lbrace;--a&rbrace;</code> <dmn>&textndash;a</dmn>
 <code>&arobase;email&lbrace;--a,--b&rbrace;</code> 
<email><emailaddress>--a</emailaddress><emailname>&textndash;b</emailname></email>
@@ -1487,7 +1485,6 @@
 <code>&arobase;cite&lbrace;--a&rbrace;</code> <cite>&textndash;a</cite>
 <code>&arobase;code&lbrace;--a&rbrace;</code> <code>--a</code>
 <code>&arobase;command&lbrace;--a&rbrace;</code> <command>--a</command>
-<code>&arobase;ctrl&lbrace;--a&rbrace;</code> <ctrl>&textndash;a</ctrl>
 <code>&arobase;dfn&lbrace;--a&rbrace;</code> <dfn>&textndash;a</dfn>
 <code>&arobase;dmn&lbrace;--a&rbrace;</code> <dmn>&textndash;a</dmn>
 <code>&arobase;email&lbrace;--a,--b&rbrace;</code> 
<email><emailaddress>--a</emailaddress><emailname>&textndash;b</emailname></email>
@@ -2087,7 +2084,6 @@
 <code>&arobase;cite&lbrace;--a&rbrace;</code> <cite>&textndash;a</cite>
 <code>&arobase;code&lbrace;--a&rbrace;</code> <code>--a</code>
 <code>&arobase;command&lbrace;--a&rbrace;</code> <command>--a</command>
-<code>&arobase;ctrl&lbrace;--a&rbrace;</code> <ctrl>&textndash;a</ctrl>
 <code>&arobase;dfn&lbrace;--a&rbrace;</code> <dfn>&textndash;a</dfn>
 <code>&arobase;dmn&lbrace;--a&rbrace;</code> <dmn>&textndash;a</dmn>
 <code>&arobase;email&lbrace;--a,--b&rbrace;</code> 
<email><emailaddress>--a</emailaddress><emailname>&textndash;b</emailname></email>
@@ -2681,7 +2677,6 @@
 <code>&arobase;cite&lbrace;--a&rbrace;</code> <cite>--a</cite>
 <code>&arobase;code&lbrace;--a&rbrace;</code> <code>--a</code>
 <code>&arobase;command&lbrace;--a&rbrace;</code> <command>--a</command>
-<code>&arobase;ctrl&lbrace;--a&rbrace;</code> <ctrl>--a</ctrl>
 <code>&arobase;dfn&lbrace;--a&rbrace;</code> <dfn>--a</dfn>
 <code>&arobase;dmn&lbrace;--a&rbrace;</code> <dmn>--a</dmn>
 <code>&arobase;email&lbrace;--a,--b&rbrace;</code> 
<email><emailaddress>--a</emailaddress><emailname>--b</emailname></email>




reply via email to

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