Update I18N.page doc.

3 files changed, 61 insertions, 14 deletions

diff --git a/tools/texbuilder/build.php b/tools/texbuilder/build.php
index 0cea6aee..1866f868 100644
--- a/tools/texbuilder/build.php
+++ b/tools/texbuilder/build.php
@@ -35,6 +35,16 @@ $pages['Controls'] = array(
 	'Controls/DataList.page',

 	'Controls/DataGrid.page');

 

+$pages['Advanced Topics'] = array(

+	'Advanced/Assets.page',

+	'Advanced/MasterContent.page',

+	'Advanced/Themes.page',

+	'Advanced/State.page',

+	'Advanced/Logging.page',

+	'Advanced/I18N.page',

+	'Advanced/Error.page',

+	'Advanced/Performance.page');

+

 

 //-------------- END CONFIG ------------------

 

@@ -47,7 +57,9 @@ function escape_verbatim($matches)
 function include_image($matches)

 {

 	global $current_path;

-	$image = dirname($current_path).'/'.$matches[1];

+

+	$image = dirname($current_path).'/'.trim($matches[1]);

+

 	$file = realpath($image);

 	$info = getimagesize($file);

 	switch($info[2])

@@ -128,10 +140,8 @@ function parse_html($page,$html)
 	$html = preg_replace('/<\/?com:TContent[^>]*>/', '', $html);

 	$html = preg_replace('/<\/?p>/m', '', $html);

 

-	//headings

-	$html = preg_replace('/<h1[^>]*>([^<]+)<\/h1>/', '\section{$1}', $html);

-	$html = preg_replace('/<h2[^>]*>([^<]+)<\/h2>/', '\subsection{$1}', $html);

-	$html = preg_replace('/<h3[^>]*>([^<]+)<\/h3>/', '\subsubsection{$1}', $html);

+	//escape { and }

+	$html = preg_replace('/([^\s]+){([^}]*)}([^\s]+)/', '$1\\\{$2\\\}$3', $html);

 

 	//codes

 	$html = str_replace('$', '\$', $html);

@@ -140,18 +150,16 @@ function parse_html($page,$html)
 	$html = preg_replace_callback('/(`1`)([^`]*)(`2`)/m', 'escape_verbatim', $html);

 	$html = preg_replace_callback('/(<div class="source">)([^<]*)(<\/div>)/', 'escape_verbatim', $html);

 			

-

-	$html = preg_replace_callback('/<img\s+src="<%~([^"]*)%>"[^\\/]*\/>/', 'include_image', $html);

+	$html = preg_replace_callback('/<img\s+src="?<%~([^"]*)%>"?[^\\/]*\/>/', 'include_image', $html);

 

 	//runbar

 	$html = preg_replace('/<com:RunBar\s+PagePath="([^"]*)"\s+\/>/', 

 			'Try, \texttt{http://../quickstart/index.php?page=$1}', $html);

 

-

 	//text modifiers

-	$html = preg_replace('/<b>([^>]*)<\/b>/', '\textbf{$1}', $html);

-	$html = preg_replace('/<i>([^>]*)<\/i>/', '\emph{$1}', $html);

-	$html = preg_replace('/<tt>([^>]*)<\/tt>/', '\texttt{$1}', $html);

+	$html = preg_replace('/<b>([^<]*)<\/b>/', '\textbf{$1}', $html);

+	$html = preg_replace('/<i>([^<]*)<\/i>/', '\emph{$1}', $html);

+	$html = preg_replace('/<tt>([^<]*)<\/tt>/', '\texttt{$1}', $html);

 

 	//links

 	$html = preg_replace_callback('/<a[^>]+href="([^"]*)"[^>]*>([^<]*)<\/a>/',

@@ -167,6 +175,13 @@ function parse_html($page,$html)
 	$html = preg_replace('/<li>/', '\item ', $html);

 	$html = preg_replace('/<\/li>/', '', $html);

 

+	//headings

+	$html = preg_replace('/<h1>([^<]+)<\/h1>/', '\section{$1}', $html);

+	$html = preg_replace('/<h2>([^<]+)<\/h2>/', '\subsection{$1}', $html);

+	$html = preg_replace('/<h3>([^<]+)<\/h3>/', '\subsubsection{$1}', $html);

+

+

+

 	$html = html_entity_decode($html);

 

 

diff --git a/tools/texbuilder/prado3_quick_start.pdf b/tools/texbuilder/prado3_quick_start.pdf
index 4f6ddbf1..39aa440c 100644
--- a/tools/texbuilder/prado3_quick_start.pdf
+++ b/tools/texbuilder/prado3_quick_start.pdf
diff --git a/tools/texbuilder/prado3_quick_start.tex b/tools/texbuilder/prado3_quick_start.tex
index 675ec357..737804c5 100644
--- a/tools/texbuilder/prado3_quick_start.tex
+++ b/tools/texbuilder/prado3_quick_start.tex
@@ -59,12 +59,45 @@
 \pagenumbering{roman}

 \tableofcontents

 

-\newpage

-

 \chapter*{Preface}

 \addcontentsline{toc}{chapter}{Preface} 

 Prado quick start doc

 

+\chapter*{License}

+\addcontentsline{toc}{chapter}{License} 

+PRADO is free software released under the terms of the following BSD license.\\

+Copyright 2004-2006, PradoSoft (http://www.pradosoft.com)\\

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions are met:

+\begin{enumerate}

+	\item Redistributions of source code must retain the above copyright notice,

+this list of conditions and the following disclaimer.

+

+ \item Redistributions in binary form must reproduce the above copyright notice,

+this list of conditions and the following disclaimer in the documentation

+and/or other materials provided with the distribution.

+

+\item Neither the name of the developer nor the names of its contributors may

+be used to endorse or promote products derived from this software without

+specific prior written permission.

+\end{enumerate}

+

+\begin{verbatim}

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE

+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR

+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT

+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+\end{verbatim}

+

+

 \newpage

 

 \pagestyle{fancyplain}

@@ -79,5 +112,4 @@ Prado quick start doc
 \include{ch7}

 \include{ch8}

 

-

 \end{document}