branch master updated: * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): remove common code cases.

[Patrice Dumas]

This is an automated email from the git hooks/post-receive script.

pertusus pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new db0a2b1152 * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): 
remove common code cases.
db0a2b1152 is described below

commit db0a2b1152fe2072a544e6a93b5a91ba58314e2c
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Aug 1 12:09:09 2022 +0200

    * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): remove
    common code cases.
---
 ChangeLog                  |   7 ++-
 tp/Texinfo/Convert/HTML.pm | 118 +++++----------------------------------------
 2 files changed, 17 insertions(+), 108 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 03af2edcd9..6d8fc01653 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2022-07-31  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): remove
+       common code cases.
+
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
        HTML consistent @def* category formatting more similar with printed
 
        * tp/Texinfo/Convert/HTML.pm (_convert_def_line_type): separate
        category formatting from function line formatting for all the
-       cases.  Never format cactegory in code context.
+       cases.  Never format category in code context.
 
 2022-07-31  Patrice Dumas  <pertusus@free.fr>
 
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 6d71c30b9c..e7cda05d87 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -5869,14 +5869,6 @@ sub _convert_def_line_type($$$$)
   unshift @classes, $original_command_name;
 
   if (!$self->get_conf('DEF_TABLE')) {
-    my $tree;
-    my $name;
-    if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
-        and defined($element->{'extra'}->{'def_parsed_hash'}->{'name'})) {
-      $name = $element->{'extra'}->{'def_parsed_hash'}->{'name'};
-    } else {
-      $name = '';
-    }
     my $category;
     if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
         and defined($element->{'extra'}->{'def_parsed_hash'}->{'category'})) {
@@ -5915,16 +5907,21 @@ sub _convert_def_line_type($$$$)
         $category_tree = $self->gdt('{category}: ', {'category' => $category});
       }
       $category_result = $self->convert_tree($category_tree);
+    }
+    my $tree;
+    my $name;
+    if ($element->{'extra'} and $element->{'extra'}->{'def_parsed_hash'}
+        and defined($element->{'extra'}->{'def_parsed_hash'}->{'name'})) {
+      $name = $element->{'extra'}->{'def_parsed_hash'}->{'name'};
     } else {
-      $category = '';
+      $name = '';
     }
-    # metasyntactic argument, no class
+    # metasyntactic argument
     if ($command_name eq 'deffn'
         or $command_name eq 'defvr'
         or $command_name eq 'deftp'
-        or (($command_name eq 'defop'
-             or $command_name eq 'defcv')
-            and !$element->{'extra'}->{'def_parsed_hash'}->{'class'})) {
+        or $command_name eq 'defop'
+        or $command_name eq 'defcv') {
       if ($arguments) {
         $tree = $self->gdt("\@code{{name}} \@r{\@slanted{{arguments}}}", {
                 'name' => $name,
@@ -5932,30 +5929,9 @@ sub _convert_def_line_type($$$$)
       } else {
         $tree = $self->gdt("\@code{{name}}", {'name' => $name});
       }
-    # metasyntactic argument with a class
-    } elsif ($command_name eq 'defcv') {
-      if ($arguments) {
-        $tree = $self->gdt("\@code{{name}} \@r{\@slanted{{arguments}}}", {
-                'name' => $name,
-                'arguments' => $arguments});
-      } else {
-        $tree = $self->gdt("\@code{{name}}", {
-                'name' => $name});
-      }
-    } elsif ($command_name eq 'defop') {
-      if ($arguments) {
-        $tree = $self->gdt("\@code{{name}} \@r{\@slanted{{arguments}}}", {
-                'name' => $name,
-                'arguments' => $arguments});
-      } else {
-        $tree = $self->gdt("\@code{{name}}", {
-                'name' => $name});
-      }
     # starting here, arguments not metasyntactic:
     #   deftypefn, deftypevr, deftypeop, deftypecv
-    # no class
-    } elsif ($command_name eq 'deftypefn' or $command_name eq 'deftypevr'
-             or !$element->{'extra'}->{'def_parsed_hash'}->{'class'}) {
+    } else {
       if (!$element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
         if ($arguments) {
           $tree = $self->gdt("\@code{{name}} \@code{{arguments}}", {
@@ -6000,78 +5976,6 @@ sub _convert_def_line_type($$$$)
           }
         }
       }
-    # with a class and possibly a type
-    } elsif ($command_name eq 'deftypeop') {
-      # no type
-      if (!$element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
-        if ($arguments) {
-          $tree = $self->gdt("\@code{{name}} \@code{{arguments}}", {
-                'name' => $name,
-                'arguments' => $arguments});
-        } else {
-          $tree = $self->gdt("\@code{{name}}", {
-                'name' => $name});
-        }
-      } else {
-        if ($arguments) {
-          my $strings = {
-                'name' => $name,
-                'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                'arguments' => $arguments};
-          if ($self->get_conf('deftypefnnewline') eq 'on') {
-            $tree
-              = $self->gdt("\@code{{type}}\@* \@code{{name}} 
\@code{{arguments}}",
-                         $strings);
-          } else {
-            $tree
-              = $self->gdt("\@code{{type}} \@code{{name}} \@code{{arguments}}",
-                         $strings);
-          }
-        } else {
-          my $strings = {
-                'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                'name' => $name};
-          if ($self->get_conf('deftypefnnewline') eq 'on') {
-            $tree
-              = $self->gdt("\@code{{type}}\@* \@code{{name}}",
-                         $strings);
-          } else {
-            $tree
-              = $self->gdt("\@code{{type}} \@code{{name}}",
-                         $strings);
-          }
-        }
-      }
-    } elsif ($command_name eq 'deftypecv') {
-      # no type
-      if (!$element->{'extra'}->{'def_parsed_hash'}->{'type'}) {
-        if ($arguments) {
-          $tree = $self->gdt("\@code{{name}} \@code{{arguments}}", {
-                'name' => $name,
-                'arguments' => $arguments});
-        } else {
-          $tree = $self->gdt("\@code{{name}}", {
-                'name' => $name});
-        }
-      } else {
-        # type and class
-        if ($arguments) {
-          my $strings = {
-                  'name' => $name,
-                  'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                  'arguments' => $arguments};
-          $tree
-            = $self->gdt("\@code{{type}} \@code{{name}} \@code{{arguments}}",
-                         $strings);
-        } else {
-          my $strings = {
-                  'type' => $element->{'extra'}->{'def_parsed_hash'}->{'type'},
-                  'name' => $name};
-          $tree
-            = $self->gdt("\@code{{type}} \@code{{name}}",
-                         $strings);
-        }
-      }
     }
 
     if ($category_result ne '') {