[7281] remove --javascript-ref

[gavinsmith0123]

Revision: 7281
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=7281
Author:   gavin
Date:     2016-07-30 18:55:22 +0000 (Sat, 30 Jul 2016)
Log Message:
-----------
remove --javascript-ref

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/tp/Texinfo/Common.pm
    trunk/tp/Texinfo/Convert/HTML.pm
    trunk/tp/texi2any.pl

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2016-07-30 18:20:58 UTC (rev 7280)
+++ trunk/ChangeLog     2016-07-30 18:55:22 UTC (rev 7281)
@@ -1,5 +1,24 @@
-2016-07-10  Gavin Smith  <address@hidden>
+2016-07-30  Gavin Smith  <address@hidden>
 
+       Remove --javascript-ref option, because nobody is using it.
+
+       * tp/texi2any.pl ($result_options): Remove option 
+       --javascript-ref.
+       ($cmdline_options): Remove value 'JAVASCRIPT_REFS'.
+       * tp/Texinfo/Convert/HTML.pm
+       (default_javascript_lines): Remove function.
+       (%default_formatting_references): Remove 'javascript_lines'.
+       (output): Don't call default_javascript_lines.
+       (_file_header_informations): Don't use 'JAVASCRIPT_LINES' conf 
+       value.
+       (_default_begin_file, default_node_redirection_page): Don't 
+       include lines referring to a JavaScript file in the file header.
+       * tp/Texinfo/Common.pm (@variable_string_settables): Remove
+       'JAVASCRIPT_LINES'.
+       (@variable_other_settables): Remove 'JAVASCRIPT_REFS'.
+
+2016-07-30  Gavin Smith  <address@hidden>
+
        * tp/Texinfo/Common.pm (%block_commands, %block_item_commands)
        (%item_line_commands): Remove 'ktable'.
        (%command_index): Remove 'ktable'.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2016-07-30 18:20:58 UTC (rev 7280)
+++ trunk/NEWS  2016-07-30 18:55:22 UTC (rev 7281)
@@ -31,7 +31,6 @@
     support file doc/txi-ja.tex for Japanese.
 
 * texi2any:
