From doxia-commits-return-774-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org Tue Feb 19 16:08:18 2008
Return-Path: <doxia-commits-return-774-apmail-maven-doxia-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-doxia-commits-archive@www.apache.org
Received: (qmail 83801 invoked from network); 19 Feb 2008 16:08:18 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 19 Feb 2008 16:08:18 -0000
Received: (qmail 22420 invoked by uid 500); 19 Feb 2008 16:08:13 -0000
Delivered-To: apmail-maven-doxia-commits-archive@maven.apache.org
Received: (qmail 22396 invoked by uid 500); 19 Feb 2008 16:08:12 -0000
Mailing-List: contact doxia-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:doxia-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:doxia-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:doxia-commits@maven.apache.org>
List-Id: <doxia-commits.maven.apache.org>
Reply-To: doxia-dev@maven.apache.org
Delivered-To: mailing list doxia-commits@maven.apache.org
Received: (qmail 22381 invoked by uid 99); 19 Feb 2008 16:08:12 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2008 08:08:12 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Feb 2008 16:07:48 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 496991A9832; Tue, 19 Feb 2008 08:07:57 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r629139 - in /maven/doxia/doxia/trunk:
 doxia-core/src/main/java/org/apache/maven/doxia/parser/
 doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/
 doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/do...
Date: Tue, 19 Feb 2008 16:07:55 -0000
To: doxia-commits@maven.apache.org
From: ltheussl@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080219160757.496991A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ltheussl
Date: Tue Feb 19 08:07:52 2008
New Revision: 629139

URL: http://svn.apache.org/viewvc?rev=629139&view=rev
Log:
Do not log unknown tags within <pre> and <source>

Modified:
    maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java
    maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java

Modified: maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java?rev=629139&r1=629138&r2=629139&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/main/java/org/apache/maven/doxia/parser/XhtmlBaseParser.java Tue Feb 19 08:07:52 2008
@@ -56,6 +56,9 @@
     /** Counts section level. */
     private int sectionLevel;
 
+    /** Verbatim level, increased whenever a &lt;pre&gt; tag is encountered. */
+    private int verbatimLevel;
+
     /**
      * <p>
      *   Goes through a common list of possible html start tags. These include only tags that can go into
@@ -137,6 +140,8 @@
          */
         else if ( parser.getName().equals( Tag.PRE.toString() ) )
         {
+            verbatim();
+
             sink.verbatim( false );
         }
         else if ( parser.getName().equals( Tag.UL.toString() ) )
@@ -394,6 +399,8 @@
         }
         else if ( parser.getName().equals( Tag.PRE.toString() ) )
         {
+            verbatim_();
+
             sink.verbatim_();
         }
         else if ( parser.getName().equals( Tag.UL.toString() ) )
@@ -677,6 +684,33 @@
     protected void setSectionLevel( int newLevel )
     {
         this.sectionLevel = newLevel;
+    }
+
+    /**
+     * Decrease the current verbatim level.
+     */
+    protected void verbatim_()
+    {
+        verbatimLevel--;
+    }
+
+    /**
+     * Increases the current verbatim level.
+     * A value of 0 means that we are not in verbatim mode, every nested &lt;pre&gt; tag increases the level.
+     */
+    protected void verbatim()
+    {
+        verbatimLevel++;
+    }
+
+    /**
+     * Checks if we are currently insid a &lt;pre&gt; tag.
+     *
+     * @return true if we are currently in verbatim mode.
+     */
+    protected boolean isVerbatim()
+    {
+        return ( this.verbatimLevel != 0 );
     }
 
 }

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java?rev=629139&r1=629138&r2=629139&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-fml/src/main/java/org/apache/maven/doxia/module/fml/FmlContentParser.java Tue Feb 19 08:07:52 2008
@@ -48,11 +48,13 @@
         }
         else if ( parser.getName().equals( SOURCE_TAG.toString() ) )
         {
+            verbatim();
+
             sink.verbatim( true );
         }
         else if ( !baseStartTag( parser, sink ) )
         {
-            if ( getLog().isWarnEnabled() )
+            if ( !isVerbatim() && getLog().isWarnEnabled() )
             {
                 String position = "[" + parser.getLineNumber() + ":"
                     + parser.getColumnNumber() + "]";
@@ -69,6 +71,8 @@
     {
         if ( parser.getName().equals( SOURCE_TAG.toString() ) )
         {
+            verbatim_();
+
             sink.verbatim_();
         }
         else if ( !baseEndTag( parser, sink ) )

Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java?rev=629139&r1=629138&r2=629139&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocParser.java Tue Feb 19 08:07:52 2008
@@ -150,6 +150,8 @@
         }
         else if ( parser.getName().equals( SOURCE_TAG.toString() ) )
         {
+            verbatim();
+
             sink.verbatim( true );
         }
         else if ( parser.getName().equals( PROPERTIES_TAG.toString() ) )
@@ -214,7 +216,8 @@
         {
             // TODO: remove
             handleRawText( sink, parser );
-            if ( getLog().isWarnEnabled() )
+
+            if ( !isVerbatim() && getLog().isWarnEnabled() )
             {
                 String position = "[" + parser.getLineNumber() + ":"
                     + parser.getColumnNumber() + "]";
@@ -258,6 +261,8 @@
         }
         else if ( parser.getName().equals( SOURCE_TAG.toString() ) )
         {
+            verbatim_();
+
             sink.verbatim_();
         }
         else if ( parser.getName().equals( PROPERTIES_TAG.toString() ) )