Return-Path: 
 <svn-return-9068-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
X-Original-To: apmail-forrest-svn-archive@www.apache.org
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 85A2CEF85
	for <apmail-forrest-svn-archive@www.apache.org>;
 Sun, 20 Jan 2013 17:47:39 +0000 (UTC)
Received: (qmail 73434 invoked by uid 500); 20 Jan 2013 17:47:39 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 73364 invoked by uid 500); 20 Jan 2013 17:47: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>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 73347 invoked by uid 99); 20 Jan 2013 17:47:38 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Jan 2013 17:47:38 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 20 Jan 2013 17:47:37 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 2322C23888CD;
	Sun, 20 Jan 2013 17:47:18 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1435901 - in
 /forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki:
 resources/chaperon/grammars/wiki.grm
 resources/chaperon/stylesheets/wiki2xdoc.xsl status.xml
Date: Sun, 20 Jan 2013 17:47:17 -0000
To: svn@forrest.apache.org
From: sjur@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20130120174718.2322C23888CD@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: sjur
Date: Sun Jan 20 17:47:17 2013
New Revision: 1435901

URL: http://svn.apache.org/viewvc?rev=1435901&view=rev
Log:
Removed unneccessary block of reserved characters inside em, strong and code elements.

Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm?rev=1435901&r1=1435900&r2=1435901&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/grammars/wiki.grm Sun Jan 20 17:47:17 2013
@@ -307,15 +307,30 @@ termtextblock 
   ;
 
 emblock 
-  : emitem text emitem
+  : emitem plaintextblock emitem
   ;
 
 strongblock 
-  : strongitem text strongitem
+  : strongitem plaintextblock strongitem
   ;
 
 codeblock 
-  : codeopenitem text codecloseitem
+  : codeopenitem plaintextblock codecloseitem
+  ;
+
+plaintextblock 
+  : plaintextitems plaintextblock
+  | plaintextitems
+  ;
+
+plaintextitems
+  : text
+  | deftermstart
+  | deftermdefstart
+  | tablecolumnitem
+  | subsubtitleitem
+  | bulleted1item
+  | numbered1item
   ;
 
 deflist

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl?rev=1435901&r1=1435900&r2=1435901&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/resources/chaperon/stylesheets/wiki2xdoc.xsl Sun Jan 20 17:47:17 2013
@@ -321,15 +321,15 @@
   <!-- Inline formatting: -->
   </xsl:template>
   <xsl:template match="st:emblock"><em>
-    <xsl:value-of select="st:text"/></em>
+    <xsl:value-of select="st:plaintextblock"/></em>
     <xsl:call-template name="addSpaceAfter"/>
   </xsl:template>
   <xsl:template match="st:strongblock"><strong>
-    <xsl:value-of select="st:text"/></strong>
+    <xsl:value-of select="st:plaintextblock"/></strong>
     <xsl:call-template name="addSpaceAfter"/>
   </xsl:template>
   <xsl:template match="st:codeblock"><code>
-    <xsl:value-of select="st:text"/></code>
+    <xsl:value-of select="st:plaintextblock"/></code>
     <xsl:call-template name="addSpaceAfter"/>
   </xsl:template>
 

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml?rev=1435901&r1=1435900&r2=1435901&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.input.wiki/status.xml Sun Jan 20 17:47:17 2013
@@ -23,6 +23,10 @@
   </developers>
   <changes>
     <release version="0.2-dev" date="not-released">
+      <action type="add" context="code" dev="SNM">
+        Removed unneccessary block of reserved characters inside em, strong and
+        code elements.
+      </action>
       <action type="fix" context="code" dev="SNM">
         The list of cases for when NOT to add a space after a text segment was
         incomplete, thus several constructs contained spaces not in the original