PG 2.19 back to develop.

drgrice1 · drgrice1 · commit 0a13e88b054e · 2024-08-06T14:37:16.000-05:00
diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@
                          Online Homework Delivery System
                                    Version 2.*
 
-                    Copyright 2000-2023, The WeBWorK Project
+                    Copyright 2000-2024, The WeBWorK Project
                               All rights reserved.
 
     This program is free software; you can redistribute it and/or modify
diff --git a/README b/README
@@ -6,6 +6,6 @@
 
 		http://webwork.maa.org/wiki/Category:Release_Notes
 
-                    Copyright 2000-2023, The WeBWorK Project
+                    Copyright 2000-2024, The WeBWorK Project
                              http://webwork.maa.org
                               All rights reserved.
diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
-$PG_VERSION  ='2.18+develop';
-$PG_COPYRIGHT_YEARS = '1996-2023';
+$PG_VERSION  ='2.19';
+$PG_COPYRIGHT_YEARS = '1996-2024';
 
 1;
diff --git a/htdocs/js/AppletSupport/ww_applet_support.js b/htdocs/js/AppletSupport/ww_applet_support.js
@@ -1,6 +1,6 @@
 // ################################################################################
 // # WeBWorK Online Homework Delivery System
-// # Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+// # Copyright &copy; 2000-2024 The WeBWorK Project, https://github.com/openwebwork
 // #
 // # This program is free software; you can redistribute it and/or modify it under
 // # the terms of either: (a) the GNU General Public License as published by the
