Hello community,
here is the log from the commit of package octave-forge-generate_html for
openSUSE:Factory checked in at 2015-08-31 22:58:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/octave-forge-generate_html (Old)
and /work/SRC/openSUSE:Factory/.octave-forge-generate_html.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-generate_html"
Changes:
--------
---
/work/SRC/openSUSE:Factory/octave-forge-generate_html/octave-forge-generate_html.changes
2015-06-16 15:11:43.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.octave-forge-generate_html.new/octave-forge-generate_html.changes
2015-08-31 22:58:47.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Aug 13 10:36:28 UTC 2015 - [email protected]
+
+- Update to version 0.1.9
+ * Bugfix release
+
+-------------------------------------------------------------------
Old:
----
generate_html-0.1.8.tar.gz
New:
----
generate_html-0.1.9.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ octave-forge-generate_html.spec ++++++
--- /var/tmp/diff_new_pack.EoeZX5/_old 2015-08-31 22:58:47.000000000 +0200
+++ /var/tmp/diff_new_pack.EoeZX5/_new 2015-08-31 22:58:47.000000000 +0200
@@ -18,7 +18,7 @@
%define octpkg generate_html
Name: octave-forge-%{octpkg}
-Version: 0.1.8
+Version: 0.1.9
Release: 0
Summary: Generate HTML web page from help texts
License: GPL-3.0+
@@ -27,8 +27,8 @@
Source0:
http://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: octave-devel
-Requires: octave-cli >= 3.2.0
Requires: makeinfo
+Requires: octave-cli >= 3.2.0
%description
This package provides functions for generating HTML pages that contain
++++++ generate_html-0.1.8.tar.gz -> generate_html-0.1.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/generate_html-0.1.8/DESCRIPTION
new/generate_html-0.1.9/DESCRIPTION
--- old/generate_html-0.1.8/DESCRIPTION 2015-05-02 09:31:13.000000000 +0200
+++ new/generate_html-0.1.9/DESCRIPTION 2015-07-24 08:35:12.000000000 +0200
@@ -1,7 +1,7 @@
Name: generate_html
-Version: 0.1.8
-Date: 2015-05-02
-Author: Søren Hauberg <[email protected]>
+Version: 0.1.9
+Date: 2015-07-24
+Author: Søren Hauberg <[email protected]> and others
Maintainer: Octave-Forge community <[email protected]>
Title: Generate HTML web page from help texts
Description: This package provides functions for generating HTML pages that
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/generate_html-0.1.8/NEWS new/generate_html-0.1.9/NEWS
--- old/generate_html-0.1.8/NEWS 2015-05-02 09:31:13.000000000 +0200
+++ new/generate_html-0.1.9/NEWS 2015-07-24 08:35:12.000000000 +0200
@@ -1,3 +1,36 @@
+Summary of important user-visible changes for generate_html 0.1.9:
+------------------------------------------------------------------
+
+ ** Bug fixes
+
+ o generate_package_html: Add missing "alt" attribute to <img> tags in
+ index.html.
+
+ o html_help_text: Fix crash for demos in @class methods (bug #44972).
+
+ o generate_package_html: Fix crash when options.include_package_news is
+ false.
+
+ o texi2html: Fix a bug that caused tex2html to output an empty page with
+ TexInfo 4.x when there is only one @deftypefn and no following
+ @deftypefnx (bug #45530).
+
+ o generate_package_html: Fix a bug that prevented generate_package_html
from
+ being run twice when package_doc contains images (bug #45111).
+
+ o html_help_text: Use a simple deterministic counter to enumerate images
+ instead of a random number (thus avoiding the risk of having one image
+ overwritten by another one).
+
+ ** Other changes
+
+ o generate_package_html: Better-looking "News" and "Package documentation"
+ links (patch #8698).
+
+ o generate_package_html: Improve dependencies display: also display system
+ requirements (bug #45499).
+
+
Summary of important user-visible changes for generate_html 0.1.8:
------------------------------------------------------------------
@@ -17,6 +50,7 @@
o texi2html.m: Use <dt class="deftypefn"> </dt> blocks both with TexInfo
4.x
and with TexInfo 5.x.
+
Summary of important user-visible changes for generate_html 0.1.7:
------------------------------------------------------------------
@@ -59,6 +93,7 @@
o Remove unused "docbrowser" style
+
Summary of important user-visible changes for generate_html 0.1.6:
------------------------------------------------------------------
@@ -75,11 +110,13 @@
the code page of Octave Forge website. It previously pointed to the
SVN repository in Sourceforge which has been retired.
+
Summary of important user-visible changes for generate_html 0.1.5:
------------------------------------------------------------------
** Updated link for the Octave Forge SVN repository.
+
Summary of important user-visible changes for generate_html 0.1.4:
------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/generate_html-0.1.8/inst/generate_package_html.m
new/generate_html-0.1.9/inst/generate_package_html.m
--- old/generate_html-0.1.8/inst/generate_package_html.m 2015-05-02
09:31:13.000000000 +0200
+++ new/generate_html-0.1.9/inst/generate_package_html.m 2015-07-24
08:35:12.000000000 +0200
@@ -1,5 +1,6 @@
## Copyright (C) 2008 Soren Hauberg <[email protected]>
## Copyright (C) 2014, 2015 Julien Bect <[email protected]>
+## Copyright (C) 2015 Oliver Heimlich <[email protected]>
##
## This program is free software; you can redistribute it and/or modify it
## under the terms of the GNU General Public License as published by
@@ -294,7 +295,9 @@
#####################
## Write NEWS file ##
#####################
- if options.include_package_news
+ if (! options.include_package_news)
+ write_package_news = false;
+ else
## Get detailed information about the package
all_list = pkg ("list");
list = [];
@@ -416,14 +419,14 @@
if (! isempty (options.download_link))
fprintf (fid, "<div class=\"download_package\">\n");
fprintf (fid, " <table><tr><td>\n");
- fprintf (fid, " <img src=\"../download.png\"/>\n");
+ fprintf (fid, " <img src=\"../download.png\" alt=\"Package download
icon\"/>\n");
fprintf (fid, " </td><td>\n");
link = strrep (options.download_link, "%name", desc.name);
link = strrep (link, "%version", desc.version);
fprintf (fid, " <a href=\"%s\"\n", link);
fprintf (fid, " class=\"download_link\">\n");
fprintf (fid, " Download Package\n");
- fprintf (fid, " </a><br>\n");
+ fprintf (fid, " </a><br />\n");
fprintf (fid, " <a
href=\"http://sourceforge.net/projects/octave/files/\"";);
fprintf (fid, " class=\"older_versions_download\">(older
versions)</a>\n");
fprintf (fid, " </td></tr></table>\n");
@@ -433,34 +436,34 @@
fprintf (fid, "<tr><td>\n");
fprintf (fid, "<div class=\"package_function_reference\">\n");
fprintf (fid, " <table><tr><td>\n");
- fprintf (fid, " <img src=\"../doc.png\"/>\n");
+ fprintf (fid, " <img src=\"../doc.png\" alt=\"Function reference
icon\"/>\n");
fprintf (fid, " </td><td>\n");
- fprintf (fid, " <a href=\"%s\" class=\"function_reference_link\">\n",
overview_filename);
+ fprintf (fid, " <a href=\"%s\" class=\"function_reference_link\">\n",
...
+ overview_filename);
fprintf (fid, " Function Reference\n");
fprintf (fid, " </a>\n");
- fprintf (fid, " </td></tr></table>\n");
- fprintf (fid, "</div>\n");
- if (write_package_news)
- fprintf (fid, "<div class=\"news_file\">\n");
- fprintf (fid, " <table><tr><td>\n");
- fprintf (fid, " </td><td>\n");
- fprintf (fid, " <a href=\"NEWS.html\" class=\"news_file\">\n");
- fprintf (fid, " NEWS\n");
- fprintf (fid, " </a>\n");
- fprintf (fid, " </td></tr></table>\n");
- fprintf (fid, "</div>\n");
- endif
+ fprintf (fid, " </td></tr>\n");
if (write_package_documentation)
- fprintf (fid, "<div class=\"package_doc\">\n");
- fprintf (fid, " <table><tr><td>\n");
+ fprintf (fid, " <tr><td>\n");
+ fprintf (fid, " <img src=\"../manual.png\" alt=\"Package doc
icon\"/>\n");
fprintf (fid, " </td><td>\n");
- fprintf (fid, " <a href=\"%s\" class=\"package_doc\">\n",
+ fprintf (fid, " <a href=\"%s\" class=\"package_doc\">\n", ...
fullfile (doc_subdir, "index.html"));
fprintf (fid, " Package Documentation\n");
fprintf (fid, " </a>\n");
- fprintf (fid, " </td></tr></table>\n");
- fprintf (fid, "</div>\n");
+ fprintf (fid, " </td></tr>\n");
+ endif
+ if (write_package_news)
+ fprintf (fid, " <tr><td>\n");
+ fprintf (fid, " <img src=\"../news.png\" alt=\"Package news
icon\"/>\n");
+ fprintf (fid, " </td><td>\n");
+ fprintf (fid, " <a href=\"NEWS.html\">\n");
+ fprintf (fid, " NEWS\n");
+ fprintf (fid, " </a>\n");
+ fprintf (fid, " </td></tr>\n");
endif
+ fprintf (fid, " </table>\n");
+ fprintf (fid, "</div>\n");
fprintf (fid, "</td></tr>\n");
fprintf (fid, "</table>\n\n");
@@ -494,8 +497,12 @@
fprintf (fid, "</td></tr>\n");
endif
+ if (isfield (list, "systemrequirements"))
+ fprintf (fid, " <tr><td>Runtime system
dependencies:</td><td>%s</td></tr>\n", list.systemrequirements);
+ endif
+
if (isfield (list, "buildrequires"))
- fprintf (fid, " <tr><td>Build Dependencies:</td><td>%s</td></tr>\n",
list.buildrequires);
+ fprintf (fid, " <tr><td>Build dependencies:</td><td>%s</td></tr>\n",
list.buildrequires);
endif
## if the package does not specify, then it is not autoloaded. Also,
sometimes
@@ -580,7 +587,7 @@
endif
## Read image references from generated files and copy images
- filelist = glob (fullfile (doc_out_dir, "*"));
+ filelist = glob (fullfile (doc_out_dir, "*.html"));
for id = 1 : numel (filelist)
copy_images (filelist{id}, doc_root_dir, doc_out_dir);
endfor
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/generate_html-0.1.8/inst/html_help_text.m
new/generate_html-0.1.9/inst/html_help_text.m
--- old/generate_html-0.1.8/inst/html_help_text.m 2015-05-02
09:31:13.000000000 +0200
+++ new/generate_html-0.1.9/inst/html_help_text.m 2015-07-24
08:35:12.000000000 +0200
@@ -71,7 +71,8 @@
case "not found"
error ("`%s' not found\n", name);
otherwise
- error ("Internal error: unsupported help text format: '%s'\n", format);
+ error ("Internal error: unsupported help text format '%s' for '%s'",
+ format, name);
endswitch
## Read 'options' input argument
@@ -95,7 +96,8 @@
## Run demo
code_k = code (idx (k):idx (k+1)-1);
try
- [output, images] = get_output (code_k, imagedir, full_imagedir,
name);
+ [output, images] = get_output (k, ...
+ code_k, imagedir, full_imagedir, name);
catch
lasterr ()
continue;
@@ -147,7 +149,10 @@
endfunction
-function [text, images] = get_output (code, imagedir, full_imagedir,
fileprefix)
+
+function [text, images] = get_output (demo_num, ...
+ code, imagedir, full_imagedir, fileprefix)
+
## Clear everything
close all
diary_file = "__diary__.txt";
@@ -193,10 +198,14 @@
endif
endif
+ ## For @class methods: Clean up fileprefix
+ fileprefix = strrep (fileprefix, filesep (), '_');
+
images = {};
+ r = demo_num * 100;
while (!isempty (get (0, "currentfigure")))
+ r = r + 1;
fig = gcf ();
- r = round (1000*rand ());
name = sprintf ("%s_%d.png", fileprefix, r);
full_filename = fullfile (full_imagedir, name);
filename = fullfile (imagedir, name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/generate_html-0.1.8/inst/texi2html.m
new/generate_html-0.1.9/inst/texi2html.m
--- old/generate_html-0.1.8/inst/texi2html.m 2015-05-02 09:31:13.000000000
+0200
+++ new/generate_html-0.1.9/inst/texi2html.m 2015-07-24 08:35:12.000000000
+0200
@@ -122,9 +122,9 @@
## <blockquote> ... </blockquote>
## </div>
- p2 = sprintf (['\\s*<div\\s*(class="[a-z]*")?>\\s*' ...
- '((%s\\s*)+)<blockquote>(.*?)\\s*</blockquote>\\s*</div>\\s*'], p1);
- text = regexprep (text, p2, '<dl>\n$2<dd>$5\n</dd></dl>');
+ p2 = sprintf (['\\s*<div\\s*(?:class="[a-z]*")?>\\s*' ...
+ '((?:%s\\s*)+)<blockquote>(.*?)\\s*</blockquote>\\s*</div>\\s*'], p1);
+ text = regexprep (text, p2, '<dl>\n$1<dd>$3\n</dd></dl>');
text = regexprep (text, p1, '<dt class="deftypefn">$1</dt>');
else ## TexInfo 5.x
