[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/macro WeblogMacro.java,1.1,1.2 CodeMacro.java,1.4,1.5

[Klaus H. <js...@us...>]

Update of /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5933/WEB-INF/src/org/hartmath/server/macro

Modified Files:
	WeblogMacro.java CodeMacro.java 
Log Message:
Improved wikipedi syntax
Improved code:none macro for special characters <>"'

Index: CodeMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/CodeMacro.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CodeMacro.java	25 Apr 2004 18:55:54 -0000	1.4
--- CodeMacro.java	11 May 2004 20:55:10 -0000	1.5
***************
*** 129,133 ****
      } else {
        formatter = (SourceCodeFormatter) formatters.get(params.get("0"));
!       result = formatter.filter(params.getContent(), nullContext);
      }
  
--- 129,137 ----
      } else {
        formatter = (SourceCodeFormatter) formatters.get(params.get("0"));
!       if (formatter instanceof AbstractCPPBasedCodeFilter) {
!         result = formatter.filter(params.getContent(), nullContext);
!       } else {
!         result = formatter.filter(Encoder.escape(params.getContent()), nullContext);
!       }
      }
  

Index: WeblogMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/WeblogMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WeblogMacro.java	9 Mar 2004 20:13:06 -0000	1.1
--- WeblogMacro.java	11 May 2004 20:55:09 -0000	1.2
***************
*** 31,34 ****
--- 31,37 ----
  import java.util.List;
  
+ import org.snipsnap.app.Application;
+ import org.snipsnap.config.Configuration;
+ import org.snipsnap.render.filter.links.BackLinks;
  import org.snipsnap.render.macro.SnipMacro;
  import org.snipsnap.render.macro.parameter.SnipMacroParameter;
***************
*** 127,130 ****
--- 130,135 ----
          }
  
+         Configuration conf = Application.get().getConfiguration();
+         
          writer.write(entry.getXMLContent());
          writer.write(" <a href=\"");
***************
*** 141,147 ****
          writer.write(entry.getComments().getPostString());
          writer.write("</div>\n\n");
! //        writer.write("<div class=\"snip-backlinks\">");
! //        BackLinks.appendTo(writer, entry.getAccess().getBackLinks(), 5);
! //        writer.write("</div>");
        }
      } else {
--- 146,155 ----
          writer.write(entry.getComments().getPostString());
          writer.write("</div>\n\n");
! 
!         if ("true".equals(conf.getFeatureReferrerShow())) {
!           writer.write("<div class=\"snip-backlinks\">");
!           BackLinks.appendTo(writer, entry.getAccess().getBackLinks(), 5);
!           writer.write("</div>");
!         }
        }
      } else {