From f6d505c1ee494ab0d30eebba86082c86a915e1df Mon Sep 17 00:00:00 2001 From: Pavel Sanda Date: Thu, 23 May 2013 22:17:20 -0700 Subject: [PATCH] Years forgotten files. --- src/Makefile.am | 2 - src/mathed/CMakeLists.txt | 3 +- src/mathed/InsetFormulaMacro.cpp | 179 ------------------------------- src/mathed/InsetFormulaMacro.h | 77 ------------- 4 files changed, 1 insertion(+), 260 deletions(-) delete mode 100644 src/mathed/InsetFormulaMacro.cpp delete mode 100644 src/mathed/InsetFormulaMacro.h diff --git a/src/Makefile.am b/src/Makefile.am index 761c8e4291..fc4a5fe15d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -364,8 +364,6 @@ liblyxgraphics_a_SOURCES = \ ############################### Mathed ############################## -EXTRA_DIST += mathed/InsetFormulaMacro.cpp - noinst_LIBRARIES += liblyxmathed.a SOURCEFILESMATHED = \ diff --git a/src/mathed/CMakeLists.txt b/src/mathed/CMakeLists.txt index 8a3cf36154..04c1a51939 100644 --- a/src/mathed/CMakeLists.txt +++ b/src/mathed/CMakeLists.txt @@ -10,8 +10,7 @@ file(GLOB mathed_sources ${TOP_SRC_DIR}/src/mathed/${LYX_CPP_FILES}) file(GLOB mathed_headers ${TOP_SRC_DIR}/src/mathed/${LYX_HPP_FILES}) list(REMOVE_ITEM mathed_sources - ${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.cpp - ${TOP_SRC_DIR}/src/mathed/InsetFormulaMacro.cpp) + ${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.cpp) lyx_add_msvc_pch(mathed) diff --git a/src/mathed/InsetFormulaMacro.cpp b/src/mathed/InsetFormulaMacro.cpp deleted file mode 100644 index 88897021fe..0000000000 --- a/src/mathed/InsetFormulaMacro.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/** - * \file InsetFormulaMacro.cpp - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author Alejandro Aguilar Sierra - * \author André Pönitz - * - * Full author contact details are available in file CREDITS. - */ - -#include - -#include "InsetFormulaMacro.h" -#include "MacroTable.h" -#include "MathMacroTemplate.h" - -#include "BufferView.h" -#include "Cursor.h" -#include "support/debug.h" -#include "support/gettext.h" -#include "Lexer.h" -#include "OutputParams.h" - -#include "frontends/FontMetrics.h" -#include "frontends/Painter.h" - -#include "support/lstrings.h" - -#include - -using namespace std; -using namespace lyx::support; - -namespace lyx { - - -InsetFormulaMacro::InsetFormulaMacro() - : InsetMathNest(2), name_(from_ascii("unknownA")) -{} - - -InsetFormulaMacro::InsetFormulaMacro - (docstring const & name, int nargs, docstring const & type) - : InsetMathNest(2), name_(name) -{ - MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type))); -} - - -InsetFormulaMacro::InsetFormulaMacro(string const & s) - : InsetMathNest(2), name_("unknownB") -{ - istringstream is(s); - read(is); -} - - -Inset * InsetFormulaMacro::clone() const -{ - return new InsetFormulaMacro(*this); -} - - -void InsetFormulaMacro::write(ostream & os) const -{ - os << "FormulaMacro\n"; - WriteStream wi(os, false, false, WriteStream::wsDefault); - tmpl()->write(wi); -} - - -void InsetFormulaMacro::latex(otexstream & os, - OutputParams const & runparams) const -{ - //lyxerr << "InsetFormulaMacro::latex" << endl; - WriteStream wi(os.os(), runparams.moving_arg, true, - runparams.dryrun ? WriteStream::wsDryrun: WriteStream::wsDefault, - runparams.encoding); - wi.canBreakLine(os.canBreakLine()); - tmpl()->write(wi); - os.canBreakLine(wi.canBreakLine()); - os.texrow().newlines(wi.line()); -} - - -int InsetFormulaMacro::plaintext(odocstringstream & os, OutputParams const & runparams, size_t) const -{ - odocstringstream oss; - WriteStream wi(oss, false, true, WriteStream::wsDefault, runparams.encoding); - tmpl()->write(wi); - - docstring const str = oss.str(); - os << str; - return str.size(); -} - - -int InsetFormulaMacro::docbook(ostream & os, - OutputParams const & runparams) const -{ - return plaintext(os, runparams); -} - - -void InsetFormulaMacro::read(Lexer & lex) -{ - read(lex.getStream()); -} - - -void InsetFormulaMacro::read(istream & is) -{ - auto_ptr p(new MathMacroTemplate(is)); - name_ = p->name(); - MathMacroTable::create(MathAtom(p.release())); -} - - -string InsetFormulaMacro::prefix() const -{ - return to_utf8(bformat(_(" Macro: %1$s: "), lyx::from_utf8(name_))); -} - - -void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const -{ - //lyxerr << "InsetFormulaMacro: " << this << " -- " << &tmpl() << endl; - tmpl()->metrics(mi, dim); - dim.asc += 5; - dim.des += 5; - dim.wid += 10 + theFontMetrics(mi.base.font).width(prefix()); - dim_ = dim; -} - - -void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const -{ - // label - Font font = p.base.font; - font.setColor(Color_math); - - PainterInfo pi(p.base.bv, p.pain); - pi.base.style = LM_ST_TEXT; - pi.base.font = font; - - int const a = y - dim_.asc + 1; - int const w = dim_.wid - 2; - int const h = dim_.height() - 2; - - // Color_mathbg used to be "AntiqueWhite" but is "linen" now, too - pi.pain.fillRectangle(x, a, w, h, Color_mathmacrobg); - pi.pain.rectangle(x, a, w, h, Color_mathframe); - - // FIXME -#if 0 - Cursor & cur = p.base.bv->cursor(); - if (cur.isInside(this)) - cur.drawSelection(pi); -#endif - - pi.pain.text(x + 2, y, prefix(), font); - - // body - tmpl()->draw(pi, - x + theFontMetrics(p.base.font).width(prefix()) + 5, - y); - - setPosCache(pi, x, y); -} - - -MathAtom & InsetFormulaMacro::tmpl() const -{ - return MathMacroTable::provide(name_); -} - - -} // namespace lyx diff --git a/src/mathed/InsetFormulaMacro.h b/src/mathed/InsetFormulaMacro.h deleted file mode 100644 index 25e8969580..0000000000 --- a/src/mathed/InsetFormulaMacro.h +++ /dev/null @@ -1,77 +0,0 @@ -// -*- C++ -*- -/** - * \file InsetFormulaMacro.h - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author Alejandro Aguilar Sierra - * \author André Pönitz - * - * Full author contact details are available in file CREDITS. - */ - -#ifndef INSET_FORMULA_MACRO_H -#define INSET_FORMULA_MACRO_H - -#include "InsetMathNest.h" - - -namespace lyx { - -class MathMacroTemplate; -class Lexer; - - -// An InsetFormulaMacro only knows its name and asks the global -// MathMacroTable if it needs to know more. - -/// Main LyX Inset for defining math macros -class InsetFormulaMacro : public InsetMathNest { -public: - /// - InsetFormulaMacro(Buffer * buf); - /// construct a macro hull from its name and the number of arguments - InsetFormulaMacro(Buffer * buf, docstring const & name, int nargs, docstring const & t); - /// constructs a mocro from its LaTeX definition - explicit InsetFormulaMacro(docstring const & s); - /// - void metrics(MetricsInfo & mi, Dimension & dim) const; - /// - void draw(PainterInfo & pi, int x, int y) const; - - /// - void read(Lexer & lex); - /// - void write(std::ostream & os) const; - /// - int latex(otexstream & os, OutputParams const &) const; - /// - int plaintext(odocstringstream &, OutputParams const &, size_t) const; - /// - int docbook(odocstream &, OutputParams const &) const; - - /// - InsetCode lyxCode() const { return MATHMACRO_CODE_CODE; } - /// - docstring const & getInsetName() const { return name_; } - /// - bool editable() const { return true; } - /// - InsetCode lyxCode() const { return MATH_FORMULA_MACRO_CODE; } -private: - /// - MathAtom & tmpl() const; - /// - void read(std::istream & is); - /// prefix in inset - docstring prefix() const; - /// - docstring name_; - /// - Inset * clone() const; -}; - - -} // namespace lyx - -#endif -- 2.39.5