Whitespace cleanup

[features.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index dd9b61637c4f9aa56617320ff81db80bb1eb7d76..05bc607bb02cb729eabea7dfccf0b7b6e4b0c95c 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -161,7 +161,7 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_MOUSE_RELEASE:
-               if (!cur.selection()) 
+               if (!cur.selection())
                        InsetIncludeMailer(*this).showDialog(&cur.bv());
                break;
 
@@ -230,7 +230,7 @@ bool isVerbatim(InsetCommandParams const & params)
 }
 
 
-bool isInputOrInclude(InsetCommandParams const & params) 
+bool isInputOrInclude(InsetCommandParams const & params)
 {
        Types const t = type(params);
        return (t == INPUT) || (t == INCLUDE);
@@ -321,7 +321,7 @@ void InsetInclude::read(Lexer & lex)
        }
        if (token != "\\end_inset") {
                lex.printError("Missing \\end_inset at this point. "
-                              "Read: `$$Token'");
+                              "Read: `$$Token'");
        }
 }
 
@@ -376,11 +376,12 @@ Buffer * getChildBuffer(Buffer const & buffer, InsetCommandParams const & params
                return 0;
 
        Buffer * childBuffer = theBufferList().getBuffer(included_file);
-       
+
        //FIXME RECURSIVE INCLUDES
        if (childBuffer == & buffer)
                return 0;
-       else return childBuffer;
+       else
+               return childBuffer;
 }
 
 
@@ -415,7 +416,7 @@ bool loadIfNeeded(Buffer const & buffer, InsetCommandParams const & params)
 
 
 int InsetInclude::latex(Buffer const & buffer, odocstream & os,
-                        OutputParams const & runparams) const
+                       OutputParams const & runparams) const
 {
        string incfile(to_utf8(params_["filename"]));
 
@@ -424,17 +425,17 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                return 0;
 
        FileName const included_file(includedFilename(buffer, params_));
-       
+
        //Check we're not trying to include ourselves.
        //FIXME RECURSIVE INCLUDE
        //This isn't sufficient, as the inclusion could be downstream.
        //But it'll have to do for now.
        if (isInputOrInclude(params_) &&
-               buffer.fileName() == included_file.toFilesystemEncoding()) 
+               buffer.fileName() == included_file.absFilename())
        {
-               Alert::error(_("Recursive input"), 
-                              bformat(_("Attempted to include file %1$s in itself! "
-                              "Ignoring inclusion."), from_utf8(incfile)));
+               Alert::error(_("Recursive input"),
+                              bformat(_("Attempted to include file %1$s in itself! "
+                              "Ignoring inclusion."), from_utf8(incfile)));
                return 0;
        }
 
@@ -445,12 +446,12 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
        if (!absolutePath(incfile)) {
                // FIXME UNICODE
                incfile = to_utf8(makeRelPath(from_utf8(included_file.absFilename()),
-                                             from_utf8(m_buffer->filePath())));
+                                             from_utf8(m_buffer->filePath())));
        }
 
        // write it to a file (so far the complete file)
        string const exportfile = changeExtension(incfile, ".tex");
-       string const mangled = 
+       string const mangled =
                DocFileName(changeExtension(included_file.absFilename(),".tex")).
                        mangledFilename();
        FileName const writefile(makeAbsPath(mangled, m_buffer->temppath()));
@@ -461,16 +462,16 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
        LYXERR(Debug::LATEX) << "exportfile:" << exportfile << endl;
        LYXERR(Debug::LATEX) << "writefile:" << writefile << endl;
 
-       if (runparams.inComment || runparams.dryrun)
-               // Don't try to load or copy the file
-               ;
-       //if it's a LyX file and we're including or inputting it...
-       else if (isInputOrInclude(params_) && 
-                isLyXFilename(included_file.absFilename())) {
+       if (runparams.inComment || runparams.dryrun) {
+               //Don't try to load or copy the file if we're
+               //in a comment or doing a dryrun
+       } else if (isInputOrInclude(params_) &&
+                isLyXFilename(included_file.absFilename())) {
+               //if it's a LyX file and we're inputting or including,
                //try to load it so we can write the associated latex
                if (!loadIfNeeded(buffer, params_))
                        return false;
-                       
+
                Buffer * tmp = theBufferList().getBuffer(included_file.absFilename());
 
                if (tmp->params().textclass != m_buffer->params().textclass) {
@@ -502,9 +503,10 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                                   runparams, false);
                runparams.encoding = oldEnc;
        } else {
-               // Copy the file to the temp dir, so that .aux files etc.
-               // are not created in the original dir. Files included by
-               // this file will be found via input@path, see ../Buffer.cpp.
+               // In this case, it's not a LyX file, so we copy the file
+               // to the temp dir, so that .aux files etc. are not created
+               // in the original dir. Files included by this file will be
+               // found via input@path, see ../Buffer.cpp.
                unsigned long const checksum_in  = sum(included_file);
                unsigned long const checksum_out = sum(writefile);
 
@@ -551,7 +553,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
                // opt is set in QInclude dialog and should have passed validation.
                InsetListingsParams params(opt);
                if (!params.params().empty())
-                       os << "[" << from_utf8(params.encodedString()) << "]";
+                       os << "[" << from_utf8(params.params()) << "]";
                os << '{'  << from_utf8(incfile) << '}';
        } else {
                runparams.exportdata->addExternalFile(tex_format, writefile,
@@ -571,7 +573,7 @@ int InsetInclude::latex(Buffer const & buffer, odocstream & os,
 
 
 int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
-                            OutputParams const &) const
+                           OutputParams const &) const
 {
        if (isVerbatim(params_) || isListings(params_)) {
                os << '[' << getScreenLabel(buffer) << '\n';
@@ -590,7 +592,7 @@ int InsetInclude::plaintext(Buffer const & buffer, odocstream & os,
 
 
 int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
-                          OutputParams const & runparams) const
+                         OutputParams const & runparams) const
 {
        string incfile = to_utf8(params_["filename"]);
 
@@ -605,9 +607,9 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
        //This isn't sufficient, as the inclusion could be downstream.
        //But it'll have to do for now.
        if (buffer.fileName() == included_file) {
-               Alert::error(_("Recursive input"), 
-                              bformat(_("Attempted to include file %1$s in itself! "
-                              "Ignoring inclusion."), from_utf8(incfile)));
+               Alert::error(_("Recursive input"),
+                              bformat(_("Attempted to include file %1$s in itself! "
+                              "Ignoring inclusion."), from_utf8(incfile)));
                return 0;
        }
 
@@ -641,7 +643,7 @@ int InsetInclude::docbook(Buffer const & buffer, odocstream & os,
                   << '&' << include_label << ';'
                   << "\" format=\"linespecific\">";
        } else
-                os << '&' << include_label << ';';
+               os << '&' << include_label << ';';
 
        return 0;
 }