texinfo/tp/Texinfo Common.pm Convert/HTML.pm

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/09/15 18:24:21

Modified files:
        tp/Texinfo     : Common.pm 
        tp/Texinfo/Convert: HTML.pm 

Log message:
        Handle correctly documentencoding as a customization variable.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Common.pm?cvsroot=texinfo&r1=1.156&r2=1.157
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/Texinfo/Convert/HTML.pm?cvsroot=texinfo&r1=1.257&r2=1.258

Patches:
Index: Common.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Common.pm,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -b -r1.156 -r1.157
--- Common.pm   15 Sep 2012 12:19:42 -0000      1.156
+++ Common.pm   15 Sep 2012 18:24:21 -0000      1.157
@@ -149,7 +149,9 @@
 
 # those should be unique
 our @document_settable_unique_at_commands = (
-        'documentdescription', # FIXME this does not work
+        # when passed through a configuration variable, this should be
+        # already formatted for HTML
+        'documentdescription',
         'evenfootingmarks', 'evenheadingmarks',
         'everyfootingmarks', 'everyheadingmarks',
         'fonttextsize', 'footnotestyle', 'novalidate',

Index: Convert/HTML.pm
===================================================================
RCS file: /sources/texinfo/texinfo/tp/Texinfo/Convert/HTML.pm,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -b -r1.257 -r1.258
--- Convert/HTML.pm     14 Sep 2012 20:20:08 -0000      1.257
+++ Convert/HTML.pm     15 Sep 2012 18:24:21 -0000      1.258
@@ -6843,7 +6843,10 @@
   }
 
   # documentdescription
-  if ($self->{'extra'}->{'documentdescription'}) {
+  if (defined($self->get_conf('documentdescription'))) {
+    $self->{'documentdescription_string'} 
+      = $self->get_conf('documentdescription');
+  } elsif ($self->{'extra'}->{'documentdescription'}) {
     print STDERR "DO documentdescription\n" if ($self->get_conf('DEBUG'));
     $self->{'documentdescription_string'} 
       = $self->convert_tree_new_formatting_context(