From: jj v. a. <we...@ma...> - 2005-02-05 14:24:25
|
Log Message: ----------- Work around IE bug for ordered lists. Maybe someday this can be undone. Modified Files: -------------- pg/macros: PGchoicemacros.pl PGbasicmacros.pl Revision Data ------------- Index: PGbasicmacros.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/PGbasicmacros.pl,v retrieving revision 1.35 retrieving revision 1.36 diff -Lmacros/PGbasicmacros.pl -Lmacros/PGbasicmacros.pl -u -r1.35 -r1.36 --- macros/PGbasicmacros.pl +++ macros/PGbasicmacros.pl @@ -1660,25 +1660,33 @@ sub OL { my(@array) = @_; my $i = 0; + my @alpha = ("A".."Z"); + my $letter; my $out= &M3( "\\begin{enumerate}\n", " \\begin{rawhtml} <OL TYPE=\"A\" VALUE=\"1\"> \\end{rawhtml} ", - "<OL TYPE=\"A\" VALUE=\"1\">\n" + # kludge to fix IE/CSS problem + #"<OL TYPE=\"A\" VALUE=\"1\">\n" + "<BLOCKQUOTE>\n" ) ; my $elem; foreach $elem (@array) { + $letter = shift @alpha; $out .= MODES( TeX=> "\\item[$ALPHABET[$i].] $elem\n", Latex2HTML=> " \\begin{rawhtml} <LI> \\end{rawhtml} $elem ", - HTML=> "<LI> $elem\n", - HTML_dpng=> "<LI> $elem <br /> <br /> \n" + #HTML=> "<LI> $elem\n", + HTML=> "<br /> <b>$letter.</b> $elem\n", + #HTML_dpng=> "<LI> $elem <br /> <br /> \n" + HTML_dpng=> "<br /> <b>$letter.</b> $elem \n" ); $i++; } $out .= &M3( "\\end{enumerate}\n", " \\begin{rawhtml} </OL>\n \\end{rawhtml} ", - "</OL>\n" + #"</OL>\n" + "</BLOCKQUOTE>\n" ) ; } Index: PGchoicemacros.pl =================================================================== RCS file: /webwork/cvs/system/pg/macros/PGchoicemacros.pl,v retrieving revision 1.5 retrieving revision 1.6 diff -Lmacros/PGchoicemacros.pl -Lmacros/PGchoicemacros.pl -u -r1.5 -r1.6 --- macros/PGchoicemacros.pl +++ macros/PGchoicemacros.pl @@ -528,24 +528,31 @@ my $self = shift; my(@array) = @_; my $i = 0; + my @alpha = ("A".."Z"); + my $letter; my $out= &main::M3( "\\begin{enumerate}\n", " \\begin{rawhtml} <OL TYPE=\"A\" VALUE=\"1\"> \\end{rawhtml} ", - "<OL COMPACT TYPE=\"A\" START=\"1\">\n" + # kludge to fix IE/CSS problem + #"<OL COMPACT TYPE=\"A\" START=\"1\">\n" + "<BLOCKQUOTE>\n" ) ; my $elem; foreach $elem (@array) { + $letter = shift @alpha; $out .= &main::M3( "\\item[$main::ALPHABET[$i].] $elem\n", " \\begin{rawhtml} <LI> \\end{rawhtml} $elem ", - "<LI> $elem\n" + #"<LI> $elem</LI>\n" + "<br /> <b>$letter.</b> $elem\n" ) ; $i++; } $out .= &main::M3( "\\end{enumerate}\n", " \\begin{rawhtml} </OL>\n \\end{rawhtml} ", - "</OL>\n" + #"</OL>\n" + "</BLOCKQUOTE>\n" ) ; $out; |