#include <sstream>
-namespace support = lyx::support;
-using lyx::docstring;
-using lyx::odocstream;
-using lyx::support::bformat;
-using lyx::support::rtrim;
-using lyx::support::tokenPos;
+namespace lyx {
+
+using support::bformat;
+using support::rtrim;
+using support::tokenPos;
using std::endl;
using std::string;
using std::pair;
namespace Alert = lyx::frontend::Alert;
-namespace biblio = lyx::biblio;
// Local translators
}
-
-// AMS
-typedef Translator<int, BufferParams::AMS> AMSTranslator;
+// LaTeX packages
+typedef Translator<int, BufferParams::Package> PackageTranslator;
-AMSTranslator const init_amstranslator()
+PackageTranslator const init_packagetranslator()
{
- AMSTranslator translator(0, BufferParams::AMS_OFF);
- translator.addPair(1, BufferParams::AMS_AUTO);
- translator.addPair(2, BufferParams::AMS_ON);
+ PackageTranslator translator(0, BufferParams::package_off);
+ translator.addPair(1, BufferParams::package_auto);
+ translator.addPair(2, BufferParams::package_on);
return translator;
}
-AMSTranslator const & amstranslator()
+PackageTranslator const & packagetranslator()
{
- static AMSTranslator translator = init_amstranslator();
+ static PackageTranslator translator = init_packagetranslator();
return translator;
}
return translator;
}
-// ends annonym namespace
+
+textclass_type defaultTextclass()
+{
+ // Initialize textclass to point to article. if `first' is
+ // true in the returned pair, then `second' is the textclass
+ // number; if it is false, second is 0. In both cases, second
+ // is what we want.
+ return textclasslist.numberOfClass("article").second;
}
+} // anon namespace
+
class BufferParams::Impl
{
: defskip(VSpace::MEDSKIP)
{
// set initial author
- authorlist.record(Author(lyxrc.user_name, lyxrc.user_email));
+ // FIXME UNICODE
+ authorlist.record(Author(from_utf8(lyxrc.user_name), from_utf8(lyxrc.user_email)));
}
BufferParams::BufferParams()
- : // Initialize textclass to point to article. if `first' is
- // true in the returned pair, then `second' is the textclass
- // number; if it is false, second is 0. In both cases, second
- // is what we want.
- textclass(textclasslist.numberOfClass("article").second),
- pimpl_(new Impl)
+ : textclass(defaultTextclass()), pimpl_(new Impl)
{
paragraph_separation = PARSEP_INDENT;
quotes_language = InsetQuotes::EnglishQ;
papersize = PAPER_DEFAULT;
orientation = ORIENTATION_PORTRAIT;
use_geometry = false;
- use_amsmath = AMS_AUTO;
+ use_amsmath = package_auto;
+ use_esint = package_auto;
cite_engine = biblio::ENGINE_BASIC;
use_bibtopic = false;
trackChanges = false;
if (pp.first) {
textclass = pp.second;
} else {
- textclass = 0;
+ textclass = defaultTextclass();
return classname;
}
}
if (!getLyXTextClass().isTeXClassAvailable()) {
docstring const msg =
bformat(_("The document uses a missing "
- "TeX class \"%1$s\".\n"), lyx::from_utf8(classname));
+ "TeX class \"%1$s\".\n"), from_utf8(classname));
Alert::warning(_("Document class not available"),
msg + _("LyX will not be able to produce output."));
}
} else if (token == "\\use_amsmath") {
int use_ams;
lex >> use_ams;
- use_amsmath = amstranslator().find(use_ams);
+ use_amsmath = packagetranslator().find(use_ams);
+ } else if (token == "\\use_esint") {
+ int useesint;
+ lex >> useesint;
+ use_esint = packagetranslator().find(useesint);
} else if (token == "\\cite_engine") {
string engine;
lex >> engine;
lex >> outputChanges;
} else if (token == "\\branch") {
lex.next();
- string branch = lex.getString();
+ docstring branch = lex.getDocString();
branchlist().add(branch);
while (true) {
lex.next();
// Update also the LColor table:
if (color == "none")
color = lcolor.getX11Name(LColor::background);
- lcolor.setColor(branch, color);
+ // FIXME UNICODE
+ lcolor.setColor(to_utf8(branch), color);
}
}
os << "\\papersize " << string_papersize[papersize]
<< "\n\\use_geometry " << convert<string>(use_geometry)
<< "\n\\use_amsmath " << use_amsmath
+ << "\n\\use_esint " << use_esint
<< "\n\\cite_engine " << citeenginetranslator().find(cite_engine)
<< "\n\\use_bibtopic " << convert<string>(use_bibtopic)
<< "\n\\paperorientation " << string_orientation[orientation]
BranchList::const_iterator it = branchlist().begin();
BranchList::const_iterator end = branchlist().end();
for (; it != end; ++it) {
- os << "\\branch " << it->getBranch()
+ os << "\\branch " << to_utf8(it->getBranch())
<< "\n\\selected " << it->getSelected()
<< "\n\\color " << lyx::X11hexname(it->getColor())
<< "\n\\end_branch"
<< user_defined_bullet(i).getSize() << "\n";
}
else {
+ // FIXME UNICODE
os << "\\bulletLaTeX " << i << " \""
- << user_defined_bullet(i).getText()
+ << lyx::to_ascii(user_defined_bullet(i).getText())
<< "\"\n";
}
}
os << "\\tracking_changes " << convert<string>(trackChanges) << "\n";
os << "\\output_changes " << convert<string>(outputChanges) << "\n";
- if (trackChanges) {
- // FIXME: Change tracking (MG)
- AuthorList::Authors::const_iterator it = pimpl_->authorlist.begin();
- AuthorList::Authors::const_iterator end = pimpl_->authorlist.end();
- for (; it != end; ++it) {
- os << "\\author " << it->second << "\n";
- }
+ AuthorList::Authors::const_iterator a_it = pimpl_->authorlist.begin();
+ AuthorList::Authors::const_iterator a_end = pimpl_->authorlist.end();
+ for (; a_it != a_end; ++a_it) {
+ os << "\\author " << a_it->second << "\n";
}
}
}
// custom, A3, B3 and B4 paper sizes need geometry
- bool nonstandard_papersize = (papersize == PAPER_B3) ||
- (papersize == PAPER_B4) ||
- (papersize == PAPER_A3) ||
- (papersize == PAPER_CUSTOM);
+ bool nonstandard_papersize = papersize == PAPER_B3
+ || papersize == PAPER_B4
+ || papersize == PAPER_A3
+ || papersize == PAPER_CUSTOM;
if (!use_geometry) {
switch (papersize) {
if (!strOptions.empty()) {
strOptions = rtrim(strOptions, ",");
// FIXME UNICODE
- os << '[' << lyx::from_utf8(strOptions) << ']';
+ os << '[' << from_utf8(strOptions) << ']';
}
- os << '{' << lyx::from_ascii(tclass.latexname()) << "}\n";
+ os << '{' << from_ascii(tclass.latexname()) << "}\n";
texrow.newline();
// end of \documentclass defs
// font selection must be done before loading fontenc.sty
string const fonts =
- loadFonts(features, fontsRoman, fontsSans,
+ loadFonts(fontsRoman, fontsSans,
fontsTypewriter, fontsSC, fontsOSF,
fontsSansScale, fontsTypewriterScale);
if (!fonts.empty()) {
- os << lyx::from_ascii(fonts);
+ os << from_ascii(fonts);
texrow.newline();
}
if (fontsDefaultFamily != "default")
os << "\\renewcommand{\\familydefault}{\\"
- << lyx::from_ascii(fontsDefaultFamily) << "}\n";
+ << from_ascii(fontsDefaultFamily) << "}\n";
// this one is not per buffer
if (lyxrc.fontenc != "default") {
- os << "\\usepackage[" << lyx::from_ascii(lyxrc.fontenc)
+ os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
<< "]{fontenc}\n";
texrow.newline();
}
- // TODO: Some people want to support more encodings than UTF-8. They can have a field day around here
- if (true) {
- os << "\\usepackage[utf8]{inputenc}\n";
- texrow.newline();
- } else {
- if (inputenc == "auto") {
- string const doc_encoding =
- language->encoding()->latexName();
+ if (inputenc == "auto") {
+ string const doc_encoding =
+ language->encoding()->latexName();
- // Create a list with all the input encodings used
- // in the document
- std::set<string> encodings =
- features.getEncodingSet(doc_encoding);
+ // Create a list with all the input encodings used
+ // in the document
+ std::set<string> encodings =
+ features.getEncodingSet(doc_encoding);
+ // thailatex does not use the inputenc package, but sets up
+ // babel directly for tis620-0 encoding, therefore we must
+ // not request inputenc for tis620-0 encoding
+ if (!encodings.empty() || doc_encoding != "tis620-0") {
os << "\\usepackage[";
std::set<string>::const_iterator it = encodings.begin();
std::set<string>::const_iterator const end = encodings.end();
+ if (it != end) {
+ os << from_ascii(*it);
+ ++it;
+ }
for (; it != end; ++it)
- os << lyx::from_ascii(*it) << ',';
- os << lyx::from_ascii(doc_encoding) << "]{inputenc}\n";
- texrow.newline();
- } else if (inputenc != "default") {
- os << "\\usepackage[" << lyx::from_ascii(inputenc)
- << "]{inputenc}\n";
+ os << ',' << from_ascii(*it);
+ if (doc_encoding != "tis620-0") {
+ if (!encodings.empty())
+ os << ',';
+ os << from_ascii(doc_encoding);
+ }
+ os << "]{inputenc}\n";
texrow.newline();
}
+ } else if (inputenc != "default" && inputenc != "tis620-0" &&
+ inputenc != "ascii") {
+ os << "\\usepackage[" << from_ascii(inputenc)
+ << "]{inputenc}\n";
+ texrow.newline();
}
if (use_geometry || nonstandard_papersize) {
case PAPER_CUSTOM:
if (!paperwidth.empty())
os << ",paperwidth="
- << lyx::from_ascii(paperwidth);
+ << from_ascii(paperwidth);
if (!paperheight.empty())
os << ",paperheight="
- << lyx::from_ascii(paperheight);
+ << from_ascii(paperheight);
break;
case PAPER_USLETTER:
os << ",letterpaper";
}
}
if (!topmargin.empty())
- os << ",tmargin=" << lyx::from_ascii(topmargin);
+ os << ",tmargin=" << from_ascii(topmargin);
if (!bottommargin.empty())
- os << ",bmargin=" << lyx::from_ascii(bottommargin);
+ os << ",bmargin=" << from_ascii(bottommargin);
if (!leftmargin.empty())
- os << ",lmargin=" << lyx::from_ascii(leftmargin);
+ os << ",lmargin=" << from_ascii(leftmargin);
if (!rightmargin.empty())
- os << ",rmargin=" << lyx::from_ascii(rightmargin);
+ os << ",rmargin=" << from_ascii(rightmargin);
if (!headheight.empty())
- os << ",headheight=" << lyx::from_ascii(headheight);
+ os << ",headheight=" << from_ascii(headheight);
if (!headsep.empty())
- os << ",headsep=" << lyx::from_ascii(headsep);
+ os << ",headsep=" << from_ascii(headsep);
if (!footskip.empty())
- os << ",footskip=" << lyx::from_ascii(footskip);
+ os << ",footskip=" << from_ascii(footskip);
os << "}\n";
texrow.newline();
}
os << "\\usepackage{fancyhdr}\n";
texrow.newline();
}
- os << "\\pagestyle{" << lyx::from_ascii(pagestyle) << "}\n";
+ os << "\\pagestyle{" << from_ascii(pagestyle) << "}\n";
texrow.newline();
}
if (paragraph_separation) {
switch (getDefSkip().kind()) {
case VSpace::SMALLSKIP:
- os << "\\setlength\\parskip{\\smallskipamount}\n";
+ os << "\\setlength{\\parskip}{\\smallskipamount}\n";
break;
case VSpace::MEDSKIP:
- os << "\\setlength\\parskip{\\medskipamount}\n";
+ os << "\\setlength{\\parskip}{\\medskipamount}\n";
break;
case VSpace::BIGSKIP:
- os << "\\setlength\\parskip{\\bigskipamount}\n";
+ os << "\\setlength{\\parskip}{\\bigskipamount}\n";
break;
case VSpace::LENGTH:
- os << "\\setlength\\parskip{"
- << lyx::from_ascii(getDefSkip().length().asLatexString())
+ os << "\\setlength{\\parskip}{"
+ << from_utf8(getDefSkip().length().asLatexString())
<< "}\n";
break;
default: // should never happen // Then delete it.
- os << "\\setlength\\parskip{\\medskipamount}\n";
+ os << "\\setlength{\\parskip}{\\medskipamount}\n";
break;
}
texrow.newline();
- os << "\\setlength\\parindent{0pt}\n";
+ os << "\\setlength{\\parindent}{0pt}\n";
texrow.newline();
}
// If we use jurabib, we have to call babel here.
if (use_babel && features.isRequired("jurabib")) {
- os << lyx::from_ascii(babelCall(language_options.str()))
+ os << from_ascii(babelCall(language_options.str()))
<< '\n'
- << lyx::from_ascii(features.getBabelOptions());
+ << from_ascii(features.getBabelOptions());
texrow.newline();
}
// Now insert the LyX specific LaTeX commands...
// The optional packages;
- string lyxpreamble(features.getPackages());
+ docstring lyxpreamble(from_ascii(features.getPackages()));
// this might be useful...
lyxpreamble += "\n\\makeatletter\n";
// Some macros LyX will need
- string tmppreamble(features.getMacros());
+ docstring tmppreamble(from_ascii(features.getMacros()));
if (!tmppreamble.empty()) {
lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
/* the user-defined preamble */
if (!preamble.empty()) {
+ // FIXME UNICODE
lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"User specified LaTeX commands.\n"
- + preamble + '\n';
+ + from_utf8(preamble) + '\n';
}
// Itemize bullet settings need to be last in case the user
// Actually it has to be done much later than that
// since some packages like frenchb make modifications
// at \begin{document} time -- JMarc
- string bullets_def;
+ docstring bullets_def;
for (int i = 0; i < 4; ++i) {
if (user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
if (bullets_def.empty())
- bullets_def="\\AtBeginDocument{\n";
+ bullets_def += "\\AtBeginDocument{\n";
bullets_def += " \\def\\labelitemi";
switch (i) {
// `i' is one less than the item to modify
// with other packages.
// Jurabib has to be called after babel, though.
if (use_babel && !features.isRequired("jurabib")) {
- lyxpreamble += babelCall(language_options.str()) + '\n';
- lyxpreamble += features.getBabelOptions();
+ // FIXME UNICODE
+ lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
+ lyxpreamble += from_utf8(features.getBabelOptions());
}
lyxpreamble += "\\makeatother\n";
texrow.newline();
}
- // FIXME UNICODE
- os << lyx::from_utf8(lyxpreamble);
+ os << lyxpreamble;
return use_babel;
}
if (!lex.next()) return;
int const index = lex.getInteger();
lex.next(true);
- string const temp_str = lex.getString();
+ docstring const temp_str = lex.getDocString();
user_defined_bullet(index).setText(temp_str);
temp_bullet(index).setText(temp_str);
}
-string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm,
+string const BufferParams::loadFonts(string const & rm,
string const & sf, string const & tt,
bool const & sc, bool const & osf,
int const & sfscale, int const & ttscale) const
// Times
else if (rm == "times") {
// try to load the best available package
- if (features.isAvailable("mathptmx"))
+ if (LaTeXFeatures::isAvailable("mathptmx"))
os << "\\usepackage{mathptmx}\n";
- else if (features.isAvailable("mathptm"))
+ else if (LaTeXFeatures::isAvailable("mathptm"))
os << "\\usepackage{mathptm}\n";
else
os << "\\usepackage{times}\n";
// Palatino
else if (rm == "palatino") {
// try to load the best available package
- if (features.isAvailable("mathpazo")) {
+ if (LaTeXFeatures::isAvailable("mathpazo")) {
os << "\\usepackage";
if (osf || sc) {
os << '[';
}
os << "{mathpazo}\n";
}
- else if (features.isAvailable("mathpple"))
+ else if (LaTeXFeatures::isAvailable("mathpple"))
os << "\\usepackage{mathpple}\n";
else
os << "\\usepackage{palatino}\n";
else if (rm == "utopia") {
// fourier supersedes utopia.sty, but does
// not work with OT1 encoding.
- if (features.isAvailable("fourier")
+ if (LaTeXFeatures::isAvailable("fourier")
&& lyxrc.fontenc != "default") {
os << "\\usepackage";
if (osf || sc) {
return os.str();
}
+
+
+Encoding const & BufferParams::encoding() const
+{
+ if (inputenc == "auto" || inputenc == "default")
+ return *(language->encoding());
+ Encoding const * const enc =
+ encodings.getFromLaTeXName(inputenc);
+ if (enc)
+ return *enc;
+ lyxerr << "Unknown inputenc value `" << inputenc
+ << "'. Using `auto' instead." << endl;
+ return *(language->encoding());
+}
+
+} // namespace lyx
projects / lyx.git / blobdiff