The branch, xhtml/new_features/assets-separate-directory, has been updated.
- Log ----------------------------------------------------------------- commit febc81fa34f4e7681175668245a28061db20fb64 Author: Richard Heck <[email protected]> Date: Wed Jul 31 22:23:36 2013 -0400 Change filename mangling not to mangle the filepath diff --git a/src/support/FileName.cpp b/src/support/FileName.cpp index f048930..31d7f4d 100644 --- a/src/support/FileName.cpp +++ b/src/support/FileName.cpp @@ -935,7 +935,7 @@ string DocFileName::mangledFileName(string const & dir) const string const name = absFileName(); // Now the real work - string mname = os::internal_path(name); + string mname = onlyFileName(); // Remove the extension. mname = support::changeExtension(name, string()); // The mangled name must be a valid LaTeX name. commit b2f54f66854f2083a9d0c2323588f971d32920ce Author: Josh Hieronymus <[email protected]> Date: Wed Jul 31 22:06:27 2013 -0400 Revert "Unmangle image filenames for XHTML export" This reverts commit 00b24a8984756bdc5dcd8e2b16952c86fecdf6c9. Unmangling the image filenames had the undesirable consequence that certain characters in the original filenames would break the outputted XHTML file. diff --git a/src/insets/InsetGraphics.cpp b/src/insets/InsetGraphics.cpp index 895c3d0..55f673c 100644 --- a/src/insets/InsetGraphics.cpp +++ b/src/insets/InsetGraphics.cpp @@ -918,16 +918,12 @@ string InsetGraphics::prepareHTMLFile(OutputParams const & runparams) const if (status == FAILURE) return string(); - // Output file name as X_filename.ext, where X is zero-based index of image within file - string orig_file_name_only = params().filename.onlyFileName(); - string temp_file_name_only = temp_file.onlyFileName(); - size_t output_file_index_pos = temp_file_name_only.find('_'); - string output_file_index = temp_file_name_only.substr(0, output_file_index_pos + 1); - string output_file = output_file_index + orig_file_name_only; - // Write image either to images/ subdirectory or to default directory + string output_file; if (masterBuffer->params().html_assets_in_separate_directory) { - output_file = "images/" + output_file; + output_file = "images/" + onlyFileName(temp_file.absFileName()); + } else { + output_file = onlyFileName(temp_file.absFileName()); } string const from = formats.getFormatFromFile(temp_file); ----------------------------------------------------------------------- Summary of changes: src/insets/InsetGraphics.cpp | 12 ++++-------- src/support/FileName.cpp | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) hooks/post-receive -- Repositories for GSOC work
