From bde6488e19b9852011a657fda8aa39680d9c4a62 Mon Sep 17 00:00:00 2001
From: wei <>
Date: Sat, 6 Jan 2007 00:00:57 +0000
Subject: Update docs.

---
 buildscripts/texbuilder/Page2Tex.php              | 20 ++++++++++++++------
 buildscripts/texbuilder/quickstart/pages.php      | 23 +++++++++++++++++++----
 buildscripts/texbuilder/quickstart/quickstart.tex |  5 +++++
 3 files changed, 38 insertions(+), 10 deletions(-)

(limited to 'buildscripts/texbuilder')

diff --git a/buildscripts/texbuilder/Page2Tex.php b/buildscripts/texbuilder/Page2Tex.php
index 9c779a64..5d9a2b81 100644
--- a/buildscripts/texbuilder/Page2Tex.php
+++ b/buildscripts/texbuilder/Page2Tex.php
@@ -88,7 +88,9 @@ class Page2Tex
 
 	function texttt($matches)
 	{
-		return '\texttt{'.str_replace(array('#','_','&amp;'),array('\#','\_','\&'), $matches[1]).'}';
+		$text ='\texttt{'.str_replace(array('#','_','&amp;'),array('\#','\_','\&'), $matches[1]).'}';
+		//$text = preg_replace('/([^\\\\])&([^;]+)/', '$1\&$2', $text);
+		return $text;
 	}
 
 	function get_current_path()
@@ -105,8 +107,11 @@ class Page2Tex
 		{
 			if(strpos($matches[1],'?') ===false)
 			{
-				$target = $this->get_current_path().'/'.substr($matches[1],1);
-				return '\hyperlink{'.$target.'}{'.$matches[2].'}';
+				if(strpos($matches[1],'http://')===false)
+				{
+					$target = $this->get_current_path().'/'.substr($matches[1],1);
+					return '\hyperlink{'.$target.'}{'.$matches[2].'}';
+				}
 			}
 			else
 			{
@@ -121,7 +126,7 @@ class Page2Tex
 			$page = str_replace('?page=','',$matches[1]);
 			return '\hyperlink{'.$page.'}{'.$matches[2].'}';
 		}
-		return '\href{'.$matches[1].'}{'.$matches[2].'}';
+		return '\href{'.str_replace('#','\\#',$matches[1]).'}{'.$matches[2].'}';
 	}
 
 	function parse_html($page,$html)
@@ -144,7 +149,7 @@ class Page2Tex
 		//codes
 		$html = str_replace('$', '\$', $html);
 
-		$html = preg_replace_callback('/<com:TTextHighlighter[^>]*>((.|\n)*?)<\/com:TTextHighlighter>/', array($this,'escape_verbatim'), $html);
+		$html = preg_replace_callback('/<com:TTextHighlighter[^>]*>((.|\n)*?)<\/com:TTextHighlighter\s*>/', array($this,'escape_verbatim'), $html);
 //		$html = preg_replace('/<\/com:TTextHighlighter>/', '`2`', $html);
 //		$html = preg_replace_callback('/(`1`)([^`]*)(`2`)/m', array($this,'escape_verbatim'), $html);
 		$html = preg_replace_callback('/(<div class="source">)((.|\n)*?)(<\/div>)/', array($this,'escape_verbatim'), $html);
@@ -158,12 +163,15 @@ class Page2Tex
 				'\href{http://www.pradosoft.com/demos/quickstart/index.php?page=$1}{$1 Demo}', $html);
 
 		//DocLink
+		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^."]*)"\s+Text="([^"]+)"\s*\/>/',
+	                        '\href{http://www.pradosoft.com/docs/manual/$1/$2.html}{$3}', $html);
+
 		$html = preg_replace('/<com:DocLink\s+ClassPath="([^"]*)[.]([^.]*)"\s+\/>/',
 	                        '\href{http://www.pradosoft.com/docs/manual/$1/$2.html}{$1.$2 API Reference}', $html);
 
 		//text modifiers
 		$html = preg_replace('/<(b|strong)[^>]*>([^<]*)<\/(b|strong)>/', '\textbf{$2}', $html);
-		$html = preg_replace('/<i[^>]*>([^<]*)<\/i>/', '\emph{$1}', $html);
+		$html = preg_replace('/<i[^>]*>([^<]*)+?<\/i>/', '\emph{$1}', $html);
 		$html = preg_replace_callback('/<tt>([^<]*)<\/tt>/', array($this,'texttt'), $html);
 
 		//links
diff --git a/buildscripts/texbuilder/quickstart/pages.php b/buildscripts/texbuilder/quickstart/pages.php
index 91dba08d..e8518d9d 100644
--- a/buildscripts/texbuilder/quickstart/pages.php
+++ b/buildscripts/texbuilder/quickstart/pages.php
@@ -8,10 +8,23 @@ $pages['Getting Started'] = array(
 	'GettingStarted/Introduction.page',
 	'GettingStarted/AboutPrado.page',
 	'GettingStarted/Installation.page',
-	'GettingStarted/HelloWorld.page',
 	'GettingStarted/Upgrading.page'
 	);
 
+$pages['Tutorials'] = array(
+	'GettingStarted/HelloWorld.page',
+	'Fundamentals/Hangman.page',
+	'GettingStarted/CommandLine.page'
+	);
+
+$pages['Tutorial: Currency Converter'] = array(
+	'Tutorial/CurrencyConverter.page'
+	);
+
+$pages['Tutorial: Building an AJAX Chat Application'] = array(
+	'Tutorial/AjaxChat.page'
+	);
+
 $pages['Fundamentals'] = array(
 	'Fundamentals/Architecture.page',
     'Fundamentals/Components.page',
@@ -19,8 +32,8 @@ $pages['Fundamentals'] = array(
     'Fundamentals/Pages.page',
     'Fundamentals/Modules.page',
     'Fundamentals/Services.page',
-    'Fundamentals/Applications.page',
-    'Fundamentals/Hangman.page');
+    'Fundamentals/Applications.page'
+	);
 
 $pages['Configurations'] = array(
 	'Configurations/Overview.page',
@@ -28,7 +41,9 @@ $pages['Configurations'] = array(
 	'Configurations/Templates2.page',
 	'Configurations/Templates3.page',
 	'Configurations/AppConfig.page',
-	'Configurations/PageConfig.page');
+	'Configurations/PageConfig.page',
+	'Configurations/UrlMapping.page'
+	);
 
 $pages['Control Reference : Standard Controls'] = array(
 	'Controls/Button.page',
diff --git a/buildscripts/texbuilder/quickstart/quickstart.tex b/buildscripts/texbuilder/quickstart/quickstart.tex
index d84383b8..7008db92 100644
--- a/buildscripts/texbuilder/quickstart/quickstart.tex
+++ b/buildscripts/texbuilder/quickstart/quickstart.tex
@@ -130,5 +130,10 @@ OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 \include{ch13}
 \include{ch14}
 \include{ch15}
+\include{ch16}
+\include{ch17}
+\include{ch18}
+\include{ch19}
+\include{ch20}
 
 \end{document}
-- 
cgit v1.2.3