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

[raeburn]

raeburn		Mon Sep  1 19:01:08 2014 EDT

  Modified files:              
    /loncom/xml	londefdef.pm 
  Log:
  - Bug 6728.
    - Support printing where <img> has .svg file as src.
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.454 loncom/xml/londefdef.pm:1.455
--- loncom/xml/londefdef.pm:1.454	Mon Aug 25 00:20:19 2014
+++ loncom/xml/londefdef.pm	Mon Sep  1 19:01:08 2014
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.454 2014/08/25 00:20:19 raeburn Exp $
+# $Id: londefdef.pm,v 1.455 2014/09/01 19:01:08 raeburn Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -2811,7 +2811,7 @@
 
 	# &Apache::lonxml::debug("LaTeX rendering = $latex_rendering image file: $src");
 
-	#if original bmp/gif/jpg/png file exist do following:
+	#if original bmp/gif/jpg/png/svg file exist do following:
 	my $origsrc=$src;
 	my ($path,$file) = &get_eps_image($src);
 	# &Apache::lonnet::logthis("Image source: $src result: $path $file");
@@ -4325,8 +4325,8 @@
 	&Apache::lonnet::repcopy($orig_src); # Failure is not completely fatal.
     }
     &Apache::lonxml::debug("get_eps_image: Original image: $orig_src");
-    my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg)/i);
-    $src=~s/\.(bmp|gif|png|jpg|jpeg)$/\.eps/i;
+    my ($spath, $sname, $sext) = &fileparse($src, qr/\.(bmp|gif|png|jpg|jpeg|svg)/i);
+    $src=~s/\.(bmp|gif|png|jpg|jpeg|svg)$/\.eps/i;
     $src=&Apache::lonnet::filelocation($Apache::lonxml::pwd[-1],$src);
     &Apache::lonxml::debug("Filelocation gives: $src");
     if (! -e $src) {