Update of /var/cvs/applications/richtext/src/org/mmbase/richtext/transformers In directory james.mmbase.org:/tmp/cvs-serv28311/src/org/mmbase/richtext/transformers
Modified Files: XmlField.java Log Message: support for css classes See also: http://cvs.mmbase.org/viewcvs/applications/richtext/src/org/mmbase/richtext/transformers Index: XmlField.java =================================================================== RCS file: /var/cvs/applications/richtext/src/org/mmbase/richtext/transformers/XmlField.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- XmlField.java 3 Jun 2008 11:26:22 -0000 1.7 +++ XmlField.java 3 Jun 2008 11:58:43 -0000 1.8 @@ -34,7 +34,7 @@ * Like [EMAIL PROTECTED] org.mmbase.util.transformers.XmlField} but adds everything related to the MMXF doctype. This means basicly that it knows how to surround <mmxf /> * * @author Michiel Meeuwissen - * @version $Id: XmlField.java,v 1.7 2008/06/03 11:26:22 michiel Exp $ + * @version $Id: XmlField.java,v 1.8 2008/06/03 11:58:43 michiel Exp $ * @todo THIS CLASS NEEDS A CONCEPT! It gets a bit messy. */ @@ -71,14 +71,14 @@ org.mmbase.util.Encode.register(XmlField.class.getName()); } - private static final Pattern WIKI_WRAPPING_ANCHOR = Pattern.compile("\\[(\\w+):(.*?)\\]"); + private static final Pattern WIKI_WRAPPING_ANCHOR = Pattern.compile("\\[(\\w+):(.*?)(?:(.*?))?\\]"); private static final Pattern WIKI_P = Pattern.compile("<p>\\[(\\w+)\\]"); private static final Pattern WIKI_SECTION = Pattern.compile("<section><h>\\[(\\w+)\\]"); private static final Pattern WIKI_ANCHOR = Pattern.compile("\\[(\\w+)\\]"); public static String wikiToXML(String data, boolean leaveExtraNewLines, boolean placeListsInsideP) { Matcher wrappingAnchors = WIKI_WRAPPING_ANCHOR.matcher(prepareDataString(data)); - data = wrappingAnchors.replaceAll("<a id=\"$1\">$2</a>"); + data = wrappingAnchors.replaceAll("<a id=\"$1\" class=\"$3\">$2</a>"); StringObject obj = new StringObject(data); handleRich(obj, true, leaveExtraNewLines, true, placeListsInsideP); if (leaveExtraNewLines) { _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs