branch master updated: * tp/Texinfo/Convert/Converter.pm (converter), tp/Texinfo/Convert/LaTeX.pm: minor coding changes.

[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 47b60fb  * tp/Texinfo/Convert/Converter.pm (converter), 
tp/Texinfo/Convert/LaTeX.pm: minor coding changes.
47b60fb is described below

commit 47b60fb8c5e9ea15b914ce0dcb0e0e7bfb108c2e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sat Sep 11 15:23:47 2021 +0200

    * tp/Texinfo/Convert/Converter.pm (converter), tp/Texinfo/Convert/LaTeX.pm:
    minor coding changes.
---
 tp/Texinfo/Convert/Converter.pm | 5 +----
 tp/Texinfo/Convert/LaTeX.pm     | 7 ++++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index baffd8e..5cb1218 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -207,10 +207,7 @@ sub converter(;$)
   # set $converter->{'converter_init_conf'} to the configuration
   # options obtained after setting the defaults and applying
   # the configuration passed as argument.
-  $converter->{'converter_init_conf'} = {};
-  foreach my $key (keys(%{$converter->{'conf'}})) {
-    $converter->{'converter_init_conf'}->{$key} = $converter->{'conf'}->{$key};
-  }
+  $converter->{'converter_init_conf'} = { %{$converter->{'conf'}} };
   foreach my $key (keys (%defaults)) {
     if (defined($converter->{$key})) {
       $converter->{'converter_init_conf'}->{$key} = $converter->{$key};
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 9a6a774..745b51b 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -1531,9 +1531,10 @@ sub _set_environment_options($$$)
 sub _kbd_code_style($)
 {
   my $self = shift;
-  return (defined($self->{'conf'}->{'kbdinputstyle'})
-          and ($self->{'conf'}->{'kbdinputstyle'} eq 'code'
-            or ($self->{'conf'}->{'kbdinputstyle'} eq 'example'
+  my $kbdinputstyle = $self->get_conf('kbdinputstyle');
+  return (defined($kbdinputstyle)
+          and ($kbdinputstyle eq 'code'
+            or ($kbdinputstyle eq 'example'
               and 
(scalar(@{$self->{'formatting_context'}->[-1]->{'preformatted_context'}})
                    and 
$preformatted_code_commands{$self->{'formatting_context'}->[-1]->{'preformatted_context'}->[-1]}))));
 }