From 47b884d9b2e3285878988ac99496c7c6a26fdceb Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Mon, 9 Dec 2013 21:38:00 +0100
Subject: [PATCH] [DEBUG] correction of the output bb code

---
 codeBB/BB_Code.py         | 10 ++++++----
 codeBB/BB_IndentAndDot.py |  8 +++++---
 codeBB/BB_Link.py         | 38 ++++++++++++++++++++++++++++++++---
 codeBB/BB_Text.py         | 42 +++++++++++++++++++++++++--------------
 codeBB/BB_Title.py        | 10 +++++-----
 codeBB/BB_comment.py      |  7 ++++---
 codeBB/BB_lineReturn.py   |  4 ----
 codeBB/codeBB.py          |  2 +-
 lutinDoc.py               | 25 +++++++++++++++++++----
 lutinDocHtml.py           | 23 +++++++++++++++++++--
 10 files changed, 125 insertions(+), 44 deletions(-)

diff --git a/codeBB/BB_Code.py b/codeBB/BB_Code.py
index 349e43c..49c311e 100644
--- a/codeBB/BB_Code.py
+++ b/codeBB/BB_Code.py
@@ -16,11 +16,13 @@ import re
 ## @return Transformed string.
 ##
 def transcode(value):
+	#value = re.sub(r'\[code(( |\t|\n|\r)+style=(.*))?\](.*?)\[/code\]',
+	value = re.sub(r'\[code(( |\t|\n|\r)+style=(.*?))?\](.*?)\[/code\]',
+	               r'<pre>\4</pre>',
+	               value,
+	               flags=re.DOTALL)
 	
-	value = re.sub(r'\[code=(\#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]',
-	               r'<span style="color: \1;">\2</span>',
-	               value)
-	
+	# TODO : remove the basic indentation of the element (to have a better display in the text tutorial ...
 	return value
 
 
diff --git a/codeBB/BB_IndentAndDot.py b/codeBB/BB_IndentAndDot.py
index ab2e3c7..a4de40b 100644
--- a/codeBB/BB_IndentAndDot.py
+++ b/codeBB/BB_IndentAndDot.py
@@ -47,13 +47,15 @@ def transcode(value):
 	value = re.sub(r'\n:',
 	               r'\n:INDENT:',
 	               value)
