Running Angus' rmcopyright.sh and hand-correcting a few cases.

Still a lot to be done in this area...


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5262 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2002-09-11 08:26:02 +00:00
parent 12b01bf0a2
commit bf2e2d58f3
47 changed files with 229 additions and 84 deletions

View File

@ -1,3 +1,7 @@
#ifdef __GNUG__
#pragma implementation
#endif
#include <config.h> #include <config.h>
#include "button_inset.h" #include "button_inset.h"

View File

@ -1,10 +1,26 @@
// -*- C++ -*-
/**
* \file button_inset.h
*
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#ifndef BUTTON_INSET_H #ifndef BUTTON_INSET_H
#define BUTTON_INSET_H #define BUTTON_INSET_H
#ifdef __GNUG__
#pragma interface
#endif
#include "math_nestinset.h" #include "math_nestinset.h"
// Try to implement the reference inset "natively" for mathed. /// try to implement the button-like insets "natively" for mathed
class ButtonInset: public MathNestInset { class ButtonInset: public MathNestInset {
public: public:
/// ///

View File

@ -1,3 +1,6 @@
#ifdef __GNUG__
#pragma implementation
#endif
#include "command_inset.h" #include "command_inset.h"
#include "math_mathmlstream.h" #include "math_mathmlstream.h"

View File

@ -1,9 +1,26 @@
// -*- C++ -*-
/**
* \file command_inset.h
*
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#ifdef __GNUG__
#pragma interface
#endif
#ifndef COMMAND_INSET_H #ifndef COMMAND_INSET_H
#define COMMAND_INSET_H #define COMMAND_INSET_H
#include "button_inset.h" #include "button_inset.h"
// for things like \name[options]{contents} /// Inset for things like \name[options]{contents}
class CommandInset : public ButtonInset { class CommandInset : public ButtonInset {
public: public:
/// name, contents, options deliminited by '|++|' /// name, contents, options deliminited by '|++|'

View File

@ -1,10 +1,28 @@
// -*- C++ -*-
/**
* \file dimension.h
*
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#ifndef DIMENSION_H #ifndef DIMENSION_H
#define DIMENSION_H #define DIMENSION_H
#ifdef __GNUG__
#pragma interface
#endif
#include <iosfwd> #include <iosfwd>
class LyXFont; class LyXFont;
/// Simple wrapper around three ints
class Dimension { class Dimension {
public: public:
/// constructor /// constructor

View File

@ -1,17 +1,15 @@
// -*- C++ -*- // -*- C++ -*-
/*
* File: formula.h /**
* Purpose: Declaration of formula inset * \file formula.h
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
* Created: January 1996
* Description: Allows the edition of math paragraphs inside Lyx.
* *
* Copyright: 1996, Alejandro Aguilar Sierra * This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
* *
* Version: 0.4, Lyx project. * \author Alejandro Aguilar Sierra
* \author André Pönitz
* *
* You are free to use and modify this code under the terms of * Full author contact details are available in file CREDITS.
* the GNU General Public Licence version 2 or later.
*/ */
#ifndef INSET_FORMULA_H #ifndef INSET_FORMULA_H
@ -26,7 +24,7 @@
#include <boost/scoped_ptr.hpp> #include <boost/scoped_ptr.hpp>
/// /// The main LyX math inset
class InsetFormula : public InsetFormulaBase { class InsetFormula : public InsetFormulaBase {
public: public:
/// ///

View File

@ -1,15 +1,13 @@
// -*- C++ -*- // -*- C++ -*-
/* /*
* File: formulabase.h * Common parts of the math LyX insets
* Purpose: Common parts of the math LyX insets * \author André Pönitz
* Author: André Pönitz
* Created: May 2001
* Description: Allows the edition of math paragraphs inside Lyx.
* *
* Copyright: 2001, The LyX Project * Full author contact details are available in file CREDITS
* *
* You are free to use and modify this code under the terms of * You are free to use and modify this code under the terms of
* the GNU General Public Licence version 2 or later. * the GNU General Public Licence version 2 or later.
*/ */
#ifndef INSET_FORMULABASE_H #ifndef INSET_FORMULABASE_H

View File

@ -1,17 +1,15 @@
// -*- C++ -*- // -*- C++ -*-
/* /*
* File: formula.h * Main LyX Inset for defining math macros
* Purpose: Declaration of formula inset
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
* Created: January 1996
* Description: Allows the edition of math paragraphs inside Lyx.
* *
* Copyright: 1996, Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
* \author André Pönitz
* *
* Version: 0.4, Lyx project. * Full author contact details are available in file CREDITS
* *
* You are free to use and modify this code under the terms of * You are free to use and modify this code under the terms of
* the GNU General Public Licence version 2 or later. * the GNU General Public Licence version 2 or later.
*/ */
#ifndef INSET_FORMULA_MACRO_H #ifndef INSET_FORMULA_MACRO_H

View File

@ -8,10 +8,13 @@
#pragma interface #pragma interface
#endif #endif
// /**
// used for [pbvV]matrix, psmatrix etc * Inset for things like [pbvV]matrix, psmatrix etc
// *
* \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/
class MathAMSArrayInset : public MathGridInset { class MathAMSArrayInset : public MathGridInset {
public: public:

View File

@ -8,6 +8,13 @@
#pragma interface #pragma interface
#endif #endif
/**
* Inset for things like \begin{array}...\end{array}
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/
class MathArrayInset : public MathGridInset { class MathArrayInset : public MathGridInset {
public: public:

View File

@ -7,6 +7,14 @@
#pragma interface #pragma interface
#endif #endif
/**
* Wrapper for MathInset * with copy-semantics
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/
/** /**
The 'atom' is the major blob in math typesetting. And 'atom' consists The 'atom' is the major blob in math typesetting. And 'atom' consists
of a nucleus, an optional superscript, and an optional subscript. of a nucleus, an optional superscript, and an optional subscript.

View File

@ -1,18 +1,27 @@
// -*- C++ -*- // -*- C++ -*-
/**
* \file math_biginset.h
*
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* \author André Pönitz
*
* Full author contact details are available in file CREDITS.
*/
#ifndef MATH_BIGINSET_H #ifndef MATH_BIGINSET_H
#define MATH_BIGINSET_H #define MATH_BIGINSET_H
#include "math_diminset.h"
#include "LString.h"
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
/** Inset for \bigl & Co. #include "math_diminset.h"
\author André Pönitz #include "LString.h"
*/
/// Inset for \bigl & Co.
class MathBigInset : public MathDimInset { class MathBigInset : public MathDimInset {
public: public:
/// ///
@ -20,7 +29,7 @@ public:
/// ///
MathInset * clone() const; MathInset * clone() const;
/// ///
void draw(MathPainterInfo &, int x, int y) const; void draw(MathPainterInfo & pi, int x, int y) const;
/// ///
void write(WriteStream & os) const; void write(WriteStream & os) const;
/// ///

View File

@ -10,7 +10,9 @@
#endif #endif
/** An inset for multiplication /** An inset for multiplication
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathBinaryOpInset : public MathNestInset { class MathBinaryOpInset : public MathNestInset {
public: public:

View File

@ -9,7 +9,7 @@
#endif #endif
/** Binom like objects /** Binom like objects
\author André Pönitz * \author André Pönitz
*/ */
class MathBinomInset : public MathFracbaseInset { class MathBinomInset : public MathFracbaseInset {
public: public:

View File

@ -9,7 +9,9 @@
#endif #endif
/** Extra nesting /** Extra nesting
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathBraceInset : public MathNestInset { class MathBraceInset : public MathNestInset {

View File

@ -9,7 +9,9 @@
#endif #endif
/** The base character inset. /** The base character inset.
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathCharInset : public MathDimInset { class MathCharInset : public MathDimInset {

View File

@ -9,7 +9,9 @@
#endif #endif
/** Inset for end-of-line comments /** Inset for end-of-line comments
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class latexkeys; class latexkeys;

View File

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
/* /**
* File: math_cursor.h * File: math_cursor.h
* Purpose: Declaration of interaction classes for mathed * Purpose: Declaration of interaction classes for mathed
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>

View File

@ -379,7 +379,7 @@ void MathArray::towards(int & x, int & y) const
} }
void MathArray::setXY(int x, int y) void MathArray::setXY(int x, int y) const
{ {
xo_ = x; xo_ = x;
yo_ = y; yo_ = y;

View File

@ -1,14 +1,16 @@
// -*- C++ -*- // -*- C++ -*-
/* /**
* You are free to use and modify this code under the terms of * You are free to use and modify this code under the terms of
* the GNU General Public Licence version 2 or later. * the GNU General Public Licence version 2 or later.
*/ */
/** \class MathArray /** \class MathArray
\brief Low level container for math insets \brief Low level container for math insets
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
\author André Pönitz * \author André Pönitz
\author Lars Gullik Bjønnes * \author Lars Gullik Bjønnes
*
* Full author contact details are available in file CREDITS
\version February 2001 \version February 2001
*/ */
@ -125,7 +127,7 @@ public:
/// access to cached y coordinate of mid point of last drawing /// access to cached y coordinate of mid point of last drawing
int ym() const { return yo_ + (dim_.d - dim_.a) / 2; } int ym() const { return yo_ + (dim_.d - dim_.a) / 2; }
/// write access to coordinate; /// write access to coordinate;
void setXY(int x, int y); void setXY(int x, int y) const;
/// returns x coordinate of given position in the array /// returns x coordinate of given position in the array
int pos2x(size_type pos) const; int pos2x(size_type pos) const;
/// returns position of given x coordinate /// returns position of given x coordinate

View File

@ -10,7 +10,9 @@
#endif #endif
/** Decorations and accents over (below) a math object /** Decorations and accents over (below) a math object
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
*/ */
class latexkeys; class latexkeys;

View File

@ -10,7 +10,9 @@
#endif #endif
/** A delimiter /** A delimiter
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
*/ */
class MathDelimInset : public MathNestInset { class MathDelimInset : public MathNestInset {

View File

@ -10,7 +10,9 @@
#endif #endif
/** Environtments á la \begin{something}...\end{something} /** Environtments á la \begin{something}...\end{something}
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathEnvInset : public MathNestInset { class MathEnvInset : public MathNestInset {

View File

@ -10,7 +10,9 @@
#endif #endif
/** Extra nesting /** Extra nesting
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class latexkeys; class latexkeys;

View File

@ -9,7 +9,9 @@
#endif #endif
/** Inset for font changes /** Inset for font changes
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class latexkeys; class latexkeys;

View File

@ -9,7 +9,9 @@
#endif #endif
/** Old-style font changes /** Old-style font changes
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class latexkeys; class latexkeys;

View File

@ -9,7 +9,9 @@
#endif #endif
/** Fraction like objects (frac, binom) /** Fraction like objects (frac, binom)
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
*/ */
class MathFracInset : public MathFracbaseInset { class MathFracInset : public MathFracbaseInset {
public: public:

View File

@ -9,7 +9,9 @@
#endif #endif
/** Extra nesting /** Extra nesting
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathFrameboxInset : public MathNestInset { class MathFrameboxInset : public MathNestInset {

View File

@ -13,7 +13,9 @@
/** Gridded math inset base class. /** Gridded math inset base class.
This is the base to all grid-like editable math objects This is the base to all grid-like editable math objects
like array and eqnarray. like array and eqnarray.
\author André Pönitz 2001 * \author André Pönitz 2001
*
* Full author contact details are available in file CREDITS
*/ */
class MathGridInset : public MathNestInset { class MathGridInset : public MathNestInset {

View File

@ -10,6 +10,8 @@
/** This provides an interface between "LyX insets" and "LyX math insets" /** This provides an interface between "LyX insets" and "LyX math insets"
* \author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class LaTeXFeatures; class LaTeXFeatures;

View File

@ -9,7 +9,9 @@
#endif #endif
/** for proof.sty's \infer /** for proof.sty's \infer
\author André Poenitz * \author André Poenitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathInferInset : public MathGridInset { class MathInferInset : public MathGridInset {
public: public:

View File

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
/* /**
* File: math_inset.h * File: math_inset.h
* Purpose: Declaration of insets for mathed * Purpose: Declaration of insets for mathed
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>

View File

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
/* /**
* File: math_macro.h * File: math_macro.h
* Purpose: Declaration of macro class for mathed * Purpose: Declaration of macro class for mathed
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
@ -30,7 +30,9 @@ class MathMacroTemplate;
/** This class contains the data for a macro /** This class contains the data for a macro
\author Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
\version November 1996 \version November 1996
*/ */
class MathMacro : public MathNestInset { class MathMacro : public MathNestInset {

View File

@ -9,7 +9,9 @@
#endif #endif
/** A macro argument /** A macro argument
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
*/ */
class MathMacroArgument : public MathNestInset { class MathMacroArgument : public MathNestInset {
public: public:

View File

@ -12,7 +12,9 @@
class MathMacro; class MathMacro;
/** This class contains the macro definition /** This class contains the macro definition
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
*/ */
//class MathMacroTemplate : public MathInset, boost::noncopyable //class MathMacroTemplate : public MathInset, boost::noncopyable

View File

@ -11,6 +11,8 @@
/** Some inset that "is" a number /** Some inset that "is" a number
* maily for math-extern * maily for math-extern
* \author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathNumberInset : public MathDimInset { class MathNumberInset : public MathDimInset {

View File

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
/* /**
* File: math_parser.h * File: math_parser.h
* Purpose: Declaration of parsing utilities for mathed * Purpose: Declaration of parsing utilities for mathed
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>

View File

@ -1,5 +1,5 @@
// -*- C++ -*- // -*- C++ -*-
/* /**
* File: math_root.h * File: math_root.h
* Purpose: Declaration of the root object * Purpose: Declaration of the root object
* Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx> * Author: Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
@ -22,7 +22,9 @@
#endif #endif
/** The general n-th root inset. /** The general n-th root inset.
\author Alejandro Aguilar Sierra * \author Alejandro Aguilar Sierra
*
* Full author contact details are available in file CREDITS
\version January 1999 \version January 1999
*/ */
class MathRootInset : public MathNestInset { class MathRootInset : public MathNestInset {

View File

@ -213,8 +213,11 @@ void MathScriptInset::draw(MathPainterInfo & pi, int x, int y) const
{ {
if (nuc().size()) if (nuc().size())
nuc().draw(pi, x + dxx(), y); nuc().draw(pi, x + dxx(), y);
else if (editing()) else {
drawStr(pi, pi.base.font, x + dxx(), y, "."); nuc().setXY(x + dxx(), y);
if (editing())
drawStr(pi, pi.base.font, x + dxx(), y, ".");
}
MathScriptChanger dummy(pi.base); MathScriptChanger dummy(pi.base);
if (hasUp()) if (hasUp())
up().draw(pi, x + dx1(), y - dy1()); up().draw(pi, x + dx1(), y - dy1());

View File

@ -9,7 +9,9 @@
#endif #endif
/** Inset for super- and subscripts /** Inset for super- and subscripts
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathScriptInset : public MathNestInset { class MathScriptInset : public MathNestInset {

View File

@ -10,7 +10,9 @@
#endif #endif
/** An inset for \scriptsize etc /** An inset for \scriptsize etc
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class latexkeys; class latexkeys;

View File

@ -9,7 +9,9 @@
#endif #endif
/** The square root inset. /** The square root inset.
\author Alejandro Aguilar Siearra * \author Alejandro Aguilar Siearra
*
* Full author contact details are available in file CREDITS
*/ */
class MathSqrtInset : public MathNestInset { class MathSqrtInset : public MathNestInset {
public: public:

View File

@ -9,7 +9,9 @@
#endif #endif
/** Stackrel objects /** Stackrel objects
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathStackrelInset : public MathFracbaseInset { class MathStackrelInset : public MathFracbaseInset {
public: public:

View File

@ -11,6 +11,8 @@
/** Some collection of chars with similar properties /** Some collection of chars with similar properties
* maily for math-extern * maily for math-extern
* \author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathStringInset : public MathDimInset { class MathStringInset : public MathDimInset {

View File

@ -1,16 +1,21 @@
// -*- C++ -*- // -*- C++ -*-
/** Underset objects
* \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/
#ifndef MATH_UNDERSETINSET_H #ifndef MATH_UNDERSETINSET_H
#define MATH_UNDERSETINSET_H #define MATH_UNDERSETINSET_H
#include "math_fracbase.h"
#ifdef __GNUG__ #ifdef __GNUG__
#pragma interface #pragma interface
#endif #endif
/** Underset objects #include "math_fracbase.h"
\author André Pönitz
*/ /// Inset for underset
class MathUndersetInset : public MathFracbaseInset { class MathUndersetInset : public MathFracbaseInset {
public: public:
/// ///

View File

@ -10,7 +10,9 @@
#endif #endif
/** Wide arrows like \xrightarrow /** Wide arrows like \xrightarrow
\author André Pönitz * \author André Pönitz
*
* Full author contact details are available in file CREDITS
*/ */
class MathXArrowInset : public MathNestInset { class MathXArrowInset : public MathNestInset {

View File

@ -1,3 +1,7 @@
#ifdef __GNUG__
#pragma implementation
#endif
#include <config.h> #include <config.h>
#include "ref_inset.h" #include "ref_inset.h"