[debian-edu-commits] debian-edu/ 01/01: Transform <pre> and <code> before looking for lists and tables, to make sure every such tag is handled.

[Petter Reinholdtsen]

This is an automated email from the git hooks/post-receive script.

pere pushed a commit to branch master
in repository debian-edu-itil-doc-nb.

commit 9d85f10a6b80db1292f3f372e19e74d601448a50
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Apr 6 23:30:30 2015 +0200

    Transform <pre> and <code> before looking for lists and tables, to make sure every such tag is handled.
---
 documentation/itil/convert.pl | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/documentation/itil/convert.pl b/documentation/itil/convert.pl
index 2b2357b..3676d66 100755
--- a/documentation/itil/convert.pl
+++ b/documentation/itil/convert.pl
@@ -86,13 +86,6 @@ open $fh, "<", "$infile"  or die $!;
 while (($line = <$fh>)) {
 	chomp $line;
 
-	next if (u_list $line); # Unordered list
-	next if (o_list $line); # Ordered list
-
-	if (substr($line, 0, 2) eq '{|') {
-		we_can_has_tables $line;
-		next;
-	}
 	# moinmon uses {{{ }}} instead of <pre></pre>
 	$line =~ s%<pre>%\{\{\{\n%g;
 	$line =~ s%</pre>%\n\}\}\}%g;
@@ -101,6 +94,14 @@ while (($line = <$fh>)) {
 	$line =~ s%<code>%`%g;
 	$line =~ s%</code>%`%g;
 
+	next if (u_list $line); # Unordered list
+	next if (o_list $line); # Ordered list
+
+	if (substr($line, 0, 2) eq '{|') {
+		we_can_has_tables $line;
+		next;
+	}
+
 	print $line . "\n";
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/upstream/debian-edu-itil-doc-nb.git