[21/25,v6] doc/asciidoc: allow documents to pass a global asciidoc configuration

Currently, a document can specify an output-specific configuration, like
the text output, that hides images references, and formats hyperlinks.

But sometime it is required that a specific configuration is used for
all the output formats, to always apply the same markup rules in all
documents (like using the [specialwords] section.)

Also look for a file named 'asciidoc.conf' in the document's directory.
If that file exists, add it to the asciidoc options (before the
output-specific config, so the former takes precedence over the latter.)

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Samuel Martin <s.martin49@gmail.com>
Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
---
 package/doc-asciidoc.mk | 6 ++++++
 1 file changed, 6 insertions(+)

Yann,

On Sat, Sep 27, 2014 at 12:16 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Currently, a document can specify an output-specific configuration, like
> the text output, that hides images references, and formats hyperlinks.
>
> But sometime it is required that a specific configuration is used for
> all the output formats, to always apply the same markup rules in all
> documents (like using the [specialwords] section.)
>
> Also look for a file named 'asciidoc.conf' in the document's directory.
> If that file exists, add it to the asciidoc options (before the
> output-specific config, so the former takes precedence over the latter.)

It is the other way around, no?
(the output-specific config taking precedence over/overriding the
sections defined in the global one)

>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Samuel Martin <s.martin49@gmail.com>
> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>
> ---
>  package/doc-asciidoc.mk | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/package/doc-asciidoc.mk b/package/doc-asciidoc.mk
> index 4dc92a8..f949733 100644
> --- a/package/doc-asciidoc.mk
> +++ b/package/doc-asciidoc.mk
> @@ -60,6 +60,10 @@ asciidoc-check-dependencies-$(5):
>  $(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5)
>         $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep))
>
> +ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),)
> +$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF)
> +endif
> +
>  $(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf
>  ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),)
>  $(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF)
> @@ -132,6 +136,8 @@ $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced:
>
>  $(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced
>
> +$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf
> +
>  $(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\
>         --xsltproc-opts "--stringparam toc.section.depth 1")
>
> --
> 1.9.1
>

Regards,

Samuel, All,

On 2014-09-27 13:20 +0200, Samuel Martin spake thusly:
> On Sat, Sep 27, 2014 at 12:16 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> > Currently, a document can specify an output-specific configuration, like
> > the text output, that hides images references, and formats hyperlinks.
> >
> > But sometime it is required that a specific configuration is used for
> > all the output formats, to always apply the same markup rules in all
> > documents (like using the [specialwords] section.)
> >
> > Also look for a file named 'asciidoc.conf' in the document's directory.
> > If that file exists, add it to the asciidoc options (before the
> > output-specific config, so the former takes precedence over the latter.)
> 
> It is the other way around, no?
> (the output-specific config taking precedence over/overriding the
> sections defined in the global one)

Yes indeed; the commit log is backward. Fixed.
Thanks.

Regards,
Yann E. MORIN.

On Sat, Sep 27, 2014 at 12:16 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> Currently, a document can specify an output-specific configuration, like
> the text output, that hides images references, and formats hyperlinks.
>
> But sometime it is required that a specific configuration is used for

sometimes

> all the output formats, to always apply the same markup rules in all
> documents (like using the [specialwords] section.)
>
> Also look for a file named 'asciidoc.conf' in the document's directory.
> If that file exists, add it to the asciidoc options (before the
> output-specific config, so the former takes precedence over the latter.)
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: Samuel Martin <s.martin49@gmail.com>
> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com>

Aside from the above commit message change + the commit message change
indicated by Samuel:

Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>