X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.C;h=57256ab10df181f797010dc3c5fe85fbcbc46d18;hb=98c966c64594611e469313314abd1e59524adb4a;hp=36de5a4b0c714fef6a3aa5d80a61af8ab8dae36b;hpb=9625f5e2300339330e099ccea259c46667ea1461;p=lyx.git diff --git a/src/LaTeX.C b/src/LaTeX.C index 36de5a4b0c..57256ab10d 100644 --- a/src/LaTeX.C +++ b/src/LaTeX.C @@ -1,14 +1,14 @@ /* This file is part of - * ====================================================== - * - * LyX, The Document Processor + * ====================================================== + * + * LyX, The Document Processor * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * - * This file is Copyright 1996-2000 + * This file is Copyright 1996-2001 * Lars Gullik Bjønnes * - * ====================================================== + * ====================================================== */ #include @@ -18,23 +18,27 @@ #endif #include -#include "support/filetools.h" #include "LaTeX.h" -#include "support/FileInfo.h" +#include "bufferlist.h" +#include "gettext.h" +#include "lyxfunc.h" #include "debug.h" -#include "support/lyxlib.h" -#include "support/syscall.h" -#include "support/syscontr.h" -#include "support/path.h" +#include "support/filetools.h" +#include "support/FileInfo.h" #include "support/LRegex.h" #include "support/LSubstring.h" -#include "bufferlist.h" -#include "minibuffer.h" -#include "gettext.h" +#include "support/lstrings.h" +#include "support/lyxlib.h" +#include "support/systemcall.h" +#include "support/os.h" +#include "support/path.h" +#include // sscanf using std::ifstream; using std::getline; using std::endl; +using std::vector; +using std::set; // TODO: in no particular order // - get rid of the extern BufferList and the call to @@ -58,7 +62,7 @@ extern BufferList bufferlist; void TeXErrors::insertError(int line, string const & error_desc, string const & error_text) { - Error newerr(line, error_desc, error_text); + Error newerr(line, error_desc, error_text); errors.push_back(newerr); } @@ -71,8 +75,12 @@ LaTeX::LaTeX(string const & latex, string const & f, string const & p) { num_errors = 0; depfile = file + ".dep"; - if (prefixIs(cmd, "pdf")) // Do we use pdflatex ? + if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ? depfile += "-pdf"; + output_file = ChangeExtension(file,".pdf"); + } else { + output_file = ChangeExtension(file,".dvi"); + } } @@ -83,7 +91,7 @@ void LaTeX::deleteFilesOnError() const // What files do we have to delete? // This will at least make latex do all the runs - ::unlink(depfile.c_str()); + lyx::unlink(depfile); // but the reason for the error might be in a generated file... @@ -91,37 +99,37 @@ void LaTeX::deleteFilesOnError() const // bibtex file string bbl = ChangeExtension(ofname, ".bbl"); - ::unlink(bbl.c_str()); + lyx::unlink(bbl); // makeindex file string ind = ChangeExtension(ofname, ".ind"); - ::unlink(ind.c_str()); - + lyx::unlink(ind); + // Also remove the aux file string aux = ChangeExtension(ofname, ".aux"); - ::unlink(aux.c_str()); + lyx::unlink(aux); } -int LaTeX::run(TeXErrors & terr, MiniBuffer * minib) +int LaTeX::run(TeXErrors & terr, LyXFunc * lfun) // We know that this function will only be run if the lyx buffer // has been changed. We also know that a newly written .tex file // is always different from the previous one because of the date // in it. However it seems safe to run latex (at least) on time each // time the .tex file changes. { - int scanres = LaTeX::NO_ERRORS; + int scanres = NO_ERRORS; unsigned int count = 0; // number of times run num_errors = 0; // just to make sure. const unsigned int MAX_RUN = 6; DepTable head; // empty head bool rerun = false; // rerun requested - + // The class LaTeX does not know the temp path. - bufferlist.updateIncludedTeXfiles(GetCWD()); - + bufferlist.updateIncludedTeXfiles(lyx::getcwd()); //GetCWD()); + // Never write the depfile if an error was encountered. - + // 0 // first check if the file dependencies exist: // ->If it does exist @@ -137,57 +145,70 @@ int LaTeX::run(TeXErrors & terr, MiniBuffer * minib) // run latex once (we need to run latex once anyway) and // remake the dependency file. // + FileInfo fi(depfile); + bool had_depfile = fi.exist(); bool run_bibtex = false; - if (fi.exist()) { + string aux_file = OnlyFilename(ChangeExtension(file, "aux")); + + if (had_depfile) { + lyxerr[Debug::DEPEND] << "Dependency file exists" << endl; // Read the dep file: head.read(depfile); // Update the checksums head.update(); - - lyxerr[Debug::DEPEND] << "Dependency file exists" << endl; - if (head.sumchange()) { - ++count; + // Can't just check if anything has changed because it might have aborted + // on error last time... in which cas we need to re-run latex + // and collect the error messages (even if they are the same). + if (!FileInfo(output_file).exist()) { lyxerr[Debug::DEPEND] - << "Dependency file has changed" << endl; - lyxerr[Debug::LATEX] - << "Run #" << count << endl; - minib->Set(string(_("LaTeX run number ")) + tostr(count)); - minib->Store(); - this->operator()(); - scanres = scanLogFile(terr); - if (scanres & LaTeX::ERRORS) { - deleteFilesOnError(); - return scanres; // return on error - } - - run_bibtex = scanAux(head); - if (run_bibtex) - lyxerr[Debug::DEPEND] - << "Bibtex demands rerun" << endl; - } else { + << "re-running LaTeX because output file doesn't exist." << endl; + } else if (!head.sumchange()) { lyxerr[Debug::DEPEND] << "return no_change" << endl; - return LaTeX::NO_CHANGE; + return NO_CHANGE; + } else { + lyxerr[Debug::DEPEND] + << "Dependency file has changed" << endl; } - } else { - ++count; + + if (head.extchanged(".bib") || head.extchanged(".bst")) + run_bibtex = true; + } else lyxerr[Debug::DEPEND] << "Dependency file does not exist" << endl; - - lyxerr[Debug::LATEX] - << "Run #" << count << endl; - head.insert(file, true); - minib->Set(string(_("LaTeX run number ")) + tostr(count)); - minib->Store(); + + /// We scan the aux file even when had_depfile = false, + /// because we can run pdflatex on the file after running latex on it, + /// in which case we will not need to run bibtex again. + vector bibtex_info_old; + if (!run_bibtex) + bibtex_info_old = scanAuxFiles(aux_file); + + ++count; + lyxerr[Debug::LATEX] << "Run #" << count << endl; + if (lfun) { + ostringstream str; + str << _("LaTeX run number") << ' ' << count; + lfun->dispatch(LFUN_MESSAGE, str.str().c_str()); + } + + this->operator()(); + scanres = scanLogFile(terr); + if (scanres & ERROR_RERUN) { + lyxerr[Debug::LATEX] << "Rerunning LaTeX" << endl; this->operator()(); scanres = scanLogFile(terr); - if (scanres & LaTeX::ERRORS) { - deleteFilesOnError(); - return scanres; // return on error - } - } + if (scanres & ERRORS) { + deleteFilesOnError(); + return scanres; // return on error + } + + vector const bibtex_info = scanAuxFiles(aux_file); + if (!run_bibtex && bibtex_info_old != bibtex_info) + run_bibtex = true; + // update the dependencies. deplog(head); // reads the latex log head.update(); @@ -198,31 +219,39 @@ int LaTeX::run(TeXErrors & terr, MiniBuffer * minib) // And if there were undefined citations or changes in references // the .aux file is checked for signs of bibtex. Bibtex is then run // if needed. - + // run makeindex if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) { // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; - minib->Set(_("Running MakeIndex.")); - minib->Store(); + if (lfun) { + lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex.")); + } + rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); } // run bibtex - if (scanres & LaTeX::UNDEF_CIT - || scanres & LaTeX::RERUN - || run_bibtex) { + // if (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex) + if (scanres & UNDEF_CIT || run_bibtex) { // Here we must scan the .aux file and look for // "\bibdata" and/or "\bibstyle". If one of those // tags is found -> run bibtex and set rerun = true; // no checks for now lyxerr[Debug::LATEX] << "Running BibTeX." << endl; - minib->Set(_("Running BibTeX.")); - minib->Store(); - rerun = runBibTeX(OnlyFilename(ChangeExtension(file, ".aux")), - head); + if (lfun) { + lfun->dispatch(LFUN_MESSAGE, _("Running BibTeX.")); + } + + updateBibtexDependencies(head, bibtex_info); + rerun |= runBibTeX(bibtex_info); + } else if (!had_depfile) { + /// If we run pdflatex on the file after running latex on it, + /// then we do not need to run bibtex, but we do need to + /// insert the .bib and .bst files into the .dep-pdf file. + updateBibtexDependencies(head, bibtex_info); } - + // 1 // we know on this point that latex has been run once (or we just // returned) and the question now is to decide if we need to run @@ -242,15 +271,19 @@ int LaTeX::run(TeXErrors & terr, MiniBuffer * minib) << "Dep. file has changed or rerun requested" << endl; lyxerr[Debug::LATEX] << "Run #" << count << endl; - minib->Set(string(_("LaTeX run number ")) + tostr(count)); - minib->Store(); + if (lfun) { + ostringstream str; + str << _("LaTeX run number") << ' ' << count; + lfun->dispatch(LFUN_MESSAGE, str.str().c_str()); + } + this->operator()(); scanres = scanLogFile(terr); - if (scanres & LaTeX::ERRORS) { + if (scanres & ERRORS) { deleteFilesOnError(); return scanres; // return on error } - + // update the depedencies deplog(head); // reads the latex log head.update(); @@ -265,16 +298,18 @@ int LaTeX::run(TeXErrors & terr, MiniBuffer * minib) // again to make sure everything is redone correctly. // Also there should be no need to run the external programs any // more after this. - + // run makeindex if the .idx has changed or was generated. if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) { // no checks for now lyxerr[Debug::LATEX] << "Running MakeIndex." << endl; - minib->Set(_("Running MakeIndex.")); - minib->Store(); + if (lfun) { + lfun->dispatch(LFUN_MESSAGE, _("Running MakeIndex.")); + } + rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx"))); } - + // 2 // we will only run latex more if the log file asks for it. // or if the sumchange() is true. @@ -285,22 +320,26 @@ int LaTeX::run(TeXErrors & terr, MiniBuffer * minib) // -> rerun not asked for: // just return (fall out of bottom of func) // - while ((head.sumchange() || rerun || (scanres & LaTeX::RERUN)) + while ((head.sumchange() || rerun || (scanres & RERUN)) && count < MAX_RUN) { // Yes rerun until message goes away, or until // MAX_RUNS are reached. rerun = false; ++count; lyxerr[Debug::LATEX] << "Run #" << count << endl; - minib->Set(string(_("LaTeX run number ")) + tostr(count)); - minib->Store(); + if (lfun) { + ostringstream str; + str << _("LaTeX run number") << ' ' << count; + lfun->dispatch(LFUN_MESSAGE, str.str().c_str()); + } + this->operator()(); scanres = scanLogFile(terr); - if (scanres & LaTeX::ERRORS) { + if (scanres & ERRORS) { deleteFilesOnError(); return scanres; // return on error } - + // keep this updated head.update(); } @@ -319,8 +358,8 @@ int LaTeX::operator()() #else // cmd.exe (OS/2) causes SYS0003 error at "/dev/null" string tmp = cmd + ' ' + file + " > nul"; #endif - Systemcalls one; - return one.startscript(Systemcalls::System, tmp); + Systemcall one; + return one.startscript(Systemcall::Wait, tmp); } @@ -336,137 +375,142 @@ bool LaTeX::runMakeIndex(string const & f) // to come for a later time. (0.13 perhaps?) string tmp = "makeindex -c -q "; tmp += f; - Systemcalls one; - one.startscript(Systemcalls::System, tmp); + Systemcall one; + one.startscript(Systemcall::Wait, tmp); return true; } -bool LaTeX::scanAux(DepTable & dep) +vector const +LaTeX::scanAuxFiles(string const & file) { - // if any of the bib file has changed we don't have to - // check the .aux file. - if (dep.extchanged(".bib") - || dep.extchanged(".bst")) return true; - - string aux = OnlyFilename(ChangeExtension(file, ".aux")); - ifstream ifs(aux.c_str()); - string token; - LRegex reg1("\\\\bibdata\\{([^}]+)\\}"); - LRegex reg2("\\\\bibstyle\\{([^}]+)\\}"); - while (getline(ifs, token)) { - if (reg1.exact_match(token)) { - LRegex::SubMatches sub = reg1.exec(token); - string data = LSubstring(token, sub[1].first, - sub[1].second); - string::size_type b; - do { - b = data.find_first_of(',', 0); - string l; - if (b == string::npos) - l = data; - else { - l = data.substr( 0, b - 0); - data.erase(0, b + 1); - } - string full_l = - findtexfile( - ChangeExtension(l, "bib"), "bib"); - if (!full_l.empty()) { - if (!dep.exist(full_l)) - return true; - } - } while (b != string::npos); - } else if (reg2.exact_match(token)) { - LRegex::SubMatches sub = reg2.exec(token); - string style = LSubstring(token, sub[1].first, - sub[1].second); - // token is now the style file - // pass it to the helper - string full_l = - findtexfile( - ChangeExtension(style, "bst"), - "bst"); - if (!full_l.empty()) { - if (!dep.exist(full_l)) - return true; - } - } + vector result; + + result.push_back(scanAuxFile(file)); + + for (int i = 1; i < 1000; ++i) { + string file2 = ChangeExtension(file, "") + "." + tostr(i) + + ".aux"; + FileInfo fi(file2); + if (!fi.exist()) + break; + result.push_back(scanAuxFile(file2)); } - return false; + return result; } -bool LaTeX::runBibTeX(string const & f, DepTable & dep) +Aux_Info const LaTeX::scanAuxFile(string const & file) { - // Since a run of Bibtex mandates more latex runs it is ok to - // remove all ".bib" and ".bst" files, it is also required to - // discover style and database changes. - dep.remove_files_with_extension(".bib"); - dep.remove_files_with_extension(".bst"); - ifstream ifs(f.c_str()); + Aux_Info result; + result.aux_file = file; + scanAuxFile(file, result); + return result; +} + + +void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info) +{ + lyxerr[Debug::LATEX] << "Scanning aux file: " << file << endl; + + ifstream ifs(file.c_str()); string token; - bool using_bibtex = false; - LRegex reg1("\\\\bibdata\\{([^}]+)\\}"); - LRegex reg2("\\\\bibstyle\\{([^}]+)\\}"); + LRegex reg1("\\\\citation\\{([^}]+)\\}"); + LRegex reg2("\\\\bibdata\\{([^}]+)\\}"); + LRegex reg3("\\\\bibstyle\\{([^}]+)\\}"); + LRegex reg4("\\\\@input\\{([^}]+)\\}"); + while (getline(ifs, token)) { + token = strip(token, '\r'); if (reg1.exact_match(token)) { - using_bibtex = true; LRegex::SubMatches const & sub = reg1.exec(token); + string data = LSubstring(token, sub[1].first, + sub[1].second); + while (!data.empty()) { + string citation; + data = split(data, citation, ','); + lyxerr[Debug::LATEX] << "Citation: " + << citation << endl; + aux_info.citations.insert(citation); + } + } else if (reg2.exact_match(token)) { + LRegex::SubMatches const & sub = reg2.exec(token); string data = LSubstring(token, sub[1].first, sub[1].second); // data is now all the bib files separated by ',' // get them one by one and pass them to the helper - string::size_type b; - do { - b = data.find_first_of(',', 0); - string l; - if (b == string::npos) - l = data; - else { - l = data.substr(0, b - 0); - data.erase(0, b + 1); - } - string full_l = - findtexfile( - ChangeExtension(l, "bib"), - "bib"); + while (!data.empty()) { + string database; + data = split(data, database, ','); + database = ChangeExtension(database, "bib"); lyxerr[Debug::LATEX] << "Bibtex database: `" - << full_l << "'" << endl; - if (!full_l.empty()) { - // add full_l to the dep file. - dep.insert(full_l, true); - } - } while (b != string::npos); - } else if (reg2.exact_match(token)) { - using_bibtex = true; - LRegex::SubMatches const & sub = reg2.exec(token); + << database << "'" << endl; + aux_info.databases.insert(database); + } + } else if (reg3.exact_match(token)) { + LRegex::SubMatches const & sub = reg3.exec(token); string style = LSubstring(token, sub[1].first, sub[1].second); // token is now the style file // pass it to the helper - string full_l = - findtexfile( - ChangeExtension(style, "bst"), - "bst"); + style = ChangeExtension(style, "bst"); lyxerr[Debug::LATEX] << "Bibtex style: `" - << full_l << "'" << endl; - if (!full_l.empty()) { - // add full_l to the dep file. - dep.insert(full_l, true); - } + << style << "'" << endl; + aux_info.styles.insert(style); + } else if (reg4.exact_match(token)) { + LRegex::SubMatches const & sub = reg4.exec(token); + string file2 = LSubstring(token, sub[1].first, + sub[1].second); + scanAuxFile(file2, aux_info); } } - if (using_bibtex) { - // run bibtex and +} + + +void LaTeX::updateBibtexDependencies(DepTable & dep, + vector const & bibtex_info) +{ + // Since a run of Bibtex mandates more latex runs it is ok to + // remove all ".bib" and ".bst" files. + dep.remove_files_with_extension(".bib"); + dep.remove_files_with_extension(".bst"); + //string aux = OnlyFilename(ChangeExtension(file, ".aux")); + + for (vector::const_iterator it = bibtex_info.begin(); + it != bibtex_info.end(); ++it) { + for (set::const_iterator it2 = it->databases.begin(); + it2 != it->databases.end(); ++it2) { + string file = findtexfile(*it2, "bib"); + if (!file.empty()) + dep.insert(file, true); + } + + for (set::const_iterator it2 = it->styles.begin(); + it2 != it->styles.end(); ++it2) { + string file = findtexfile(*it2, "bst"); + if (!file.empty()) + dep.insert(file, true); + } + } +} + + +bool LaTeX::runBibTeX(vector const & bibtex_info) +{ + bool result = false; + for (vector::const_iterator it = bibtex_info.begin(); + it != bibtex_info.end(); ++it) { + if (it->databases.empty()) + continue; + result = true; + string tmp = "bibtex "; - tmp += OnlyFilename(ChangeExtension(file, string())); - Systemcalls one; - one.startscript(Systemcalls::System, tmp); - return true; + tmp += OnlyFilename(ChangeExtension(it->aux_file, string())); + Systemcall one; + one.startscript(Systemcall::Wait, tmp); } - // bibtex was not run. - return false; + // Return whether bibtex was run + return result; } @@ -482,7 +526,7 @@ int LaTeX::scanLogFile(TeXErrors & terr) string token; while (getline(ifs, token)) { lyxerr[Debug::LATEX] << "Log line: " << token << endl; - + if (token.empty()) continue; @@ -510,8 +554,22 @@ int LaTeX::scanLogFile(TeXErrors & terr) && contains(token, "undefined")) { retval |= UNDEF_CIT; } - } else if (contains(token, "Rerun LaTeX.")) { - // at least longtable.sty might use this. + } else if (contains(token, "run BibTeX")) { + retval |= UNDEF_CIT; + } else if (contains(token, "Rerun LaTeX") || + contains(token, "Rerun to get")) { + // at least longtable.sty and bibtopic.sty + // might use this. + lyxerr[Debug::LATEX] + << "We should rerun." << endl; + retval |= RERUN; + } + } else if (prefixIs(token, "(")) { + if (contains(token, "Rerun LaTeX") || + contains(token, "Rerun to get")) { + // Used by natbib + lyxerr[Debug::LATEX] + << "We should rerun." << endl; retval |= RERUN; } } else if (prefixIs(token, "! ")) { @@ -534,6 +592,8 @@ int LaTeX::scanLogFile(TeXErrors & terr) if (prefixIs(tmp, "l.")) { // we have a latex error retval |= TEX_ERROR; + if (contains(desc, "Package babel Error: You haven't defined the language")) + retval |= ERROR_RERUN; // get the line number: int line = 0; sscanf(tmp.c_str(), "l.%d", &line); @@ -573,7 +633,7 @@ int LaTeX::scanLogFile(TeXErrors & terr) retval |= TEX_WARNING; } else if (contains(token, "Rerun to get citations")) { // Natbib seems to use this. - retval |= RERUN; + retval |= UNDEF_CIT; } else if (contains(token, "No pages of output")) { // A dvi file was not created retval |= NO_OUTPUT; @@ -594,14 +654,19 @@ void LaTeX::deplog(DepTable & head) // files used by the LaTeX run. The files are then entered into the // dependency file. - string logfile = OnlyFilename(ChangeExtension(file, ".log")); + string const logfile = OnlyFilename(ChangeExtension(file, ".log")); - LRegex reg1(")* *\\(([^ ]+).*"); + LRegex reg1("\\)* *\\(([^ )]+).*"); LRegex reg2("File: ([^ ]+).*"); LRegex reg3("No file ([^ ]+)\\..*"); LRegex reg4("\\\\openout[0-9]+.*=.*`([^ ]+)'\\..*"); + // If an index should be created, MikTex does not write a line like + // \openout# = 'sample,idx'. + // but intstead only a line like this into the log: + // Writing index file sample.idx + LRegex reg5("Writing index file ([^ ]+).*"); LRegex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$"); - + ifstream ifs(logfile.c_str()); while (ifs) { // Ok, the scanning of files here is not sufficient. @@ -612,8 +677,9 @@ void LaTeX::deplog(DepTable & head) string foundfile; string token; getline(ifs, token); + token = strip(token, '\r'); if (token.empty()) continue; - + if (reg1.exact_match(token)) { LRegex::SubMatches const & sub = reg1.exec(token); foundfile = LSubstring(token, sub[1].first, @@ -630,35 +696,42 @@ void LaTeX::deplog(DepTable & head) LRegex::SubMatches const & sub = reg4.exec(token); foundfile = LSubstring(token, sub[1].first, sub[1].second); + } else if (reg5.exact_match(token)) { + LRegex::SubMatches const & sub = reg5.exec(token); + foundfile = LSubstring(token, sub[1].first, + sub[1].second); } else { continue; } - lyxerr[Debug::DEPEND] << "Found file: " + // convert from native os path to unix path + foundfile = os::internal_path(foundfile); + + lyxerr[Debug::DEPEND] << "Found file: " << foundfile << endl; - + // Ok now we found a file. // Now we should make sure that this is a file that we can // access through the normal paths. - // We will not try any fance search methods to + // We will not try any fancy search methods to // find the file. - + // (1) foundfile is an // absolute path and should // be inserted. if (AbsolutePath(foundfile)) { - lyxerr[Debug::DEPEND] << "AbsolutePath file: " + lyxerr[Debug::DEPEND] << "AbsolutePath file: " << foundfile << endl; - // On inital insert we want to do the update at once + // On initial insert we want to do the update at once // since this file can not be a file generated by // the latex run. - head.insert(foundfile, true); - continue; + if (FileInfo(foundfile).exist()) + head.insert(foundfile, true); } // (2) foundfile is in the tmpdir // insert it into head - if (FileInfo(OnlyFilename(foundfile)).exist()) { + else if (FileInfo(OnlyFilename(foundfile)).exist()) { if (unwanted.exact_match(foundfile)) { lyxerr[Debug::DEPEND] << "We don't want " @@ -681,10 +754,12 @@ void LaTeX::deplog(DepTable & head) << endl; head.insert(OnlyFilename(foundfile)); } - continue; - } - lyxerr[Debug::DEPEND] - << "Not a file or we are unable to find it." - << endl; + } else + lyxerr[Debug::DEPEND] + << "Not a file or we are unable to find it." + << endl; } + + // Make sure that the main .tex file is in the dependancy file. + head.insert(OnlyFilename(file), true); }