Return-Path: 
 <svn-return-496-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 81299 invoked from network); 26 Aug 2004 13:50:40 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur-2.apache.org with SMTP; 26 Aug 2004 13:50:40 -0000
Received: (qmail 36998 invoked by uid 500); 26 Aug 2004 13:50:39 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 36908 invoked by uid 500); 26 Aug 2004 13:50:38 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
list-post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 36847 invoked by uid 99); 26 Aug 2004 13:50:37 -0000
X-ASF-Spam-Status: No, hits=-2.8 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
  by apache.org (qpsmtpd/0.27.1) with SMTP; Thu, 26 Aug 2004 06:50:35 -0700
Received: (qmail 80994 invoked by uid 65534); 26 Aug 2004 13:50:33 -0000
Date: 26 Aug 2004 13:50:33 -0000
Message-ID: <20040826135033.80990.qmail@minotaur.apache.org>
From: brondsem@apache.org
To: svn@forrest.apache.org
Subject: svn commit: rev 37082 - forrest/trunk/scratchpad/XXE-config
X-Virus-Checked: Checked
X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N

Author: brondsem
Date: Thu Aug 26 06:50:33 2004
New Revision: 37082

Modified:
   forrest/trunk/scratchpad/XXE-config/build.xml
   forrest/trunk/scratchpad/XXE-config/common_config.xml
   forrest/trunk/scratchpad/XXE-config/document-v10.xxe
   forrest/trunk/scratchpad/XXE-config/document-v20.xxe
   forrest/trunk/scratchpad/XXE-config/toolBar.xml
Log:
fix link/fork menu items; other minor tidying

Modified: forrest/trunk/scratchpad/XXE-config/build.xml
==============================================================================
--- forrest/trunk/scratchpad/XXE-config/build.xml	(original)
+++ forrest/trunk/scratchpad/XXE-config/build.xml	Thu Aug 26 06:50:33 2004
@@ -15,12 +15,6 @@
   limitations under the License.
 -->
 
-<!--
-XXE Forrest plugin builder
-
- - You must update catalog.xml manually based on changes to forrest's catalog.xcat
--->
-
 <project basedir="." name="xxe-forrest" default="dist">
 
   <target name="-init">
@@ -46,7 +40,7 @@
     </zip>
   </target>
   
-  <target name="update" depends="copy-dtds, copy-catalog" description="Update schemas from FORREST_HOME"/>
+  <target name="update" depends="clean, copy-dtds, copy-catalog" description="Update schemas from FORREST_HOME"/>
   
   <target name="copy-dtds" depends="-init" description="Copy DTDs from FORREST_HOME">
     <copy todir=".">

Modified: forrest/trunk/scratchpad/XXE-config/common_config.xml
==============================================================================
--- forrest/trunk/scratchpad/XXE-config/common_config.xml	(original)
+++ forrest/trunk/scratchpad/XXE-config/common_config.xml	Thu Aug 26 06:50:33 2004
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<configuration name="Forrest Doc v20"
+<configuration name="Forrest Common"
   xsi:schemaLocation="http://www.xmlmind.com/xmleditor/schema/configuration
                       xsd/configuration.xsd"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -24,9 +24,9 @@
   <include location="toolBar.xml" />
   
   <documentResources>
-    <resource path="//img/@src" />
-    <resource path="//figure/@src" />
-    <resource path="//icon/@src" />
+    <resource path="//img/@src"/>
+    <resource path="//figure/@src"/>
+    <resource path="//icon/@src"/>
   </documentResources>
   
   <elementTemplate xmlns="" name="tableHeaded">
@@ -66,10 +66,6 @@
     </tr>
   </elementTemplate>
   
-  <elementTemplate xmlns="" name="aFork">
-    <a target="_blank"/>
-  </elementTemplate>
-  
   <!-- Bindings =========================================================== -->
   <!--   modified from xhtml & docbook config files =============== -->
 
