Fix 3188, update the labels at each Caption insertion.

[lyx.git] / src / lyxtextclasslist.C

diff --git a/src/lyxtextclasslist.C b/src/lyxtextclasslist.C
index 8fb1c1098348506c91eda421769f247556241829..39b0f2faba62c0e2b85e4c4754d82dda3e971c7e 100644 (file)
--- a/src/lyxtextclasslist.C
+++ b/src/lyxtextclasslist.C
@@ -16,31 +16,45 @@
 #include "debug.h"
 #include "lyxlex.h"
 
-#include "support/lyxfunctional.h"
 #include "support/filetools.h"
 
+#include <boost/bind.hpp>
+#include <boost/regex.hpp>
+#include <boost/filesystem/operations.hpp>
+#include <fstream>
 
-using namespace lyx::support;
 
-#ifndef CXX_GLOBAL_CSTD
-using std::exit;
-#endif
+namespace lyx {
+namespace fs = boost::filesystem;
+
+using support::FileName;
+using support::libFileSearch;
+using support::makeDisplayPath;
+
+using boost::bind;
+using boost::regex;
+using boost::smatch;
 
-using lyx::textclass_type;
-using std::pair;
-using std::make_pair;
 using std::endl;
+using std::equal_to;
 using std::find_if;
+using std::make_pair;
 using std::sort;
+using std::string;
+using std::pair;
+using std::ifstream;
 
 
 // Gets textclass number from name
 pair<bool, textclass_type> const
-LyXTextClassList::NumberOfClass(string const & textclass) const
+LyXTextClassList::numberOfClass(string const & textclass) const
 {
        ClassList::const_iterator cit =
                find_if(classlist_.begin(), classlist_.end(),
-                       lyx::compare_memfun(&LyXTextClass::name, textclass));
+                       bind(equal_to<string>(),
+                            bind(&LyXTextClass::name, _1),
+                            textclass));
+
        return cit != classlist_.end() ?
                make_pair(true, textclass_type(cit - classlist_.begin())) :
                make_pair(false, textclass_type(0));
@@ -60,31 +74,36 @@ LyXTextClassList::operator[](textclass_type textclass) const
 
 
 // used when sorting the textclass list.
-class less_textclass_avail_desc {
+class less_textclass_avail_desc
+       : public std::binary_function<LyXTextClass, LyXTextClass, int>
+{
 public:
-       int operator()(LyXTextClass const & tc1, LyXTextClass const & tc2) {
+       int operator()(LyXTextClass const & tc1,
+                      LyXTextClass const & tc2) const
+       {
                // Ordering criteria:
                //   1. Availability of text class
                //   2. Description (lexicographic)
 
                return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
-                      (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
-                       tc1.description() < tc2.description());
+                       (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
+                        tc1.description() < tc2.description());
        }
 };
 
 
 // Reads LyX textclass definitions according to textclass config file
-bool LyXTextClassList::Read()
+bool LyXTextClassList::read()
 {
        LyXLex lex(0, 0);
-       string real_file = LibFileSearch("", "textclass.lst");
+       support::FileName const real_file = libFileSearch("", "textclass.lst");
        lyxerr[Debug::TCLASS] << "Reading textclasses from `"
                              << real_file << '\'' << endl;
 
        if (real_file.empty()) {
                lyxerr << "LyXTextClassList::Read: unable to find "
-                       "textclass file  `" << MakeDisplayPath(real_file, 1000)
+                         "textclass file  `"
+                      << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
                       << "'. Exiting." << endl;
                return false;
                // This causes LyX to end... Not a desirable behaviour. Lgb
@@ -102,7 +121,8 @@ bool LyXTextClassList::Read()
 
        if (!lex.isOK()) {
                lyxerr << "LyXTextClassList::Read: unable to open "
-                       "textclass file  `" << MakeDisplayPath(real_file, 1000)
+                         "textclass file  `"
+                      << to_utf8(makeDisplayPath(real_file.absFilename(), 1000))
                       << "'\nCheck your installation. LyX can't continue."
                       << endl;
                return false;
@@ -154,20 +174,62 @@ bool LyXTextClassList::Read()
 }
 
 
+std::pair<bool, textclass_type> const
+LyXTextClassList::addTextClass(std::string const & textclass, std::string const & path)
+{
+       // only check for textclass.layout file, .cls can be anywhere in $TEXINPUTS
+       // NOTE: latex class name is defined in textclass.layout, which can be different from textclass
+       FileName const layout_file(path + '/' + textclass + ".layout");
+       if (fs::exists(layout_file.toFilesystemEncoding())) {
+               lyxerr[Debug::TCLASS] << "Adding class " << textclass << " from directory " << path << endl;
+               // Read .layout file and get description, real latex classname etc
+               //
+               // This is a C++ version of function processLayoutFile in configure.py,
+               // which uses the following regex
+               //     \Declare(LaTeX|DocBook)Class\s*(\[([^,]*)(,.*)*\])*\s*{(.*)}
+               ifstream ifs(layout_file.toFilesystemEncoding().c_str());
+               static regex const reg("^#\\s*\\\\Declare(LaTeX|DocBook)Class\\s*"
+                       "(?:\\[([^,]*)(?:,.*)*\\])*\\s*\\{(.*)\\}\\s*");
+               string line;
+               while (getline(ifs, line)) {
+                       // look for the \DeclareXXXClass line
+                       smatch sub;
+                       if (regex_match(line, sub, reg)) {
+                               // returns: whole string, classtype (not used here), first option, description
+                               BOOST_ASSERT(sub.size()==4);
+                               // now, add the layout to textclass.
+                               LyXTextClass tmpl(textclass, sub.str(2)==""?textclass:sub.str(2), 
+                                       sub.str(3) + " <" + path + ">", true);
+                               if (lyxerr.debugging(Debug::TCLASS))
+                                       tmpl.load(path);
+                               classlist_.push_back(tmpl);
+                               return make_pair(true, classlist_.size() - 1);
+                       }
+               }
+       }
+       // If .layout is not in local directory, or an invalid layout is found, return false
+       return make_pair(false, textclass_type(0));
+}
+       
+
 // Global variable: textclass table.
 LyXTextClassList textclasslist;
 
 
 // Reads the style files
-void LyXSetStyle()
+bool LyXSetStyle()
 {
        lyxerr[Debug::TCLASS] << "LyXSetStyle: parsing configuration..." << endl;
 
-       if (!textclasslist.Read()) {
+       if (!textclasslist.read()) {
                lyxerr[Debug::TCLASS] << "LyXSetStyle: an error occured "
                        "during parsing.\n             Exiting." << endl;
-               exit(1);
+               return false;
        }
 
        lyxerr[Debug::TCLASS] << "LyXSetStyle: configuration parsed." << endl;
+       return true;
 }
+
+
+} // namespace lyx