[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-commits ] SF.net SVN: jedit: [9366] plugins/Code2HTML/trunk
From: seconddevil () users ! sourceforge ! net
Date: 2007-03-31 13:55:57
Message-ID: E1HXe3h-0004aX-K8 () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]
Revision: 9366
http://svn.sourceforge.net/jedit/?rev=9366&view=rev
Author: seconddevil
Date: 2007-03-31 06:55:57 -0700 (Sat, 31 Mar 2007)
Log Message:
-----------
Bug fixes over previous release and CSS styles now allow the gutter to be the same \
size as in jEdit. Also the CSS right-border has been set instead of a char for better \
display
Modified Paths:
--------------
plugins/Code2HTML/trunk/Code2HTML.props
plugins/Code2HTML/trunk/TODO
plugins/Code2HTML/trunk/code2html/Code2HTML.java
plugins/Code2HTML/trunk/code2html/Code2HTMLOptionPane.java
plugins/Code2HTML/trunk/code2html/Main.java
plugins/Code2HTML/trunk/code2html/html/HtmlCssGutter.java
plugins/Code2HTML/trunk/code2html/html/HtmlDocument.java
plugins/Code2HTML/trunk/code2html/html/HtmlGutter.java
plugins/Code2HTML/trunk/code2html/html/HtmlPainter.java
Modified: plugins/Code2HTML/trunk/Code2HTML.props
===================================================================
--- plugins/Code2HTML/trunk/Code2HTML.props 2007-03-31 12:54:16 UTC (rev 9365)
+++ plugins/Code2HTML/trunk/Code2HTML.props 2007-03-31 13:55:57 UTC (rev 9366)
@@ -38,7 +38,7 @@
code2html.use-css=true
code2html.show-gutter=true
code2html.wrap=0
-options.code2html.body.style.value=background: #ffffff
+options.code2html.body.style.value=\tbackground: #ffffff;
options.code2html.pre.style.value=
options.code2html.body.html.value=bgcolor="#ffffff"
options.code2html.pre.html.value=
@@ -50,3 +50,6 @@
options.code2html.label=Code2HTML
options.code2html.code=new code2html.Code2HTMLOptionPane();
+# Other properties
+plugin.code2html.line.separator=\n
+plugin.code2html.gutter.divider=|
Modified: plugins/Code2HTML/trunk/TODO
===================================================================
--- plugins/Code2HTML/trunk/TODO 2007-03-31 12:54:16 UTC (rev 9365)
+++ plugins/Code2HTML/trunk/TODO 2007-03-31 13:55:57 UTC (rev 9366)
@@ -4,16 +4,23 @@
-- TODO for version 0.6 --
--------------------------------------------------------------------------------
* Need to follow the @todo tags in several files
++ Add gutter font size to style sheet (view.gutter.fontsize)
++ change gutter object from span to something more line-expansive - nested span
* Work out what the code does in obfuscated bits, no time ATM
* Link th estandalone code with jEdit. It is already required to even start so
it should be painless (probably... maybe... just a bit)
* Code should at the very least be copied and exported (symlinked) from main
- jEdit trunk.
+ jEdit trunk - better, require jedit.jar in ${CLASSPATH}.
+ * Make scripts to run the standalone Code2HTML command
* Make better docs
- * Include javadoc in help file
+ * Include javadoc in help file ?
* prettyfy help file a bit
-* Check that I got rid of all hardcoded \n's
++ Check that I got rid of all hardcoded \n's - Firefox problem: \r\n is
+ interpreted as \n\n when inside <pre> tags. Hardcode \n's all over again!
+ + Better yet - put \n as a property in props file
* Clean up code in html package
+ * Make abstract gutter class; style class & make {CSS/HTML}{Gutter/Style}
+ subclass it
* Add ant target to reload plugin
* Fix the <span class="some>word</span> <span class="some">after</span>
duplication in generated code
Modified: plugins/Code2HTML/trunk/code2html/Code2HTML.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/Code2HTML.java 2007-03-31 12:54:16 UTC (rev \
9365)
+++ plugins/Code2HTML/trunk/code2html/Code2HTML.java 2007-03-31 13:55:57 UTC (rev \
9366) @@ -84,7 +84,7 @@
this.style,
this.gutter,
buffer.getName(),
- System.getProperty("line.separator"));
+ jEdit.getProperty("plugin.code2html.line.separator"));
}
Modified: plugins/Code2HTML/trunk/code2html/Code2HTMLOptionPane.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/Code2HTMLOptionPane.java 2007-03-31 12:54:16 \
UTC (rev 9365)
+++ plugins/Code2HTML/trunk/code2html/Code2HTMLOptionPane.java 2007-03-31 13:55:57 \
UTC (rev 9366) @@ -105,6 +105,7 @@
new EtchedBorder(EtchedBorder.LOWERED),
jEdit.getProperty("options.code2html.custom.styles.1")));
this.customStylePanel.setPreferredSize(new Dimension(500, 500));
+ this.customStylePanel.setMinimumSize(new Dimension(300, 300));
this.customStylePanel.setToolTipText(
jEdit.getProperty("options.code2html.custom.styles.2"));
@@ -186,7 +187,12 @@
this.customPRE.add(this.customPREHtml, BorderLayout.NORTH);
this.customPRE.add(this.customPRECss, BorderLayout.CENTER);
- addComponent(this.customStylePanel);
+ this.addComponent(this.customStylePanel);
+
+ //Component c = this.get
+
+ //this.getFrame().pack();
+ this.revalidate();
}
Modified: plugins/Code2HTML/trunk/code2html/Main.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/Main.java 2007-03-31 12:54:16 UTC (rev 9365)
+++ plugins/Code2HTML/trunk/code2html/Main.java 2007-03-31 13:55:57 UTC (rev 9366)
@@ -38,6 +38,7 @@
import javax.swing.text.Segment;
+import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.MiscUtilities;
import org.gjt.sp.jedit.syntax.ParserRule;
import org.gjt.sp.jedit.syntax.SyntaxStyle;
@@ -116,7 +117,7 @@
style,
gutter,
"Code2HTML",
- System.getProperty("line.separator"));
+ jEdit.getProperty("plugin.code2html.line.separator"));
document.htmlOpen(writer);
Modified: plugins/Code2HTML/trunk/code2html/html/HtmlCssGutter.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/html/HtmlCssGutter.java 2007-03-31 12:54:16 UTC \
(rev 9365)
+++ plugins/Code2HTML/trunk/code2html/html/HtmlCssGutter.java 2007-03-31 13:55:57 UTC \
(rev 9366) @@ -18,6 +18,8 @@
*/
package code2html.html;
+import org.gjt.sp.jedit.jEdit;
+
/**
* Manager class for the gutter when CSS mode in enabled
*
@@ -25,7 +27,7 @@
* @version 0.5
*/
public class HtmlCssGutter extends HtmlGutter {
- private String nl = System.getProperty("line.separator");
+ private String nl = jEdit.getProperty("plugin.code2html.line.separator");
/**
@@ -78,13 +80,25 @@
public String toCSS() {
StringBuffer buf = new StringBuffer();
- buf.append(".gutter {").append(nl)
- .append("\tbackground: " + this.bgColor + ";").append(nl)
+ buf.append(".outerGutter{").append(nl)
+ .append("\tborder-right: solid;").append(nl)
+ .append("\tborder-right-color: #660066;").append(nl)
+ .append("\tborder-right-width: 2;").append(nl)
+ .append("\tpadding-right:2px;").append(nl)
+ .append("\tbackground: " + this.bgColor + ";").append(nl)
+ .append("\tline-height: 100%;").append(nl)
+ .append("}").append(nl)
+ .append(".gutter {").append(nl)
.append("\tcolor: " + this.fgColor + ";").append(nl)
+ .append("\tfont-size: ")
+ .append(jEdit.getProperty("view.gutter.fontsize")).append(";")
+ .append(nl)
.append("}").append(nl)
.append(".gutterH {").append(nl)
- .append("\tbackground: " + this.bgColor + ";").append(nl)
.append("\tcolor: " + this.highlightColor + ";").append(nl)
+ .append("\tfont-size: ")
+ .append(jEdit.getProperty("view.gutter.fontsize")).append(";")
+ .append(nl)
.append("}").append(nl);
return buf.toString();
@@ -105,10 +119,11 @@
String style = highlighted ? "gutterH" : "gutter";
- buf.append("<span class=\"" + style + "\">")
- .append(spacer)
+ buf.append("<span class=\"outerGutter\"> ")
+ .append("<span class=\"" + style + "\">")
+ .append(spacer.substring(1))
.append(this.gutterBorder)
- .append("</span>");
+ .append("</span></span>");
return buf.toString();
}
@@ -129,13 +144,13 @@
String s = Integer.toString(lineNumber);
- buf.append("<span class=\"" + style + "\">")
- .append(spacer.substring(0, this.gutterSize - s.length()))
+ buf.append("<span class=\"outerGutter\"> ")
+ .append("<span class=\"" + style + "\">")
+ .append(spacer.substring(1, this.gutterSize - s.length()))
.append(s)
- .append(this.gutterBorder)
- .append("</span>");
+ //.append(this.gutterBorder)
+ .append("</span></span>");
return buf.toString();
}
}
-
Modified: plugins/Code2HTML/trunk/code2html/html/HtmlDocument.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/html/HtmlDocument.java 2007-03-31 12:54:16 UTC \
(rev 9365)
+++ plugins/Code2HTML/trunk/code2html/html/HtmlDocument.java 2007-03-31 13:55:57 UTC \
(rev 9366) @@ -153,7 +153,7 @@
out.write("<body>");
out.write(this.lineSeparator);
out.write("<pre>");
- out.write("<span class=\"syntax0\">");
+ out.write("<span class=\"NULL\">");
} else {
out.write("<body ");
out.write(jEdit.getProperty("options.code2html.body.html.value"));
Modified: plugins/Code2HTML/trunk/code2html/html/HtmlGutter.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/html/HtmlGutter.java 2007-03-31 12:54:16 UTC \
(rev 9365)
+++ plugins/Code2HTML/trunk/code2html/html/HtmlGutter.java 2007-03-31 13:55:57 UTC \
(rev 9366) @@ -18,7 +18,7 @@
*/
package code2html.html;
-
+import org.gjt.sp.jedit.jEdit;
/**
* Gutter for generated code in HTML
*
@@ -37,7 +37,7 @@
/**
* the gutter border char
*/
- protected char gutterBorder = ':';
+ protected String gutterBorder = \
jEdit.getProperty("plugin.code2html.gutter.divider"); /**
* the gutter border size
*/
@@ -193,23 +193,27 @@
bufOpen.append("<font")
.append(" color=\"")
.append(this.highlightColor)
+ .append("\" size=\"")
+ .append(jEdit.getProperty("view.gutter.fontsize"))
.append("\">");
} else {
bufOpen.append("<font")
.append(" color=\"")
.append(this.fgColor)
+ .append("\" size=\"")
+ .append(jEdit.getProperty("view.gutter.fontsize"))
.append("\">");
}
bufClose.insert(0, "</font>");
- /*
- *bufOpen.append("<font")
- *.append(" bgcolor=\"")
- *.append(this.bgColor)
- *.append("\">");
- *bufClose.insert(0, "</font>");
- */
+ // -> Doesn't work in pure HTML
+ //bufOpen.append("<font")
+ // .append(" bgcolor=\"")
+ // .append(this.bgColor)
+ // .append("\">");
+ //bufClose.insert(0, "</font>");
+
StringBuffer buf = new StringBuffer();
buf.append(bufOpen.toString())
.append(spacer)
@@ -231,35 +235,38 @@
StringBuffer bufOpen = new StringBuffer();
StringBuffer bufClose = new StringBuffer();
+ bufOpen.append("<font color=\"");
+
if ((this.highlightInterval > 0)
&& (lineNumber % this.highlightInterval == 0)
) {
- bufOpen.append("<font")
- .append(" color=\"")
- .append(this.highlightColor)
- .append("\">");
-
+ bufOpen.append(this.highlightColor);
} else {
- bufOpen.append("<font")
- .append(" color=\"")
- .append(this.fgColor)
- .append("\">");
+ bufOpen.append(this.fgColor);
}
+
+ // -> Doesn't work in pure HTML
+ // append("\" size=\"")
+ // .append(jEdit.getProperty("view.gutter.fontsize"))
+ // .append("pt")
+
+ bufOpen.append("\">");
+
bufClose.insert(0, "</font>");
- /*
- *bufOpen.append("<font")
- *.append(" bgcolor=\"")
- *.append(this.bgColor)
- *.append("\">");
- *bufClose.insert(0, "</font>");
- */
+ // -> Doesn't work in pure HTML
+ //bufOpen.append("<font")
+ // .append(" bgcolor=\"")
+ // .append(this.bgColor)
+ // .append("\">");
+ //bufClose.insert(0, "</font>");
+
StringBuffer buf = new StringBuffer();
String s = Integer.toString(lineNumber);
buf.append(bufOpen.toString())
.append(spacer.substring(0, this.gutterSize - s.length()))
.append(s)
- .append(':')
+ .append(gutterBorder)
.append(bufClose.toString());
return buf.toString();
Modified: plugins/Code2HTML/trunk/code2html/html/HtmlPainter.java
===================================================================
--- plugins/Code2HTML/trunk/code2html/html/HtmlPainter.java 2007-03-31 12:54:16 UTC \
(rev 9365)
+++ plugins/Code2HTML/trunk/code2html/html/HtmlPainter.java 2007-03-31 13:55:57 UTC \
(rev 9366) @@ -23,6 +23,7 @@
import javax.swing.text.Segment;
+import org.gjt.sp.jedit.jEdit;
import org.gjt.sp.jedit.syntax.SyntaxStyle;
import org.gjt.sp.jedit.syntax.Token;
@@ -42,7 +43,7 @@
public class HtmlPainter {
private LineTabExpander expander;
private HtmlGutter gutter;
- private String nl = System.getProperty("line.separator");
+ private String nl = jEdit.getProperty("plugin.code2html.line.separator");
private LinePosition position;
private boolean showGutter;
private HtmlStyle style;
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
jEdit-CVS mailing list
jEdit-CVS@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jedit-cvs
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic