Merge the 1.5.2 changes from trunk.

[SVN r62830]
This commit is contained in:
Daniel James
2010-06-12 08:29:53 +00:00
parent f50dee9a1c
commit e529faf7ba
62 changed files with 1569 additions and 612 deletions

View File

@@ -48,9 +48,9 @@ namespace quickbook
fs::path const img_path(x.image_filename);
attributes.insert(attribute("fileref", x.image_filename));
// Note: If there is already an alt attribute this is a no-op.
attributes.insert(attribute("alt", fs::basename(img_path)));
attributes.insert(attribute("alt", img_path.stem()));
if(fs::extension(img_path) == ".svg")
if(img_path.extension() == ".svg")
{
//
// SVG's need special handling: