[LON-CAPA-cvs] cvs: loncom /xml lonxml.pm

sakharuk lon-capa-cvs@mail.lon-capa.org
Thu, 19 Feb 2004 19:29:40 -0000


sakharuk		Thu Feb 19 14:29:40 2004 EDT

  Modified files:              
    /loncom/xml	lonxml.pm 
  Log:
  I fixed my own bug. When I added line allowing to print something like ###3 I 
  disallowed to print HTML entities (for example &$984;). Now all these possibilities are supported and can be printed.
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.301 loncom/xml/lonxml.pm:1.302
--- loncom/xml/lonxml.pm:1.301	Fri Feb  6 15:59:50 2004
+++ loncom/xml/lonxml.pm	Thu Feb 19 14:29:40 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.301 2004/02/06 20:59:50 sakharuk Exp $
+# $Id: lonxml.pm,v 1.302 2004/02/19 19:29:40 sakharuk Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -410,8 +410,8 @@
 	#fixup & if it doesn't look like
         # { or α
 	$string=~s/(&(?!((\#[0-9]+)|([a-z]+));))/\\$1/gi;
-	$string=~s/([^&])\#/$1\\#/g;
-	$string=~s/([^\\])\#/$1\\#/g;
+        $string=~s/([^&\\])\#/$1\\#/g;
+	$string=~s/\#\#/\#\\#/g;
 	$string=~s/(\$|_|{|})/\\$1/g;
 	$string=~s/\\char92 /\\texttt{\\char92}/g;
 	$string=~s/(>|<)/\$$1\$/g; #more or less