#include "buffer.h"
#include "bufferparams.h"
+#include "counters.h"
+#include "debug.h"
+#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
+#include "support/tostr.h"
#include <stack>
using lyx::support::atoi;
using lyx::support::split;
+using lyx::support::subst;
using std::endl;
using std::ostream;
Paragraph::depth_type cmd_depth = 0;
Paragraph::depth_type depth = 0; // paragraph depth
- string item_name;
string command_name;
+ string item_tag;
+
ParagraphList::iterator par = const_cast<ParagraphList&>(paragraphs).begin();
ParagraphList::iterator pend = const_cast<ParagraphList&>(paragraphs).end();
+ Counters & counters = buf.params().getLyXTextClass().counters();
+
for (; par != pend; ++par) {
- string sgmlparam;
- string c_depth;
- string c_params;
- int desc_on = 0; // description mode
LyXLayout_ptr const & style = par->layout();
// environment tag closing
for (; depth > par->params().depth(); --depth) {
- if (!environment_inner[depth].empty())
sgml::closeEnvTags(os, false, environment_inner[depth],
- command_depth + depth);
+ item_tag, command_depth + depth);
sgml::closeTag(os, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
&& environment_stack[depth] != style->latexname()
&& !environment_stack[depth].empty()) {
sgml::closeEnvTags(os, false, environment_inner[depth],
- command_depth + depth);
+ item_tag, command_depth + depth);
sgml::closeTag(os, depth + command_depth, false, environment_stack[depth]);
environment_stack[depth].erase();
environment_inner[depth].erase();
}
-
+
+ string ls = "";
+ bool labelid = false;
// Write opening SGML tags.
switch (style->latextype) {
case LATEX_PARAGRAPH:
+ if (!style->latexparam().empty()) {
+ counters.step("para");
+ int i = counters.value("para");
+ ls = subst(style->latexparam(), "#", tostr(i));
+ }
sgml::openTag(os, depth + command_depth,
- false, style->latexname());
+ false, style->latexname(), ls);
break;
case LATEX_COMMAND:
command_name = style->latexname();
- sgmlparam = style->latexparam();
- c_params = split(sgmlparam, c_depth,'|');
-
- cmd_depth = atoi(c_depth);
-
+ cmd_depth = style->commanddepth;
+
if (command_flag) {
if (cmd_depth < command_base) {
for (Paragraph::depth_type j = command_depth;
command_stack.push_back(string());
command_stack[command_depth] = command_name;
+ if (style->latexparam().find('#') != string::npos) {
+ counters.step(style->counter);
+ }
// treat label as a special case for
// more WYSIWYM handling.
// This is a hack while paragraphs can't have
// attributes, like id in this case.
- if (par->isInset(0)) {
- InsetOld * inset = par->getInset(0);
- InsetOld::Code lyx_code = inset->lyxCode();
- if (lyx_code == InsetOld::LABEL_CODE) {
+ if (par->size() && par->isInset(0)) {
+ InsetBase * inset = par->getInset(0);
+ if (inset->lyxCode() == InsetOld::LABEL_CODE) {
command_name += " id=\"";
command_name += (static_cast<InsetCommand *>(inset))->getContents();
command_name += '"';
- desc_on = 3;
+ labelid = true;
}
}
+ if (!labelid && !style->latexparam().empty()) {
+ ls = style->latexparam();
+ if (ls.find('#') != string::npos) {
+ string el = expandLabel(buf.params().getLyXTextClass(),
+ style, false);
+ ls = subst(ls, "#", el);
+ }
+ }
+
+ sgml::openTag(os, depth + command_depth, false, command_name, ls);
+
+ // Label around sectioning number:
+ if (!style->labeltag().empty()) {
+ sgml::openTag(os, depth + 1 + command_depth, false,
+ style->labeltag());
+ os << expandLabel(buf.params().getLyXTextClass(), style, false);
+ sgml::closeTag(os, depth + 1 + command_depth, false,
+ style->labeltag());
+ }
- sgml::openTag(os, depth + command_depth, false, command_name);
-
- item_name = c_params.empty() ? "title" : c_params;
- sgml::openTag(os, depth + 1 + command_depth, false, item_name);
+ // Inner tagged header text, e.g. <title> for sectioning:
+ sgml::openTag(os, depth + 1 + command_depth, false,
+ style->innertag());
break;
case LATEX_ENVIRONMENT:
}
environment_stack[depth] = style->latexname();
environment_inner[depth] = "!-- --";
- sgml::openTag(os, depth + command_depth, false, environment_stack[depth]);
+ // outputs <environment_stack[depth] latexparam()>
+ sgml::openTag(os, depth + command_depth, false,
+ environment_stack[depth], style->latexparam());
} else {
- sgml::closeEnvTags(os, false, environment_inner[depth],
- command_depth + depth);
+ sgml::closeEnvTags(os, false, environment_inner[depth],
+ style->itemtag(), command_depth + depth);
}
if (style->latextype == LATEX_ENVIRONMENT) {
- if (!style->latexparam().empty()) {
- if (style->latexparam() == "CDATA")
+ if (!style->innertag().empty()) {
+ if (style->innertag() == "CDATA")
os << "<![CDATA[";
else
- sgml::openTag(os, depth + command_depth, false, style->latexparam());
+ sgml::openTag(os, depth + command_depth, false,
+ style->innertag());
}
break;
}
- desc_on = (style->labeltype == LABEL_MANUAL);
+ environment_inner[depth] = style->innertag();
- environment_inner[depth] = desc_on ? "varlistentry" : "listitem";
- sgml::openTag(os, depth + 1 + command_depth,
+ if (!environment_inner[depth].empty())
+ sgml::openTag(os, depth + 1 + command_depth,
false, environment_inner[depth]);
-
- item_name = desc_on ? "term" : "para";
- sgml::openTag(os, depth + 1 + command_depth,
- false, item_name);
break;
default:
sgml::openTag(os, depth + command_depth,
break;
}
- par->simpleDocBookOnePar(buf, os, outerFont(par, paragraphs), desc_on,
- runparams, depth + 1 + command_depth);
+ par->simpleDocBookOnePar(buf, os, outerFont(par, paragraphs),
+ runparams, depth + 1 + command_depth, labelid);
- string end_tag;
// write closing SGML tags
switch (style->latextype) {
case LATEX_COMMAND:
- end_tag = c_params.empty() ? "title" : c_params;
- sgml::closeTag(os, depth + command_depth,
- false, end_tag);
+ sgml::closeTag(os, depth + command_depth, false,
+ style->innertag());
break;
case LATEX_ENVIRONMENT:
- if (!style->latexparam().empty()) {
- if (style->latexparam() == "CDATA")
+ if (!style->innertag().empty()) {
+ if (style->innertag() == "CDATA")
os << "]]>";
else
- sgml::closeTag(os, depth + command_depth, false, style->latexparam());
+ sgml::closeTag(os, depth + command_depth, false,
+ style->innertag());
}
break;
case LATEX_ITEM_ENVIRONMENT:
- if (desc_on == 1) break;
- end_tag = "para";
- sgml::closeTag(os, depth + 1 + command_depth, false, end_tag);
+ item_tag = style->itemtag();
break;
case LATEX_PARAGRAPH:
sgml::closeTag(os, depth + command_depth, false, style->latexname());
for (int d = depth; d >= 0; --d) {
if (!environment_stack[depth].empty()) {
sgml::closeEnvTags(os, false, environment_inner[depth],
- command_depth + depth);
+ item_tag, command_depth + depth);
}
}
projects / lyx.git / blobdiff