#include <map>
#include <sstream>
+#include <algorithm>
using std::map;
FileName::FileName(string const & abs_filename, bool save_abs)
- : name_(abs_filename), save_abs_path_(save_abs)
+ : name_(abs_filename), save_abs_path_(save_abs), zipped_valid_(false)
{
- BOOST_ASSERT(AbsolutePath(name_));
+ BOOST_ASSERT(absolutePath(name_));
}
void FileName::set(string const & name, string const & buffer_path)
{
- save_abs_path_ = AbsolutePath(name);
- name_ = save_abs_path_ ? name : MakeAbsPath(name, buffer_path);
+ save_abs_path_ = absolutePath(name);
+ name_ = save_abs_path_ ? name : makeAbsPath(name, buffer_path);
+ zipped_valid_ = false;
}
void FileName::erase()
{
name_.erase();
+ zipped_valid_ = false;
}
string const FileName::relFilename(string const & path) const
{
- return MakeRelPath(name_, path);
+ return makeRelPath(name_, path);
}
string const FileName::outputFilename(string const & path) const
{
- return save_abs_path_ ? name_ : MakeRelPath(name_, path);
+ return save_abs_path_ ? name_ : makeRelPath(name_, path);
}
-string const FileName::mangledFilename() const
+string const FileName::mangledFilename(std::string const & dir) const
{
// We need to make sure that every FileName instance for a given
// filename returns the same mangled name.
// Now the real work
string mname = os::internal_path(name_);
// Remove the extension.
- mname = ChangeExtension(name_, string());
+ mname = changeExtension(name_, string());
// Replace '/' in the file name with '_'
mname = subst(mname, "/", "_");
// Replace '.' in the file name with '_'
mname = subst(mname, ".", "_");
// Replace ' ' in the file name with '_'
mname = subst(mname, " ", "_");
+ // Replace ':' in the file name with '_'
+ mname = subst(mname, ":", "_");
// Add the extension back on
- mname = ChangeExtension(mname, GetExtension(name_));
-
-#if defined(__CYGWIN__) || defined(__CYGWIN32__) || defined(_WIN32)
- // Mangle the drive letter in a Windows-style path.
- if (mname.size() >= 2 && mname[1] == ':')
- mname[1] = '_';
-#endif
+ mname = changeExtension(mname, getExtension(name_));
// Prepend a counter to the filename. This is necessary to make
// the mangled name unique.
static int counter = 0;
std::ostringstream s;
- s << counter++;
- mname = s.str() + mname;
+ s << counter++ << mname;
+ mname = s.str();
+
+ // MiKTeX's YAP (version 2.4.1803) crashes if the file name
+ // is longer than about 160 characters. MiKTeX's pdflatex
+ // is even pickier. A maximum length of 100 has been proven to work.
+ // If dir.size() > max length, all bets are off for YAP. We truncate
+ // the filename nevertheless, keeping a minimum of 10 chars.
+
+ string::size_type max_length = std::max(100 - ((int)dir.size() + 1), 10);
+
+ // If the mangled file name is too long, hack it to fit.
+ // We know we're guaranteed to have a unique file name because
+ // of the counter.
+ if (mname.size() > max_length) {
+ int const half = (int(max_length) / 2) - 2;
+ if (half > 0) {
+ mname = mname.substr(0, half) + "___" +
+ mname.substr(mname.size() - half);
+ }
+ }
+
mangledNames[name_] = mname;
return mname;
}
bool FileName::isZipped() const
{
- return zippedFile(name_);
+ if (!zipped_valid_) {
+ zipped_ = zippedFile(name_);
+ zipped_valid_ = true;
+ }
+ return zipped_;
}