--- loncom/xml/lonplot.pm 2008/03/24 21:53:41 1.136 +++ loncom/xml/lonplot.pm 2008/05/12 11:13:28 1.137 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Dynamic plot # -# $Id: lonplot.pm,v 1.136 2008/03/24 21:53:41 raeburn Exp $ +# $Id: lonplot.pm,v 1.137 2008/05/12 11:13:28 foxr Exp $ # # Copyright Michigan State University Board of Trustees # @@ -821,8 +821,10 @@ sub parse_label { my %lookup = - ('(Alpha|#913)' => {'tex' => '{/Symbol A}', 'web' => "\x{391}"}, - '(Beta|#914)' => {'tex' => '{/Symbol B}', 'web' => "\x{392}"}, + ( # Greek alphabet: + + '(Alpha|#913)' => {'tex' => '{/Symbol A}', 'web' => "\x{391}"}, + '(Beta|#914)' => {'tex' => '{/Symbol B}', 'web' => "\x{392}"}, '(Chi|#935)' => {'tex' => '{/Symbol C}', 'web' => "\x{3A7}"}, '(Delta|#916)' => {'tex' => '{/Symbol D}', 'web' => "\x{394}"}, '(Epsilon|#917)' => {'tex' => '{/Symbol E}', 'web' => "\x{395}"}, @@ -869,6 +871,29 @@ my %lookup = '(xi|#958)' => {'tex' => '{/Symbol x}', 'web' => "\x{3BE}"}, '(psi|#968)' => {'tex' => '{/Symbol y}', 'web' => "\x{3C8}"}, '(zeta|#950)' => {'tex' => '{/Symbol z}', 'web' => "\x{3B6}"}, + + # Punctuation: + + '(quot|#034)' => {'tex' => '\42', 'web' => '\42'}, + '(amp|#038)' => {'tex' => '\46', 'web' => '\46'}, + '(lt|#060)' => {'tex' => '\74', 'web' => '\74'}, + '(gt|#062)' => {'tex' => '\76', 'web' => '\76'}, + '#131' => {'tex' => '{/Symbol \246}', 'web' => "\x{192}"}, + '#132' => {'tex' => '{/Text \271}', 'web' => "\x{201e}"}, + '#133' => {'tex' => '{/Symbol \274}', 'web'=> "\x{2026}"}, + '#134' => {'tex' => '{/Text \262}', 'web' => "\x{2020}"}, + '#135' => {'tex' => '{/Text \263}', 'web' => "\x{2021}"}, + '#136' => {'tex' => '\\\\^', 'web' => '\\\\^'}, + '#137' => {'tex' => '{/Text \275}', 'web' => "\x{2030}"}, + '#138' => {'tex' => 'S', 'web' => "\x{160}"}, # no S-caron in ps fonts. + '#139' => {'tex' => '<', 'web' => '<'}, + '#140' => {'tex' => '{/Text \352}','web' => "\x{152}"}, + '#145' => {'tex' => '\140', 'web' => "\x{2018}"}, + '#146' => {'tex' => '\47', 'web' => "\x{2019}"}, + '#147' => {'tex' => '{/Text \252}','web' => "\x{201c}"}, + '#148' => {'tex' => '{/Text \315}','web' => '\\"'}, + '#149' => {'tex' => '{/Symbol \267}', 'web' => "\x{2022}"}, + ); @@ -876,6 +901,7 @@ sub replace_entities { my ($target,$text) = @_; $text =~ s{([_^~\{\}]|\\\\)}{\\\\$1}g; while (my ($re, $replace) = each(%lookup)) { + my $repl = $replace->{$target}; $text =~ s/&$re;/$replace->{$target}/g; } $text =~ s{(&)}{\\\\$1}g;