use EscapeHTML() from PLP v3.23

[sheet.git] / cc.plp

diff --git a/cc.plp b/cc.plp
index 847324176763bdaa7e675c47c1fe363f48f4e688..7138c3b39cd815f06eadfae8a5b2b37b24619ba9 100644 (file)
--- a/cc.plp
+++ b/cc.plp
@@ -17,14 +17,6 @@
 <:
 my $cc = do 'cc.inc.pl';
 
 <:
 my $cc = do 'cc.inc.pl';
 

-sub quote {
-       local $_ = shift;
-       s/"/&quot;/g;
-       s/</&lt;/g;
-       s/>/&gt;/g;
-       return $_;
-}
-

 {
        printf '<table class="mcmap">';
        print '<col><colgroup span="26">';
 {
        printf '<table class="mcmap">';
        print '<col><colgroup span="26">';


@@ -62,12 +54,12 @@ sub quote {
                                s/North(?:ern)? /N-/g;
                                s/New /n./g;
                                s/(\S)(\S+)-/$1-/g;  # strip most chars preceding dash
                                s/North(?:ern)? /N-/g;
                                s/New /n./g;
                                s/(\S)(\S+)-/$1-/g;  # strip most chars preceding dash

-                               s/(\S{4}[b-df-hj-np-tv-xz])(\w{2,})/$1./g;  # abbreviate (at consonant)
-                               $_ = quote($_);
+                               s/(\S{4}[b-df-hj-np-tv-xz])((?<!Austr)(?!land)\w{2,})/$1./g;  # abbreviate (at consonant)
+                               $_ = EscapeHTML($_);

                        }
                        $name =~ s/([^,]*), (.*)/$2 $1/;
                        printf "\n".'<td class="%s" title="%s">%s',
                        }
                        $name =~ s/([^,]*), (.*)/$2 $1/;
                        printf "\n".'<td class="%s" title="%s">%s',

-                               $_ ? 'X '.$class : '', quote("$code: $name"), $_;
+                               $_ ? 'X '.$class : '', EscapeHTML("$code: $name"), $_;

                }
                print "\n";
        }
                }
                print "\n";
        }