#include "insetspecialchar.h"
#include "debug.h"
#include "LaTeXFeatures.h"
+#include "BufferView.h"
#include "Painter.h"
+#include "font.h"
+using std::ostream;
using std::max;
InsetSpecialChar::InsetSpecialChar(Kind k)
int InsetSpecialChar::ascent(Painter &, LyXFont const & font) const
{
- return font.maxAscent();
+ return lyxfont::maxAscent(font);
}
int InsetSpecialChar::descent(Painter &, LyXFont const & font) const
{
- return font.maxDescent();
+ return lyxfont::maxDescent(font);
}
switch (kind) {
case HYPHENATION:
{
- int w = font.textWidth("-", 1);
+ int w = lyxfont::width('-', font);
if (w > 5)
w -= 2; // to make it look shorter
return w;
}
case END_OF_SENTENCE:
{
- return font.textWidth(".", 1);
+ return lyxfont::width('.', font);
}
case LDOTS:
{
- return font.textWidth(". . .", 5);
+ return lyxfont::width(". . .", font);
}
case MENU_SEPARATOR:
{
- return font.textWidth(" x ", 3);
+ return lyxfont::width(" x ", font);
}
-#if 0
- case NEWLINE:
- {
- }
-#endif
case PROTECTED_SEPARATOR:
{
- return font.textWidth("x", 1);
+ return lyxfont::width('x', font);
}
}
}
-void InsetSpecialChar::draw(Painter & pain, LyXFont const & f,
- int baseline, float & x) const
+void InsetSpecialChar::draw(BufferView * bv, LyXFont const & f,
+ int baseline, float & x, bool) const
{
+ Painter & pain = bv->painter();
LyXFont font(f);
+
switch (kind) {
case HYPHENATION:
{
case MENU_SEPARATOR:
{
// A triangle the width and height of an 'x'
- int w = font.textWidth("x", 1);
- int ox = font.textWidth(" ", 1) + int(x);
- int h = font.ascent('x');
+ int w = lyxfont::width('x', font);
+ int ox = lyxfont::width(' ', font) + int(x);
+ int h = lyxfont::ascent('x', font);
int xp[4], yp[4];
xp[0] = ox; yp[0] = baseline;
x += width(pain, font);
break;
}
-#if 0
- case NEWLINE:
- {
- }
-#endif
case PROTECTED_SEPARATOR:
{
float w = width(pain, font);
- int h = font.ascent('x');
+ int h = lyxfont::ascent('x', font);
int xp[4], yp[4];
xp[0] = int(x);
// In lyxf3 this will be just LaTeX
-void InsetSpecialChar::Write(ostream & os) const
+void InsetSpecialChar::Write(Buffer const *, ostream & os) const
{
string command;
switch (kind) {
case END_OF_SENTENCE: command = "\\@."; break;
case LDOTS: command = "\\ldots{}"; break;
case MENU_SEPARATOR: command = "\\menuseparator"; break;
-#if 0
- case NEWLINE: command = "\\newline"; break;
-#endif
case PROTECTED_SEPARATOR:
- command = "\\protected_separator"; break;
+ //command = "\\protected_separator";
+ command = "~";
+ break;
}
os << "\\SpecialChar " << command << "\n";
}
// This function will not be necessary when lyx3
-void InsetSpecialChar::Read(LyXLex & lex)
+void InsetSpecialChar::Read(Buffer const *, LyXLex & lex)
{
lex.nextToken();
string command = lex.GetString();
kind = LDOTS;
else if (command == "\\menuseparator")
kind = MENU_SEPARATOR;
- else if (command == "\\protected_separator")
+ else if (command == "\\protected_separator"
+ || command == "~")
kind = PROTECTED_SEPARATOR;
else
lex.printError("InsetSpecialChar: Unknown kind: `$$Token'");
}
-int InsetSpecialChar::Latex(ostream & os, signed char /*fragile*/) const
+int InsetSpecialChar::Latex(Buffer const *, ostream & os, bool /*fragile*/,
+ bool free_space) const
{
-#ifdef USE_OSTREAM_ONLY
switch (kind) {
case HYPHENATION: os << "\\-"; break;
case END_OF_SENTENCE: os << "\\@."; break;
case LDOTS: os << "\\ldots{}"; break;
case MENU_SEPARATOR: os << "\\lyxarrow{}"; break;
- case PROTECTED_SEPARATOR: os << "~"; break;
- }
- return 0;
-#else
- string command;
- signed char dummy = 0;
- Latex(command, dummy);
- os << command;
- return 0;
-#endif
-}
-
-
-#ifndef USE_OSTREAM_ONLY
-int InsetSpecialChar::Latex(string & file, signed char /*fragile*/) const
-{
- switch (kind) {
- case HYPHENATION: file += "\\-"; break;
- case END_OF_SENTENCE: file += "\\@."; break;
- case LDOTS: file += "\\ldots{}"; break;
- case MENU_SEPARATOR: file += "\\lyxarrow{}"; break;
- case PROTECTED_SEPARATOR: file += "~"; break;
+ case PROTECTED_SEPARATOR: os << (free_space ? " " : "~"); break;
}
return 0;
}
-
-int InsetSpecialChar::Linuxdoc(string & file) const
+int InsetSpecialChar::Ascii(Buffer const *, ostream & os) const
{
switch (kind) {
- case HYPHENATION: file += ""; break;
- case END_OF_SENTENCE: file += ""; break;
- case LDOTS: file += "..."; break;
- case MENU_SEPARATOR: file += "->"; break;
- case PROTECTED_SEPARATOR: file += " "; break;
- }
- return 0;
-}
-
-
-int InsetSpecialChar::DocBook(string & file) const
-{
- switch (kind) {
- case HYPHENATION: file += ""; break;
- case END_OF_SENTENCE: file += ""; break;
- case LDOTS: file += "..."; break;
- case MENU_SEPARATOR: file += "->"; break;
- case PROTECTED_SEPARATOR: file += " "; break;
+ case HYPHENATION: break;
+ case END_OF_SENTENCE: os << "."; break;
+ case LDOTS: os << "..."; break;
+ case MENU_SEPARATOR: os << "->"; break;
+ case PROTECTED_SEPARATOR: os << " "; break;
}
return 0;
}
-#else
-int InsetSpecialChar::Linuxdoc(ostream & os) const
+int InsetSpecialChar::Linuxdoc(Buffer const * buf, ostream & os) const
{
- switch (kind) {
- case HYPHENATION: os << ""; break;
- case END_OF_SENTENCE: os << ""; break;
- case LDOTS: os << "..."; break;
- case MENU_SEPARATOR: os << "->"; break;
- case PROTECTED_SEPARATOR: os << " "; break;
- }
- return 0;
+ return Ascii(buf, os);
}
-int InsetSpecialChar::DocBook(ostream & os) const
+int InsetSpecialChar::DocBook(Buffer const * buf, ostream & os) const
{
- switch (kind) {
- case HYPHENATION: os << ""; break;
- case END_OF_SENTENCE: os << ""; break;
- case LDOTS: os << "..."; break;
- case MENU_SEPARATOR: os << "->"; break;
- case PROTECTED_SEPARATOR: os << " "; break;
- }
- return 0;
+ return Ascii(buf, os);
}
-#endif
Inset * InsetSpecialChar::Clone() const
projects / lyx.git / blobdiff