--- make_poll.pl	2003/11/08 22:12:57	1.19
+++ make_poll.pl	2003/11/08 22:42:18	1.20
@@ -556,10 +556,18 @@
 	} else {
 		$q_type = $q_db_col;
 	}
-
+	
 	$question_nr{$q_type}++;
 
-	$body.=$html{'que_before'} if ($html{'que_before'});
+	# attribute markup_before override que_before
+	my $markup_before = x($attref->{markup_before});
+	my $markup_after = x($attref->{markup_after});
+
+	if (defined($markup_before)) {
+		$body.=$markup_before;
+	} elsif ($html{'que_before'}) {
+		$body.=$html{'que_before'}
+	}
 
 	$$ncref = sub {
 		my ($xp, $text) = @_;
@@ -567,7 +575,11 @@
 		if (defined $text) {
 			$body.=x($text);
 		} else {
-			$body.=$html{'que_after'} if ($html{'que_after'});
+			if (defined($markup_after)) {
+				$body.=$markup_after;
+			} elsif ($html{'que_after'}) {
+				$body.=$html{'que_after'}
+			}
 		}
 	}
 }
@@ -577,7 +589,14 @@
 
 	my ($xp, $el, $attref, $ncref) = @_;
 
-	$body.=$html{'subque_before'} if ($html{'subque_before'});
+	my $markup_before = x($attref->{markup_before});
+	my $markup_after = x($attref->{markup_after});
+
+	if (defined($markup_before)) {
+		$body.=$markup_before;
+	} elsif ($html{'subque_before'}) {
+		$body.=$html{'subque_before'}
+	}
 
 	$$ncref = sub {
 		my ($xp, $text) = @_;
@@ -585,7 +604,11 @@
 		if (defined $text) {
 			$body.=x($text);
 		} else {
-			$body.=$html{'subque_after'} if ($html{'subque_after'});
+			if (defined($markup_after)) {
+				$body.=$markup_after;
+			} elsif ($html{'subque_after'}) {
+				$body.=$html{'subque_after'}
+			}
 		}
 	}
 }
@@ -596,7 +619,14 @@
 
 	my ($xp, $el, $attref, $ncref) = @_;
 
-	$body.=$html{'ans_before'} if ($html{'ans_before'});
+	my $markup_before = x($attref->{markup_before});
+	my $markup_after = x($attref->{markup_after});
+
+	if (defined($markup_before)) {
+		$body.=$markup_before;
+	} elsif ($html{'ans_before'}) {
+		$body.=$html{'ans_before'}
+	}
 	
 	$$ncref = sub {
 		my ($xp, $text) = @_;
@@ -604,7 +634,11 @@
 		if (defined $text) {
 			$body .= x($text);
 		} else {
-			$body.=$html{'ans_after'} if ($html{'ans_after'});
+			if (defined($markup_after)) {
+				$body.=$markup_after;
+			} elsif ($html{'ans_after'}) {
+				$body.=$html{'ans_after'}
+			}
 		}
 	}
 }