From 17ab47b3e6acafae8f11e6363ee64252b26c81e7 Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Wed, 1 Mar 2017 09:19:18 +0100 Subject: [PATCH] Allow Input of local includes from local layout files When including files, LyX always searches the user and the system directory, in that order. This means that when using local layout files broken down into multiple includes, the various includes should be specified with a path relative to the user layouts directory (typically ~/.lyx/layouts), making this very impractical. This commit allows including local files by specifying their path as explicitly relative to the main layout file position, i.e., by specifying their path with either "./" or "../". If the main layout is not loaded from a local file, the usual search order is used, even if the path are explicitly relative. So, for system layouts, both "Input ./name.inc" and "Input name.inc" are equivalent. --- src/LayoutFile.cpp | 6 ++++-- src/TextClass.cpp | 7 ++++++- src/TextClass.h | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/LayoutFile.cpp b/src/LayoutFile.cpp index 771a9c4926..ccf2838d11 100644 --- a/src/LayoutFile.cpp +++ b/src/LayoutFile.cpp @@ -43,7 +43,8 @@ LayoutFile::LayoutFile(string const & fn, string const & cln, string const & desc, string const & prereq, string const & category, bool texclassavail) { - name_ = fn; + name_ = onlyFileName(fn); + path_ = fn.rfind('/') == string::npos ? string() : onlyPath(fn); latexname_ = cln; description_ = desc; prerequisites_ = prereq; @@ -331,7 +332,8 @@ LayoutFileIndex LayoutFileList::addLocalLayout( return string(); LayoutFile * tmpl = - new LayoutFile(textclass, class_name, textclass, class_prereq, category, true); + new LayoutFile(addName(moved ? oldpath : path, textclass), + class_name, textclass, class_prereq, category, true); //FIXME: The prerequisites are available from the layout file and // can be extracted from the above regex, but for now this // field is simply set to class_name + ".cls" diff --git a/src/TextClass.cpp b/src/TextClass.cpp index 34b55fa97f..b127f24f11 100644 --- a/src/TextClass.cpp +++ b/src/TextClass.cpp @@ -463,8 +463,13 @@ TextClass::ReturnValues TextClass::read(Lexer & lexrc, ReadType rt) case TC_INPUT: // Include file if (lexrc.next()) { + FileName tmp; string const inc = lexrc.getString(); - FileName tmp = libFileSearch("layouts", inc, + if (!path().empty() && (prefixIs(inc, "./") || + prefixIs(inc, "../"))) + tmp = fileSearch(path(), inc, "layout"); + else + tmp = libFileSearch("layouts", inc, "layout"); if (tmp.empty()) { diff --git a/src/TextClass.h b/src/TextClass.h index 56a61da48f..b84179fb9a 100644 --- a/src/TextClass.h +++ b/src/TextClass.h @@ -194,6 +194,8 @@ public: /// std::string const & name() const { return name_; } /// + std::string const & path() const { return path_; } + /// std::string const & category() const { return category_; } /// std::string const & description() const { return description_; } @@ -242,6 +244,8 @@ protected: mutable LayoutList layoutlist_; /// Layout file name std::string name_; + /// Layout file path (empty for system layout files) + std::string path_; /// Class category std::string category_; /// document class name -- 2.39.5