-	p = re.compile('((\:INDENT\:(.*?)\n)*)')
+	p = re.compile('((\:INDENT\:(.*?)\n)*)',
+	               flags=re.DOTALL)
 	value = p.sub(replace_wiki_identation,
 	              value)
 	
 	value = re.sub(r'\*\*(.*?)\n',
 	               r'<li>\1</li>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	return value
 
@@ -61,7 +63,7 @@ def transcode(value):
 def replace_wiki_identation(match):
 	if match.group() == "":
 		return ""
-	debug.info("plop: " + str(match.group()))
+	#debug.verbose("plop: " + str(match.group()))
 	value  = "<ul>"
 	value += re.sub(r':INDENT:',
 	               r'',
diff --git a/codeBB/BB_Link.py b/codeBB/BB_Link.py
index 1a63505..d3a8bc8 100644
--- a/codeBB/BB_Link.py
+++ b/codeBB/BB_Link.py
@@ -8,14 +8,46 @@ import re
 ##
 ## @brief Transcode:
 ## [http://votre_site.con] => http://votre_site.con
-## [http://votre_site.con | texte affiché] => texte affiché
-## [http://votre_site.con texte affiché] => texte affiché.
+## [http://votre_site.con | text displayed] => text displayed
+## [http://votre_site.con text displayed] => text displayed.
 ## 
 ## @param[in] value String to transform.
 ## @return Transformed string.
 ##
 def transcode(value):
 	
+	
+	# named link : [[http://plop.html | link name]]
+	value = re.sub(r'\[\[http://(.*?) \| (.*?)\]\]',
+	               r'<a href="http://\1">\2</a>',
+	               value)
+	
+	# direct link : [[http://plop.html]]
+	value = re.sub(r'\[\[http://(.*?)\]\]',
+	               r'<a href="http://\1">http://\1</a>',
+	               value)
+	
+	# direct lib link : [lib[libname]]
+	value = re.sub(r'\[lib\[(.*?) \| (.*?)\]\]',
+	               r'<a href="../\1">\2</a>',
+	               value)
+	"""
+	p = re.compile('\[\[(.*?)(|(.*?))\]\])',
+	               flags=re.DOTALL)
+	value = p.sub(replace_link,
+	              value)
+	"""
 	return value
 
-
+"""
+def replace_link(match):
+	if match.group() == "":
+		return ""
+	#debug.verbose("plop: " + str(match.group()))
+	value  = "<ul>"
+	value += re.sub(r':INDENT:',
+	               r'',
+	               match.group())
+	value += "</ul>"
+	return transcode(value)
+"""
diff --git a/codeBB/BB_Text.py b/codeBB/BB_Text.py
index 02f5b03..fe0365a 100644
--- a/codeBB/BB_Text.py
+++ b/codeBB/BB_Text.py
@@ -24,55 +24,67 @@ import re
 def transcode(value):
 	value = re.sub(r'\[b\](.*?)\[/b\]',
 	               r'<span style="font-weight: bold;">\1</span>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[i\](.*?)\[/i\]',
 	               r'<span style="font-style: italic;">\1</span>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[u\](.*?)\[/u\]',
 	               r'<span style="text-decoration: underline;">\1</span>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[sup\](.*?)\[/sup\]',
 	               r'<sup>\1</sup>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[sub\](.*?)\[/sub\]',
 	               r'<sub>\1</sub>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[color=(\#[0-9A-F]{6}|[a-z\-]+)\](.*?)\[/color\]',
 	               r'<span style="color: \1;">\2</span>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
-	value = re.sub(r'\[center\](.*?)\[/center\]',
+	value = re.sub(r'\[center\](.*)\[/center\]',
 	               r'<div align="center">\1</div>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[right\](.*?)\[/right\]',
 	               r'<div align="right">\1</div>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[left\](.*?)\[/left\]',
 	               r'<div align="left">\1</div>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[strike\](.*?)\[/strike\]',
 	               r'<span><strike>\1</strike></span>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[size=(.*?)\](.*?)\[/size\]',
 	               r'<span style="font-size: \1px; line-height: normal;">\2</span>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'\[cadre\](.*?)\[/cadre\]',
 	               r'<table align="center" border="0" cellpadding="3" cellspacing="1" width="90%"><tbody><tr><td class="quote">\1</td></tr></tbody></table>',
-	               value)
+	               value,
+	               flags=re.DOTALL)
 	
 	value = re.sub(r'____(.*?)\n',
 	               r'<hr>',
-	               value)
-	
+	               value,
+	               flags=re.DOTALL)
 	
 	return value
diff --git a/codeBB/BB_Title.py b/codeBB/BB_Title.py
index 3b1365e..b52362e 100644
--- a/codeBB/BB_Title.py
+++ b/codeBB/BB_Title.py
@@ -18,23 +18,23 @@ import re
 def transcode(value):
 	
 	value = re.sub(r'\n======(.*?)======',
-	               r'<h5>\1</h5>',
+	               r'\n<h5>\1</h5>',
 	               value)
 	
 	value = re.sub(r'\n=====(.*?)=====',
-	               r'<h4>\1</h4>',
+	               r'\n<h4>\1</h4>',
 	               value)
 	
 	value = re.sub(r'\n====(.*?)====',
-	               r'<h3>\1</h3>',
+	               r'\n<h3>\1</h3>',
 	               value)
 	
 	value = re.sub(r'\n===(.*?)===',
-	               r'<h2>\1</h2>',
+	               r'\n<h2>\1</h2>',
 	               value)
 	
 	value = re.sub(r'\n==(.*?)==',
-	               r'<h1>\1</h1>',
+	               r'\n<h1>\1</h1>',
 	               '\n' + value)
 	# todo : remove \n at the start of the file ...
 	
diff --git a/codeBB/BB_comment.py b/codeBB/BB_comment.py
index 9e9fbda..4ae35e3 100644
--- a/codeBB/BB_comment.py
+++ b/codeBB/BB_comment.py
@@ -15,12 +15,13 @@ def transcode(value):
 	
 	value = re.sub(r'\/\*(.*?)\*\/',
 	               r'',
-	               value)
-	
+	               value,
+	               flags=re.DOTALL)
+	"""
 	value = re.sub(r'\/\/(.*?)\n',
 	               r'',
 	               value)
-	
+	"""
 	return value
 
 
diff --git a/codeBB/BB_lineReturn.py b/codeBB/BB_lineReturn.py
index b1c7036..a29c7b9 100644
--- a/codeBB/BB_lineReturn.py
+++ b/codeBB/BB_lineReturn.py
@@ -17,10 +17,6 @@ def transcode(value):
 	               r'\n',
 	               value)
 	
