[ViewVC] Diff of: cvs/cfmaps/cfmap2html

Comparing cfmaps/cfmap2html (file contents):
Revision 1.1 by root, Thu Nov 17 11:51:08 2005 UTC vs.
Revision 1.12 by root, Sun Nov 20 05:02:58 2005 UTC

 #!/opt/bin/perl
+# cfmap2html - convert crossfire maps to html
+# Copyright (C) 2005      Marc Lehmann <gvpe@schmorp.de>
+#
+# CFMAP2HTML is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with gvpe; if not, write to the Free Software
+# Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+our $VERSION = '1.12';
 use Storable;
 my $LIBDIR = $ENV{CROSSFIRE_LIBDIR}
    or die "\$CROSSFIRE_LIBDIR must be set\n";
 my $T = 32;
 my $arch;
-umask 022;
 sub escape_html($) {
    local $_ = shift;
    s/([<>&])/sprintf "&#%d;", ord $1/ge;
    $_
 }
 for my $path (@ARGV) {
+#   print STDERR "$path\n";
    if (!-e "$path.png"
        || !-e "$path.pst"
        || -M "$path.pst" > -M $path
        || -M "$path.png" > -M $path) {
       # regenerate png and metainfo
-      $ENV{CROSSFIRE_LIBDIR} = $LIBDIR;
       system "cfmap2png", $path;
-      system "convert", "$path.png", -filter => "lanczos", -geometry => "3.125%", -quality => 85, "$path.jpg";
-      system "pngcrush", -m => 7, -reduce, "$path.png", "$path.png~";
-      rename "$path.png~", "$path.png";
    };
    $arch ||= Storable::retrieve "$LIBDIR/archetypes.pst";
    my $meta = Storable::retrieve "$path.pst";
-   open my $fh, ">:utf8", "$path.html"
+   open my $fh, ">:utf8", "$path.xhtml"
-      or die "$path.html: $!";
+      or die "$path.xhtml: $!";
    select $fh;
    my $W = $meta->{width}  * $T;
    my $H = $meta->{height} * $T;
+   my $W2 = $W + 600;
    my (@path) = split /\//, $path;
+   print "<?xml version='1.0' encoding='utf-8'?>",
-   print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">",
+         "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1//EN\" \"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd\">",
-         "<html>",
+         "<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en'>",
          "<head>",
-            "<title>$path</title>",
+            "<title>Crossfire Map \"$path\"</title>",
+            "<link rel='stylesheet' type='text/css' media='all' href='/common.css'/>\n",
-            "<style type='text/css'><!--\n",
+            "<style type='text/css'>\n",
-               "body { background: white; text-color: black; }\n",
+            ".map { width: ${W}px; height: ${H}px; background-image: url($path[-1].png); }\n",
-               "a { text-color: blue; }\n",
+            ".enlarge { width: ${W2}px; height: 600px; }\n",
-               "a:hover { text-color: red; }\n",
-               "a:visited { text-color: #008; }\n",
-               "#nav { border-spacing: 0px; margin: 10px; padding: 0px; }\n",
-               "#nav td { margin: 0px; padding: 0px; border: 0px; }\n",
-               "#thumb { border: 2px solid yellow; width: $meta->{width}px; height: $meta->{height}px; padding: 0px; }\n",
-               "#map { table-layout: fixed; width: ${W}px; height: ${H}px; border: 2px solid #777; border-spacing: 0px; ",
-                  "background-image: url($path[-1].png); background-position: 0px 0px; background-repeat: no-repeat; background-attachment: relative; }\n",
-               "#map tr { width: ${W}px; height: ${T}px; border-style: none; margin: 0px; padding: 0px; }\n",
-               "#map td { width: ${T}px; height: ${T}px; border-style: none; margin: 0px; padding: 0px; }\n",
-               "#map td:hover { border: 3px solid yellow; border-style: ridge; }\n",
-               "#map span { position: relative; }\n",
-               "#map div { display: none; position: absolute; min-width: 40em; ",
-                  "font-size: 8pt; border: 0px; background: #eee; border: 3px solid yellow; border-style: ridge; padding: 4px; }\n",
-               "#map td:hover div { display: block; position: absolute; z-index: 1; top: -1px; left: ${T}px; white-space: pre; }\n",
-               "p.m { white-space: pre; margin-left: 2em; background: #ddd; padding: 2px; border: 1px solid black; }\n",
-            "-->\n</style>",
+            "</style>",
          "</head>",
          "<body>";
-   print "<table id='nav'>",
+   print "<table class='nav'>",
-         "<tr><td rowspan='3'><span style='font-height: 20pt; font-style: bold;'>";
+         "<tr class='center'><td class='title' rowspan='3'>",
+         "Crossfire Map<br/>",
+         "<span class='big'>";
    print "<a href='/'>/</a> ";
    for (0 .. $#path - 1) {
       print "<a href='/", (join "/", @path[0..$_]), "/'>$path[$_]</a> / ";
    }
+   my @dir = qw(none up right down left);
    my @tile = map {
       $meta->{info}{"tile_path_$_"}
-         ? "<a href='$meta->{info}{\"tile_path_$_\"}.html'><img style='border: 2px solid blue;' src='$meta->{info}{\"tile_path_$_\"}.jpg'/></a>"
+         ? "<a href='$meta->{info}{\"tile_path_$_\"}.xhtml'><img class='tile' src='$meta->{info}{\"tile_path_$_\"}.jpg' alt='$dir[$_]'/></a>"
          : ""
    } 1..4;
+   #"}"# vim misparses without this comment
-   print "$path[-1] ";
+   print "$path[-1]",
-   print "</span></td>",
+         "</span>",
+         "<p class='about'><a href='/about.txt'>[more about cfmaps.schmorp.de]</a></p>",
+         "</td>",
          "<td/><td>$tile[0]</td><td/></tr>",
-         "<tr><td>$tile[3]</td>";
+         "<tr><td>$tile[3]</td>",
-   print "<td><img id='thumb' src='@path[-1].jpg'/></td>",
+         "<td><img class='thumb' src='@path[-1].jpg' width='$meta->{width}' height='$meta->{height}' alt='map thumbnail'/></td>",
-         "<td>$tile[1]</td>",
+         "<td>$tile[1]</td></tr>",
-         "<tr><td/><td>$tile[2]</td><td/></tr>";
+         "<tr><td/><td>$tile[2]</td><td/></tr>",
-   print "</table>";
+         "</table>";
    my $W1 = $W + 600;
-   print "<p style='width: ${W1}px'><a href='/about.txt'>[about cfmaps.schmorp.de]</a></p>";
+   print "<p class='m'>",
-   print "<p class='m' style='white-space: pre; width=auto; '>",
             escape_html $meta->{info}{msg},
          "</p>";
-   print "<table id='map'>";
+   print "<table class='map'>";
-   my %ignore = map +($_ => 1), qw(_name x y);
+   my %ignore = map +($_ => 1), qw(name _name x y);
    for my $y (0.. $meta->{height} - 1) {
       print "<tr>";
       for my $x (0.. $meta->{width} - 1) {
           print "<td>";
           if (my $as = $meta->{map}[$x][$y]) {
-             print "<span><div>($x|$y)<ul>";
+             print "<div><div>($x|$y)";
-             for my $a (@$as) {
-                my $o = $arch->{$a->{_name}};
-                print "<li>\"$o->{name}\" ($a->{_name})\n";
-                for (sort keys %$a) {
-                   next if $ignore{$_};
-                   my $v = escape_html $a->{$_};
-                   if (($o->{type} == 66 || $o->{type} == 41) && $_ eq "slaying") { # door, teleporter
+             sub print_archs {
-                      $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1
+                print "<ul>";
-                         if $v eq "/!"; # random map
+                for my $a (@{$_[0]}) {
+                   my $o = $arch->{$a->{_name}};
+                   my $type = $a->{type} || $o->{type};
+                   my $aname = escape_html $a->{_name};
+                   my $name = escape_html $a->{name} || $o->{name};
+                   print "<li><a href='/arc.xhtml#", (lc $a->{_name}), "'>$aname \"$name\"</a>\n";
+                   for (sort keys %$a) {
+                      next if $ignore{$_};
+                      my $v = escape_html $a->{$_};
+                      if ($_ eq "slaying" && ($type == 41 || $type == 57 || $type == 66)) { # door, teleporter, player_changer
+                         $a->{msg} =~ /^final_map\s*(\S+)\s*$/m, $v = $1
+                            if $v eq "/!"; # random map
-                      print "slaying => <a href='$v.html'>$v</a>\n";
+                         print "slaying => <a href='$v.xhtml'>$v</a>\n";
+                      } elsif ($_ eq "other_arch") {
+                         print "$_ => <a href='/arc.xhtml#", (lc $a->{$_}), "'>$v</a>\n";
+                      } elsif ($_ eq "inventory") {
+                         print "inventory =>\n";
+                         print_archs ($a->{$_});
-                   } elsif ($_ eq "msg") {
+                      } elsif ($_ eq "msg") {
-                      print "<p class='m'>$v</p>";
+                         print "<p class='m'>$v</p>";
-                   } else {
+                      } else {
-                      print "$_ => $v\n";
+                         print "$_ => $v\n";
+                      }
                    }
+                   print "</li>";
                 }
+                print "</ul>";
              }
+             print_archs $as;
-             print "</ul></div></span>";
+             print "</div></div>";
           }
           print "</td>";
       }
       print "</tr>";
    }
-   print "</table></p><p style='height: 600px;'/></body></html>";
+   print "</table><p class='footer'>created by <a href='http://software.schmorp.de/#crossfire'>cfmap2html</a> version $VERSION</p>",
+         "<p class='enlarge'/></body></html>";
    close $fh;
-   system "gzip", "-7f", "$path.html";
+   system "gzip", "-7f", "$path.xhtml";
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing cfmaps/cfmap2html (file contents): Revision 1.1 by root, Thu Nov 17 11:51:08 2005 UTC vs. Revision 1.12 by root, Sun Nov 20 05:02:58 2005 UTC

Diff Legend

Comparing cfmaps/cfmap2html (file contents):
Revision 1.1 by root, Thu Nov 17 11:51:08 2005 UTC vs.
Revision 1.12 by root, Sun Nov 20 05:02:58 2005 UTC