# HG changeset patch # User Claudio Luck # Date 1584632859 -3600 # Node ID d659b8c2ed22f1ac2ab185f953d21d28c8c732ec # Parent 00a196f8d14ad944b5a5cb3f661e7907202c9bc0# Parent 4e4782144f4f139982dab2639ec61ba8996750ec Merge 2.6.3 diff -r 00a196f8d14a -r d659b8c2ed22 features.en.yhtml2 --- a/features.en.yhtml2 Thu Mar 19 16:45:02 2020 +0100 +++ b/features.en.yhtml2 Thu Mar 19 16:47:39 2020 +0100 @@ -975,6 +975,7 @@ if the «YML_PATH» environment variable is set to a colon separated list of directories, these directories are being searched for the given filename. Otherwise, the local directory is searched. + The system location for «.yml2» and «.ysl2» files is always searched afterwards. >> p >> diff -r 00a196f8d14a -r d659b8c2ed22 heading.en.yhtml2 --- a/heading.en.yhtml2 Thu Mar 19 16:45:02 2020 +0100 +++ b/heading.en.yhtml2 Thu Mar 19 16:47:39 2020 +0100 @@ -13,7 +13,7 @@ div id=headline { p > YML – Why a Markup Language?! div class=small { - "YML 2.6.2 of Mo 02 Nov 2019 – Copyleft 2007-2019, " + "YML 2.6.3 of Thu 19 Mar 2020 – Copyleft 2007-2020, " a "http://blog.fdik.org", "Volker Birk"; " – " a "http://fdik.org/yml2.tar.bz2", "Download YML 2"; diff -r 00a196f8d14a -r d659b8c2ed22 toolchain.en.yhtml2 --- a/toolchain.en.yhtml2 Thu Mar 19 16:45:02 2020 +0100 +++ b/toolchain.en.yhtml2 Thu Mar 19 16:47:39 2020 +0100 @@ -87,6 +87,7 @@ If «YML_PATH» is set to a colon separated ¬http://en.wikipedia.org/wiki/Path_(computing) path¬ list, then the `a href="features#including" code "include";` statement searches these paths. If «YML_PATH» is not set, the local directory «.» is searched for files. + The system location for «.yml2» and «.ysl2» files is always searched afterwards. >> h2 id=processor > The YML/YSLT processor @@ -218,8 +219,6 @@ p > Convert XML to normalized YML. Equivalent to -xy xml2yml.ysl2 - p > The file xml2yml.ysl2 has to be in YML_PATH. - h3 > -V, --version p >> @@ -233,6 +232,7 @@ If «YML_PATH» is set to a colon separated ¬http://en.wikipedia.org/wiki/Path_(computing) path¬ list, then the `a href="features#including" code "include";` statement searches these paths. If «YML_PATH» is not set, the local directory «.» is searched for files. + The system location for «.yml2» and «.ysl2» files is always searched afterwards. >> h2 id=recommended > Recommended external tools diff -r 00a196f8d14a -r d659b8c2ed22 yml2/manpage.yml2 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/yml2/manpage.yml2 Thu Mar 19 16:47:39 2020 +0100 @@ -0,0 +1,1 @@ +decl manpage(xmlns="http://docbook.org/ns/docbook", version="5.0", *title) alias article { title *title; content; }; diff -r 00a196f8d14a -r d659b8c2ed22 yml2/yslt.yml2 --- a/yml2/yslt.yml2 Thu Mar 19 16:45:02 2020 +0100 +++ b/yml2/yslt.yml2 Thu Mar 19 16:47:39 2020 +0100 @@ -1,4 +1,4 @@ -// YSLT version 2.6.2 +// YSLT version 2.6.3 !! def indent(level):