From fa5d6fcc451da8ccf7678329b10c392c17c3a414 Mon Sep 17 00:00:00 2001 From: Matthew Peveler Date: Fri, 29 Jan 2021 13:52:56 +0000 Subject: replace asciidoc-file attribute with asciidoc-module Signed-off-by: Matthew Peveler --- asciidoc/asciidoc.py | 1 + asciidoc/resources/asciidoc.conf | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/asciidoc/asciidoc.py b/asciidoc/asciidoc.py index da5769f..f55d629 100644 --- a/asciidoc/asciidoc.py +++ b/asciidoc/asciidoc.py @@ -1432,6 +1432,7 @@ class Document(object): """ t = time.time() self.attributes['localdate'], self.attributes['localtime'] = date_time_str(t) + self.attributes['asciidoc-module'] = 'asciidoc' self.attributes['asciidoc-version'] = VERSION self.attributes['asciidoc-confdir'] = CONF_DIR self.attributes['user-dir'] = USER_DIR diff --git a/asciidoc/resources/asciidoc.conf b/asciidoc/resources/asciidoc.conf index d1ca3fd..bee8603 100644 --- a/asciidoc/resources/asciidoc.conf +++ b/asciidoc/resources/asciidoc.conf @@ -550,7 +550,7 @@ emphasis-style=tags="emphasis" strong-style=tags="strong" monospaced-style=tags="monospaced" header-style=tags="header" -asciidoc-style=tags="asciidoc",subs=(),filter='"{python}" "{asciidoc-file}" -b {backend} {asciidoc-args}{lang? -a "lang={lang}@"}{icons? -a icons -a "iconsdir={iconsdir}"}{imagesdir? -a "imagesdir={imagesdir}"}{data-uri? -a data-uri} -a "indir={indir}"{trace? -a "trace={trace}"}{blockname? -a "blockname={blockname}"} -s -' +asciidoc-style=tags="asciidoc",subs=(),filter='"{python}" -m "{asciidoc-module}" -b {backend} {asciidoc-args}{lang? -a "lang={lang}@"}{icons? -a icons -a "iconsdir={iconsdir}"}{imagesdir? -a "imagesdir={imagesdir}"}{data-uri? -a data-uri} -a "indir={indir}"{trace? -a "trace={trace}"}{blockname? -a "blockname={blockname}"} -s -' [tabledef-nested] # Same as [tabledef-default] but with different delimiter and separator. @@ -564,7 +564,7 @@ emphasis-style=tags="emphasis" strong-style=tags="strong" monospaced-style=tags="monospaced" header-style=tags="header" -asciidoc-style=tags="asciidoc",subs=(),filter='"{python}" "{asciidoc-file}" -b {backend} {asciidoc-args}{lang? -a "lang={lang}@"}{icons? -a icons -a "iconsdir={iconsdir}"}{imagesdir? -a "imagesdir={imagesdir}"}{data-uri? -a data-uri} -a "indir={indir}"{trace? -a "trace={trace}"}{blockname? -a "blockname={blockname}"} -s -' +asciidoc-style=tags="asciidoc",subs=(),filter='"{python}" -m "{asciidoc-module}" -b {backend} {asciidoc-args}{lang? -a "lang={lang}@"}{icons? -a icons -a "iconsdir={iconsdir}"}{imagesdir? -a "imagesdir={imagesdir}"}{data-uri? -a data-uri} -a "indir={indir}"{trace? -a "trace={trace}"}{blockname? -a "blockname={blockname}"} -s -' #---------------------------------------- # Common block and macro markup templates -- cgit v1.2.1