| author | Marc Aubry | 2012-11-06 08:47:17 (EST) |
|---|---|---|
| committer | Simon Bernard | 2012-11-06 08:47:17 (EST) |
| commit | d6ec52834d79d24671c9c9e97da58afe04e4d2b0 (patch) (side-by-side diff) | |
| tree | 3485020aa5a3bb3633ac7d5354a6255f912c18a6 | |
| parent | c7acd0f8a635f5e266e4d131d198ca78e2481ef9 (diff) | |
| download | org.eclipse.koneki.ldt-d6ec52834d79d24671c9c9e97da58afe04e4d2b0.zip org.eclipse.koneki.ldt-d6ec52834d79d24671c9c9e97da58afe04e4d2b0.tar.gz org.eclipse.koneki.ldt-d6ec52834d79d24671c9c9e97da58afe04e4d2b0.tar.bz2 | |
Bug 389887 - [luadocumentor] Markdown paragraph are not properly
generated
47 files changed, 159 insertions, 180 deletions
diff --git a/libraries/doctemplates/template/file.lua b/libraries/doctemplates/template/file.lua index 2439353..a46f1cc 100644 --- a/libraries/doctemplates/template/file.lua +++ b/libraries/doctemplates/template/file.lua @@ -24,7 +24,7 @@ return[[# $( format(_file.shortdescription) )
# end
# if _file.description and #_file.description > 0 then
- <br/>$( format(_file.description) )
+ $( format(_file.description) )
# end
# --
# -- Handle "@usage" special tag
diff --git a/libraries/doctemplates/template/item.lua b/libraries/doctemplates/template/item.lua index b958fa5..5276dfc 100644 --- a/libraries/doctemplates/template/item.lua +++ b/libraries/doctemplates/template/item.lua @@ -45,7 +45,7 @@ return $( format(_item.shortdescription) ) # end # if _item.description and #_item.description > 0 then - <br/>$( format(_item.description) ) + $( format(_item.description) ) # end # # -- @@ -71,17 +71,34 @@ return <ul> # for position, param in ipairs( fdef.params ) do # if not (position == 1 and param.name == 'self') then - <li><code><em> + <li> +# local paramline = "<code><em>" # if param.type then # local link = linkto( param.type ) # local name = prettyname( param.type ) # if link then - <a href="$( link )">$( name )</a> +# paramline = paramline .. '<a href=\"' .. link .. '\">' .. name .. "</a>" # else - $( name ) +# paramline = paramline .. name # end -# end - $(param.name) $(param.optional and 'optional') $(param.hidden and 'hidden')</em></code>: $( format(param.description) ) +# end +# +# paramline = paramline .. " " .. param.name .. " " +# +# if param.optional then +# paramline = paramline .. "optional" .. " " +# end +# if param.hidden then +# paramline = paramline .. "hidden" +# end +# +# paramline = paramline .. "</em></code>: " +# +# if param.description and #param.description > 0 then +# paramline = paramline .. param.description +# end +# + $( format (paramline)) </li> # end # end @@ -118,11 +135,14 @@ return <ol> # for position, ret in ipairs(fdef.returns) do <li> +# local returnline = ""; +# # local paramlist = niceparmlist(ret.types) # if #ret.types > 0 and #paramlist > 0 then - <em>$( paramlist )</em> +# local returnline = "<em>" .. paramlist .. "</em>" # end - $(ret.description and format(ret.description)) +# returnline = returnline .. (ret.description and ret.description) + $( format (returnline)) </li> # end </ol> @@ -130,19 +150,16 @@ return # local paramlist = niceparmlist(fdef.returns[1].types) # local isreturn = fdef.returns and #fdef.returns > 0 and #paramlist > 0 # local isdescription = fdef.returns and fdef.returns[1].description and #format(fdef.returns[1].description) > 0 -# if isreturn or isdescription then - <p> -# end +# +# local returnline = ""; # -- Show return type if provided # if isreturn then - <em>$( paramlist )</em> +# returnline = "<em>"..paramlist.."</em>" # end # if isdescription then - $( format(fdef.returns[1].description) ) -# end -# if isreturn or isdescription then - </p> +# returnline = returnline .. fdef.returns[1].description # end + $( format(returnline)) # end # end #end diff --git a/libraries/doctemplates/template/recordtypedef.lua b/libraries/doctemplates/template/recordtypedef.lua index 5d1961d..d72ee6f 100644 --- a/libraries/doctemplates/template/recordtypedef.lua +++ b/libraries/doctemplates/template/recordtypedef.lua @@ -14,10 +14,10 @@ return [[# # -- Descriptions # -- #if _recordtypedef.shortdescription and #_recordtypedef.shortdescription > 0 then - <p>$( format( _recordtypedef.shortdescription ) )</p> + $( format( _recordtypedef.shortdescription ) ) #end #if _recordtypedef.description and #_recordtypedef.description > 0 then - <p>$( format( _recordtypedef.description ) )</p> + $( format( _recordtypedef.description ) ) #end #-- #-- Describe usage diff --git a/libraries/templateengine/templateengine.lua b/libraries/templateengine/templateengine.lua index a3f9735..aed244a 100644 --- a/libraries/templateengine/templateengine.lua +++ b/libraries/templateengine/templateengine.lua @@ -85,7 +85,7 @@ local function format(string) end string = string:gsub('@{%s*(.-)%s*}', replace) -- Trim markdown results from auto generated <p></p> - return M.env.markdown( string ):gsub('^%s*<p>(.+)</p>%s*$','%1') + return M.env.markdown( string ) end --- -- Provide a full link to an element using `prettyname` and `linkto`. diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java b/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java index 784daf4..c2d32ba 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java +++ b/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/JDMTemplateEngineTestSuite.java @@ -110,9 +110,6 @@ public class JDMTemplateEngineTestSuite extends AbstractLuaTestSuite { protected List<String> createTestBlacklist() { ArrayList<String> blacklist = new ArrayList<String>(); - // Bug 389887 - blacklist.add("paragraph.lua"); //$NON-NLS-1$ - // Bug 389828 blacklist.add("code2.lua"); //$NON-NLS-1$ diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java b/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java index abcbcbe..4c159d9 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java +++ b/tests/org.eclipse.koneki.ldt.lua.tests/src/org/eclipse/koneki/ldt/lua/tests/internal/template/engine/TemplateEngineTestSuite.java @@ -32,12 +32,6 @@ public class TemplateEngineTestSuite extends AbstractLuaTestSuite { // Bug 389828 blacklist.add("markdown/code2.lua"); //$NON-NLS-1$ - // Bug 389887 - blacklist.add("markdown/paragraph.lua"); //$NON-NLS-1$ - - // Bug 388163 - blacklist.add("markdown/list4.lua"); //$NON-NLS-1$ - // Bug 389991 blacklist.add("markdown/title2.lua"); //$NON-NLS-1$ diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam.html index 3280f3a..0af3aaf 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedparam.html @@ -12,7 +12,7 @@ <tr> <td class="name" nowrap="nowrap"> <a href="modulename.html##(modulename).functionname">modulename.functionname(paramname)</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -26,13 +26,11 @@ <a id="#(modulename).functionname"> <strong>modulename.functionname(paramname)</strong></a> </dt> <dd> - Function short description. - <br /> Function long description + <p>Function short description.</p> + <p>Function long description</p> <h3>Parameter</h3> <ul> - <li><code> - <em> paramname </em> - </code>: param description</li> + <li><p><code><em> paramname </em></code>: param description</p></li> </ul> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html index 5ce5f4d..ada20ec 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedreturn.html @@ -8,7 +8,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname()</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -24,8 +24,8 @@ </a> </dt> <dd> - Function short description.<br /> - Function long description + <p>Function short description.</p> + <p>Function long description</p> <h3>Return value</h3> <p> return description diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html index fd9fe83..c01f963 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedparam.html @@ -12,7 +12,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname(paramname)</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -26,14 +26,13 @@ <a id="#(modulename).functionname"> <strong>modulename.functionname(paramname)</strong></a> </dt> <dd> - Function short description. <br /> - Function long description + <p>Function short description. </p> + <p>Function long description</p> <h3>Parameter</h3> <ul> - <li><code> - <em>#string - paramname </em> - </code>: param description</li> + <li> + <p><code><em>#string paramname </em></code>: param description</p> + </li> </ul> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html index ea66809..447d3c3 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypedreturn.html @@ -11,7 +11,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname()</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -27,14 +27,11 @@ </a> </dt> <dd> - Function short description. - <br />Function long description - + <p>Function short description.</p> + <p>Function long description</p> <h3>Return value</h3> - <p> - <em>#string:</em> return description - </p> + <p><em>#string:</em> return description</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html index 2f34520..9b91943 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedparam.html @@ -12,7 +12,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname(paramname)</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -26,14 +26,13 @@ <a id="#(modulename).functionname"> <strong>modulename.functionname(paramname)</strong></a> </dt> <dd> - Function short description. <br /> - Function long description + <p>Function short description. </p> + <p>Function long description</p> <h3>Parameter</h3> <ul> - <li><code> - <em><a href="othermodule.html##(atype)">othermodule#atype</a> - paramname </em> - </code>: param description</li> + <li><p><code> + <em><a href="othermodule.html##(atype)">othermodule#atype</a> paramname </em> + </code>: param description</p></li> </ul> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html index 1ca694c..fc2b08a 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/describedtypelinkedreturn.html @@ -11,7 +11,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname()</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -27,13 +27,12 @@ </a> </dt> <dd> - Function short description. - <br />Function long description - + <p>Function short description.</p> + <p>Function long description</p> <h3>Return value</h3> <p> - <em><a href="othermodule.html##(atype)">othermodule#atype</a>:</em> return description + <em><a href="othermodule.html##(atype)">othermodule#atype</a>:</em>return description </p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/empty.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/empty.html index 33c3981..3acaf3c 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/empty.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/empty.html @@ -16,7 +16,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname()</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -32,9 +32,8 @@ </a> </dt> <dd> - Function short description. - <br /> Function long description - + <p>Function short description.</p> + <p>Function long description</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam.html index 530328a..39a9bc1 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedparam.html @@ -15,7 +15,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname(paramname)</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -31,15 +31,14 @@ </a> </dt> <dd> - Function short description. - <br /> Function long description + <p>Function short description.</p> + <p>Function long description</p> <h3>Parameter</h3> <ul> - <li><code> - <em>#string - paramname </em> - </code>:</li> + <li> + <p><code><em>#string paramname </em></code>:</p> + </li> </ul> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html index 1cc4ec5..fa55501 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typedreturn.html @@ -15,7 +15,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname()</a></td> - <td class="summary">Function short description. + <td class="summary"><p>Function short description.</p> </td> </tr> </table> @@ -32,12 +32,11 @@ </a> </dt> <dd> - Function short description. <br /> - Function long description + <p>Function short description.</p> + <p>Function long description</p> <h3>Return value</h3> <p> <em>#string:</em> - </p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html index 13058c1..88c11aa 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedparam.html @@ -3,11 +3,6 @@ Module <code>modulename</code> </h1> - - - - - <h2> <a id="#(modulename)">Type <code>modulename</code></a> </h2> @@ -15,7 +10,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname(paramname)</a></td> - <td class="summary">Function short description.</td> + <td class="summary"><p>Function short description.</p></td> </tr> </table> @@ -31,15 +26,14 @@ </a> </dt> <dd> - Function short description. - <br /> Function long description + <p>Function short description.</p> + <p>Function long description</p> <h3>Parameter</h3> <ul> - <li><code> - <em><a href="othermodule.html##(atype)">othermodule#atype</a> - paramname </em> - </code>:</li> + <li><p><code> + <em><a href="othermodule.html##(atype)">othermodule#atype</a>paramname </em> + </code>:</p></li> </ul> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html index e46e417..f2dc6aa 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/function/typelinkedreturn.html @@ -15,7 +15,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(modulename).functionname">modulename.functionname()</a></td> - <td class="summary">Function short description. + <td class="summary"><p> Function short description.</p> </td> </tr> </table> @@ -32,8 +32,8 @@ </a> </dt> <dd> - Function short description. <br /> - Function long description + <p>Function short description.</p> + <p>Function long description</p> <h3>Return value</h3> <p> <em><a href="othermodule.html##(atype)">othermodule#atype</a>:</em> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/field.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/field.html index ea6215b..b34f0d9 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/field.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/field.html @@ -11,7 +11,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="mod.html##(mod).fieldname">mod.fieldname</a></td> - <td class="summary">Field short description.</td> + <td class="summary"><p>Field short description.</p></td> </tr> </table> @@ -27,8 +27,8 @@ </a> </dt> <dd> - Field short description. -<br /> Field long description + <p>Field short description.</p> + <p>Field long description</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/typedfield.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/typedfield.html index 11217cc..6457980 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/typedfield.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/global/typedfield.html @@ -12,7 +12,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="mod.html##(mod).fieldname">mod.fieldname</a></td> - <td class="summary">Field short description.</td> + <td class="summary"><p>Field short description.</p></td> </tr> </table> @@ -29,10 +29,8 @@ </a> </dt> <dd> - Field short description. - <br /> Field long description - - + <p>Field short description.</p> + <p>Field long description</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html index 5d1fe5f..6faf45f 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortdescription.html @@ -3,7 +3,7 @@ Module <code>modulename</code> </h1> - Module short description. + <p>Module short description.</p> <h2> <a id="#(modulename)">Type <code>modulename</code></a> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html index c72ea0c..908fe15 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription.html @@ -3,8 +3,8 @@ Module <code>modulename</code> </h1> - Module short description. <br /> - Module long description. + <p>Module short description.</p> + <p>Module long description.</p> <h2> <a id="#(modulename)">Type <code>modulename</code></a> </h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html index 0f475e4..150b604 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/module/shortlongdescription2.html @@ -3,9 +3,8 @@ Module <code>modulename</code> </h1> - Module short description? - <br /> - Module long description + <p>Module short description?</p> + <p>Module long description</p> <h2> <a id="#(modulename)">Type <code>modulename</code></a> </h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/field.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/field.html index 48ced57..7bbf7ce 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/field.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/field.html @@ -18,7 +18,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(typename).fieldname">typename.fieldname</a></td> - <td class="summary">Field short description.</td> + <td class="summary"><p>Field short description.</p></td> </tr> </table> @@ -39,7 +39,8 @@ </a> </dt> <dd> - Field short description. <br />Field long description + <p>Field short description.</p> + <p>Field long description</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html index c6149d4..7b97d1b 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/inlinedescribedtypedfield.html @@ -18,7 +18,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(typename).fieldname">typename.fieldname</a></td> - <td class="summary">field short description.</td> + <td class="summary"><p>field short description.</p></td> </tr> </table> @@ -36,11 +36,10 @@ <h3>Field(s)</h3> <dl class="function"> <dt> - - <em>#string</em> <a id="#(typename).fieldname" ><strong>typename.fieldname</strong></a> + <em>#string</em> <a id="#(typename).fieldname" ><strong>typename.fieldname</strong></a> </dt> <dd> - field short description. + <p>field short description.</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedfield.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedfield.html index 583ae25..c10123b 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedfield.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/apimodel/html/type/typedfield.html @@ -18,7 +18,7 @@ <tr> <td class="name" nowrap="nowrap"><a href="modulename.html##(typename).fieldname">typename.fieldname</a></td> - <td class="summary">Field short description. </td> + <td class="summary"><p>Field short description.</p></td> </tr> </table> @@ -37,8 +37,8 @@ <em>#string</em> <a id="#(typename).fieldname" ><strong>typename.fieldname</strong></a> </dt> <dd> - Field short description.<br /> - Field long description + <p>Field short description.</p> + <p>Field long description</p> </dd> </dl> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html index f4843ea..13b9d56 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfield.html @@ -1,8 +1,9 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/> + <p>Module to process.</p> + <p> See <a href="anothermodulename.html##(typename).fieldname">typename.fieldname</a> + </p> <h2> <a id="#(modulename)" >Type <code>modulename</code></a> </h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html index 92cad98..e7b6130 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalfunction.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/> - See <a href="anothermodulename.html##(typename).functionname">typename.functionname</a> + <p>Module to process.</p> + <p>See <a href="anothermodulename.html##(typename).functionname">typename.functionname</a></p> <h2> <a id="#(modulename)" >Type <code>modulename</code></a> </h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html index 68b20eb..86b8d2d 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externalmodule.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/> - See <a href="anothermodulename.html">anothermodulename</a> + <p>Module to process.</p> + <p>See <a href="anothermodulename.html">anothermodulename</a></p> <h2> <a id="#(modulename)" >Type <code>modulename</code></a> </h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html index 620dbce..66e357d 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/externaltype.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/> - See <a href="anothermodulename.html##(typename)">anothermodulename#typename</a> + <p>Module to process.</p> + <p>See <a href="anothermodulename.html##(typename)">anothermodulename#typename</a></p> <h2> <a id="#(modulename)" >Type <code>modulename</code></a> </h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html index a91390c..9b9acb0 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfield.html @@ -1,7 +1,7 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/>See <a href="##(typename).fieldname">#typename.fieldname</a> + <p>Module to process.</p> + <p>See <a href="##(typename).fieldname">#typename.fieldname</a></p> <h2> <a id="#(modulename)" >Type <code>modulename</code></a> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html index 10a2104..63fc99e 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internalfunction.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/> - See <a href="##(modulename).functionname">#modulename.functionname</a> + <p>Module to process.</p> + <p>See <a href="##(modulename).functionname">#modulename.functionname</a></p> <h2> <a id="#(modulename)" >Type <code>modulename</code></a> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html index 8670299..16b91dd 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/inlinelink/internaltype.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>modulename</code></h1> - Module to process. - <br/> - See <a href="##(typename)">#typename</a> + <p>Module to process.</p> + <p>See <a href="##(typename)">#typename</a></p> <h2><a id="#(modulename)">Type <code>modulename</code></a></h2> <h2><a id="#(typename)" >Type <code>typename</code></a></h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code.html index e30ad83..190fb63 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>code</code></h1> - Module to process. - <br/> - Some code with special char to be escaped<code>&#8;</code>. + <p>Module to process.</p> + <p>Some code with special char to be escaped<code>&#8;</code>.</p> <h2> <a id="#(code)" > Type <code>code</code> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html index 849954f..714f0e2 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/code2.html @@ -1,10 +1,9 @@ <div id="content"> <h1>Module <code>code2</code></h1> - Module to process. - <br/> - + <p>Module to process.</p> + <pre><code><p>Some code here</p> - With indentation + With indentation </code></pre> <h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html index 9d8b28b..c98bcf5 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/emphasis.html @@ -1,7 +1,7 @@ <div id="content"> <h1>Module <code>emphasis</code></h1> - Module to process. - <br/><em>emphasis</em> or <em>emphasis</em> + <p>Module to process.</p> + <p><em>emphasis</em> or <em>emphasis</em></p> <h2> <a id="#(emphasis)" > Type <code>emphasis</code> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link.html index 1f8cb88..c79eb2c 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link.html @@ -1,9 +1,9 @@ <div id="content"> <h1>Module <code>link</code></h1> - Module to process. - <br/> - - This is an <a href="http://eclipse.org/koneki/ldt">example link</a>. + <p>Module to process.</p> + <p> + This is an <a href="http://eclipse.org/koneki/ldt">example link</a>. + </p> <h2> <a id="#(link)" > diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html index 1ddb1e8..b124caf 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/link2.html @@ -1,9 +1,9 @@ <div id="content"> <h1>Module <code>link2</code></h1> - Module to process. - <br/> - + <p>Module to process.</p> + <p> This is an <a href="http://eclipse.org/koneki/ldt" title="link title">example link</a>. + </p> <h2> <a id="#(link2)" > diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list.html index df96703..3f2034c 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list.html @@ -1,7 +1,7 @@ <div id="content"> <h1>Module <code>list</code></h1> - Module to process. - <br/> + <p>Module to process.</p> + <ul> <li>apple</li> <li>banana @@ -9,6 +9,7 @@ <li>orange</li> </ul></li> </ul> + <h2> <a id="#(list)" > Type <code>list</code> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html index 26eea68..971a287 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list2.html @@ -1,7 +1,6 @@ <div id="content"> <h1>Module <code>list</code></h1> - Module to process. - <br/> + <p>Module to process.</p> <p>A regular line.</p> <ul> <li>apple</li> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html index 94f1cea..aebc1a0 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list3.html @@ -1,7 +1,7 @@ <div id="content"> <h1>Module <code>list</code></h1> - Module to process. - <br/> + <p>Module to process.</p> + <ul> <li>apple</li> <li>banana</li> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html index 660ba27..aaa8d4f 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/list4.html @@ -1,7 +1,6 @@ <div id="content"> <h1>Module <code>list</code></h1> - Module to process. - <br/> + <p>Module to process.</p> <p>A regular line.</p> <ul> <li>apple</li> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html index f7c213d..22bf3a6 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/markdowntitle.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>markdowntitle</code></h1> - Module to process. - <br/> - + <p>Module to process.</p> + <h1>A First Level Header</h1> <h2>A Second Level Header</h2> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html index 39b9eeb..733b8c7 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/paragraph.html @@ -1,15 +1,14 @@ <div id="content"> - <h1>Module <code>list</code></h1> - Module to process. - <br/> + <h1>Module <code>paragraph</code></h1> + <p>Module to process.</p> <p>first paragraph</p> <p>second one</p> <h2> - <a id="#(list)" > - Type <code>list</code> + <a id="#(paragraph)" > + Type <code>paragraph</code> </a> </h2> - <h2>Type <code>list</code></h2> + <h2>Type <code>paragraph</code></h2> </div>
\ No newline at end of file diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html index 97ec790..ca1a8e3 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/quote.html @@ -1,8 +1,7 @@ <div id="content"> <h1>Module <code>quote</code></h1> - Module to process. - <br/> - + <p>Module to process.</p> + <blockquote> <p>This is a quote</p> </blockquote> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html index f605bfa..d9496ee 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/strong.html @@ -1,8 +1,9 @@ <div id="content"> <h1>Module <code>strong</code></h1> - Module to process. - <br/> - <strong>strong</strong> or <strong>strong</strong> + <p>Module to process.</p> + + <p><strong>strong</strong> or <strong>strong</strong></p> + <h2> <a id="#(strong)" > Type <code>strong</code> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title.html index 07d2c78..f9d51a1 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title.html @@ -1,7 +1,6 @@ <div id="content"> <h1>Module <code>title</code></h1> - Module to process. - <br/> + <p>Module to process.</p> <h1>Header level 1</h1> diff --git a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html index 21c1e8e..45ba241 100644 --- a/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html +++ b/tests/org.eclipse.koneki.ldt.lua.tests/tests/templateengine/reference/markdown/title2.html @@ -1,10 +1,11 @@ <div id="content"> <h1>Module <code>title</code></h1> - Module to process. - <br/> - + <p>Module to process.</p> + <h1>First level 1</h1> + <p> coucou</p> + <h1>Second level 1</h1> <h2> |