@@ -135,29 +131,6 @@
         <command name="insertNode" parameter="textAfter" />
         <command name="cancelSelection" />
       </sequence>
-    </macro>
-  </command>
-  
-  <!-- v1.x versus v2.x deciders -->
-  <command name="forrest.insertFork">
-    <macro trace="false">
-      <choice>
-        <!-- v1.x -->
-        <command name="convert" parameter="[implicitElement] fork" />
-        <!-- v2.x -->
-        <command name="convert" parameter="[implicitElement] #template(a,aFork)" />
-      </choice>
-    </macro>
-  </command>
-
-  <command name="forrest.insertLink">
-    <macro trace="false">
-      <choice>
-        <!-- v1.x -->
-        <command name="convert" parameter="[implicitElement] link" />
-        <!-- v2.x -->
-        <command name="convert" parameter="[implicitElement] a" />
-      </choice>
     </macro>
   </command>
 

Modified: forrest/trunk/scratchpad/XXE-config/document-v10.xxe
==============================================================================
--- forrest/trunk/scratchpad/XXE-config/document-v10.xxe	(original)
+++ forrest/trunk/scratchpad/XXE-config/document-v10.xxe	Thu Aug 26 06:50:33 2004
@@ -43,5 +43,22 @@
   <template name="Document DTD v1.3" location="template/document13.xml" />
   
   <css name="Formatted v1.x" location="css/document1x.css" />
- 
+   
+  <!-- v1.x versus v2.x commands -->
+  <command name="forrest.convertFork">
+    <macro trace="false">
+      <sequence>
+        <command name="convert" parameter="[implicitElement] fork" />
+      </sequence>
+    </macro>
+  </command>
+
+  <command name="forrest.convertLink">
+    <macro trace="false">
+      <sequence>
+        <command name="convert" parameter="[implicitElement] link" />
+      </sequence>
+    </macro>
+  </command>
+
 </configuration>

Modified: forrest/trunk/scratchpad/XXE-config/document-v20.xxe
==============================================================================
--- forrest/trunk/scratchpad/XXE-config/document-v20.xxe	(original)
+++ forrest/trunk/scratchpad/XXE-config/document-v20.xxe	Thu Aug 26 06:50:33 2004
@@ -35,5 +35,18 @@
   <template name="Document DTD v2.0" location="template/document20.xml" />
   
   <css name="Formatted v2.x" location="css/document2x.css" />
+  
+  <!-- v1.x versus v2.x commands -->
+  
+  <!-- no forrest.convertFork because <a> doesn't have @target -->
+
+  <command name="forrest.convertLink">
+    <macro trace="false">
+      <choice>
+        <command name="convert" parameter="[implicitElement] a" />
+        <command name="removeAttribute" parameter="target"/>
+      </choice>
+    </macro>
+  </command>
 
 </configuration>

Modified: forrest/trunk/scratchpad/XXE-config/toolBar.xml
==============================================================================
--- forrest/trunk/scratchpad/XXE-config/toolBar.xml	(original)
+++ forrest/trunk/scratchpad/XXE-config/toolBar.xml	Thu Aug 26 06:50:33 2004
@@ -20,8 +20,8 @@
   xmlns="http://www.xmlmind.com/xmleditor/schema/configuration"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:cfg="http://www.xmlmind.com/xmleditor/schema/configuration">
-
-  <toolBar>
+  
+   <toolBar>
 	<insert />
     <button toolTip="Convert to strong" 
             icon="../common/icons2/b.gif">
@@ -41,12 +41,8 @@
     <button toolTip="Convert to link" 
             icon="../common/icons2/link_menu.gif">
       <menu>
-<!--
-        <item label="link" command="convertLink" 
-              parameter="[implicitElement] link" />
--->
-        <item label="link" command="convertLink"/>
-        <item label="fork" command="convertFork"/>
+        <item label="link" command="forrest.convertLink"/>
+        <item label="fork" command="forrest.convertFork"/>
       </menu>
     </button>