forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
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 GMT
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



Mime
View raw message