X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Foutput_latex.cpp;h=697a3b5028d3cb97a2263cb0e04f588c4ce6d033;hb=3d4076b598deb18660e50ec9c327efc3b15f15d0;hp=6785c2749eeb83379922e84fb0032d53a30aaf29;hpb=a7f8fb8c5fe8f99b30e3d507dc20d455c65a4b27;p=lyx.git diff --git a/src/output_latex.cpp b/src/output_latex.cpp index 6785c2749e..697a3b5028 100644 --- a/src/output_latex.cpp +++ b/src/output_latex.cpp @@ -33,6 +33,7 @@ #include "support/convert.h" #include "support/debug.h" #include "support/lstrings.h" +#include "support/textutils.h" #include #include @@ -163,9 +164,9 @@ static TeXEnvironmentData prepareEnvironment(Buffer const & buf, if (style.isEnvironment()) { os << "\\begin{" << from_ascii(style.latexname()) << '}'; if (!style.latexargs().empty()) { - OutputParams rp = runparams; - rp.local_font = &pit->getFirstFontSettings(bparams); - latexArgInsets(*pit, os, rp, style.latexargs()); + OutputParams rp = runparams; + rp.local_font = &pit->getFirstFontSettings(bparams); + latexArgInsets(paragraphs, pit, os, rp, style.latexargs()); } if (style.latextype == LATEX_LIST_ENVIRONMENT) { os << '{' @@ -312,39 +313,10 @@ void TeXEnvironment(Buffer const & buf, Text const & text, LYXERR(Debug::LATEX, "TeXEnvironment for paragraph " << par_begin << " done."); } -} // namespace anon - -void latexArgInsets(Paragraph const & par, otexstream & os, - OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs) +void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, + map ilist, vector required, string const & prefix) { - map ilist; - vector required; - - InsetList::const_iterator it = par.insetList().begin(); - InsetList::const_iterator end = par.insetList().end(); - for (; it != end; ++it) { - if (it->inset->lyxCode() == ARG_CODE) { - InsetArgument const * ins = - static_cast(it->inset); - if (ins->name().empty()) - LYXERR0("Error: Unnamed argument inset!"); - else { - unsigned int const nr = convert(ins->name()); - ilist[nr] = ins; - Layout::LaTeXArgMap::const_iterator const lit = - latexargs.find(nr); - if (lit != latexargs.end()) { - Layout::latexarg const & arg = (*lit).second; - if (!arg.requires.empty()) { - vector req = getVectorFromString(arg.requires); - required.insert(required.end(), req.begin(), req.end()); - } - } - } - } - } - unsigned int const argnr = latexargs.size(); if (argnr == 0) return; @@ -356,7 +328,7 @@ void latexArgInsets(Paragraph const & par, otexstream & os, InsetArgument const * ins = (*lit).second; if (ins) { Layout::LaTeXArgMap::const_iterator const lait = - latexargs.find(convert(ins->name())); + latexargs.find(ins->name()); if (lait != latexargs.end()) { Layout::latexarg arg = (*lait).second; docstring ldelim = arg.mandatory ? @@ -367,7 +339,7 @@ void latexArgInsets(Paragraph const & par, otexstream & os, ldelim = arg.ldelim; if (!arg.rdelim.empty()) rdelim = arg.rdelim; - ins->latexArgument(os, runparams, ldelim, rdelim); + ins->latexArgument(os, runparams, ldelim, rdelim, arg.presetarg); inserted = true; } } @@ -376,16 +348,29 @@ void latexArgInsets(Paragraph const & par, otexstream & os, Layout::LaTeXArgMap::const_iterator lait = latexargs.begin(); Layout::LaTeXArgMap::const_iterator const laend = latexargs.end(); for (; lait != laend; ++lait) { - if ((*lait).first == i) { + string const name = prefix + convert(i); + if ((*lait).first == name) { Layout::latexarg arg = (*lait).second; + docstring preset = arg.presetarg; + if (!arg.defaultarg.empty()) { + if (!preset.empty()) + preset += ","; + preset += arg.defaultarg; + } if (arg.mandatory) { docstring ldelim = arg.ldelim.empty() ? from_ascii("{") : arg.ldelim; docstring rdelim = arg.rdelim.empty() ? from_ascii("}") : arg.rdelim; - os << ldelim << rdelim; + os << ldelim << preset << rdelim; + } else if (!preset.empty()) { + docstring ldelim = arg.ldelim.empty() ? + from_ascii("[") : arg.ldelim; + docstring rdelim = arg.rdelim.empty() ? + from_ascii("]") : arg.rdelim; + os << ldelim << preset << rdelim; } else if (find(required.begin(), required.end(), - convert((*lait).first)) != required.end()) { + (*lait).first) != required.end()) { docstring ldelim = arg.ldelim.empty() ? from_ascii("[") : arg.ldelim; docstring rdelim = arg.rdelim.empty() ? @@ -399,6 +384,103 @@ void latexArgInsets(Paragraph const & par, otexstream & os, } } + +} // namespace anon + + +void latexArgInsets(Paragraph const & par, otexstream & os, + OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, string const & prefix) +{ + map ilist; + vector required; + + InsetList::const_iterator it = par.insetList().begin(); + InsetList::const_iterator end = par.insetList().end(); + for (; it != end; ++it) { + if (it->inset->lyxCode() == ARG_CODE) { + InsetArgument const * ins = + static_cast(it->inset); + if (ins->name().empty()) + LYXERR0("Error: Unnamed argument inset!"); + else { + string const name = prefix.empty() ? ins->name() : split(ins->name(), ':'); + unsigned int const nr = convert(name); + ilist[nr] = ins; + Layout::LaTeXArgMap::const_iterator const lit = + latexargs.find(ins->name()); + if (lit != latexargs.end()) { + Layout::latexarg const & arg = (*lit).second; + if (!arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + } + } + } + getArgInsets(os, runparams, latexargs, ilist, required, prefix); +} + + +void latexArgInsets(ParagraphList const & pars, ParagraphList::const_iterator pit, + otexstream & os, OutputParams const & runparams, Layout::LaTeXArgMap const & latexargs, + string const & prefix) +{ + map ilist; + vector required; + + depth_type const current_depth = pit->params().depth(); + Layout const current_layout = pit->layout(); + + // get the first paragraph in sequence with this layout and depth + pit_type offset = 0; + while (true) { + if (boost::prior(pit, offset) == pars.begin()) + break; + ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1); + if (priorpit->layout() == current_layout + && priorpit->params().depth() == current_depth) + ++offset; + else + break; + } + + ParagraphList::const_iterator spit = boost::prior(pit, offset); + + for (; spit != pars.end(); ++spit) { + if (spit->layout() != current_layout || spit->params().depth() < current_depth) + break; + if (spit->params().depth() > current_depth) + continue; + InsetList::const_iterator it = spit->insetList().begin(); + InsetList::const_iterator end = spit->insetList().end(); + for (; it != end; ++it) { + if (it->inset->lyxCode() == ARG_CODE) { + InsetArgument const * ins = + static_cast(it->inset); + if (ins->name().empty()) + LYXERR0("Error: Unnamed argument inset!"); + else { + string const name = prefix.empty() ? ins->name() : split(ins->name(), ':'); + unsigned int const nr = convert(name); + if (ilist.find(nr) == ilist.end()) + ilist[nr] = ins; + Layout::LaTeXArgMap::const_iterator const lit = + latexargs.find(ins->name()); + if (lit != latexargs.end()) { + Layout::latexarg const & arg = (*lit).second; + if (!arg.requires.empty()) { + vector req = getVectorFromString(arg.requires); + required.insert(required.end(), req.begin(), req.end()); + } + } + } + } + } + } + getArgInsets(os, runparams, latexargs, ilist, required, prefix); +} + namespace { // output the proper paragraph start according to latextype. @@ -409,14 +491,18 @@ void parStartCommand(Paragraph const & par, otexstream & os, case LATEX_COMMAND: os << '\\' << from_ascii(style.latexname()); - // Separate handling of optional argument inset. + // Command arguments if (!style.latexargs().empty()) latexArgInsets(par, os, runparams, style.latexargs()); os << from_ascii(style.latexparam()); break; case LATEX_ITEM_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT: - os << "\\item "; + os << "\\" + style.itemcommand(); + // Item arguments + if (!style.itemargs().empty()) + latexArgInsets(par, os, runparams, style.itemargs(), "item:"); + os << " "; break; case LATEX_BIB_ENVIRONMENT: // ignore this, the inset will write itself @@ -501,7 +587,7 @@ void TeXOnePar(Buffer const & buf, os << '\n'; if (!style.parbreak_is_newline) { os << '\n'; - } else if (nextpar) { + } else if (nextpar && !style.isEnvironment()) { Layout const nextstyle = text.inset().forcePlainLayout() ? bparams.documentClass().plainLayout() : nextpar->layout(); @@ -661,7 +747,7 @@ void TeXOnePar(Buffer const & buf, par.getFontSettings(bparams, i).language()->encoding(); if (encoding->package() != Encoding::CJK && runparams.encoding->package() == Encoding::inputenc - && c < 0x80) + && isASCII(c)) continue; if (par.isInset(i)) break; @@ -755,6 +841,8 @@ void TeXOnePar(Buffer const & buf, os << "\\" << from_ascii(font.latexSize()) << " \\par}"; } else if (is_command) { os << '}'; + if (!style.postcommandargs().empty()) + latexArgInsets(par, os, runparams, style.postcommandargs(), "post:"); if (runparams.encoding != prev_encoding) { runparams.encoding = prev_encoding; if (!runparams.isFullUnicode()) @@ -953,6 +1041,9 @@ void latexParagraphs(Buffer const & buf, OutputParams const & runparams, string const & everypar) { + LASSERT(runparams.par_begin <= runparams.par_end, + { os << "% LaTeX Output Error\n"; return; } ); + BufferParams const & bparams = buf.params(); bool const maintext = text.isMainText(); @@ -990,7 +1081,6 @@ void latexParagraphs(Buffer const & buf, } ParagraphList const & paragraphs = text.paragraphs(); - LASSERT(runparams.par_begin <= runparams.par_end, /**/); if (runparams.par_begin == runparams.par_end) { // The full doc will be exported but it is easier to just rely on