Changeset 10739

Timestamp:

2005-10-20T12:06:26+13:00 (18 years ago)

Author:

mdewsnip

Message:

Added a bug fix suggested by Jens Wille: expand any macros in the text to be highlighted before it is highlighted, to prevent the highlighting messing up the macros in rare situations.

File:

• trunk/gsdl/src/recpt/highlighttext.cpp (modified) (1 diff)

trunk/gsdl/src/recpt/highlighttext.cpp

@@ -71 +71 @@
   remove_space(querystring);
 
+  // Expand macros before highlighting -- by Jens Wille
+  text_t text_expanded = "";
+  disp.expandstring(text, text_expanded);
+
   if ((args["hl"] == 2) || ((*(querystring.begin()) == '"') && (*(querystring.end()-1) == '"'))) {
-    highlight_phrases(text, querystring, terms, shl, ehl, disp, outconvert, textout);
+    highlight_phrases(text_expanded, querystring, terms, shl, ehl, disp, outconvert, textout);
   } else {
-    highlight_terms(text, terms, shl, ehl, disp, outconvert, textout);
+    highlight_terms(text_expanded, terms, shl, ehl, disp, outconvert, textout);
   }
 }