X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxtextclass.C;h=cdda271a71d942a40660e246fcc891867197cc9d;hb=b01a9dc187d9cd396a57463ad27511379dcdc9cd;hp=7eae766cff10c94623f2a20c2b64171a842ee238;hpb=a6444784dca48da8b1f7723be12069b2e1dbb4c5;p=lyx.git

diff --git a/src/lyxtextclass.C b/src/lyxtextclass.C
index 7eae766cff..cdda271a71 100644
--- a/src/lyxtextclass.C
+++ b/src/lyxtextclass.C
@@ -31,13 +31,16 @@ namespace fs = boost::filesystem;
 
 #include <sstream>
 
-using lyx::docstring;
-using lyx::support::libFileSearch;
-using lyx::support::makeDisplayPath;
-using lyx::support::quoteName;
-using lyx::support::rtrim;
-using lyx::support::subst;
-using lyx::support::addName;
+
+namespace lyx {
+
+using support::FileName;
+using support::libFileSearch;
+using support::makeDisplayPath;
+using support::quoteName;
+using support::rtrim;
+using support::subst;
+using support::addName;
 
 using std::endl;
 using std::find_if;
@@ -62,12 +65,12 @@ private:
 };
 
 
-int const FORMAT = 2;
+int const FORMAT = 3;
 
 
-bool layout2layout(string const & filename, string const & tempfile)
+bool layout2layout(FileName const & filename, FileName const & tempfile)
 {
-	string const script = libFileSearch("scripts", "layout2layout.py");
+	FileName const script = libFileSearch("scripts", "layout2layout.py");
 	if (script.empty()) {
 		lyxerr << "Could not find layout conversion "
 			  "script layout2layout.py." << endl;
@@ -75,15 +78,15 @@ bool layout2layout(string const & filename, string const & tempfile)
 	}
 
 	std::ostringstream command;
-	command << lyx::support::os::python() << ' ' << quoteName(script)
-		<< ' ' << quoteName(filename)
-		<< ' ' << quoteName(tempfile);
+	command << support::os::python() << ' ' << quoteName(script.toFilesystemEncoding())
+		<< ' ' << quoteName(filename.toFilesystemEncoding())
+		<< ' ' << quoteName(tempfile.toFilesystemEncoding());
 	string const command_str = command.str();
 
 	lyxerr[Debug::TCLASS] << "Running `" << command_str << '\'' << endl;
 
-	lyx::support::cmd_ret const ret =
-		lyx::support::runCommand(command_str);
+	support::cmd_ret const ret =
+		support::runCommand(command_str);
 	if (ret.first != 0) {
 		lyxerr << "Could not run layout conversion "
 			  "script layout2layout.py." << endl;
@@ -171,9 +174,9 @@ enum TextClassTags {
 
 
 // Reads a textclass structure from file.
-bool LyXTextClass::read(string const & filename, bool merge)
+bool LyXTextClass::read(FileName const & filename, bool merge)
 {
-	if (!lyx::support::isFileReadable(filename)) {
+	if (!support::isFileReadable(filename)) {
 		lyxerr << "Cannot read layout file `" << filename << "'."
 		       << endl;
 		return true;
@@ -211,11 +214,11 @@ bool LyXTextClass::read(string const & filename, bool merge)
 
 	if (!merge)
 		lyxerr[Debug::TCLASS] << "Reading textclass "
-					<< lyx::to_utf8(makeDisplayPath(filename))
+					<< to_utf8(makeDisplayPath(filename.absFilename()))
 					<< endl;
 	else
 		lyxerr[Debug::TCLASS] << "Reading input file "
-				     << lyx::to_utf8(makeDisplayPath(filename))
+				     << to_utf8(makeDisplayPath(filename.absFilename()))
 				     << endl;
 
 	LyXLex lexrc(textClassTags,
@@ -257,13 +260,17 @@ bool LyXTextClass::read(string const & filename, bool merge)
 
 		case TC_INPUT: // Include file
 			if (lexrc.next()) {
-				string tmp = libFileSearch("layouts",
-							    lexrc.getString(),
+				string const inc = lexrc.getString();
+				FileName tmp = libFileSearch("layouts", inc,
 							    "layout");
 
-				if (read(tmp, true)) {
+				if (tmp.empty()) {
+					lexrc.printError("Could not find input"
+					                 "file: " + inc);
+					error = true;
+				} else if (read(tmp, true)) {
 					lexrc.printError("Error reading input"
-							 "file: "+tmp);
+							 "file: " + tmp.absFilename());
 					error = true;
 				}
 			}
@@ -373,7 +380,7 @@ bool LyXTextClass::read(string const & filename, bool merge)
 			break;
 
 		case TC_PREAMBLE:
-			preamble_ = lexrc.getLongString("EndPreamble");
+			preamble_ = from_utf8(lexrc.getLongString("EndPreamble"));
 			break;
 
 		case TC_PROVIDESAMSMATH:
@@ -438,17 +445,17 @@ bool LyXTextClass::read(string const & filename, bool merge)
 	if (format != FORMAT) {
 		lyxerr[Debug::TCLASS] << "Converting layout file from format "
 				      << format << " to " << FORMAT << endl;
-		string const tempfile = lyx::support::tempName();
+		FileName const tempfile(support::tempName());
 		error = !layout2layout(filename, tempfile);
 		if (!error)
 			error = read(tempfile, merge);
-		lyx::support::unlink(tempfile);
+		support::unlink(tempfile);
 		return error;
 	}
 
 	if (!merge) { // we are at top level here.
 		lyxerr[Debug::TCLASS] << "Finished reading textclass "
-				      << lyx::to_utf8(makeDisplayPath(filename))
+				      << to_utf8(makeDisplayPath(filename.absFilename()))
 				      << endl;
 		if (defaultlayout_.empty()) {
 			lyxerr << "Error: Textclass '" << name_
@@ -478,7 +485,7 @@ bool LyXTextClass::read(string const & filename, bool merge)
 
 	} else
 		lyxerr[Debug::TCLASS] << "Finished reading input file "
-				      << lyx::to_utf8(makeDisplayPath(filename))
+				      << to_utf8(makeDisplayPath(filename.absFilename()))
 				      << endl;
 
 	return error;
@@ -675,7 +682,7 @@ void LyXTextClass::readCharStyle(LyXLex & lexrc, string const & name)
 		cs.latexparam = latexparam;
 		cs.font = font;
 		cs.labelfont = labelfont;
-		cs.preamble = preamble;
+		cs.preamble = from_utf8(preamble);
 		charstyles().push_back(cs);
 	}
 
@@ -800,8 +807,8 @@ void LyXTextClass::readCounter(LyXLex & lexrc)
 
 	lexrc.pushTable(counterTags, CT_END);
 
-	string name;
-	string within;
+	docstring name;
+	docstring within;
 
 	bool getout = false;
 	while (!getout && lexrc.isOK()) {
@@ -815,11 +822,11 @@ void LyXTextClass::readCounter(LyXLex & lexrc)
 		switch (static_cast<CounterTags>(le)) {
 		case CT_NAME:
 			lexrc.next();
-			name = lexrc.getString();
+			name = from_ascii(lexrc.getString());
 			break;
 		case CT_WITHIN:
 			lexrc.next();
-			within = lexrc.getString();
+			within = from_ascii(lexrc.getString());
 			if (within == "none")
 				within.erase();
 			break;
@@ -831,11 +838,10 @@ void LyXTextClass::readCounter(LyXLex & lexrc)
 
 	// Here if have a full counter if getout == true
 	if (getout) {
-		if (within.empty()) {
+		if (within.empty())
 			ctrs_->newCounter(name);
-		} else {
+		else
 			ctrs_->newCounter(name, within);
-		}
 	}
 
 	lexrc.popTable();
@@ -920,16 +926,16 @@ bool LyXTextClass::load(string const & path) const
 		return true;
 
 	// Read style-file, provided path is searched before the system ones
-	string layout_file;
+	FileName layout_file;
 	if (!path.empty())
-		layout_file = addName(path, name_ + ".layout");
-	if (layout_file.empty() || !fs::exists(layout_file))
+		layout_file = FileName(addName(path, name_ + ".layout"));
+	if (layout_file.empty() || !fs::exists(layout_file.toFilesystemEncoding()))
 		layout_file = libFileSearch("layouts", name_, "layout");
 	loaded_ = const_cast<LyXTextClass*>(this)->read(layout_file) == 0;
 
 	if (!loaded_) {
 		lyxerr << "Error reading `"
-		       << lyx::to_utf8(makeDisplayPath(layout_file))
+		       << to_utf8(makeDisplayPath(layout_file.absFilename()))
 		       << "'\n(Check `" << name_
 		       << "')\nCheck your installation and "
 			"try Options/Reconfigure..." << endl;
@@ -1031,7 +1037,7 @@ string const & LyXTextClass::pagestyle() const
 }
 
 
-string const & LyXTextClass::preamble() const
+docstring const & LyXTextClass::preamble() const
 {
 	return preamble_;
 }
@@ -1121,3 +1127,6 @@ ostream & operator<<(ostream & os, LyXTextClass::PageSides p)
 	}
 	return os;
 }
+
+
+} // namespace lyx