The branch, xhtml/new_features/assets-separate-directory, has been updated.
- Log ----------------------------------------------------------------- commit e8a600c0cf9562a13f720460a9401025187e14ab Author: Josh Hieronymus <[email protected]> Date: Thu Aug 1 00:32:26 2013 -0400 Clean up code controlling XHTML export image save directory diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 55f673c..30c6642 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -919,11 +919,9 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const return string(); // Write image either to images/ subdirectory or to default directory - string output_file; + string output_file = temp_file.onlyFileName(); if (masterBuffer->params().html_assets_in_separate_directory) { - output_file = "images/" + onlyFileName(temp_file.absFileName()); - } else { - output_file = onlyFileName(temp_file.absFileName()); + output_file = "images/" + output_file; } string const from = formats.getFormatFromFile(temp_file); commit ca9d0a819643f5c2ce6b576c8c3de7f1ef2ae917 Author: Josh Hieronymus <[email protected]> Date: Thu Aug 1 00:26:31 2013 -0400 Fix filename mangling diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index 31d7f4d..da086af 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -933,9 +933,9 @@ string DocFileName::mangledFileName(string const & dir) const if (it != mangledNames.end()) return (*it).second; - string const name = absFileName(); + string const name = onlyFileName(); // Now the real work - string mname = onlyFileName(); + string mname; // Remove the extension. mname = support::changeExtension(name, string()); // The mangled name must be a valid LaTeX name. @@ -958,7 +958,7 @@ string DocFileName::mangledFileName(string const & dir) const // the mangled name unique. static int counter = 0; ostringstream s; - s << counter++ << mname; + s << counter++ << "_" << mname; mname = s.str(); // MiKTeX's YAP (version 2.4.1803) crashes if the file name ----------------------------------------------------------------------- Summary of changes: src/insets/InsetGraphics.cpp | 6 ++---- src/support/FileName.cpp | 6 +++--- 2 files changed, 5 insertions(+), 7 deletions(-) hooks/post-receive -- Repositories for GSOC work