-	value = re.sub(r'\n\n\n',
-	               r'<br/><br/>',
-	               value)
-	
 	value = re.sub(r'\n\n',
 	               r'<br/>',
 	               value)
diff --git a/codeBB/codeBB.py b/codeBB/codeBB.py
index 6c8055f..2ea0834 100644
--- a/codeBB/codeBB.py
+++ b/codeBB/codeBB.py
@@ -24,7 +24,7 @@ def transcode(value):
 	value = BB_Title.transcode(value)
 	value = BB_Text.transcode(value)
 	value = BB_IndentAndDot.transcode(value)
-	#value = BB_Link.transcode(value)
+	value = BB_Link.transcode(value)
 	value = BB_Image.transcode(value)
 	value = BB_Table.transcode(value)
 	value = BB_Code.transcode(value)
diff --git a/lutinDoc.py b/lutinDoc.py
index 13febac..5efa5ec 100644
--- a/lutinDoc.py
+++ b/lutinDoc.py
@@ -20,6 +20,7 @@ class doc:
 	def __init__(self, moduleName):
 		self.moduleName = moduleName
 		self.listDocFile = []
+		self.listTutorialFile = []
 		self.listClass = dict()
 		self.listEnum = dict()
 		self.listVariable = dict()
@@ -94,17 +95,33 @@ class doc:
 				# Import the module :
 				for filename in tmpList:
 					fileCompleteName = os.path.join(root, filename)
-					debug.debug("    Find a doc file : '" + fileCompleteName + "'")
-					self.add_file_doc(fileCompleteName)
+					tutorialPath = os.path.join(self.pathGlobalDoc, "tutorial/")
+					debug.verbose("    Find a doc file : '" + fileCompleteName + "'")
+					pathBase = fileCompleteName[len(self.pathGlobalDoc):len(fileCompleteName)-3]
+					if fileCompleteName[:len(tutorialPath)] == tutorialPath:
+						self.add_file_doc(fileCompleteName, pathBase)
+					else:
+						self.add_tutorial_doc(fileCompleteName, pathBase)
 	
 	##
 	## @brief Add a documentation file at the parsing system
 	## @param[in] filename File To add at the parsing element system.
+	## @param[in] outPath output system file.
 	## @return True if no error occured, False otherwise
 	##
-	def add_file_doc(self, filename):
+	def add_file_doc(self, filename, outPath):
 		debug.debug("adding file in documantation : '" + filename + "'");
-		self.listDocFile.append(filename)
+		self.listDocFile.append([filename, outPath])
+	
+	##
+	## @brief Add a documentation file at the parsing system
+	## @param[in] filename File To add at the parsing element system.
+	## @param[in] outPath output system file.
+	## @return True if no error occured, False otherwise
+	##
+	def add_tutorial_doc(self, filename, outPath):
+		debug.debug("adding file in documantation : '" + filename + "'");
+		self.listTutorialFile.append([filename, outPath])
 	
 	##
 	## @brief Add a file at the parsing system
diff --git a/lutinDocHtml.py b/lutinDocHtml.py
index 10c0458..4e951d7 100644
--- a/lutinDocHtml.py
+++ b/lutinDocHtml.py
@@ -443,8 +443,27 @@ def generate(myDoc, outFolder) :
 		
 		file.close()
 	
-	for docInputName in myDoc.listDocFile :
-		codeBB.transcode_file(docInputName, docInputName+".html")
+	for docInputName,outpath in myDoc.listDocFile :
+		debug.printElement("doc", myDoc.moduleName, "<==", docInputName)
+		outputFileName = outFolder + "/" + outpath.replace('/','_') +".html"
+		debug.debug("output file : " + outputFileName)
+		lutinTools.CreateDirectoryOfFile(outputFileName)
+		inData = lutinTools.FileReadData(docInputName)
+		if inData == "":
+			continue
+		outData = genericHeader + codeBB.transcode(inData) + genericFooter
+		lutinTools.FileWriteData(outputFileName, outData)
+	
+	for docInputName,outpath in myDoc.listTutorialFile :
+		debug.printElement("tutorial", myDoc.moduleName, "<==", docInputName)
+		outputFileName = outFolder + "/" + outpath+".html"
+		debug.debug("output file : " + outputFileName)
+		lutinTools.CreateDirectoryOfFile(outputFileName)
+		inData = lutinTools.FileReadData(docInputName)
+		if inData == "":
+			continue
+		outData = genericHeader + codeBB.transcode(inData) + genericFooter
+		lutinTools.FileWriteData(outputFileName, outData)