X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=99bb39ee299477a1efef29bf0849b0e4ef20dae2;hb=1fa0fb5c67656cacbe3cfe6e8b08dd98cada1f73;hp=0fc6816232cf4a3e7bc472678392729d25a1e929;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C index 0fc6816232..99bb39ee29 100644 --- a/src/LaTeXFeatures.C +++ b/src/LaTeXFeatures.C @@ -15,32 +15,35 @@ #include #include "LaTeXFeatures.h" -#include "debug.h" -#include "lyx_sty.h" -#include "lyxrc.h" + #include "bufferparams.h" +#include "debug.h" +#include "encoding.h" +#include "Floating.h" #include "FloatList.h" #include "language.h" -#include "encoding.h" -#include "LString.h" -#include "Lsstream.h" +#include "lyx_sty.h" +#include "lyxrc.h" #include "support/filetools.h" -#include "support/lstrings.h" -using namespace lyx::support; +#include "support/std_sstream.h" -using lyx::textclass_type; +using lyx::support::IsSGMLFilename; +using lyx::support::MakeRelPath; +using lyx::support::OnlyPath; using std::endl; -using std::list; -using std::set; using std::find; +using std::string; +using std::list; using std::ostream; +using std::ostringstream; +using std::set; -LaTeXFeatures::LaTeXFeatures(BufferParams const & p) - : params(p) +LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p, bool n) + : buffer_(&b), params_(p), nice_(n) {} @@ -57,7 +60,7 @@ void LaTeXFeatures::require(string const & name) if (isRequired(name)) return; - features.push_back(name); + features_.push_back(name); } @@ -73,11 +76,11 @@ void LaTeXFeatures::useLayout(string const & layoutname) return; } - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params_.getLyXTextClass(); if (tclass.hasLayout(layoutname)) { // Is this layout already in usedLayouts? - list::const_iterator cit = usedLayouts.begin(); - list::const_iterator end = usedLayouts.end(); + list::const_iterator cit = usedLayouts_.begin(); + list::const_iterator end = usedLayouts_.end(); for (; cit != end; ++cit) { if (layoutname == *cit) return; @@ -89,7 +92,7 @@ void LaTeXFeatures::useLayout(string const & layoutname) useLayout(lyt->depends_on()); --level; } - usedLayouts.push_back(layoutname); + usedLayouts_.push_back(layoutname); } else { lyxerr << "LaTeXFeatures::useLayout: layout `" << layoutname << "' does not exist in this class" @@ -102,23 +105,26 @@ void LaTeXFeatures::useLayout(string const & layoutname) bool LaTeXFeatures::isRequired(string const & name) const { - return find(features.begin(), features.end(), name) != features.end(); + return find(features_.begin(), features_.end(), name) != features_.end(); } -void LaTeXFeatures::addExternalPreamble(string const & pream) +void LaTeXFeatures::addExternalPreamble(string const & preamble) { - externalPreambles += pream; + FeaturesList::const_iterator begin = preamble_snippets_.begin(); + FeaturesList::const_iterator end = preamble_snippets_.end(); + if (find(begin, end, preamble) == end) + preamble_snippets_.push_back(preamble); } void LaTeXFeatures::useFloat(string const & name) { - usedFloats.insert(name); + usedFloats_.insert(name); // We only need float.sty if we use non builtin floats, or if we // use the "H" modifier. This includes modified table and // figure floats. (Lgb) - Floating const & fl = params.getLyXTextClass().floats().getType(name); + Floating const & fl = params_.getLyXTextClass().floats().getType(name); if (!fl.type().empty() && !fl.builtin()) { require("float"); } @@ -127,19 +133,19 @@ void LaTeXFeatures::useFloat(string const & name) void LaTeXFeatures::useLanguage(Language const * lang) { - UsedLanguages.insert(lang); + UsedLanguages_.insert(lang); } void LaTeXFeatures::includeFile(string const & key, string const & name) { - IncludedFiles[key] = name; + IncludedFiles_[key] = name; } bool LaTeXFeatures::hasLanguages() const { - return !UsedLanguages.empty(); + return !UsedLanguages_.empty(); } @@ -148,21 +154,21 @@ string LaTeXFeatures::getLanguages() const ostringstream languages; for (LanguageList::const_iterator cit = - UsedLanguages.begin(); - cit != UsedLanguages.end(); + UsedLanguages_.begin(); + cit != UsedLanguages_.end(); ++cit) languages << (*cit)->babel() << ','; - return STRCONV(languages.str()); + return languages.str(); } set LaTeXFeatures::getEncodingSet(string const & doc_encoding) const { set encodings; - for (LanguageList::const_iterator it = - UsedLanguages.begin(); - it != UsedLanguages.end(); ++it) + LanguageList::const_iterator it = UsedLanguages_.begin(); + LanguageList::const_iterator end = UsedLanguages_.end(); + for (; it != end; ++it) if ((*it)->encoding()->LatexName() != doc_encoding) encodings.insert((*it)->encoding()->LatexName()); return encodings; @@ -183,7 +189,10 @@ char const * simplefeatures[] = { "prettyref", "float", "wasy", - "dvipost" + "dvipost", + "fancybox", + "calc", + "jurabib" }; int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *); @@ -194,7 +203,7 @@ int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *); string const LaTeXFeatures::getPackages() const { ostringstream packages; - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params_.getLyXTextClass(); // // These are all the 'simple' includes. i.e @@ -213,17 +222,17 @@ string const LaTeXFeatures::getPackages() const if (isRequired("amsmath") && !tclass.provides(LyXTextClass::amsmath) - && params.use_amsmath != BufferParams::AMS_OFF) { + && params_.use_amsmath != BufferParams::AMS_OFF) { packages << "\\usepackage{amsmath}\n"; } // color.sty if (isRequired("color")) { - if (params.graphicsDriver == "default") + if (params_.graphicsDriver == "default") packages << "\\usepackage[usenames]{color}\n"; else packages << "\\usepackage[" - << params.graphicsDriver + << params_.graphicsDriver << ",usenames" << "]{color}\n"; } @@ -236,12 +245,12 @@ string const LaTeXFeatures::getPackages() const } // graphicx.sty - if (isRequired("graphicx") && params.graphicsDriver != "none") { - if (params.graphicsDriver == "default") + if (isRequired("graphicx") && params_.graphicsDriver != "none") { + if (params_.graphicsDriver == "default") packages << "\\usepackage{graphicx}\n"; else packages << "\\usepackage[" - << params.graphicsDriver + << params_.graphicsDriver << "]{graphicx}\n"; } @@ -255,12 +264,12 @@ string const LaTeXFeatures::getPackages() const } // setspace.sty - if ((params.spacing.getSpace() != Spacing::Single - && !params.spacing.isDefault()) + if ((params_.spacing().getSpace() != Spacing::Single + && !params_.spacing().isDefault()) || isRequired("setspace")) { packages << "\\usepackage{setspace}\n"; } - switch (params.spacing.getSpace()) { + switch (params_.spacing().getSpace()) { case Spacing::Default: case Spacing::Single: // we dont use setspace.sty so dont print anything @@ -274,12 +283,12 @@ string const LaTeXFeatures::getPackages() const break; case Spacing::Other: packages << "\\setstretch{" - << params.spacing.getValue() << "}\n"; + << params_.spacing().getValue() << "}\n"; break; } // amssymb.sty - if (isRequired("amssymb") || params.use_amsmath == BufferParams::AMS_ON) + if (isRequired("amssymb") || params_.use_amsmath == BufferParams::AMS_ON) packages << "\\usepackage{amssymb}\n"; // url.sty if (isRequired("url") && ! tclass.provides(LyXTextClass::url)) @@ -290,7 +299,7 @@ string const LaTeXFeatures::getPackages() const // natbib.sty if (isRequired("natbib") && ! tclass.provides(LyXTextClass::natbib)) { packages << "\\usepackage["; - if (params.use_numerical_citations) { + if (params_.use_numerical_citations) { packages << "numbers"; } else { packages << "authoryear"; @@ -298,9 +307,13 @@ string const LaTeXFeatures::getPackages() const packages << "]{natbib}\n"; } - packages << externalPreambles; + // bibtopic -- the dot provides the aux file naming which + // LyX can detect. + if (isRequired("bibtopic")) { + packages << "\\usepackage[dot]{bibtopic}\n"; + } - return STRCONV(packages.str()); + return packages.str(); } @@ -308,6 +321,14 @@ string const LaTeXFeatures::getMacros() const { ostringstream macros; + if (!preamble_snippets_.empty()) + macros << '\n'; + FeaturesList::const_iterator pit = preamble_snippets_.begin(); + FeaturesList::const_iterator pend = preamble_snippets_.end(); + for (; pit != pend; ++pit) { + macros << *pit << '\n'; + } + if (isRequired("LyX")) macros << lyx_def << '\n'; @@ -343,8 +364,6 @@ string const LaTeXFeatures::getMacros() const macros << mathcircumflex_def << '\n'; // other - if (isRequired("NeedLyXMinipageIndent")) - macros << minipageindent_def; if (isRequired("ParagraphLeftIndent")) macros << paragraphleftindent_def; if (isRequired("NeedLyXFootnoteCode")) @@ -361,7 +380,7 @@ string const LaTeXFeatures::getMacros() const // floats getFloatDefinitions(macros); - return STRCONV(macros.str()); + return macros.str(); } @@ -369,32 +388,40 @@ string const LaTeXFeatures::getBabelOptions() const { ostringstream tmp; - for (LanguageList::const_iterator cit = UsedLanguages.begin(); - cit != UsedLanguages.end(); ++cit) - if (!(*cit)->latex_options().empty()) - tmp << (*cit)->latex_options() << '\n'; - if (!params.language->latex_options().empty()) - tmp << params.language->latex_options() << '\n'; + LanguageList::const_iterator it = UsedLanguages_.begin(); + LanguageList::const_iterator end = UsedLanguages_.end(); + for (; it != end; ++it) + if (!(*it)->latex_options().empty()) + tmp << (*it)->latex_options() << '\n'; + if (!params_.language->latex_options().empty()) + tmp << params_.language->latex_options() << '\n'; - return STRCONV(tmp.str()); + return tmp.str(); } string const LaTeXFeatures::getTClassPreamble() const { // the text class specific preamble - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params_.getLyXTextClass(); ostringstream tcpreamble; tcpreamble << tclass.preamble(); - list::const_iterator cit = usedLayouts.begin(); - list::const_iterator end = usedLayouts.end(); + list::const_iterator cit = usedLayouts_.begin(); + list::const_iterator end = usedLayouts_.end(); for (; cit != end; ++cit) { tcpreamble << tclass[*cit]->preamble(); } - return STRCONV(tcpreamble.str()); + CharStyles::iterator cs = tclass.charstyles().begin(); + CharStyles::iterator csend = tclass.charstyles().end(); + for (; cs != csend; ++cs) { + if (isRequired(cs->name)) + tcpreamble << cs->preamble; + } + + return tcpreamble.str(); } @@ -407,7 +434,7 @@ string const LaTeXFeatures::getLyXSGMLEntities() const entities << "" << '\n'; } - return STRCONV(entities.str()); + return entities.str(); } @@ -416,14 +443,14 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const ostringstream sgmlpreamble; string const basename = OnlyPath(fname); - FileMap::const_iterator end = IncludedFiles.end(); - for (FileMap::const_iterator fi = IncludedFiles.begin(); + FileMap::const_iterator end = IncludedFiles_.end(); + for (FileMap::const_iterator fi = IncludedFiles_.begin(); fi != end; ++fi) sgmlpreamble << "\nfirst << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"") << MakeRelPath(fi->second, basename) << "\">"; - return STRCONV(sgmlpreamble.str()); + return sgmlpreamble.str(); } @@ -436,23 +463,35 @@ void LaTeXFeatures::showStruct() const { } +Buffer const & LaTeXFeatures::buffer() const +{ + return *buffer_; +} + + +void LaTeXFeatures::setBuffer(Buffer const & buffer) +{ + buffer_ = &buffer; +} + + BufferParams const & LaTeXFeatures::bufferParams() const { - return params; + return params_; } void LaTeXFeatures::getFloatDefinitions(ostream & os) const { - FloatList const & floats = params.getLyXTextClass().floats(); + FloatList const & floats = params_.getLyXTextClass().floats(); // Here we will output the code to create the needed float styles. // We will try to do this as minimal as possible. // \floatstyle{ruled} // \newfloat{algorithm}{htbp}{loa} // \floatname{algorithm}{Algorithm} - UsedFloats::const_iterator cit = usedFloats.begin(); - UsedFloats::const_iterator end = usedFloats.end(); + UsedFloats::const_iterator cit = usedFloats_.begin(); + UsedFloats::const_iterator end = usedFloats_.end(); // ostringstream floats; for (; cit != end; ++cit) { Floating const & fl = floats.getType((*cit));