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

[albertel]

albertel		Wed Aug 25 16:16:44 2004 EDT

  Modified files:              (Branch: version_1_2_X)
    /loncom/xml	londefdef.pm 
  Log:
   backport 1.237 and 1.238
  
  
Index: loncom/xml/londefdef.pm
diff -u loncom/xml/londefdef.pm:1.231.2.1 loncom/xml/londefdef.pm:1.231.2.2
--- loncom/xml/londefdef.pm:1.231.2.1	Thu Aug 19 08:23:17 2004
+++ loncom/xml/londefdef.pm	Wed Aug 25 16:16:44 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Tags Default Definition Module 
 #
-# $Id: londefdef.pm,v 1.231.2.1 2004/08/19 12:23:17 albertel Exp $
+# $Id: londefdef.pm,v 1.231.2.2 2004/08/25 20:16:44 albertel Exp $
 # 
 #
 # Copyright Michigan State University Board of Trustees
@@ -66,6 +66,7 @@
     @Apache::londefdef::description=();
     $Apache::londefdef::DD_redirection=0;
     $Apache::londefdef::DT_redirection=0;
+    $Apache::londefdef::list_index=0;
 }
 
 #======================= TAG SUBROUTINES =====================
@@ -1485,17 +1486,28 @@
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
-	my  $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,1);
-	if ($type=~/circle/) {
-	    $currentstring .= ' \item[o] ';
+	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
+	my $value=&Apache::lonxml::get_param('value',$parstack,$safeeval,undef,0);
+	#FIXME need to support types i and I 
+	if ($type=~/disc/) {
+	    $currentstring .= ' \item[$\bullet$] ';
+	} elsif ($type=~/circle/) {
+	    $currentstring .= ' \item[$\circ$] ';
 	} elsif ($type=~/square/) {
-	    $currentstring .= ' \item[$\Box$] ';
-	} elsif ($type ne '') { 
-	    $currentstring .= ' \item['.$type.'] ';
+	    $currentstring .= ' \item[$\diamond$] ';
+	} elsif ($type eq '1') {
+	    $currentstring .= ' \item['.($Apache::londefdef::list_index+1).'.]';
+	} elsif ($type eq 'A') {
+	    $currentstring .= ' \item['.('A'..'Z')[$Apache::londefdef::list_index].'.]';
+	} elsif ($type eq 'a') {
+	    $currentstring .= ' \item['.('a'..'z')[$Apache::londefdef::list_index].'.]';
+	} elsif ($value ne '') {
+	    $currentstring .= ' \item['.$value.'] ';
 	} else {
 	    $currentstring .= ' \item ';
 	}  
-    } 
+	$Apache::londefdef::list_index++;
+    }
     return $currentstring;
 }
 
@@ -1542,6 +1554,7 @@
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
 	my $TeXtype=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
+	$Apache::londefdef::list_index=0;
 	if ($TeXtype eq 'disc') {
 	    $currentstring .= '\renewcommand{\labelitemi}{$\bullet$}'.
                               '\renewcommand{\labelitemii}{$\bullet$}'. 
@@ -1630,6 +1643,7 @@
     if ($target eq 'web') {
 	$currentstring = $token->[4];     
     } elsif ($target eq 'tex') {
+	$Apache::londefdef::list_index=0;
 	my $type=&Apache::lonxml::get_param('type',$parstack,$safeeval,undef,0);
 	if ($type eq '1') {
 	    $currentstring .= '\renewcommand{\labelenumi}{\arabic{enumi}.}'.