Merge r23211 from mainline.

git-svn-id: https://svn.dealii.org/branches/releases/Branch-7-0@23213 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/doc/doxygen/tutorial/program2plain b/deal.II/doc/doxygen/tutorial/program2plain
index 92ca48494ba92151d50d8d31f20310b852e36b1a..d18bf8ca864e28722c9acdc6b7887af1a30365c2 100644 (file)
--- a/deal.II/doc/doxygen/tutorial/program2plain
+++ b/deal.II/doc/doxygen/tutorial/program2plain
@@ -2,7 +2,7 @@
 #    $Id$
 #    Version: $Name$
 #
-#    Copyright (C) 2010 by the deal.II authors
+#    Copyright (C) 2010, 2011 by the deal.II authors
 #
 #    This file is subject to QPL and may not be  distributed
 #    without copyright and license information. Please refer
@@ -17,33 +17,10 @@
 
 my $block_comment = 0;
 while (<>) {
-    # Eliminate comment lines
+    # Eliminate //-comment lines
     next if (m!^\s*//!);
-    if (s!^\s*/\*.*\*/!!g)
-    {
-       print unless (m/^\s*$/);
-       next;
-    }    
-    #Find begin of block comment
-    if (s!/\*.*!!)
-    {
-       $block_comment = 1;
-       # Print unless empty
-       print unless m/^\s*$/;
-       next;
-    }
-    
-    # Find end of block comment
-    if ($block_comment != 0)
-    {
-       if (s!.*\*/!!)
-       {
-           $block_comment = 0;
-            # Print unless empty
-           print unless m/^\s*$/;
-       }
-       next;
-    }
+
+    # Otherwise print the line
     print;
 }