Author: ltheussl
Date: Wed Mar 26 05:40:31 2008
New Revision: 641288
URL: http://svn.apache.org/viewvc?rev=641288&view=rev
Log:
Distribute EOLs for pretty-printing
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java?rev=641288&r1=641287&r2=641288&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/main/java/org/apache/maven/doxia/module/latex/LatexSink.java
Wed Mar 26 05:40:31 2008
@@ -195,7 +195,7 @@
{
if ( fragmentDocument )
{
- markup( "\\psection" );
+ markup( "\\section" );
}
else
{
@@ -330,7 +330,7 @@
if ( StringUtils.isNotEmpty( title ) )
{
- markup( "\\section{" + title + "}" + EOL );
+ markup( EOL + "\\section{" + title + "}" + EOL );
title = null;
}
@@ -357,7 +357,7 @@
if ( StringUtils.isNotEmpty( title ) )
{
- markup( "\\subsection{" + title + "}" + EOL );
+ markup( EOL + "\\subsection{" + title + "}" + EOL );
title = null;
}
@@ -384,7 +384,7 @@
if ( StringUtils.isNotEmpty( title ) )
{
- markup( "\\subsubsection{" + title + "}" + EOL );
+ markup( EOL + "\\subsubsection{" + title + "}" + EOL );
title = null;
}
@@ -411,7 +411,7 @@
if ( StringUtils.isNotEmpty( title ) )
{
- markup( "\\paragraph{" + title + "}" + EOL );
+ markup( EOL + "\\paragraph{" + title + "}" + EOL );
title = null;
}
@@ -438,7 +438,7 @@
if ( StringUtils.isNotEmpty( title ) )
{
- markup( "\\subparagraph{" + title + "}" + EOL );
+ markup( EOL + "\\subparagraph{" + title + "}" + EOL );
title = null;
}
@@ -453,7 +453,7 @@
*/
public void list()
{
- markup( "\\begin{itemize}" + EOL + EOL );
+ markup( EOL + "\\begin{itemize}" );
}
/**
@@ -461,7 +461,7 @@
*/
public void list_()
{
- markup( "\\end{itemize}" + EOL + EOL );
+ markup( EOL + "\\end{itemize}" + EOL );
}
/**
@@ -469,7 +469,7 @@
*/
public void listItem()
{
- markup( "\\item " );
+ markup( EOL + "\\item " );
}
/**
@@ -516,8 +516,8 @@
style = "arabic";
}
- markup( "\\begin{enumerate}" + EOL );
- markup( "\\renewcommand{\\the" + counter + "}{\\" + style + "{" +
counter + "}}" + EOL + EOL );
+ markup( EOL + "\\begin{enumerate}" + EOL );
+ markup( "\\renewcommand{\\the" + counter + "}{\\" + style + "{" +
counter + "}}" + EOL );
}
/**
@@ -525,7 +525,7 @@
*/
public void numberedList_()
{
- markup( "\\end{enumerate}" + EOL + EOL );
+ markup( EOL + "\\end{enumerate}" + EOL );
--numberedListNesting;
}
@@ -542,7 +542,7 @@
*/
public void definitionList()
{
- markup( "\\begin{description}" + EOL + EOL );
+ markup( EOL + "\\begin{description}" );
}
/**
@@ -550,7 +550,7 @@
*/
public void definitionList_()
{
- markup( "\\end{description}" + EOL + EOL );
+ markup( EOL + "\\end{description}" + EOL );
}
/**
@@ -558,7 +558,7 @@
*/
public void definedTerm()
{
- markup( "\\item[\\mbox{" );
+ markup( EOL + "\\item[\\mbox{" );
}
/**
@@ -579,7 +579,7 @@
public void figure()
{
figureFlag = true;
- markup( "\\begin{figure}[htb]" + EOL );
+ markup( EOL + "\\begin{figure}[htb]" + EOL );
}
/**
@@ -587,7 +587,7 @@
*/
public void figure_()
{
- markup( "\\end{figure}" + EOL + EOL );
+ markup( "\\end{figure}" + EOL );
figureFlag = false;
}
@@ -634,7 +634,7 @@
public void table()
{
tableFlag = true;
- markup( "\\begin{table}[htp]" + EOL );
+ markup( EOL + "\\begin{table}[htp]" + EOL );
}
/**
@@ -642,7 +642,7 @@
*/
public void table_()
{
- markup( "\\end{table}" + EOL + EOL );
+ markup( "\\end{table}" + EOL );
tableFlag = false;
}
@@ -816,7 +816,7 @@
/**
* [EMAIL PROTECTED]
*/
- public void paragraph_()
+ public void paragraph()
{
markup( EOL + EOL );
}
@@ -824,6 +824,14 @@
/**
* [EMAIL PROTECTED]
*/
+ public void paragraph_()
+ {
+ markup( EOL );
+ }
+
+ /**
+ * [EMAIL PROTECTED]
+ */
public void verbatim( boolean boxed )
{
markup( EOL + "\\begin{small}" + EOL );
@@ -847,7 +855,7 @@
public void verbatim_()
{
markup( EOL + "\\end{Verbatim}" + EOL );
- markup( "\\end{small}" + EOL + EOL );
+ markup( "\\end{small}" + EOL );
verbatimFlag = false;
boxFlag = false;
@@ -858,7 +866,7 @@
*/
public void horizontalRule()
{
- markup( "\\begin{center}\\rule[0.5ex]{\\linewidth}{1pt}\\end{center}"
+ EOL + EOL );
+ markup( EOL +
"\\begin{center}\\rule[0.5ex]{\\linewidth}{1pt}\\end{center}" + EOL );
}
/**
@@ -866,7 +874,7 @@
*/
public void pageBreak()
{
- markup( "\\newpage" + EOL + EOL );
+ markup( EOL + "\\newpage" + EOL );
}
/**
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?rev=641288&r1=641287&r2=641288&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Wed Mar 26 05:40:31 2008
@@ -85,91 +85,90 @@
/** [EMAIL PROTECTED] */
protected String getSection1Block( String title )
{
- return "\\section{" + title + "}" + EOL;
+ return EOL + "\\section{" + title + "}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getSection2Block( String title )
{
- return "\\subsection{" + title + "}" + EOL;
+ return EOL + "\\subsection{" + title + "}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getSection3Block( String title )
{
- return "\\subsubsection{" + title + "}" + EOL;
+ return EOL + "\\subsubsection{" + title + "}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getSection4Block( String title )
{
- return "\\paragraph{" + title + "}" + EOL;
+ return EOL + "\\paragraph{" + title + "}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getSection5Block( String title )
{
- return "\\subparagraph{" + title + "}" + EOL;
+ return EOL + "\\subparagraph{" + title + "}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getListBlock( String item )
{
- return "\\begin{itemize}" + EOL + EOL + "\\item " + LatexSink.escaped(
item ) + "\\end{itemize}" + EOL + EOL;
+ return EOL + "\\begin{itemize}" + EOL + "\\item " + LatexSink.escaped(
item ) + EOL + "\\end{itemize}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getNumberedListBlock( String item )
{
- return "\\begin{enumerate}" + EOL +
"\\renewcommand{\\theenumi}{\\roman{enumi}}" + EOL + EOL + "\\item "
- + LatexSink.escaped( item ) + "\\end{enumerate}" + EOL + EOL;
+ return EOL + "\\begin{enumerate}" + EOL +
"\\renewcommand{\\theenumi}{\\roman{enumi}}" + EOL + "\\item "
+ + LatexSink.escaped( item ) + EOL + "\\end{enumerate}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getDefinitionListBlock( String definum, String definition
)
{
- return "\\begin{description}" + EOL + EOL + "\\item[\\mbox{" + definum
+ "}] " + definition + "\\end{description}" + EOL + EOL;
+ return EOL + "\\begin{description}" + EOL + "\\item[\\mbox{" + definum
+ "}] " + definition + EOL + "\\end{description}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getFigureBlock( String source, String caption )
{
- return "\\begin{figure}[htb]" + EOL + "\\begin{center}" + EOL +
"\\includegraphics{" + source + "}" + EOL
- + "\\end{center}" + EOL + "\\caption{Figure\\_caption}" + EOL +
"\\end{figure}" + EOL + EOL;
+ return EOL + "\\begin{figure}[htb]" + EOL + "\\begin{center}" + EOL +
"\\includegraphics{" + source + "}" + EOL
+ + "\\end{center}" + EOL + "\\caption{Figure\\_caption}" + EOL +
"\\end{figure}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getTableBlock( String cell, String caption )
{
-
- return "\\begin{table}[htp]" + EOL + "\\begin{center}" + EOL +
"\\begin{tabular}{c}" + EOL
+ return EOL + "\\begin{table}[htp]" + EOL + "\\begin{center}" + EOL +
"\\begin{tabular}{c}" + EOL
+ "\\begin{tabular}[t]{c}cell\\end{tabular}\\\\" + EOL +
"\\end{tabular}" + EOL
- + "\\end{center}" + EOL + "\\caption{Table\\_caption}" + EOL +
"\\end{table}" + EOL + EOL;
+ + "\\end{center}" + EOL + "\\caption{Table\\_caption}" + EOL +
"\\end{table}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getParagraphBlock( String text )
{
- return text + EOL + EOL;
+ return EOL + EOL + text + EOL;
}
/** [EMAIL PROTECTED] */
protected String getVerbatimBlock( String text )
{
return EOL + "\\begin{small}" + EOL +
"\\begin{Verbatim}[frame=single]" + EOL + text + EOL
- + "\\end{Verbatim}" + EOL + "\\end{small}" + EOL + EOL;
+ + "\\end{Verbatim}" + EOL + "\\end{small}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getHorizontalRuleBlock()
{
- return "\\begin{center}\\rule[0.5ex]{\\linewidth}{1pt}\\end{center}" +
EOL + EOL;
+ return EOL +
"\\begin{center}\\rule[0.5ex]{\\linewidth}{1pt}\\end{center}" + EOL;
}
/** [EMAIL PROTECTED] */
protected String getPageBreakBlock()
{
- return "\\newpage" + EOL + EOL;
+ return EOL + "\\newpage" + EOL;
}
/** [EMAIL PROTECTED] */