diff --git a/htdocs/js/Problem/problem.scss b/htdocs/js/Problem/problem.scss
@@ -1,5 +1,5 @@
 /* WeBWorK Online Homework Delivery System
- * Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+ * Copyright &copy; 2000-2024 The WeBWorK Project, https://github.com/openwebwork
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of either: (a) the GNU General Public License as published by the
diff --git a/htdocs/js/RadioButtons/RadioButtons.js b/htdocs/js/RadioButtons/RadioButtons.js
@@ -1,6 +1,6 @@
 // ################################################################################
 // # WeBWorK Online Homework Delivery System
-// # Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+// # Copyright &copy; 2000-2024 The WeBWorK Project, https://github.com/openwebwork
 // #
 // # This program is free software; you can redistribute it and/or modify it under
 // # the terms of either: (a) the GNU General Public License as published by the
diff --git a/htdocs/js/RadioMultiAnswer/RadioMultiAnswer.js b/htdocs/js/RadioMultiAnswer/RadioMultiAnswer.js
@@ -1,6 +1,6 @@
 // ################################################################################
 // # WeBWorK Online Homework Delivery System
-// # Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+// # Copyright &copy; 2000-2024 The WeBWorK Project, https://github.com/openwebwork
 // #
 // # This program is free software; you can redistribute it and/or modify it under
 // # the terms of either: (a) the GNU General Public License as published by the
diff --git a/htdocs/js/RadioMultiAnswer/RadioMultiAnswer.scss b/htdocs/js/RadioMultiAnswer/RadioMultiAnswer.scss
@@ -1,6 +1,6 @@
 // ################################################################################
 // # WeBWorK Online Homework Delivery System
-// # Copyright &copy; 2000-2023 The WeBWorK Project, https://github.com/openwebwork
+// # Copyright &copy; 2000-2024 The WeBWorK Project, https://github.com/openwebwork
 // #
 // # This program is free software; you can redistribute it and/or modify it under
 // # the terms of either: (a) the GNU General Public License as published by the
diff --git a/lib/Parser/BOP.pm b/lib/Parser/BOP.pm
@@ -302,6 +302,32 @@ sub swapOps {
 	return $self;
 }
 
+#
+#  Change an association "(a bop b) bop c" to "a bop (b bop c)" or vice versa
+#  argument $dir should be 'left' or 'right'
+#  'left'  for "a bop (b bop c)" to become "(a bop b) bop c"
+#  'right' for "(a bop b) bop c" to become "a bop (b bop c)"
+#  Assumes the calling entity verified it is appropriate to associate
+#
+sub associateOps {
+	my $self = shift;
+	my $dir  = shift;
+	if ($dir eq 'left') {
+		return $self->Item('BOP')->new(
+			$self->{equation}, $self->{bop},
+			$self->Item('BOP')->new($self->{equation}, $self->{bop}, $self->{lop}, $self->{rop}{lop})->reduce,
+			$self->{rop}{rop}
+		)->reduce;
+	} else {
+		return $self->Item('BOP')->new(
+			$self->{equation},
+			$self->{lop}{bop},
+			$self->{lop}{lop},
+			$self->Item('BOP')->new($self->{equation}, $self->{bop}, $self->{lop}{rop}, $self->{rop})
+		)->reduce;
+	}
+}
+
 #
 #  Get the variables from the two operands
 #
diff --git a/lib/Parser/BOP/multiply.pm b/lib/Parser/BOP/multiply.pm
@@ -68,6 +68,11 @@ sub _reduce {
 	$self->swapOps
 		if (($self->{rop}->class eq 'Number' && $self->{lop}->class ne 'Number' && $reduce->{'x*n'})
 			|| ($self->{lop}->class eq 'Function' && $self->{rop}->class ne 'Function' && $reduce->{'fn*x'}));
+	$self = $self->associateOps('left')
+		if ($reduce->{'m*(n*x)'}
+			&& $self->{lop}->class eq 'Number'
+			&& $self->{rop}->isa('Parser::BOP::multiply')
+			&& $self->{rop}{lop}->class eq 'Number');
 	return $self;
 }
 
@@ -78,14 +83,15 @@ sub makeNeg {
 	return $self;
 }
 
-$Parser::reduce->{'1*x'}    = 1;
-$Parser::reduce->{'x*1'}    = 1;
-$Parser::reduce->{'0*x'}    = 1;
-$Parser::reduce->{'x*0'}    = 1;
-$Parser::reduce->{'(-x)*y'} = 1;
-$Parser::reduce->{'x*(-y)'} = 1;
-$Parser::reduce->{'x*n'}    = 1;
-$Parser::reduce->{'fn*x'}   = 1;
+$Parser::reduce->{'1*x'}     = 1;
+$Parser::reduce->{'x*1'}     = 1;
+$Parser::reduce->{'0*x'}     = 1;
+$Parser::reduce->{'x*0'}     = 1;
+$Parser::reduce->{'(-x)*y'}  = 1;
+$Parser::reduce->{'x*(-y)'}  = 1;
+$Parser::reduce->{'x*n'}     = 1;
+$Parser::reduce->{'fn*x'}    = 1;
+$Parser::reduce->{'m*(n*x)'} = 1;
 
 sub string {
 	my ($self, $precedence, $showparens, $position, $outerRight) = @_;
diff --git a/macros/core/PGbasicmacros.pl b/macros/core/PGbasicmacros.pl
@@ -1968,11 +1968,26 @@ sub general_math_ev3 {
 		$out = "`$in`"                                   if $mode eq "inline";
 		$out = '<DIV ALIGN="CENTER">`' . $in . '`</DIV>' if $mode eq "display";
 	} elsif ($displayMode eq "PTX") {
-		#protect XML control characters
+		# protect XML control characters
 		$in =~ s/\&(?!([\w#]+;))/\\amp /g;
 		$in =~ s/</\\lt /g;
-		$out = '<m>' . "$in" . '</m>'   if $mode eq "inline";
-		$out = '<me>' . "$in" . '</me>' if $mode eq "display";
+		# attempt to parse align|alignat|gather into complete md/mrow structure, otherwise use me
+		if ($mode eq 'inline') {
+			$out = "<m>$in</m>";
+		} elsif ($mode eq 'display' && $in =~ /^\s*\\begin\{(align|alignat|gather)}((?!\\end\{\1}).)*\\end\{\1}\s*$/s) {
+			my $alignment = $1;
+			my $lines =
+				($in =~ s/^\s*\\begin\{$alignment}\s*(((?!\\end\{$alignment}).)*)\s*\\end\{$alignment}\s*$/$1/sr);
+			$lines =~ s/^\{\d+\}// if ($alignment eq 'alignat');
+			my @lines = split(/\\\\\n?/, $lines);
+			@lines = map { $_ =~ s/^\s+|\s+$//r } @lines;
+			my @rows = map {"<mrow>$_</mrow>"} @lines;
+			my $rows = join("\n", @rows);
+			$alignment = ($alignment eq 'align') ? '' : " alignment=\"$alignment\"";
+			$out       = "<md${alignment}>\n$rows\n</md>";
+		} elsif ($mode eq 'display') {
+			$out = "<me>$in</me>";
+		}
 	} elsif ($displayMode eq "HTML_LaTeXMathML") {
 		$in = HTML::Entities::encode_entities($in);
 		$in = '{' . $in . '}';
diff --git a/macros/deprecated/compoundProblem.pl b/macros/deprecated/compoundProblem.pl
diff --git a/macros/deprecated/compoundProblem2.pl b/macros/deprecated/compoundProblem2.pl
diff --git a/macros/deprecated/compoundProblem5.pl b/macros/deprecated/compoundProblem5.pl
diff --git a/macros/parsers/parserCheckboxList.pl b/macros/parsers/parserCheckboxList.pl
@@ -591,21 +591,21 @@ sub CHECKS {
 			my $originalLabels = $self->{originalLabels};
 			if ($originalLabels =~ m/^(123|abc|roman)$/i) {
 				my $marker = '';
-				$marker = "1" if $originalLabels eq '123';
-				$marker = "a" if $originalLabels eq 'abc';
-				$marker = "A" if uc($originalLabels) eq 'ABC' && $originalLabels ne 'abc';
-				$marker = "i" if $originalLabels eq 'roman';
-				$marker = "I" if uc($originalLabels) eq 'ROMAN' && $originalLabels ne 'roman';
+				$marker = '1' if $originalLabels eq '123';
+				$marker = 'a' if $originalLabels eq 'abc';
+				$marker = 'A' if uc($originalLabels) eq 'ABC' && $originalLabels ne 'abc';
+				$marker = 'i' if $originalLabels eq 'roman';
+				$marker = 'I' if uc($originalLabels) eq 'ROMAN' && $originalLabels ne 'roman';
 
 				$list_type = 'ol';
 				$subtype   = qq( marker="$marker");
 			} elsif ($self->{localLabels} || ref $originalLabels eq 'ARRAY') {
 				$list_type = 'dl';
 				$subtype   = ' width = "narrow"';
 				my %checks_to_labels = map { $checks[$_] => $self->{labels}[$_] } (0 .. $#{ $self->{orderedChoices} });
-				map { $_ =~ s/^(<li.*?>)/$1<title>$checks_to_labels{$_}<\/title>/gr } @checks;
+				@checks = map { $_ =~ s/^(<li.*?>)/$1<title>$checks_to_labels{$_}<\/title>/gr } @checks;
 			}
-			$checks[0] = qq{<$list_type$subtype name="$name">\n$checks[0]};
+			$checks[0] = qq{<$list_type$subtype name="$name" form="checkboxes">\n$checks[0]};
 			$checks[-1] .= "</$list_type>";
 
 			# Change math delimiters
diff --git a/macros/parsers/parserPopUp.pl b/macros/parsers/parserPopUp.pl
@@ -428,9 +428,10 @@ sub MENU {
 	} elsif ($main::displayMode eq 'PTX') {
 		if ($self->{showInStatic}) {
 			$menu = main::tag(
-				'fillin',
+				'ul',
 				name => $name,
-				join('', map { main::tag('choice', $self->quoteXML($_)) } (@list))
+				form => 'popup',
+				join('', map { main::tag('li', $self->quoteXML($_)) } (@list))
 			);
 		} else {
 			$menu = qq(<fillin name="$name"/>);
diff --git a/macros/parsers/parserRadioButtons.pl b/macros/parsers/parserRadioButtons.pl
@@ -301,10 +301,12 @@ sub new {
 		last             => undef,
 		order            => undef,
 		noindex          => 0,
+		localLabels      => 0,
 		showInStatic     => 1,
 		@_,
 		checkedI => -1,
 	);
+	$options{originalLabels} = $options{labels};
 	Value::Error("A RadioButton's first argument should be a list of button values")
 		unless ref($choices) eq 'ARRAY';
 	Value::Error("A RadioButton's second argument should be the correct button choice")
@@ -373,6 +375,7 @@ sub addLabels {
 		if (ref($choices->[$i]) eq "HASH") {
 			my $key = (keys %{ $choices->[$i] })[0];
 			$labels->[$i] = $key;
+			$self->{localLabels} = 1;
 			if (ref($choices->[$i]{$key}) eq 'ARRAY') {
 				$values[$i] = $choices->[$i]{$key}[1];
 				$choices->[$i] = $choices->[$i]{$key}[0];
@@ -442,8 +445,9 @@ sub flattenChoices {
 sub labelFormat {
 	my $self  = shift;
 	my $label = shift;
-	return ""   unless $label || $self->{forceLabelFormat};
-	$label = "" unless defined $label;
+	return '' unless $label || $self->{forceLabelFormat};
+	return '' if $main::displayMode eq 'PTX';
+	$label = '' unless defined $label;
 	sprintf($self->{labelFormat}, $self->protect($label));
 }
 
@@ -679,9 +683,26 @@ sub BUTTONS {
 		}
 	} elsif ($main::displayMode eq 'PTX') {
 		if ($self->{showInStatic}) {
-			$radio[0] = qq(<ul name="$name">) . "\n" . $radio[0];
-			$radio[-1] .= '</ul>';
-			#turn any math delimiters
+			# Do we want an ol, ul, or dl?
+			my $list_type      = 'ul';
+			my $subtype        = '';
+			my $originalLabels = $self->{originalLabels};
+			if ($originalLabels =~ m/^(123|abc)$/i) {
+				my $marker = '';
+				$marker    = '1' if $originalLabels eq '123';
+				$marker    = 'a' if $originalLabels eq 'abc';
+				$marker    = 'A' if uc($originalLabels) eq 'ABC' && $originalLabels ne 'abc';
+				$list_type = 'ol';
+				$subtype   = qq( marker="$marker");
+			} elsif ($self->{localLabels} || ref $originalLabels eq 'ARRAY') {
+				$list_type = 'dl';
+				$subtype   = ' width = "narrow"';
+				my %radio_to_labels = map { $radio[$_] => $self->{labels}[$_] } (0 .. $#{ $self->{orderedChoices} });
+				@radio = map { $_ =~ s/^(<li.*?>)/$1<title>$radio_to_labels{$_}<\/title>/gr } @radio;
+			}
+			$radio[0] = qq(<$list_type$subtype name="$name" form="buttons">) . "\n" . $radio[0];
+			$radio[-1] .= "</$list_type>";
+			# Change math delimiters
 			@radio = map { $_ =~ s/\\\(/<m>/g;   $_ } (@radio);
 			@radio = map { $_ =~ s/\\\)/<\/m>/g; $_ } (@radio);
 		} else {
diff --git a/macros/ui/niceTables.pl b/macros/ui/niceTables.pl

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/* WeBWorK Online Homework Delivery System`
`2`		`- * Copyright © 2000-2023 The WeBWorK Project, https://github.com/openwebwork`
	`2`	`+ * Copyright © 2000-2024 The WeBWorK Project, https://github.com/openwebwork`
`3`	`3`	`*`
`4`	`4`	`* This program is free software; you can redistribute it and/or modify it under`
`5`	`5`	`* the terms of either: (a) the GNU General Public License as published by the`