+2003-12-31 Martin Vermeer <martin.vermeer@hut.fi>
+
+ * layouts/agu_stdclass.inc:
+ * layouts/agu_std sections.inc:
+ * layouts/agu_stdtitle.inc: moving LatexParam functionality into
+ .layout files
+
2003-12-22 Michael Schmitt <michael.schmitt@teststep.org>
* layouts/g-brief2-en.layout: fix spelling,
2003-12-22 Michael Schmitt <michael.schmitt@teststep.org>
* layouts/g-brief2-en.layout: fix spelling,
Align Block
AlignPossible Block
LabelType No_Label
Align Block
AlignPossible Block
LabelType No_Label
+ LatexParam "id="para#""
InnerTag head
LabelTag label
CommandDepth 2
InnerTag head
LabelTag label
CommandDepth 2
+ LatexParam "id = "s#""
InnerTag head
LabelTag label
CommandDepth 3
InnerTag head
LabelTag label
CommandDepth 3
+ LatexParam "id = "s#""
InnerTag head
LabelTag label
CommandDepth 4
InnerTag head
LabelTag label
CommandDepth 4
+ LatexParam "id = "s#""
InnerTag head
LabelTag label
CommandDepth 5
InnerTag head
LabelTag label
CommandDepth 5
+ LatexParam "id = "s#""
InnerTag head
LabelTag label
CommandDepth 6
InnerTag head
LabelTag label
CommandDepth 6
+ LatexParam "id = "s#""
End
Style Subsubparagraph
End
Style Subsubparagraph
InnerTag head
LabelTag label
CommandDepth 7
InnerTag head
LabelTag label
CommandDepth 7
+ LatexParam "id = "s#""
Style AGU-journal
CopyStyle Special-section
Style AGU-journal
CopyStyle Special-section
+ LatexParam "journal-code="$1" electronic-only="yes""
LatexName AGU-journal
LabelString "AGU-journal: "
CommandDepth 3
LatexName AGU-journal
LabelString "AGU-journal: "
CommandDepth 3
+2003-12-31 Martin Vermeer <martin.vermeer@hut.fi>
+
+ * output_docbook.C: moving LatexParam functionality into
+ .layout files
+
2003-12-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* buffer.C: increment format to 229.
2003-12-29 Jürgen Spitzmüller <j.spitzmueller@gmx.de>
* buffer.C: increment format to 229.
#include "buffer.h"
#include "bufferparams.h"
#include "counters.h"
#include "buffer.h"
#include "bufferparams.h"
#include "counters.h"
#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
#include "lyxtext.h"
#include "paragraph.h"
#include "paragraph_funcs.h"
if (!style->latexparam().empty()) {
counters.step("para");
int i = counters.value("para");
if (!style->latexparam().empty()) {
counters.step("para");
int i = counters.value("para");
- ls = "id=\"" + subst(style->latexparam(), "#", tostr(i)) + '"';
+ ls = subst(style->latexparam(), "#", tostr(i));
}
sgml::openTag(os, depth + command_depth,
false, style->latexname(), ls);
}
sgml::openTag(os, depth + command_depth,
false, style->latexname(), ls);
command_stack.push_back(string());
command_stack[command_depth] = command_name;
command_stack.push_back(string());
command_stack[command_depth] = command_name;
- if (!style->latexparam().empty()) {
+ if (style->latexparam().find('#') != string::npos) {
counters.step(style->counter);
}
// treat label as a special case for
counters.step(style->counter);
}
// treat label as a special case for
command_name += '"';
labelid = true;
}
command_name += '"';
labelid = true;
}
- } else {
- if (!style->latexparam().empty()) {
- ls = expandLabel(buf.params().getLyXTextClass(), style, false);
- ls = "id=\"" + subst(style->latexparam(), "#", ls) + '"';
- }
+ }
+ 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);
}
sgml::openTag(os, depth + command_depth, false, command_name, ls);