Skip to content

Commit 0af7ee8

Browse files
committed
chore: doc-producer and doc-creator handling in HTML and AsciiDoc format
1 parent 9aaa4d5 commit 0af7ee8

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/asciidoc.ftl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
<#if (docBase.infoDocAuthor)??>${docBase.infoDocAuthor}</#if>
44
<#if (docBase.infoDocSubject)??>:description: ${docBase.infoDocSubject}</#if>
55
<#if (docBase.infoDocLanguage)??>:lang: ${docBase.infoDocLanguage}</#if>
6+
<#if (docBase.infoDocProducer)??>:generator: ${docBase.infoDocProducer}<#else>:generator: Venus Fugerit Doc over Apache FreeMarker</#if>
7+
<#if (docBase.infoDocCreator)??>:created-by: ${docBase.infoDocCreator}<#else>:created-by: Venus Fugerit Doc (https://venusdocs.fugerit.org)</#if>
68

79
<#list docBase.docBody.elementList as item>
810
<@doc_element.handleElement current=item/>

fj-doc-freemarker/src/main/resources/fj_doc_freemarker_config/template/html_doc.ftl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313
<#if (docBase.stableInfo['html-charset'])??><meta charset="${docBase.stableInfo['html-charset']}"></#if>
1414
<#if (docBase.infoDocAuthor)??><meta name="author" content="${docBase.infoDocAuthor}"/></#if>
1515
<#if (docBase.infoDocSubject)??><meta name="description" content="${docBase.infoDocSubject}"/></#if>
16-
<#if (docBase.infoDocLanguage)??><meta http-equiv="content-language" content="${docBase.infoDocLanguage}"/></#if>
17-
<meta name="doc-version-compatibility" content="${comp}"/>
16+
<#if (docBase.infoDocLanguage)??><meta http-equiv="content-language" content="${docBase.infoDocLanguage}"/></#if>
17+
<#if (docBase.infoDocProducer)??><meta http-equiv="generator" content="${docBase.infoDocProducer}"/><#else><meta http-equiv="generator" content="Venus Fugerit Doc over Apache FreeMarker"/></#if>
18+
<#if (docBase.infoDocCreator)??><meta http-equiv="created-by" content="${docBase.infoDocCreator}"/><#else><meta http-equiv="created-by" content="Venus Fugerit Doc (https://venusdocs.fugerit.org)"/></#if>
19+
<meta name="doc-version-compatibility" content="${comp}"/>
1820
${docBase.stableInfo['html-add-to-head']!''}
1921
<#if (docBase.stableInfo['html-css-style'])??>
2022
<style type="text/css">

fj-doc-freemarker/src/test/resources/coverage/xml/asciidoc.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<info name="doc-subject">fj doc venus sample source xml</info>
1414
<info name="doc-author">fugerit79</info>
1515
<info name="doc-language">en</info>
16+
<info name="doc-producer">My AsciiDoc producer</info>
17+
<info name="doc-creator">My AsciiDoc creator</info>
1618
<!-- additional properties -->
1719
<info name="set-total-page">true</info>
1820
<info name="html-css-link">/css/test.css</info>

0 commit comments

Comments
 (0)