[prev in list] [next in list] [prev in thread] [next in thread]
List: jedit-cvs
Subject: [ jEdit-commits ] SF.net SVN: jedit: [10242]
From: ezust () users ! sourceforge ! net
Date: 2007-07-30 23:57:20
Message-ID: E1IFf72-0007rn-Li () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]
Revision: 10242
http://jedit.svn.sourceforge.net/jedit/?rev=10242&view=rev
Author: ezust
Date: 2007-07-30 16:57:20 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
Fixed build file, updated docs to work with docbook 4.2.
Modified Paths:
--------------
plugins/JDiffPlugin/trunk/JDiffPlugin.props
plugins/JDiffPlugin/trunk/build.xml
plugins/JDiffPlugin/trunk/users-guide.xml
Removed Paths:
-------------
plugins/JDiffPlugin/trunk/users-guide.xsl
Modified: plugins/JDiffPlugin/trunk/JDiffPlugin.props
===================================================================
--- plugins/JDiffPlugin/trunk/JDiffPlugin.props 2007-07-30 23:39:52 UTC (rev 10241)
+++ plugins/JDiffPlugin/trunk/JDiffPlugin.props 2007-07-30 23:57:20 UTC (rev 10242)
@@ -1,9 +1,9 @@
# JDiffPlugin properties
# Author: Andre Kaplan
plugin.jdiff.JDiffPlugin.name=JDiff Plugin
-plugin.jdiff.JDiffPlugin.author=Andre Kaplan/Mark Wickens
+plugin.jdiff.JDiffPlugin.author=André Kaplan/Mark Wickens
plugin.jdiff.JDiffPlugin.version=1.5.2
-plugin.jdiff.JDiffPlugin.docs=users-guide.html
+plugin.jdiff.JDiffPlugin.docs=index.html
plugin.jdiff.JDiffPlugin.description=JDiffPlugin is a visual diff utility for jEdit.
# Dependencies
Modified: plugins/JDiffPlugin/trunk/build.xml
===================================================================
--- plugins/JDiffPlugin/trunk/build.xml 2007-07-30 23:39:52 UTC (rev 10241)
+++ plugins/JDiffPlugin/trunk/build.xml 2007-07-30 23:57:20 UTC (rev 10242)
@@ -1,13 +1,11 @@
<?xml version="1.0"?>
<!--
-
This is the standard build.xml file for building the JDiffPlugin plugin.
The 'dist' target compiles the plugin, generates documentation, and creates
the JAR file. Before running the 'dist' target, you will need to choose
whether to generate the documentation using one of these two targets:
-
-->
<project name="JDiffPlugin" default="dist" basedir=".">
@@ -15,11 +13,12 @@
<property file="build.properties"/>
<property file="../build.properties"/>
<property name="user-doc.xml" location = "users-guide.xml"/>
- <import file="${build.support}/plugin-build.xml" />
<property name="jedit.install.dir" value="../.."/>
<property name="jar.name" value="${ant.project.name}.jar"/>
<property name="docs-proc.target" value="xsltproc"/>
+ <import file="${build.support}/plugin-build.xml" />
+
<property name="src.dir" value="."/>
<property name="build.dir" value="build"/>
<property name="install.dir" value=".."/>
@@ -30,83 +29,4 @@
<pathelement location="${src.dir}"/>
</path>
-
- <target name="init">
- <mkdir dir="${build.dir}"/>
- <delete file="docbook-wrapper.xsl" />
- <echo file="docbook-wrapper.xsl"
- message="<xsl:stylesheet"/>
- <echo file="docbook-wrapper.xsl" append="true"
- message=" xmlns:xsl='http://www.w3.org/1999/XSL/Transform'"/>
- <echo file="docbook-wrapper.xsl" append="true"
- message=" version='1.0'>"/>
- <echo file="docbook-wrapper.xsl" append="true"
- message="<xsl:import href='${docbook.xsl}/html/docbook.xsl'/>"/>
- <echo file="docbook-wrapper.xsl" append="true"
- message="</xsl:stylesheet>"/>
- </target>
-
-
- <target name="compile" depends="init">
- <javac
- srcdir="${src.dir}"
- destdir="${build.dir}"
- deprecation="on"
- debug="on"
- includeJavaRuntime="yes"
- >
- <classpath refid="project.class.path"/>
- </javac>
- </target>
-
-
- <target name="dist" depends="compile, docs">
- <mkdir dir="${install.dir}"/>
-
- <jar jarfile="${install.dir}/${jar.name}">
- <fileset dir="${build.dir}"/>
- <fileset dir="${src.dir}">
- <include name="actions.xml"/>
- <include name="**/*.props"/>
- <include name="**/*.jpg"/>
- <include name="**/*.html"/>
- </fileset>
- </jar>
- </target>
-
-
- <target name="docs">
- <antcall target="docs-${docs-proc.target}"/>
- </target>
-
-
- <!-- Generate docs with xsltproc tool from www.xmlsoft.org -->
- <target name="docs-xsltproc">
- <exec executable="xsltproc">
- <arg value="--catalogs"/>
- <arg value="--output"/>
- <arg value="users-guide.html"/>
- <arg value="users-guide.xsl"/>
- <arg value="users-guide.xml"/>
- </exec>
- </target>
-
-
- <!-- Generate docs with Xalan tool from xml.apache.org -->
- <target name="docs-xalan">
- <style
- style="users-guide.xsl"
- in="users-guide.xml"
- out="users-guide.html"
- />
- </target>
-
-
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete>
- <fileset dir="." includes="users-guide.html"/>
- <fileset dir="." includes="**/*~"/>
- </delete>
- </target>
</project>
Modified: plugins/JDiffPlugin/trunk/users-guide.xml
===================================================================
--- plugins/JDiffPlugin/trunk/users-guide.xml 2007-07-30 23:39:52 UTC (rev 10241)
+++ plugins/JDiffPlugin/trunk/users-guide.xml 2007-07-30 23:57:20 UTC (rev 10242)
@@ -1,11 +1,7 @@
<?xml version="1.0"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+ "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!-- JDiff plugin user's guide -->
-<!-- (C) 2002 Andre Kaplan -->
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
-"file:///c:/develop/docbook-xml-4.2/docbookx.dtd">
-
<book>
@@ -14,7 +10,7 @@
<authorgroup>
<author>
- <firstname>André</firstname>
+ <firstname>André</firstname>
<surname>Kaplan</surname>
</author>
<author>
@@ -50,20 +46,15 @@
<para>It features:</para>
<itemizedlist>
- <listitem>Diff overviews (local and global)</listitem>
- <listitem>Synchronized scrolling</listitem>
- <listitem>Ignore case option</listitem>
- <listitem>Ignore leading and trailing whitespace option</listitem>
- <listitem>Ignore amount of whitespace option</listitem>
- <listitem>Ignore all whitespace option</listitem>
- <listitem>Normal diff output</listitem>
+ <listitem><para>Diff overviews (local and global)</para></listitem>
+ <listitem><para>Synchronized scrolling</para></listitem>
+ <listitem><para>Ignore case option</para></listitem>
+ <listitem><para>Ignore leading and trailing whitespace \
option</para></listitem> + <listitem><para>Ignore amount of whitespace \
option</para></listitem> + <listitem><para>Ignore all whitespace \
option</para></listitem> + <listitem><para>Normal diff \
output</para></listitem> </itemizedlist>
- <para>It requires:</para>
- <itemizedlist>
- <listitem>JDK 1.3</listitem>
- <listitem>jEdit 4.2+</listitem>
- </itemizedlist>
</chapter>
@@ -75,35 +66,34 @@
<para>The simplest method is to open the Dual Diff Dialog
(<guimenu>Plugins</guimenu>>
<guisubmenu>JDiff</guisubmenu>>
- <guimenuitem>Show dual diff dialog</guimenuitem>)
+ <guimenuitem>Show dual diff dialog</guimenuitem>)
and choose the files to compare. But you can also:
</para>
<orderedlist>
- <listitem>Split your view in two (vertically)</listitem>
+ <listitem><para>Split your view in two (vertically)</para></listitem>
- <listitem>Edit the buffers you want to compare:
+ <listitem><para>Edit the buffers you want to compare:</para>
<itemizedlist>
- <listitem>the buffer on the left is the original</listitem>
- <listitem>the buffer on the right is the revision</listitem>
+ <listitem><para>the buffer on the left is the \
original</para></listitem> + <listitem><para>the buffer on the right \
is the revision</para></listitem> </itemizedlist>
</listitem>
- <listitem>Activate JDiff:
+ <listitem><para>Activate JDiff:
<guimenu>Plugins</guimenu>>
<guisubmenu>JDiff</guisubmenu>>
- <guimenuitem>Dual Diff</guimenuitem>
+ <guimenuitem>Dual Diff</guimenuitem> </para>
</listitem>
</orderedlist>
- <para>Figure 1 shows the result</para>
+ <para>Figure 1 shows the result</para>
<mediaobject>
- <caption>Figure 1 - JDiff Plugin</caption>
- <alt>JDiff Plugin snapshot</alt>
<imageobject>
- <imagedata fileref="diff_snapshot.jpg" format="jpg"/>
- </imageobject>
+ <imagedata fileref="diff_snapshot.jpg" format="JPG"/>
+ </imageobject>
+ <caption><para>Figure 1 - JDiff Plugin</para></caption>
</mediaobject>
</chapter>
@@ -112,11 +102,11 @@
<chapter id="display">
<title>Display</title>
- <para>Once JDiff is activated as in Figure 1, you should see:</para>
+ <para>Once JDiff is activated as in Figure 1, you should see:</para>
<itemizedlist>
- <listitem>Text Highlights</listitem>
- <listitem>A local overview (right of the original)</listitem>
- <listitem>A global overview (right of the revision)</listitem>
+ <listitem><para>Text Highlights</para></listitem>
+ <listitem><para>A local overview (right of the original)</para></listitem>
+ <listitem><para>A global overview (right of the revision)</para></listitem>
</itemizedlist>
@@ -126,17 +116,17 @@
<para>By default:</para>
<itemizedlist>
- <listitem>Changed lines appear in yellow</listitem>
- <listitem>Deleted (from the original) lines appear in red</listitem>
- <listitem>Inserted (to the revision) lines appear in green</listitem>
+ <listitem><para>Changed lines appear in yellow</para></listitem>
+ <listitem><para>Deleted (from the original) lines appear in \
red</para></listitem> + <listitem><para>Inserted (to the revision) lines \
appear in green</para></listitem>
- <listitem>Invalid lines appear as thin dark grey lines.
+ <listitem><para>Invalid lines appear as thin dark grey lines.</para>
<itemizedlist>
- <listitem>In the original, invalid lines indicate where a block was \
inserted
- in the revision.
+ <listitem><para>In the original, invalid lines indicate where a \
block was inserted + in the revision.</para>
</listitem>
- <listitem>In the revision, invalid lines indicate where a block was \
deleted in
- the original.
+ <listitem><para>In the revision, invalid lines indicate where a \
block was deleted in + the original. </para>
</listitem>
</itemizedlist>
</listitem>
@@ -175,39 +165,39 @@
<title>Other commands</title>
<itemizedlist>
- <listitem>
+ <listitem><para>
<guimenuitem>Refresh</guimenuitem>:
- refreshes the diff display
+ refreshes the diff display </para>
</listitem>
- <listitem>
- <guimenuitem>Go to previous/next difference</guimenuitem>
+ <listitem><para>
+ <guimenuitem>Go to previous/next difference</guimenuitem> </para>
</listitem>
- <listitem>
+ <listitem><para>
<guimenuitem>Ignore case</guimenuitem>:
toggles the "Ignore case" option for the current diff
- </listitem>
+ </para></listitem>
- <listitem>
+ <listitem><para>
<guimenuitem>Ignore leading and trailing whitespace</guimenuitem>:
toggles the "Ignore leading and trailing whitespace" option \
for the current diff
- </listitem>
+ </para></listitem>
- <listitem>
+ <listitem><para>
<guimenuitem>Ignore amount of whitespace</guimenuitem>:
toggles the "Ignore amount of whitespace" option for the \
current diff
- </listitem>
+ </para></listitem>
- <listitem>
+ <listitem><para>
<guimenuitem>Ignore all whitespace</guimenuitem>:
toggles the "Ignore all whitespace" option for the current \
diff
- </listitem>
+ </para></listitem>
- <listitem>
+ <listitem><para>
<guimenuitem>Normal Diff Output</guimenuitem>:
generates a diff file using the normal method
- </listitem>
+ </para></listitem>
</itemizedlist>
</chapter>
@@ -223,29 +213,29 @@
<para>You can configure how JDiff compares lines by default. JDiff \
can:</para>
<itemizedlist>
- <listitem>
+ <listitem><para>
Ignore case: upper-cased lines are compared.
- </listitem>
+ </para></listitem>
- <listitem>
+ <listitem><para>
Ignore leading and trailing whitespace: lines are compared as if
leading and trailing whitespaces were removed.
- </listitem>
+ </para></listitem>
- <listitem>
- Ignore amount of whitespace: lines are compared as if any
+ <listitem><para>
+ Ignore amount of whitespace: lines are compared as if any</para>
<itemizedlist>
- <listitem>leading and trailing whitespaces were \
removed</listitem>
- <listitem>sequence of whitespaces were replaced by one single \
space.</listitem> + <listitem><para>leading and trailing \
whitespaces were removed</para></listitem> + \
<listitem><para>sequence of whitespaces were replaced by one single \
space.</para></listitem> </itemizedlist>
</listitem>
- <listitem>
+ <listitem><para>
Ignore all whitespace: lines are compared as if any
<itemizedlist>
- <listitem>leading, trailing and inner whitespaces were \
removed</listitem> + <listitem><para>leading, trailing and inner \
whitespaces were removed</para></listitem> </itemizedlist>
- </listitem>
+ </para></listitem>
</itemizedlist>
</simplesect>
@@ -255,12 +245,10 @@
<title>Global overview display</title>
<itemizedlist>
- <listitem>Virtual overview: uses the virtual representation of
- buffers for its display
+ <listitem><para>Virtual overview: uses the virtual representation of \
buffers for its display </para> </listitem>
- <listitem>Physical overview: uses the physical representation of
- buffers for its display
+ <listitem><para>Physical overview: uses the physical representation of \
buffers for its display </para> </listitem>
</itemizedlist>
@@ -273,12 +261,12 @@
<para>You can configure the colors of:</para>
<itemizedlist>
- <listitem>Changed lines</listitem>
- <listitem>Deleted lines</listitem>
- <listitem>Inserted lines</listitem>
- <listitem>Invalid lines</listitem>
- <listitem>Left cursor in the global overview</listitem>
- <listitem>Right cursor in the global overview</listitem>
+ <listitem><para>Changed lines</para></listitem>
+ <listitem><para>Deleted lines</para></listitem>
+ <listitem><para>Inserted lines</para></listitem>
+ <listitem><para>Invalid lines</para></listitem>
+ <listitem><para>Left cursor in the global overview</para></listitem>
+ <listitem><para>Right cursor in the global overview</para></listitem>
</itemizedlist>
</simplesect>
@@ -290,10 +278,10 @@
<para>You can configure the colors of:</para>
<itemizedlist>
- <listitem>Changed lines</listitem>
- <listitem>Deleted lines</listitem>
- <listitem>Inserted lines</listitem>
- <listitem>Invalid lines</listitem>
+ <listitem><para>Changed lines</para></listitem>
+ <listitem><para>Deleted lines</para></listitem>
+ <listitem><para>Inserted lines</para></listitem>
+ <listitem><para>Invalid lines</para></listitem>
</itemizedlist>
</simplesect>
@@ -327,22 +315,22 @@
<para>You can also write to:</para>
<itemizedlist>
- <listitem>
- Mark Wickens <email>m.wickens@rhodium-consulting.com</email>;
+ <listitem><para>
+ Mark Wickens <email>m.wickens@rhodium-consulting.com</email>; </para>
</listitem>
- <listitem>
- André Kaplan <email>akaplan@jedit.org</email>;
+ <listitem><para>
+ André Kaplan <email>akaplan@jedit.org</email>; </para>
</listitem>
- <listitem>
+ <listitem><para>
or jEdit-users mailing-list
- <email>jedit-users@lists.sourceforge.net</email>;
+ <email>jedit-users@lists.sourceforge.net</email>; </para>
</listitem>
- <listitem>
+ <listitem><para>
or jEdit-devel mailing-list
- <email>jedit-devel@lists.sourceforge.net</email>.
+ <email>jedit-devel@lists.sourceforge.net</email>. </para>
</listitem>
</itemizedlist>
</chapter>
@@ -351,13 +339,13 @@
<title>History</title>
<itemizedlist>
- <listitem>
+ <listitem> <para>
Version 1.4. Updated to work with jEdit v4.2+, including edits for new
- JEditTextArea handling and new plugin API.
+ JEditTextArea handling and new plugin API. </para>
</listitem>
- <listitem>
- Version 1.3.2. Last pre-jEdit v4.2 version of plugin by André.
+ <listitem><para>
+ Version 1.3.2. Last pre-jEdit v4.2 version of plugin by André. </para>
</listitem>
</itemizedlist>
</chapter>
@@ -366,20 +354,20 @@
<title>Credits</title>
<itemizedlist>
- <listitem>
+ <listitem><para>
Stuart D. Gathman ported the GNU diff algorithm to Java.
See
<ulink url="http://www.bmsi.com/java/">
http://www.bmsi.com/java/
- </ulink>
+ </ulink></para>
</listitem>
- <listitem>
+ <listitem><para>
Some code and ideas borrowed from JDiff by
Mike Dillon <email>mdillon@jedit.org</email>.
See <ulink url="http://sourceforge.net/projects/jdiff">
http://sourceforge.net/projects/jdiff
- </ulink>
+ </ulink> </para>
</listitem>
</itemizedlist>
Deleted: plugins/JDiffPlugin/trunk/users-guide.xsl
===================================================================
--- plugins/JDiffPlugin/trunk/users-guide.xsl 2007-07-30 23:39:52 UTC (rev 10241)
+++ plugins/JDiffPlugin/trunk/users-guide.xsl 2007-07-30 23:57:20 UTC (rev 10242)
@@ -1,52 +0,0 @@
-<?xml version='1.0'?>
-
-<!-- You should use this XSL stylesheet to create plugin documentation.
-
- If you want all output in a single HTML file, specify the path to
- your DocBook-XSL "html/docbook.xsl" file in the <xsl:import>
- statement below. If you want each chapter to have its own file,
- specify the path to your "html/xtchunk.xsl".
--->
-
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version='1.0'
- xmlns="http://www.w3.org/TR/xhtml1/transitional"
- exclude-result-prefixes="#default">
-
-<xsl:import href="docbook-wrapper.xsl"/>
-
-<!-- Swing HTML control doesn't support “ and ” -->
-<xsl:template match="quote">"<xsl:apply-templates/>"</xsl:template>
-
-<xsl:template match="guibutton">
- <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guiicon">
- <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guilabel">
- <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guimenu">
- <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guimenuitem">
- <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:template match="guisubmenu">
- <xsl:call-template name="inline.boldseq"/>
-</xsl:template>
-
-<xsl:variable name="toc.list.type">ul</xsl:variable>
-
-<xsl:variable name="shade.verbatim">1</xsl:variable>
-
-<xsl:variable name="funcsynopsis.style">ansi</xsl:variable>
-<xsl:template match="void"><xsl:apply-templates/></xsl:template>
-
-</xsl:stylesheet>
This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
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