[ViewVC] Diff of: cvs/cfmaps/cfmap2html

Comparing cfmaps/cfmap2html (file contents):
Revision 1.10 by root, Sun Nov 20 01:05:34 2005 UTC vs.
Revision 1.17 by root, Sun Nov 20 08:58:26 2005 UTC

 #
 # 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.05';
+our $VERSION = '1.2';
 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;
    $_
    };
    $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>Crossfire Map \"$path\"</title>",
+            "<link rel='stylesheet' type='text/css' media='all' href='/common.css'/>\n",
+            "<link rel='stylesheet' type='text/css' media='all' href='/overlay.css' title='Show Overlays'/>\n",
+            "<link rel='alternate stylesheet' type='text/css' media='all' href='/plain.css' title='Hide Overlays'/>\n",
-            "<style type='text/css'><!--\n",
+            "<style type='text/css'>\n",
-               "body { background: white; color: black; }\n",
+            ".map { width: ${W}px; height: ${H}px; background-image: url($path[-1].png); }\n",
-               "a { color: blue; }\n",
+            ".enlarge { width: ${W2}px; height: 600px; }\n",
-               "a:hover { color: #800; }\n",
-               "a:active { color: #f00; }\n",
-               "a:visited { color: #008; }\n",
-               "img { display: block; }\n",
-               ".nav { border-spacing: 0px; margin: 10px; padding: 0px; }\n",
-               ".nav td { margin: 0px; padding: 0px; border: 0px; }\n",
-               ".thumb { border: 3px solid yellow; width: $meta->{width}px; height: $meta->{height}px; padding: 0px; }\n",
-               ".tile { border: 3px solid blue; }\n",
-               ".tile:hover { border: 3px solid yellow; }\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; }\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 class='nav'>",
-         "<tr style='vertical-align: middle;'><td rowspan='3' style='padding-right: 3em'>",
+         "<tr class='center'><td class='title' rowspan='3'>",
          "Crossfire Map<br/>",
-         "<span style='font-size: 18pt'>";
+         "<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 class='tile' src='$meta->{info}{\"tile_path_$_\"}.jpg' alt='tile_path_$_'/></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]",
          "</span>",
-         "<p style='font-size: 8pt;'><a href='/about.txt'>[more about cfmaps.schmorp.de]</a></p>",
+         "<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>",
-         "<td><img class='thumb' src='@path[-1].jpg' alt='map thumbnail'/></td>",
+         "<td><img class='thumb' src='@path[-1].jpg' width='$meta->{width}' height='$meta->{height}' alt='map thumbnail'/></td>",
          "<td>$tile[1]</td></tr>",
          "<tr><td/><td>$tile[2]</td><td/></tr>",
          "</table>";
    my $W1 = $W + 600;
-   print "<p class='m' style='white-space: pre; width: auto; '>",
+   print "<p class='m'>",
             escape_html $meta->{info}{msg},
          "</p>";
    print "<table class='map'>";
    my %ignore = map +($_ => 1), qw(name _name x y);
+   my %is_exit = map +($_ => 1), 41, 57, 66;
    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]) {
+             my @class;
+             push @class, "fishy"  if grep $_->{invisible} || $_->{face} || exists $_->{no_pass}, @$as;
+             push @class, "exit"   if grep $is_exit{$arch->{$_->{_name}}{type}} && $_->{slaying}, @$as;
+             push @class, "dialog" if grep $_->{msg} =~ /^\@match/m, @$as;
+             print "<td", (@class ? " class='" . (join " ", @class) . "'" : ""), ">";
+             print "<div>";
+             print join "\n", map "<span class='c'>$_</span>",
+                reverse sort { (length $a) <=> (length $b) or $b <=> $a }
+                   grep $_, map $_->{connected}, @$as;
-             print "<span><div>($x|$y)";
+             print "<div>($x|$y)";
              sub print_archs {
                 print "<ul>";
                 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='/archetypes.html#", (lc $a->{_name}), "'>$aname \"$name\"</a>\n";
+                   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 (($type == 66 || $type == 41) && $_ eq "slaying") { # door, teleporter
+                      if ($_ eq "slaying" && $is_exit{$type}) { # 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='/archetypes.html#", (lc $a->{$_}), "'>$v</a>\n";
+                         print "$_ => <a href='/arc.xhtml#", (lc $a->{$_}), "'>$v</a>\n";
                       } elsif ($_ eq "inventory") {
                          print "inventory =>\n";
                          print_archs ($a->{$_});
                       } elsif ($_ eq "msg") {
                          print "<p class='m'>$v</p>";
                 }
                 print "</ul>";
              }
              print_archs $as;
-             print "</div></span>";
+             print "</div></div></td>";
+          } else {
+             print "<td/>";
           }
-          print "</td>";
       }
       print "</tr>";
    }
-   my $W2 = $W + 600;
-   print "</table><hr/><p style='font-size: 8pt'>created by <a href='http://software.schmorp.de/#crossfire'>cfmap2html</a> version $VERSION</p>",
+   print "</table><p class='footer'>created by <a href='http://software.schmorp.de/#crossfire'>cfmap2html</a> version $VERSION</p>",
-         "<p style='width: ${W2}px; height: 600px;'/></body></html>";
+         "<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.10 by root, Sun Nov 20 01:05:34 2005 UTC vs. Revision 1.17 by root, Sun Nov 20 08:58:26 2005 UTC

Diff Legend

Comparing cfmaps/cfmap2html (file contents):
Revision 1.10 by root, Sun Nov 20 01:05:34 2005 UTC vs.
Revision 1.17 by root, Sun Nov 20 08:58:26 2005 UTC