-  . New option `--javascript-ref'.  (TODO: Add documentation.)
   . Fix handling of compiler options when building Perl extension modules.
 
 * texi2dvi:

Modified: trunk/tp/Texinfo/Common.pm
===================================================================
--- trunk/tp/Texinfo/Common.pm  2016-07-30 18:20:58 UTC (rev 7280)
+++ trunk/tp/Texinfo/Common.pm  2016-07-30 18:55:22 UTC (rev 7281)
@@ -233,8 +233,8 @@
   'USE_NODE_TARGET',
   'PROGRAM_NAME_IN_FOOTER', 'NODE_FILENAMES',
   'EXTERNAL_CROSSREF_SPLIT', 'BODYTEXT',
-  'CSS_LINES', 'JAVASCRIPT_LINES',
-  'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE', 'CPP_LINE_DIRECTIVES',
+  'CSS_LINES', 'RENAMED_NODES_REDIRECTIONS', 'RENAMED_NODES_FILE',
+  'CPP_LINE_DIRECTIVES',
   'TEXI2DVI', 'DUMP_TREE', 'MAX_MACRO_CALL_NESTING',
   'INPUT_ENCODING_NAME', 'INPUT_PERL_ENCODING', 
   'OUTPUT_ENCODING_NAME', 'OUTPUT_PERL_ENCODING', 
@@ -270,7 +270,7 @@
   'MISC_BUTTONS', 'CHAPTER_BUTTONS', 'BUTTONS_NAME',
   'BUTTONS_EXAMPLE', 'SPECIAL_ELEMENTS_NAME', 'SPECIAL_ELEMENTS_CLASS',
   'ACTIVE_ICONS', 'PASSIVE_ICONS',
-  'CSS_FILES', 'CSS_REFS', 'JAVASCRIPT_REFS',
+  'CSS_FILES', 'CSS_REFS', 
   'GLOBAL_COMMANDS',
 );
 

Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm    2016-07-30 18:20:58 UTC (rev 7280)
+++ trunk/tp/Texinfo/Convert/HTML.pm    2016-07-30 18:55:22 UTC (rev 7281)
@@ -4566,7 +4566,6 @@
      'comment' => \&_default_comment,
      'protect_text' => \&_default_protect_text,
      'css_lines' => \&_default_css_lines,
-     'javascript_lines' => \&_default_javascript_lines,
      'begin_file' => \&_default_begin_file, 
      'node_redirection_page' => \&_default_node_redirection_page, 
      'end_file' => \&_default_end_file, 
@@ -5031,24 +5030,6 @@
   $self->{'css_rule_lines'} = address@hidden;
 }
 
-# Set 'JAVASCRIPT_LINES' conf value with text containing a reference to
-# an external JavaScript file.
-sub _default_javascript_lines ($)
-{
-  my $self = shift;
-
-  my $javascript_refs = $self->get_conf('JAVASCRIPT_REFS');
-  return if (!$javascript_refs or address@hidden);
-
-  my $javascript_text = '';
-  foreach my $script (@$javascript_refs) {
-    $javascript_text
-                .= '<script type="text/javascript" '
-                .  'src="' . $script . '"></script>' ."\n";
-  }
-  $self->set_conf('JAVASCRIPT_LINES', $javascript_text);
-}
-
 sub _node_id_file($$)
 {
   my $self = shift;
@@ -6268,12 +6249,6 @@
   } else {
     $css_lines = '';
   }
-  my $javascript_lines;
-  if (defined($self->get_conf('JAVASCRIPT_LINES'))) {
-    $javascript_lines = $self->get_conf('JAVASCRIPT_LINES');
-  } else {
-    $javascript_lines = '';
-  }
   my $doctype = $self->get_conf('DOCTYPE');
   my $bodytext = $self->get_conf('BODYTEXT');
   my $copying_comment = '';
@@ -6293,8 +6268,8 @@
     $generator = "\n<meta name=\"Generator\" content=\"$program\">";
   }
 
-  return ($title, $description, $encoding, $date, $css_lines,
-    $javascript_lines, $doctype, $bodytext, $copying_comment, $after_body_open,
+  return ($title, $description, $encoding, $date, $css_lines, 
+          $doctype, $bodytext, $copying_comment, $after_body_open,
           $extra_head, $program_and_version, $program_homepage,
           $program, $generator);
 }
@@ -6338,7 +6313,7 @@
     $command = $self->element_command($element);
   }
 
-  my ($title, $description, $encoding, $date, $css_lines, $javascript_lines,
+  my ($title, $description, $encoding, $date, $css_lines, 
           $doctype, $bodytext, $copying_comment, $after_body_open,
           $extra_head, $program_and_version, $program_homepage,
           $program, $generator) = $self->_file_header_informations($command);
@@ -6356,7 +6331,7 @@
 <meta name=\"resource-type\" content=\"document\">
 <meta name=\"distribution\" content=\"global\">${generator}$date
 $encoding
-${links}$css_lines$javascript_lines
+${links}$css_lines
 $extra_head
 </head>
 
@@ -6371,7 +6346,7 @@
   my $self = shift;
   my $command = shift;
 
-  my ($title, $description, $encoding, $date, $css_lines, $javascript_lines,
+  my ($title, $description, $encoding, $date, $css_lines,
           $doctype, $bodytext, $copying_comment, $after_body_open,
           $extra_head, $program_and_version, $program_homepage,
           $program, $generator) = $self->_file_header_informations($command);
@@ -6394,7 +6369,7 @@
 <meta name=\"resource-type\" content=\"document\">
 <meta name=\"distribution\" content=\"global\">${generator}$date
 $encoding
-$css_lines$javascript_lines
+$css_lines
 <meta http-equiv=\"Refresh\" content=\"0; url=$href\">
 $extra_head
 </head>
@@ -6880,7 +6855,6 @@
   return undef unless($structure_status);
 
   &{$self->{'format_css_lines'}}($self);
-  &{$self->{'format_javascript_lines'}}($self);
 
   $self->set_conf('BODYTEXT',
                   'lang="' . $self->get_conf('documentlanguage') . '"');

Modified: trunk/tp/texi2any.pl
===================================================================
--- trunk/tp/texi2any.pl        2016-07-30 18:20:58 UTC (rev 7280)
+++ trunk/tp/texi2any.pl        2016-07-30 18:55:22 UTC (rev 7281)
@@ -117,10 +117,8 @@
 # command line parsing.
 my @css_files = ();
 my @css_refs = ();
-my @javascript_refs = ();
 my $cmdline_options = { 'CSS_FILES' => address@hidden,
-                        'CSS_REFS' => address@hidden,
-                        'JAVASCRIPT_REFS' => address@hidden };
+                        'CSS_REFS' => address@hidden };
 
 # determine the path separators
 my $path_separator = $Config{'path_sep'};
@@ -977,7 +975,6 @@
  },
  'css-include=s' => address@hidden,
  'css-ref=s' => address@hidden,
- 'javascript-ref=s' => address@hidden,
  'transliterate-file-names!' => 
      sub {set_from_cmdline('TRANSLITERATE_FILE_NAMES', $_[1]);},
  'error-limit|e=i' => sub { set_from_cmdline('ERROR_LIMIT', $_[1]); },