Преглед изворни кода

Fix XHTML error when having '<set option="value">' in a CSS file that gets included.
Append "+CVS" if the directory CVS/ exist in the source tree (ie a cvs checkout).

Torbjorn Svensson пре 20 година
родитељ
комит
f8f5beb749
3 измењених фајлова са 7 додато и 1 уклоњено
  1. 4 0
      docs/Changelog
  2. 1 1
      modules/Pisg.pm
  3. 2 0
      modules/Pisg/HTMLGenerator.pm

+ 4 - 0
docs/Changelog

@@ -16,6 +16,10 @@ pisg (0.69) - ??
        for this note).
        for this note).
      + Fix minortypo in HTMLGenerator.pm (thanks Daeron).
      + Fix minortypo in HTMLGenerator.pm (thanks Daeron).
      + Fix wordcount (thanks Daeron).
      + Fix wordcount (thanks Daeron).
+     + Use nested HTML comments in CSS to cheat XML error having "<set ..>"
+       in the CSS file.
+   * Features:
+     + Add "+CVS" to versionstring if ./CVS is found
    Language Updates:
    Language Updates:
      + Portuguese: completed by DarkForce72.
      + Portuguese: completed by DarkForce72.
      + Portuguese/Brazil: completed by Guilherme Barile.
      + Portuguese/Brazil: completed by Guilherme Barile.

+ 1 - 1
modules/Pisg.pm

@@ -219,7 +219,7 @@ sub get_default_config_settings
         modules_dir => '',         # set in get_cmdline_options
         modules_dir => '',         # set in get_cmdline_options
         cchannels => '',           # set in get_cmdline_options
         cchannels => '',           # set in get_cmdline_options
 
 
-        version => "0.68",
+        version => "0.68" . (-d "$self->{search_path}/CVS" ? '+CVS' : ''),
     };
     };
 
 
     # This enables us to use the search_path in other modules
     # This enables us to use the search_path in other modules

+ 2 - 0
modules/Pisg/HTMLGenerator.pm

@@ -224,6 +224,8 @@ sub _htmlheader
         {
         {
             local $/; # enable "slurp" mode
             local $/; # enable "slurp" mode
             $CSS = "<style type=\"text/css\" title=\"$self->{cfg}->{colorscheme}\">\n". <FILE>. "</style>";
             $CSS = "<style type=\"text/css\" title=\"$self->{cfg}->{colorscheme}\">\n". <FILE>. "</style>";
+			$CSS =~ s/\/\*/\/\* <!--/g;
+			$CSS =~ s/\*\//--> \*\//g;
         }
         }
         close FILE;
         close FILE;
     }
     }