GraphicsMagick: rst2html5.py: Fix for includes when invoked from...
GraphicsMagick Commits <[email protected]>
| Newsgroups | gmane.comp.video.graphicsmagick.cvs |
|---|---|
| Message-ID | <mailman.23179.1664721729.11362.graphicsmagick-commit@lists.sourceforge.net> |
changeset 95f1225117f6 in /hg/GraphicsMagick details: http://hg.GraphicsMagick.org/hg/GraphicsMagick?cmd=changeset;node=95f1225117f6 summary: rst2html5.py: Fix for includes when invoked from different directory. diffstat: ChangeLog | 12 +- Makefile.in | 66 +- VisualMagick/installer/inc/version.isx | 4 +- magick/version.h | 4 +- scripts/rst2html5.py | 27 +- www/Changelog.html | 17 + www/Makefile.am | 37 +- www/api/Makefile.am | 12 +- www/api/animate.html | 84 +- www/api/annotate.html | 72 +- www/api/attribute.html | 121 +- www/api/average.html | 42 +- www/api/blob.html | 495 +- www/api/cdl.html | 44 +- www/api/channel.html | 169 +- www/api/color.html | 99 +- www/api/colormap.html | 85 +- www/api/compare.html | 216 +- www/api/composite.html | 57 +- www/api/confirm_access.html | 64 +- www/api/constitute.html | 245 +- www/api/decorate.html | 101 +- www/api/deprecate.html | 266 +- www/api/describe.html | 47 +- www/api/display.html | 93 +- www/api/draw.html | 2329 ++++++------- www/api/effect.html | 743 ++-- www/api/enhance.html | 174 +- www/api/error.html | 308 +- www/api/export.html | 129 +- www/api/fx.html | 315 +- www/api/hclut.html | 42 +- www/api/image.html | 745 ++-- www/api/import.html | 125 +- www/api/list.html | 361 +- www/api/log.html | 216 +- www/api/magick.html | 285 +- www/api/memory.html | 162 +- www/api/monitor.html | 101 +- www/api/montage.html | 104 +- www/api/operator.html | 106 +- www/api/paint.html | 138 +- www/api/pixel_cache.html | 748 ++-- www/api/pixel_iterator.html | 505 +- www/api/plasma.html | 52 +- www/api/profile.html | 230 +- www/api/quantize.html | 231 +- www/api/registry.html | 122 +- www/api/render.html | 178 +- www/api/resize.html | 178 +- www/api/resource.html | 126 +- www/api/segment.html | 65 +- www/api/shear.html | 140 +- www/api/signature.html | 109 +- www/api/statistics.html | 49 +- www/api/texture.html | 70 +- www/api/transform.html | 302 +- www/api/widget.html | 458 +- www/docutils-api.css | 4 + www/wand/Makefile.am | 13 +- www/wand/drawing_wand.html | 2354 ++++++------- www/wand/magick_wand.html | 5405 ++++++++++++++----------------- www/wand/pixel_wand.html | 727 +-- 63 files changed, 10008 insertions(+), 10920 deletions(-) diffs (truncated from 37646 to 500 lines): diff -r d22863ed3173 -r 95f1225117f6 ChangeLog --- a/ChangeLog Sun Oct 02 00:44:37 2022 +0200 +++ b/ChangeLog Sun Oct 02 09:41:49 2022 -0500 @@ -1,9 +1,15 @@ +2022-10-02 Bob Friesenhahn <[email protected]> + + * scripts/rst2html5.py: Fix from Mark Mitchell to deal with RST + file local include statements when invoked from a different + directory. Also fix requested character set encoding. + 2022-10-02 Fojtik Jaroslav <[email protected]> - * PerlMagick/t/input_8_BW_rle.tga + * PerlMagick/t/input_8_BW_rle.tga * PerlMagick/t/input_8_CC_rle.tga - * PerlMagick/t/input_8_BW.tga - Added 8 bit TGA samples. + * PerlMagick/t/input_8_BW.tga + Added 8 bit TGA samples. 2022-10-01 Bob Friesenhahn <[email protected]> diff -r d22863ed3173 -r 95f1225117f6 Makefile.in --- a/Makefile.in Sun Oct 02 00:44:37 2022 +0200 +++ b/Makefile.in Sun Oct 02 09:41:49 2022 -0500 @@ -90,7 +90,7 @@ # Makefile for building Wand library # -# Copyright (C) 2008 - 2021 GraphicsMagick Group +# Copyright (C) 2008 - 2022 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -99,7 +99,7 @@ # Makefile for building HTML files # -# Copyright (C) 2008-2011 GraphicsMagick Group +# Copyright (C) 2008-2022 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -108,7 +108,7 @@ # Makefile for building API HTML files # -# Copyright (C) 2009 - 2012 GraphicsMagick Group +# Copyright (C) 2009 - 2022 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -4747,9 +4747,6 @@ WWWAPI_MAINTAINER_TARGETS = $(WWWAPI_HTML_TARGETS) @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@APIWHATIS = $(top_srcdir)/scripts/whatis.txt @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@FORMATCAPI = $(top_srcdir)/scripts/format_c_api_doc.py -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@APIRST2HTML_COMMAND = $(RST2HTMLDECO) \ -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ --link-stylesheet=../docutils-articles.css` - wwwwandapidir = $(htmldir)/wand WWWWANDAPIDIR = $(top_srcdir)/www/wand WWWWANDAPI_HTML_TARGETS = \ @@ -11080,102 +11077,129 @@ @MAINTAINER_MODE_TRUE@ $(top_srcdir)/scripts/omp_decimal_align.py \ @MAINTAINER_MODE_TRUE@ $(WWWDIR)/Makefile.am -# Build HTML version of RST file +# Build HTML version of RST file (with "txt" extension) @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/%.html: $(top_srcdir)/%.txt -@MAINTAINER_MODE_TRUE@ $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css \ -@MAINTAINER_MODE_TRUE@ --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< > $@ - +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" +@MAINTAINER_MODE_TRUE@ $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< > $@ + +# Build HTML version of RST file @MAINTAINER_MODE_TRUE@$(top_srcdir)/%.html: $(top_srcdir)/%.rst -@MAINTAINER_MODE_TRUE@ $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css \ -@MAINTAINER_MODE_TRUE@ --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< | $(OMP_DECIMAL_ALIGN) > $@ +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" +@MAINTAINER_MODE_TRUE@ $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< | $(OMP_DECIMAL_ALIGN) > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/Changelog.rst: $(top_srcdir)/ChangeLog +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2021.rst: $(top_srcdir)/ChangeLog.2021 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2020.rst: $(top_srcdir)/ChangeLog.2020 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2019.rst: $(top_srcdir)/ChangeLog.2019 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2018.rst: $(top_srcdir)/ChangeLog.2018 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2017.rst: $(top_srcdir)/ChangeLog.2017 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2016.rst: $(top_srcdir)/ChangeLog.2016 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2015.rst: $(top_srcdir)/ChangeLog.2015 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2014.rst: $(top_srcdir)/ChangeLog.2014 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2013.rst: $(top_srcdir)/ChangeLog.2013 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2012.rst: $(top_srcdir)/ChangeLog.2012 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2011.rst: $(top_srcdir)/ChangeLog.2011 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2010.rst: $(top_srcdir)/ChangeLog.2010 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2009.rst: $(top_srcdir)/ChangeLog.2009 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2008.rst: $(top_srcdir)/ChangeLog.2008 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2007.rst: $(top_srcdir)/ChangeLog.2007 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2006.rst: $(top_srcdir)/ChangeLog.2006 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2005.rst: $(top_srcdir)/ChangeLog.2005 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2004.rst: $(top_srcdir)/ChangeLog.2004 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2003.rst: $(top_srcdir)/ChangeLog.2003 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2002.rst: $(top_srcdir)/ChangeLog.2002 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/ChangeLog-2001.rst: $(top_srcdir)/ChangeLog.2001 +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ @MAINTAINER_MODE_TRUE@$(top_srcdir)/www/Magick++/ChangeLog.rst: $(top_srcdir)/Magick++/ChangeLog +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(CHANGELOG2RST) < $^ > $@ # Build color.html @MAINTAINER_MODE_TRUE@$(WWWDIR)/color.html : $(NAMED_COLORS) +@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @MAINTAINER_MODE_TRUE@ $(NAMED_COLORS) > $@ -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWAPI_HTML_TARGETS) : $(FORMATCAPI) $(RST2HTMLDECO) $(APIWHATIS) $(top_srcdir)/scripts/html_fragments.py $(top_srcdir)/www/api/Makefile.am $(top_srcdir)/www/api/api_hyperlinks.rst +#APIRST2HTML_COMMAND = $(RST2HTML5) --stylesheet=../docutils-articles.css` + +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWAPI_HTML_TARGETS) : $(FORMATCAPI) $(RST2HTML5) $(APIWHATIS) $(top_srcdir)/scripts/html_fragments.py $(top_srcdir)/www/api/Makefile.am $(top_srcdir)/www/api/api_hyperlinks.rst @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWAPIDIR)/%.apirst : $(top_srcdir)/magick/%.c +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(FORMATCAPI) --whatis-file $(APIWHATIS) $< $@ @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWAPIDIR)/%.html : $(WWWAPIDIR)/%.apirst -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(RST2HTMLDECO) --link-stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-api.css \ -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< $@ +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-api.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< $@ #APIWHATIS = $(top_srcdir)/scripts/whatis.txt #FORMATCAPI = $(top_srcdir)/scripts/format_c_api_doc.py -#APIRST2HTML_COMMAND = $(RST2HTMLDECO) \ -# --link-stylesheet=../docutils-articles.css` +#APIRST2HTML_COMMAND = $(RST2HTMLDECO) --link-stylesheet=../docutils-articles.css` @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWWANDAPI_HTML_TARGETS) : $(FORMATCAPI) \ @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(RST2HTMLDECO) \ @@ -11185,12 +11209,12 @@ @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(top_srcdir)/www/api/api_hyperlinks.rst @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWWANDAPIDIR)/%.apirst : $(top_srcdir)/wand/%.c -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(FORMATCAPI) --whatis-file $(APIWHATIS) \ -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ --include-rst ../api/api_hyperlinks.rst $< $@ +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(FORMATCAPI) --whatis-file $(APIWHATIS) --include-rst $(top_srcdir)/www/api/api_hyperlinks.rst $< $@ @HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@$(WWWWANDAPIDIR)/%.html : $(WWWWANDAPIDIR)/%.apirst -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(RST2HTMLDECO) --link-stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-api.css \ -@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< $@ +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ @printf "Updating $@ ...\n" +@HasRST2HTML_TRUE@@MAINTAINER_MODE_TRUE@ $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-api.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< $@ utilities/tests/montage.log : \ utilities/tests/effects.log diff -r d22863ed3173 -r 95f1225117f6 VisualMagick/installer/inc/version.isx --- a/VisualMagick/installer/inc/version.isx Sun Oct 02 00:44:37 2022 +0200 +++ b/VisualMagick/installer/inc/version.isx Sun Oct 02 09:41:49 2022 -0500 @@ -10,5 +10,5 @@ #define public MagickPackageName "GraphicsMagick" #define public MagickPackageVersion "1.4" -#define public MagickPackageVersionAddendum ".020221001" -#define public MagickPackageReleaseDate "snapshot-20221001" +#define public MagickPackageVersionAddendum ".020221002" +#define public MagickPackageReleaseDate "snapshot-20221002" diff -r d22863ed3173 -r 95f1225117f6 magick/version.h --- a/magick/version.h Sun Oct 02 00:44:37 2022 +0200 +++ b/magick/version.h Sun Oct 02 09:41:49 2022 -0500 @@ -38,8 +38,8 @@ #define MagickLibVersion 0x272400 #define MagickLibVersionText "1.4" #define MagickLibVersionNumber 27,24,0 -#define MagickChangeDate "20221001" -#define MagickReleaseDate "snapshot-20221001" +#define MagickChangeDate "20221002" +#define MagickReleaseDate "snapshot-20221002" /* The MagickLibInterfaceNewest and MagickLibInterfaceOldest defines diff -r d22863ed3173 -r 95f1225117f6 scripts/rst2html5.py --- a/scripts/rst2html5.py Sun Oct 02 00:44:37 2022 +0200 +++ b/scripts/rst2html5.py Sun Oct 02 09:41:49 2022 -0500 @@ -11,7 +11,7 @@ html_fragments.py. Usage: - rst2html5.py [options] [<RSTDOC> [<DESTINATION>]] + rst2html5.py [options] <RSTDOC> [<DESTINATION>] Options: -h, --help display the usage help message @@ -28,12 +28,18 @@ header and navigation menu. Defaults to empty. Example: --url-prefix=../../ -Reads from <RSTDOC> (default is stdin) and writes to <DESTINATION> (default is stdout) +Arguments: + <RSTDOC> is the file path of the source reStructuredText document + + <DESTINATION> is the file path where the HTML output will be written. -If no input <RSTDOC> is specified, input will be read from stdin and output will be -written to stdout. +Reads from <RSTDOC> and writes to <DESTINATION> (default is stdout) + +If no <DESTINATION> is specified, output will be written to stdout. -Note that images referenced from the stylesheet (such as background images) +Note: + +Images referenced from the stylesheet (such as background images) may require different image-dir paths depending on whether the stylesheet is embedded or linked. If linked, image URLs in the stylesheet are relative to the stylesheet's location. If embedded, image URLs in the stylesheet are relative @@ -257,7 +263,7 @@ # 8-bit string, provide the correct encoding. If it is a Unicode string, # use "unicode", the default. - overrides = {'input_encoding': 'unicode', + overrides = {'input_encoding': 'utf-8', 'doctitle_xform': doctitle, 'initial_header_level': initial_header_level, 'stylesheet_path' : stylesheet, @@ -286,7 +292,16 @@ html_fragments.footer = html_fragments.make_footer() rst_string = src_fo.read() + + src_filepath = src_fo.name + # change to document's original directory, so docutils can find any + # things it might include via "include::" + cwdsave = os.getcwd() + if src_filepath != '<stdin>': + os.chdir(os.path.dirname(os.path.abspath(src_filepath))) doc_parts = make_html_parts(rst_string, stylesheet=stylesheet, embed_stylesheet=embed_stylesheet) + os.chdir(cwdsave) + webpage = assemble_html(doc_parts, stylesheet_screen=stylesheet) try: dest_fo.write(webpage) diff -r d22863ed3173 -r 95f1225117f6 www/Changelog.html --- a/www/Changelog.html Sun Oct 02 00:44:37 2022 +0200 +++ b/www/Changelog.html Sun Oct 02 09:41:49 2022 -0500 @@ -37,6 +37,23 @@ </div> <div class="document"> +<p>2022-10-02 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> +<blockquote> +<ul class="simple"> +<li><p>scripts/rst2html5.py: Fix from Mark Mitchell to deal with RST +file local include statements when invoked from a different +directory. Also fix requested character set encoding.</p></li> +</ul> +</blockquote> +<p>2022-10-02 Fojtik Jaroslav <<a class="reference external" href="mailto:JaFojtik%40yandex.com">JaFojtik<span>@</span>yandex<span>.</span>com</a>></p> +<blockquote> +<ul class="simple"> +<li><p>PerlMagick/t/input_8_BW_rle.tga</p></li> +<li><p>PerlMagick/t/input_8_CC_rle.tga</p></li> +<li><p>PerlMagick/t/input_8_BW.tga +Added 8 bit TGA samples.</p></li> +</ul> +</blockquote> <p>2022-10-01 Bob Friesenhahn <<a class="reference external" href="mailto:bfriesen%40simple.dallas.tx.us">bfriesen<span>@</span>simple<span>.</span>dallas<span>.</span>tx<span>.</span>us</a>></p> <blockquote> <ul> diff -r d22863ed3173 -r 95f1225117f6 www/Makefile.am --- a/www/Makefile.am Sun Oct 02 00:44:37 2022 +0200 +++ b/www/Makefile.am Sun Oct 02 09:41:49 2022 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2008 - 2021 GraphicsMagick Group +# Copyright (C) 2008 - 2022 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -260,14 +260,15 @@ $(top_srcdir)/scripts/omp_decimal_align.py \ $(WWWDIR)/Makefile.am -# Build HTML version of RST file +# Build HTML version of RST file (with "txt" extension) $(top_srcdir)/www/%.html: $(top_srcdir)/%.txt - $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css \ - --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< > $@ + @printf "Updating $@ ...\n" + $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< > $@ +# Build HTML version of RST file $(top_srcdir)/%.html: $(top_srcdir)/%.rst - $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css \ - --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< | $(OMP_DECIMAL_ALIGN) > $@ + @printf "Updating $@ ...\n" + $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-articles.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< | $(OMP_DECIMAL_ALIGN) > $@ # # Build HTML version of ChangeLogs @@ -275,76 +276,100 @@ CHANGELOG2RST=$(top_srcdir)/scripts/changelog2rst.sh $(top_srcdir)/www/Changelog.rst: $(top_srcdir)/ChangeLog + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2021.rst: $(top_srcdir)/ChangeLog.2021 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2020.rst: $(top_srcdir)/ChangeLog.2020 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2019.rst: $(top_srcdir)/ChangeLog.2019 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2018.rst: $(top_srcdir)/ChangeLog.2018 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2017.rst: $(top_srcdir)/ChangeLog.2017 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2016.rst: $(top_srcdir)/ChangeLog.2016 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2015.rst: $(top_srcdir)/ChangeLog.2015 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2014.rst: $(top_srcdir)/ChangeLog.2014 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2013.rst: $(top_srcdir)/ChangeLog.2013 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2012.rst: $(top_srcdir)/ChangeLog.2012 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2011.rst: $(top_srcdir)/ChangeLog.2011 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2010.rst: $(top_srcdir)/ChangeLog.2010 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2009.rst: $(top_srcdir)/ChangeLog.2009 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2008.rst: $(top_srcdir)/ChangeLog.2008 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2007.rst: $(top_srcdir)/ChangeLog.2007 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2006.rst: $(top_srcdir)/ChangeLog.2006 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2005.rst: $(top_srcdir)/ChangeLog.2005 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2004.rst: $(top_srcdir)/ChangeLog.2004 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2003.rst: $(top_srcdir)/ChangeLog.2003 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2002.rst: $(top_srcdir)/ChangeLog.2002 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/ChangeLog-2001.rst: $(top_srcdir)/ChangeLog.2001 + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ $(top_srcdir)/www/Magick++/ChangeLog.rst: $(top_srcdir)/Magick++/ChangeLog + @printf "Updating $@ ...\n" $(CHANGELOG2RST) < $^ > $@ # Build color.html $(WWWDIR)/color.html : $(NAMED_COLORS) + @printf "Updating $@ ...\n" $(NAMED_COLORS) > $@ endif # MAINTAINER_MODE diff -r d22863ed3173 -r 95f1225117f6 www/api/Makefile.am --- a/www/api/Makefile.am Sun Oct 02 00:44:37 2022 +0200 +++ b/www/api/Makefile.am Sun Oct 02 09:41:49 2022 -0500 @@ -1,4 +1,4 @@ -# Copyright (C) 2008-2011 GraphicsMagick Group +# Copyright (C) 2008-2022 GraphicsMagick Group # This program is covered by multiple licenses, which are described in # Copyright.txt. You should have received a copy of Copyright.txt with this @@ -129,17 +129,17 @@ APIWHATIS = $(top_srcdir)/scripts/whatis.txt FORMATCAPI = $(top_srcdir)/scripts/format_c_api_doc.py -APIRST2HTML_COMMAND = $(RST2HTMLDECO) \ - --link-stylesheet=../docutils-articles.css` +#APIRST2HTML_COMMAND = $(RST2HTML5) --stylesheet=../docutils-articles.css` -$(WWWAPI_HTML_TARGETS) : $(FORMATCAPI) $(RST2HTMLDECO) $(APIWHATIS) $(top_srcdir)/scripts/html_fragments.py $(top_srcdir)/www/api/Makefile.am $(top_srcdir)/www/api/api_hyperlinks.rst +$(WWWAPI_HTML_TARGETS) : $(FORMATCAPI) $(RST2HTML5) $(APIWHATIS) $(top_srcdir)/scripts/html_fragments.py $(top_srcdir)/www/api/Makefile.am $(top_srcdir)/www/api/api_hyperlinks.rst $(WWWAPIDIR)/%.apirst : $(top_srcdir)/magick/%.c + @printf "Updating $@ ...\n" $(FORMATCAPI) --whatis-file $(APIWHATIS) $< $@ $(WWWAPIDIR)/%.html : $(WWWAPIDIR)/%.apirst - $(RST2HTMLDECO) --link-stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-api.css \ - --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< $@ + @printf "Updating $@ ...\n" + $(RST2HTML5) --stylesheet=`$(RELPATH) $(top_srcdir)/www $@`docutils-api.css --url-prefix=`$(RELPATH) $(top_srcdir)/www $@` $< $@ endif # HasRST2HTML diff -r d22863ed3173 -r 95f1225117f6 www/api/animate.html --- a/www/api/animate.html Sun Oct 02 00:44:37 2022 +0200 +++ b/www/api/animate.html Sun Oct 02 09:41:49 2022 -0500 @@ -1,12 +1,14 @@