diff --git a/src/CutAndPaste.C b/src/CutAndPaste.C index f0aba7cdbd..7a22cfc335 100644 --- a/src/CutAndPaste.C +++ b/src/CutAndPaste.C @@ -39,9 +39,9 @@ #include "insets/insetcharstyle.h" #include "insets/insettabular.h" -#include "mathed/math_data.h" -#include "mathed/math_inset.h" -#include "mathed/math_support.h" +#include "mathed/MathData.h" +#include "mathed/InsetMath.h" +#include "mathed/MathSupport.h" #include "support/lstrings.h" diff --git a/src/buffer.C b/src/buffer.C index ff5bc7f4c7..1467f5bd54 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -55,9 +55,9 @@ #include "insets/insetinclude.h" #include "insets/insettext.h" -#include "mathed/math_macrotemplate.h" -#include "mathed/math_macrotable.h" -#include "mathed/math_support.h" +#include "mathed/MatheMacroTemplate.h" +#include "mathed/MathMacroTable.h" +#include "mathed/MathSupport.h" #include "frontends/Alert.h" diff --git a/src/coordcache.C b/src/coordcache.C index 51920e25c7..ecfffec949 100644 --- a/src/coordcache.C +++ b/src/coordcache.C @@ -14,7 +14,6 @@ #include "lyxtext.h" -#include "mathed/math_data.h" #include "insets/insetbase.h" #include diff --git a/src/cursor.C b/src/cursor.C index ffcb30e489..3a4b3a6169 100644 --- a/src/cursor.C +++ b/src/cursor.C @@ -35,11 +35,11 @@ #include "insets/insettabular.h" #include "insets/insettext.h" -#include "mathed/math_data.h" -#include "mathed/math_inset.h" -#include "mathed/math_scriptinset.h" -#include "mathed/math_macrotable.h" -#include "mathed/math_parser.h" +#include "mathed/MathData.h" +#include "mathed/InsetMath.h" +#include "mathed/InsetMathScript.h" +#include "mathed/MathMacroTable.h" +#include "mathed/MathParser.h" #include "support/limited_stack.h" @@ -569,14 +569,14 @@ std::ostream & operator<<(std::ostream & os, LCursor const & cur) // /////////////////////////////////////////////////////////////////// -#include "mathed/math_charinset.h" -#include "mathed/math_factory.h" -#include "mathed/math_gridinset.h" -#include "mathed/math_macroarg.h" -#include "mathed/math_mathmlstream.h" -#include "mathed/math_scriptinset.h" -#include "mathed/math_support.h" -#include "mathed/math_unknowninset.h" +#include "mathed/InsetMathChar.h" +#include "mathed/MathFactory.h" +#include "mathed/InsetMathGrid.h" +#include "mathed/MathMacroArgument.h" +#include "mathed/MathMLStream.h" +#include "mathed/InsetMathScript.h" +#include "mathed/MathSupport.h" +#include "mathed/InsetMathUnknown.h" //#define FILEDEBUG 1 diff --git a/src/cursor_slice.C b/src/cursor_slice.C index 7425bf5f84..145dcace3b 100644 --- a/src/cursor_slice.C +++ b/src/cursor_slice.C @@ -18,8 +18,8 @@ #include "lyxtext.h" #include "paragraph.h" -#include "mathed/math_inset.h" -#include "mathed/math_data.h" +#include "mathed/InsetMath.h" +#include "mathed/MathData.h" #include diff --git a/src/dociterator.C b/src/dociterator.C index 257cf4eabe..4955cbf910 100644 --- a/src/dociterator.C +++ b/src/dociterator.C @@ -18,8 +18,9 @@ #include "lyxrow.h" #include "paragraph.h" -#include "mathed/math_data.h" -#include "mathed/math_inset.h" +#include "mathed/MathData.h" +#include "mathed/InsetMath.h" + #include "insets/insettabular.h" #include diff --git a/src/factory.C b/src/factory.C index 4279534000..10efffa57f 100644 --- a/src/factory.C +++ b/src/factory.C @@ -53,8 +53,8 @@ #include "insets/insetvspace.h" #include "insets/insetwrap.h" -#include "mathed/math_macrotemplate.h" -#include "mathed/math_hullinset.h" +#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathHull.h" #include "support/lstrings.h" diff --git a/src/lyx_main.C b/src/lyx_main.C index d87fff26fb..1627140e71 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -40,8 +40,6 @@ #include "mover.h" #include "ToolbarBackend.h" -#include "mathed/math_inset.h" - #include "frontends/Alert.h" #include "frontends/lyx_gui.h" #include "frontends/LyXView.h" diff --git a/src/mathed/formulamacro.C b/src/mathed/InsetFormulaMacro.C similarity index 95% rename from src/mathed/formulamacro.C rename to src/mathed/InsetFormulaMacro.C index 3cd2f08346..1406d1bb73 100644 --- a/src/mathed/formulamacro.C +++ b/src/mathed/InsetFormulaMacro.C @@ -1,5 +1,5 @@ /** - * \file formulamacro.C + * \file InsetFormulaMacro.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,10 +11,10 @@ #include -#include "formulamacro.h" -#include "math_macrotable.h" -#include "math_macrotemplate.h" -#include "math_mathmlstream.h" +#include "InsetFormulaMacro.h" +#include "MathMacroTable.h" +#include "MatheMacroTemplate.h" +#include "MathMLStream.h" #include "BufferView.h" #include "cursor.h" diff --git a/src/mathed/formulamacro.h b/src/mathed/InsetFormulaMacro.h similarity index 96% rename from src/mathed/formulamacro.h rename to src/mathed/InsetFormulaMacro.h index 03968620c9..8f9f46a6eb 100644 --- a/src/mathed/formulamacro.h +++ b/src/mathed/InsetFormulaMacro.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file formulamacro.h + * \file InsetFormulaMacro.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef INSET_FORMULA_MACRO_H #define INSET_FORMULA_MACRO_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class MathMacroTemplate; class LyXLex; diff --git a/src/mathed/math_inset.C b/src/mathed/InsetMath.C similarity index 95% rename from src/mathed/math_inset.C rename to src/mathed/InsetMath.C index fc5d35a653..57fed3d604 100644 --- a/src/mathed/math_inset.C +++ b/src/mathed/InsetMath.C @@ -1,5 +1,5 @@ /** - * \file math_inset.C + * \file InsetMath.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,9 +11,9 @@ #include -#include "math_inset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMath.h" +#include "MathData.h" +#include "MathMLStream.h" #include "debug.h" #include "support/lstrings.h" diff --git a/src/mathed/math_inset.h b/src/mathed/InsetMath.h similarity index 99% rename from src/mathed/math_inset.h rename to src/mathed/InsetMath.h index 09972c2e58..91a1d1d86b 100644 --- a/src/mathed/math_inset.h +++ b/src/mathed/InsetMath.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_inset.h + * \file InsetMath.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATH_INSET_H #define MATH_INSET_H -#include "math_data.h" +#include "MathData.h" #include "insets/insetbase.h" diff --git a/src/mathed/math_amsarrayinset.C b/src/mathed/InsetMathAMSArray.C similarity index 94% rename from src/mathed/math_amsarrayinset.C rename to src/mathed/InsetMathAMSArray.C index 26bca0c610..613c60fd6f 100644 --- a/src/mathed/math_amsarrayinset.C +++ b/src/mathed/InsetMathAMSArray.C @@ -1,5 +1,5 @@ /** - * \file math_amsarrayinset.C + * \file InsetMathAMSArray.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,11 +11,11 @@ #include #include "LaTeXFeatures.h" -#include "math_amsarrayinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathAMSArray.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" #include "funcrequest.h" #include "FuncStatus.h" diff --git a/src/mathed/math_amsarrayinset.h b/src/mathed/InsetMathAMSArray.h similarity index 95% rename from src/mathed/math_amsarrayinset.h rename to src/mathed/InsetMathAMSArray.h index 4ca858753b..d890aee7a2 100644 --- a/src/mathed/math_amsarrayinset.h +++ b/src/mathed/InsetMathAMSArray.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_amsarrayinset.h + * \file InsetMathAMSArray.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_AMSARRAYINSET_H #define MATH_AMSARRAYINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" /// Inset for things like [pbvV]matrix, psmatrix etc diff --git a/src/mathed/math_arrayinset.C b/src/mathed/InsetMathArray.C similarity index 94% rename from src/mathed/math_arrayinset.C rename to src/mathed/InsetMathArray.C index fdf44d961b..49ba207f32 100644 --- a/src/mathed/math_arrayinset.C +++ b/src/mathed/InsetMathArray.C @@ -1,5 +1,5 @@ /** - * \file math_arrayinset.C + * \file InsetMathArray.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,11 +11,11 @@ #include #include "LaTeXFeatures.h" -#include "math_arrayinset.h" -#include "math_data.h" -#include "math_parser.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathArray.h" +#include "MathData.h" +#include "MathParser.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "support/lstrings.h" diff --git a/src/mathed/math_arrayinset.h b/src/mathed/InsetMathArray.h similarity index 96% rename from src/mathed/math_arrayinset.h rename to src/mathed/InsetMathArray.h index e688a084f2..c104287e63 100644 --- a/src/mathed/math_arrayinset.h +++ b/src/mathed/InsetMathArray.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_arrayinset.h + * \file InsetMathArray.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_ARRAYINSET_H #define MATH_ARRAYINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" /// Inset for things like \begin{array}...\end{array} diff --git a/src/mathed/math_biginset.C b/src/mathed/InsetMathBig.C similarity index 94% rename from src/mathed/math_biginset.C rename to src/mathed/InsetMathBig.C index 40f9be317e..b06654ae9e 100644 --- a/src/mathed/math_biginset.C +++ b/src/mathed/InsetMathBig.C @@ -1,5 +1,5 @@ /** - * \file math_biginset.C + * \file InsetMathBig.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_biginset.h" -#include "math_support.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathBig.h" +#include "MathSupport.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "support/lstrings.h" diff --git a/src/mathed/math_biginset.h b/src/mathed/InsetMathBig.h similarity index 95% rename from src/mathed/math_biginset.h rename to src/mathed/InsetMathBig.h index c778d7a097..2c3c9ca7d6 100644 --- a/src/mathed/math_biginset.h +++ b/src/mathed/InsetMathBig.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_biginset.h + * \file InsetMathBig.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_BIGINSET_H #define MATH_BIGINSET_H -#include "math_diminset.h" +#include "InsetMathDim.h" #include diff --git a/src/mathed/math_binominset.C b/src/mathed/InsetMathBinom.C similarity index 92% rename from src/mathed/math_binominset.C rename to src/mathed/InsetMathBinom.C index 80eafb3fd8..e09de0e319 100644 --- a/src/mathed/math_binominset.C +++ b/src/mathed/InsetMathBinom.C @@ -1,5 +1,5 @@ /** - * \file math_binominset.C + * \file InsetMathBinom.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_binominset.h" -#include "math_data.h" -#include "math_support.h" -#include "math_mathmlstream.h" +#include "InsetMathBinom.h" +#include "MathData.h" +#include "MathSupport.h" +#include "MathMLStream.h" using std::max; diff --git a/src/mathed/math_binominset.h b/src/mathed/InsetMathBinom.h similarity index 92% rename from src/mathed/math_binominset.h rename to src/mathed/InsetMathBinom.h index 659b23d4d7..0fddb3a05d 100644 --- a/src/mathed/math_binominset.h +++ b/src/mathed/InsetMathBinom.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_binominset.h + * \file InsetMathBinom.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_BINOMINSET_H #define MATH_BINOMINSET_H -#include "math_fracbase.h" +#include "InsetMathFracBase.h" /// Binom like objects diff --git a/src/mathed/math_boldsymbolinset.C b/src/mathed/InsetMathBoldSymbol.C similarity index 92% rename from src/mathed/math_boldsymbolinset.C rename to src/mathed/InsetMathBoldSymbol.C index cbb284e6b7..6e74713870 100644 --- a/src/mathed/math_boldsymbolinset.C +++ b/src/mathed/InsetMathBoldSymbol.C @@ -1,5 +1,5 @@ /** - * \file math_boldsymbolinset.C + * \file InsetMathBoldSymbol.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_boldsymbolinset.h" -#include "math_mathmlstream.h" -#include "math_data.h" +#include "InsetMathBoldSymbol.h" +#include "MathMLStream.h" +#include "MathData.h" #include "LaTeXFeatures.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_boldsymbolinset.h b/src/mathed/InsetMathBoldSymbol.h similarity index 93% rename from src/mathed/math_boldsymbolinset.h rename to src/mathed/InsetMathBoldSymbol.h index 76153ed318..16d0ef60cc 100644 --- a/src/mathed/math_boldsymbolinset.h +++ b/src/mathed/InsetMathBoldSymbol.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_boldsymbolinset.h + * \file InsetMathBoldSymbol.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_BOLDSYMBOLINSET_H #define MATH_BOLDSYMBOLINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Inset for AMSTeX's \boldsymbol diff --git a/src/mathed/math_boxinset.C b/src/mathed/InsetMathBox.C similarity index 89% rename from src/mathed/math_boxinset.C rename to src/mathed/InsetMathBox.C index 7fd3ac7a80..09f048e105 100644 --- a/src/mathed/math_boxinset.C +++ b/src/mathed/InsetMathBox.C @@ -1,5 +1,5 @@ /** - * \file math_boxinset.C + * \file InsetMathBox.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_boxinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathBox.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "support/std_ostream.h" using std::string; diff --git a/src/mathed/math_boxinset.h b/src/mathed/InsetMathBox.h similarity index 94% rename from src/mathed/math_boxinset.h rename to src/mathed/InsetMathBox.h index 96629de670..fc8d9aa977 100644 --- a/src/mathed/math_boxinset.h +++ b/src/mathed/InsetMathBox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_boxinset.h + * \file InsetMathBox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_BOXINSET_H #define MATH_BOXINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include diff --git a/src/mathed/math_boxedinset.C b/src/mathed/InsetMathBoxed.C similarity index 88% rename from src/mathed/math_boxedinset.C rename to src/mathed/InsetMathBoxed.C index de36c489d9..5617409b96 100644 --- a/src/mathed/math_boxedinset.C +++ b/src/mathed/InsetMathBoxed.C @@ -1,5 +1,5 @@ /** - * \file math_boxedinset.C + * \file InsetMathBoxed.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_boxedinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_parser.h" -#include "math_streamstr.h" +#include "InsetMathBoxed.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathParser.h" +#include "MathStream.h" #include "LaTeXFeatures.h" #include "LColor.h" diff --git a/src/mathed/math_boxedinset.h b/src/mathed/InsetMathBoxed.h similarity index 93% rename from src/mathed/math_boxedinset.h rename to src/mathed/InsetMathBoxed.h index 06924e762f..a2fe36892b 100644 --- a/src/mathed/math_boxedinset.h +++ b/src/mathed/InsetMathBoxed.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_boxedinset.h + * \file InsetMathBoxed.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_BOXEDINSET_H #define MATH_BOXEDINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Non-AMS-style frame diff --git a/src/mathed/math_braceinset.C b/src/mathed/InsetMathBrace.C similarity index 93% rename from src/mathed/math_braceinset.C rename to src/mathed/InsetMathBrace.C index b8b20acc2a..f2d802ed5e 100644 --- a/src/mathed/math_braceinset.C +++ b/src/mathed/InsetMathBrace.C @@ -1,5 +1,5 @@ /** - * \file math_braceinset.C + * \file InsetMathBrace.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_braceinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_support.h" +#include "InsetMathBrace.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathSupport.h" #include "LColor.h" #include "support/std_ostream.h" #include "frontends/Painter.h" diff --git a/src/mathed/math_braceinset.h b/src/mathed/InsetMathBrace.h similarity index 95% rename from src/mathed/math_braceinset.h rename to src/mathed/InsetMathBrace.h index 1eb3939999..d5c5205a43 100644 --- a/src/mathed/math_braceinset.h +++ b/src/mathed/InsetMathBrace.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_braceinset.h + * \file InsetMathBrace.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_BRACEINSET_H #define MATH_BRACEINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Extra nesting diff --git a/src/mathed/math_casesinset.C b/src/mathed/InsetMathCases.C similarity index 95% rename from src/mathed/math_casesinset.C rename to src/mathed/InsetMathCases.C index 0e1695075d..d8507cf54f 100644 --- a/src/mathed/math_casesinset.C +++ b/src/mathed/InsetMathCases.C @@ -1,5 +1,5 @@ /** - * \file math_casesinset.C + * \file InsetMathCases.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_casesinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_support.h" +#include "InsetMathCases.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathSupport.h" #include "FuncStatus.h" #include "LaTeXFeatures.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_casesinset.h b/src/mathed/InsetMathCases.h similarity index 94% rename from src/mathed/math_casesinset.h rename to src/mathed/InsetMathCases.h index d868fba09b..a349763584 100644 --- a/src/mathed/math_casesinset.h +++ b/src/mathed/InsetMathCases.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_casesinset.h + * \file InsetMathCases.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_CASESINSET_H #define MATH_CASESINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" class LaTeXFeatures; diff --git a/src/mathed/math_charinset.C b/src/mathed/InsetMathChar.C similarity index 96% rename from src/mathed/math_charinset.C rename to src/mathed/InsetMathChar.C index 309bf4a63c..edec8c43d0 100644 --- a/src/mathed/math_charinset.C +++ b/src/mathed/InsetMathChar.C @@ -1,5 +1,5 @@ /** - * \file math_charinset.C + * \file InsetMathChar.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,14 +11,14 @@ #include -#include "math_charinset.h" -#include "math_support.h" -#include "math_mathmlstream.h" +#include "InsetMathChar.h" +#include "MathSupport.h" +#include "MathMLStream.h" #include "debug.h" #include "dimension.h" #include "support/lstrings.h" -#include "textpainter.h" +#include "TextPainter.h" using std::auto_ptr; diff --git a/src/mathed/math_charinset.h b/src/mathed/InsetMathChar.h similarity index 95% rename from src/mathed/math_charinset.h rename to src/mathed/InsetMathChar.h index cf8ca1fc62..9a583d96e9 100644 --- a/src/mathed/math_charinset.h +++ b/src/mathed/InsetMathChar.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_charinset.h + * \file InsetMathChar.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_CHARINSET_H #define MATH_CHARINSET_H -#include "math_inset.h" +#include "InsetMath.h" /// The base character inset. diff --git a/src/mathed/math_colorinset.C b/src/mathed/InsetMathColor.C similarity index 92% rename from src/mathed/math_colorinset.C rename to src/mathed/InsetMathColor.C index d05f44ad98..6740ff5612 100644 --- a/src/mathed/math_colorinset.C +++ b/src/mathed/InsetMathColor.C @@ -1,5 +1,5 @@ /** - * \file math_colorinset.C + * \file InsetMathColor.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_colorinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathColor.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_colorinset.h b/src/mathed/InsetMathColor.h similarity index 96% rename from src/mathed/math_colorinset.h rename to src/mathed/InsetMathColor.h index 539345faa9..06ae60023d 100644 --- a/src/mathed/math_colorinset.h +++ b/src/mathed/InsetMathColor.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_colorinset.h + * \file InsetMathColor.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,7 +14,7 @@ #include "LColor.h" -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Change colours. diff --git a/src/mathed/command_inset.C b/src/mathed/InsetMathCommand.C similarity index 93% rename from src/mathed/command_inset.C rename to src/mathed/InsetMathCommand.C index e303aec832..d74801a342 100644 --- a/src/mathed/command_inset.C +++ b/src/mathed/InsetMathCommand.C @@ -1,5 +1,5 @@ /** - * \file command_inset.C + * \file InsetMathCommand.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "command_inset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathCommand.h" +#include "MathData.h" +#include "MathMLStream.h" #include "dispatchresult.h" #include "funcrequest.h" diff --git a/src/mathed/command_inset.h b/src/mathed/InsetMathCommand.h similarity index 95% rename from src/mathed/command_inset.h rename to src/mathed/InsetMathCommand.h index 1cc5d2dac4..ab2b4875fa 100644 --- a/src/mathed/command_inset.h +++ b/src/mathed/InsetMathCommand.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file command_inset.h + * \file InsetMathCommand.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef COMMAND_INSET_H #define COMMAND_INSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include "insets/render_button.h" diff --git a/src/mathed/math_commentinset.C b/src/mathed/InsetMathComment.C similarity index 91% rename from src/mathed/math_commentinset.C rename to src/mathed/InsetMathComment.C index 11c09080bb..b7fde26649 100644 --- a/src/mathed/math_commentinset.C +++ b/src/mathed/InsetMathComment.C @@ -1,5 +1,5 @@ /** - * \file math_commentinset.C + * \file InsetMathComment.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_commentinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_support.h" +#include "InsetMathComment.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathSupport.h" #include "support/std_ostream.h" using std::string; diff --git a/src/mathed/math_commentinset.h b/src/mathed/InsetMathComment.h similarity index 94% rename from src/mathed/math_commentinset.h rename to src/mathed/InsetMathComment.h index 40653b0826..7bec2fce6b 100644 --- a/src/mathed/math_commentinset.h +++ b/src/mathed/InsetMathComment.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_commentinset.h + * \file InsetMathComment.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_COMMENTINSET_H #define MATH_COMMENTINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class latexkeys; diff --git a/src/mathed/math_dfracinset.C b/src/mathed/InsetMathDFrac.C similarity index 92% rename from src/mathed/math_dfracinset.C rename to src/mathed/InsetMathDFrac.C index d73d470c49..3b3ec6caa9 100644 --- a/src/mathed/math_dfracinset.C +++ b/src/mathed/InsetMathDFrac.C @@ -1,5 +1,5 @@ /** - * \file math_dfracinset.C + * \file InsetMathDFrac.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_dfracinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathDFrac.h" +#include "MathData.h" +#include "MathMLStream.h" #include "LaTeXFeatures.h" #include "LColor.h" #include "frontends/Painter.h" diff --git a/src/mathed/math_dfracinset.h b/src/mathed/InsetMathDFrac.h similarity index 92% rename from src/mathed/math_dfracinset.h rename to src/mathed/InsetMathDFrac.h index e294f25c7e..cb5996a0a5 100644 --- a/src/mathed/math_dfracinset.h +++ b/src/mathed/InsetMathDFrac.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_fracinset.h + * \file InsetMathFrac.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_DFRACINSET_H #define MATH_DFRACINSET_H -#include "math_fracinset.h" +#include "InsetMathFrac.h" /// \dfrac support diff --git a/src/mathed/math_decorationinset.C b/src/mathed/InsetMathDecoration.C similarity index 94% rename from src/mathed/math_decorationinset.C rename to src/mathed/InsetMathDecoration.C index 2c836e2a86..474fda2f0c 100644 --- a/src/mathed/math_decorationinset.C +++ b/src/mathed/InsetMathDecoration.C @@ -1,5 +1,5 @@ /** - * \file math_decorationinset.C + * \file InsetMathDecoration.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,12 +11,12 @@ #include -#include "math_decorationinset.h" -#include "math_data.h" -#include "math_support.h" -#include "math_parser.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathDecoration.h" +#include "MathData.h" +#include "MathSupport.h" +#include "MathParser.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "LaTeXFeatures.h" #include "debug.h" diff --git a/src/mathed/math_decorationinset.h b/src/mathed/InsetMathDecoration.h similarity index 95% rename from src/mathed/math_decorationinset.h rename to src/mathed/InsetMathDecoration.h index 4dbdb60f4b..0834e15577 100644 --- a/src/mathed/math_decorationinset.h +++ b/src/mathed/InsetMathDecoration.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_decorationinset.h + * \file InsetMathDecoration.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATH_DECORATIONINSET_H #define MATH_DECORATIONINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class latexkeys; diff --git a/src/mathed/math_deliminset.C b/src/mathed/InsetMathDelim.C similarity index 95% rename from src/mathed/math_deliminset.C rename to src/mathed/InsetMathDelim.C index 460e3350f2..778b2e3efa 100644 --- a/src/mathed/math_deliminset.C +++ b/src/mathed/InsetMathDelim.C @@ -1,5 +1,5 @@ /** - * \file math_deliminset.C + * \file InsetMathDelim.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,11 +11,11 @@ #include -#include "math_deliminset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathDelim.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" using std::string; diff --git a/src/mathed/math_deliminset.h b/src/mathed/InsetMathDelim.h similarity index 96% rename from src/mathed/math_deliminset.h rename to src/mathed/InsetMathDelim.h index baefcd347d..894eccaff8 100644 --- a/src/mathed/math_deliminset.h +++ b/src/mathed/InsetMathDelim.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_deliminset.h + * \file InsetMathDelim.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATH_DELIMINSET_H #define MATH_DELIMINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include diff --git a/src/mathed/math_diffinset.C b/src/mathed/InsetMathDiff.C similarity index 94% rename from src/mathed/math_diffinset.C rename to src/mathed/InsetMathDiff.C index 3882df30e9..dfa3416a48 100644 --- a/src/mathed/math_diffinset.C +++ b/src/mathed/InsetMathDiff.C @@ -1,5 +1,5 @@ /** - * \file math_diffinset.C + * \file InsetMathDiff.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_diffinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathDiff.h" +#include "MathData.h" +#include "MathMLStream.h" #include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_diffinset.h b/src/mathed/InsetMathDiff.h similarity index 94% rename from src/mathed/math_diffinset.h rename to src/mathed/InsetMathDiff.h index 034e1ef90f..60c4d84711 100644 --- a/src/mathed/math_diffinset.h +++ b/src/mathed/InsetMathDiff.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_diffinset.h + * \file InsetMathDiff.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -16,7 +16,7 @@ // d f(x)/dx in one block // for interfacing external programs -#include "math_nestinset.h" +#include "InsetMathNest.h" class InsetMathDiff : public InsetMathNest { public: diff --git a/src/mathed/math_diminset.C b/src/mathed/InsetMathDim.C similarity index 92% rename from src/mathed/math_diminset.C rename to src/mathed/InsetMathDim.C index 2908fbc3dd..d267c2bca4 100644 --- a/src/mathed/math_diminset.C +++ b/src/mathed/InsetMathDim.C @@ -1,5 +1,5 @@ /** - * \file math_diminset.C + * \file InsetMathDim.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "math_diminset.h" +#include "InsetMathDim.h" #include "coordcache.h" #include "debug.h" diff --git a/src/mathed/math_diminset.h b/src/mathed/InsetMathDim.h similarity index 93% rename from src/mathed/math_diminset.h rename to src/mathed/InsetMathDim.h index 990516d03d..73a4ce4be2 100644 --- a/src/mathed/math_diminset.h +++ b/src/mathed/InsetMathDim.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_diminset.h + * \file InsetMathDim.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_DIMINSET_H #define MATH_DIMINSET_H -#include "math_inset.h" +#include "InsetMath.h" #include "dimension.h" class PainterInfo; diff --git a/src/mathed/math_dotsinset.C b/src/mathed/InsetMathDots.C similarity index 90% rename from src/mathed/math_dotsinset.C rename to src/mathed/InsetMathDots.C index 9411f11096..c0679cc52f 100644 --- a/src/mathed/math_dotsinset.C +++ b/src/mathed/InsetMathDots.C @@ -1,5 +1,5 @@ /** - * \file math_dotsinset.C + * \file InsetMathDots.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,10 +11,10 @@ #include -#include "math_dotsinset.h" -#include "math_mathmlstream.h" -#include "math_support.h" -#include "math_parser.h" +#include "InsetMathDots.h" +#include "MathMLStream.h" +#include "MathSupport.h" +#include "MathParser.h" using std::string; diff --git a/src/mathed/math_dotsinset.h b/src/mathed/InsetMathDots.h similarity index 93% rename from src/mathed/math_dotsinset.h rename to src/mathed/InsetMathDots.h index f923f5d467..77057d5a37 100644 --- a/src/mathed/math_dotsinset.h +++ b/src/mathed/InsetMathDots.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_dotsinset.h + * \file InsetMathDots.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_DOTSINSET_H #define MATH_DOTSINSET_H -#include "math_diminset.h" +#include "InsetMathDim.h" class latexkeys; diff --git a/src/mathed/math_envinset.C b/src/mathed/InsetMathEnv.C similarity index 88% rename from src/mathed/math_envinset.C rename to src/mathed/InsetMathEnv.C index 98e69b864a..73509a83a2 100644 --- a/src/mathed/math_envinset.C +++ b/src/mathed/InsetMathEnv.C @@ -1,5 +1,5 @@ /** - * \file math_envinset.C + * \file InsetMathEnv.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_envinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathEnv.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_envinset.h b/src/mathed/InsetMathEnv.h similarity index 94% rename from src/mathed/math_envinset.h rename to src/mathed/InsetMathEnv.h index 4bf3298acf..23c9f83706 100644 --- a/src/mathed/math_envinset.h +++ b/src/mathed/InsetMathEnv.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_envinset.h + * \file InsetMathEnv.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_ENVINSET_H #define MATH_ENVINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include diff --git a/src/mathed/math_exfuncinset.C b/src/mathed/InsetMathExFunc.C similarity index 94% rename from src/mathed/math_exfuncinset.C rename to src/mathed/InsetMathExFunc.C index 348d82d1f1..6ee9479e50 100644 --- a/src/mathed/math_exfuncinset.C +++ b/src/mathed/InsetMathExFunc.C @@ -1,5 +1,5 @@ /** - * \file math_exfuncinset.C + * \file InsetMathExFunc.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_exfuncinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathExFunc.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" using std::string; diff --git a/src/mathed/math_exfuncinset.h b/src/mathed/InsetMathExFunc.h similarity index 94% rename from src/mathed/math_exfuncinset.h rename to src/mathed/InsetMathExFunc.h index c0caf64951..c0f8301f58 100644 --- a/src/mathed/math_exfuncinset.h +++ b/src/mathed/InsetMathExFunc.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_exfuncinset.h + * \file InsetMathExFunc.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define MATH_EXFUNCINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include diff --git a/src/mathed/math_exintinset.C b/src/mathed/InsetMathExInt.C similarity index 93% rename from src/mathed/math_exintinset.C rename to src/mathed/InsetMathExInt.C index a0900bbfbe..b24435205e 100644 --- a/src/mathed/math_exintinset.C +++ b/src/mathed/InsetMathExInt.C @@ -1,5 +1,5 @@ /** - * \file math_exintinset.C + * \file InsetMathExInt.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_exintinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_symbolinset.h" +#include "InsetMathExInt.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "InsetMathSymbol.h" #include "debug.h" #include diff --git a/src/mathed/math_exintinset.h b/src/mathed/InsetMathExInt.h similarity index 95% rename from src/mathed/math_exintinset.h rename to src/mathed/InsetMathExInt.h index ea589e9983..d4bcc01223 100644 --- a/src/mathed/math_exintinset.h +++ b/src/mathed/InsetMathExInt.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_exintinset.h + * \file InsetMathExInt.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -16,7 +16,7 @@ // \int_l^u f(x) dx in one block (as opposed to 'f','(','x',')' or 'f','x') // or \sum, \prod... for interfacing external programs -#include "math_nestinset.h" +#include "InsetMathNest.h" #include diff --git a/src/mathed/math_fboxinset.C b/src/mathed/InsetMathFBox.C similarity index 89% rename from src/mathed/math_fboxinset.C rename to src/mathed/InsetMathFBox.C index d6c16e14f7..2ee55c1edf 100644 --- a/src/mathed/math_fboxinset.C +++ b/src/mathed/InsetMathFBox.C @@ -1,5 +1,5 @@ /** - * \file math_fboxinset.C + * \file InsetMathFBox.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_fboxinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_parser.h" -#include "math_streamstr.h" +#include "InsetMathFBox.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathParser.h" +#include "MathStream.h" #include "LColor.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_fboxinset.h b/src/mathed/InsetMathFBox.h similarity index 93% rename from src/mathed/math_fboxinset.h rename to src/mathed/InsetMathFBox.h index 2865ae3162..de0dcb9559 100644 --- a/src/mathed/math_fboxinset.h +++ b/src/mathed/InsetMathFBox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_fboxinset.h + * \file InsetMathFBox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_FBOXINSET_H #define MATH_FBOXINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Non-AMS-style frame diff --git a/src/mathed/math_fontinset.C b/src/mathed/InsetMathFont.C similarity index 93% rename from src/mathed/math_fontinset.C rename to src/mathed/InsetMathFont.C index f7980368df..7511844211 100644 --- a/src/mathed/math_fontinset.C +++ b/src/mathed/InsetMathFont.C @@ -1,5 +1,5 @@ /** - * \file math_fontinset.C + * \file InsetMathFont.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_fontinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_parser.h" +#include "InsetMathFont.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathParser.h" #include "LaTeXFeatures.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_fontinset.h b/src/mathed/InsetMathFont.h similarity index 95% rename from src/mathed/math_fontinset.h rename to src/mathed/InsetMathFont.h index 6e6b567dc6..e73dc3de4c 100644 --- a/src/mathed/math_fontinset.h +++ b/src/mathed/InsetMathFont.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_fontinset.h + * \file InsetMathFont.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_FONTINSET_H #define MATH_FONTINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class latexkeys; diff --git a/src/mathed/math_fontoldinset.C b/src/mathed/InsetMathFontOld.C similarity index 89% rename from src/mathed/math_fontoldinset.C rename to src/mathed/InsetMathFontOld.C index 54c183fc46..76438c0bc6 100644 --- a/src/mathed/math_fontoldinset.C +++ b/src/mathed/InsetMathFontOld.C @@ -1,5 +1,5 @@ /** - * \file math_fontoldinset.C + * \file InsetMathFontOld.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_fontoldinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_parser.h" -#include "math_streamstr.h" +#include "InsetMathFontOld.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathParser.h" +#include "MathStream.h" #include "support/std_ostream.h" using std::auto_ptr; diff --git a/src/mathed/math_fontoldinset.h b/src/mathed/InsetMathFontOld.h similarity index 95% rename from src/mathed/math_fontoldinset.h rename to src/mathed/InsetMathFontOld.h index b29c3190f6..6239b9fa31 100644 --- a/src/mathed/math_fontoldinset.h +++ b/src/mathed/InsetMathFontOld.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_fontoldinset.h + * \file InsetMathFontOld.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_FONTOLDINSET_H #define MATH_FONTOLDINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class latexkeys; diff --git a/src/mathed/math_fracinset.C b/src/mathed/InsetMathFrac.C similarity index 96% rename from src/mathed/math_fracinset.C rename to src/mathed/InsetMathFrac.C index e13e114a87..d7e875d9f8 100644 --- a/src/mathed/math_fracinset.C +++ b/src/mathed/InsetMathFrac.C @@ -1,5 +1,5 @@ /** - * \file math_fracinset.C + * \file InsetMathFrac.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,10 +11,10 @@ #include -#include "math_fracinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "textpainter.h" +#include "InsetMathFrac.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "TextPainter.h" #include "LaTeXFeatures.h" #include "LColor.h" #include "frontends/Painter.h" diff --git a/src/mathed/math_fracinset.h b/src/mathed/InsetMathFrac.h similarity index 95% rename from src/mathed/math_fracinset.h rename to src/mathed/InsetMathFrac.h index c46d726aca..34fa136f80 100644 --- a/src/mathed/math_fracinset.h +++ b/src/mathed/InsetMathFrac.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_fracinset.h + * \file InsetMathFrac.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATH_FRACINSET_H #define MATH_FRACINSET_H -#include "math_fracbase.h" +#include "InsetMathFracBase.h" /// Fraction like objects (frac, binom) diff --git a/src/mathed/math_fracbase.C b/src/mathed/InsetMathFracBase.C similarity index 89% rename from src/mathed/math_fracbase.C rename to src/mathed/InsetMathFracBase.C index 555657cc37..7b25e941c6 100644 --- a/src/mathed/math_fracbase.C +++ b/src/mathed/InsetMathFracBase.C @@ -1,5 +1,5 @@ /** - * \file math_fracbase.C + * \file InsetMathFracBase.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "math_fracbase.h" -#include "math_data.h" +#include "InsetMathFracBase.h" +#include "MathData.h" #include "cursor.h" diff --git a/src/mathed/math_fracbase.h b/src/mathed/InsetMathFracBase.h similarity index 89% rename from src/mathed/math_fracbase.h rename to src/mathed/InsetMathFracBase.h index 8a200b5a97..620bb3b1ea 100644 --- a/src/mathed/math_fracbase.h +++ b/src/mathed/InsetMathFracBase.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_fracbase.h + * \file InsetMathFracBase.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_FRACBASE_H #define MATH_FRACBASE_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class InsetMathFracBase : public InsetMathNest { diff --git a/src/mathed/math_frameboxinset.C b/src/mathed/InsetMathFrameBox.C similarity index 92% rename from src/mathed/math_frameboxinset.C rename to src/mathed/InsetMathFrameBox.C index 4414ba8170..dac60baff9 100644 --- a/src/mathed/math_frameboxinset.C +++ b/src/mathed/InsetMathFrameBox.C @@ -1,5 +1,5 @@ /** - * \file math_frameboxinset.C + * \file InsetMathFrameBox.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_frameboxinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_support.h" +#include "InsetMathFrameBox.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathSupport.h" #include "LColor.h" #include "frontends/Painter.h" diff --git a/src/mathed/math_frameboxinset.h b/src/mathed/InsetMathFrameBox.h similarity index 93% rename from src/mathed/math_frameboxinset.h rename to src/mathed/InsetMathFrameBox.h index 513ee60a0d..7488f8f671 100644 --- a/src/mathed/math_frameboxinset.h +++ b/src/mathed/InsetMathFrameBox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_frameboxinset.h + * \file InsetMathFrameBox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_FRAMEBOXINSET_H #define MATH_FRAMEBOXINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Extra nesting diff --git a/src/mathed/math_gridinset.C b/src/mathed/InsetMathGrid.C similarity index 99% rename from src/mathed/math_gridinset.C rename to src/mathed/InsetMathGrid.C index 08a9517ee1..06b53ae5c4 100644 --- a/src/mathed/math_gridinset.C +++ b/src/mathed/InsetMathGrid.C @@ -1,5 +1,5 @@ /** - * \file math_gridinset.C + * \file InsetMathGrid.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_gridinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathGrid.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "BufferView.h" #include "CutAndPaste.h" diff --git a/src/mathed/math_gridinset.h b/src/mathed/InsetMathGrid.h similarity index 99% rename from src/mathed/math_gridinset.h rename to src/mathed/InsetMathGrid.h index 38d0b02a9f..7cd93fe1aa 100644 --- a/src/mathed/math_gridinset.h +++ b/src/mathed/InsetMathGrid.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_gridinset.h + * \file InsetMathGrid.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_GRID_H #define MATH_GRID_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include "lyxlength.h" diff --git a/src/mathed/math_hullinset.C b/src/mathed/InsetMathHull.C similarity index 98% rename from src/mathed/math_hullinset.C rename to src/mathed/InsetMathHull.C index b119f582e4..81af5ffa74 100644 --- a/src/mathed/math_hullinset.C +++ b/src/mathed/InsetMathHull.C @@ -1,5 +1,5 @@ /** - * \file math_hullinset.C + * \file InsetMathHull.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,20 +10,20 @@ #include -#include "math_arrayinset.h" -#include "math_charinset.h" -#include "math_colorinset.h" -#include "math_data.h" -#include "math_deliminset.h" -#include "math_extern.h" -#include "math_factory.h" -#include "math_hullinset.h" -#include "math_mathmlstream.h" -#include "math_parser.h" -#include "math_spaceinset.h" -#include "math_streamstr.h" -#include "math_support.h" -#include "ref_inset.h" +#include "InsetMathArray.h" +#include "InsetMathChar.h" +#include "InsetMathColor.h" +#include "MathData.h" +#include "InsetMathDelim.h" +#include "MathExtern.h" +#include "MathFactory.h" +#include "InsetMathHull.h" +#include "MathMLStream.h" +#include "MathParser.h" +#include "InsetMathSpace.h" +#include "MathStream.h" +#include "MathSupport.h" +#include "InsetMathRef.h" #include "bufferview_funcs.h" #include "lyxtext.h" @@ -44,7 +44,7 @@ #include "lyxrc.h" #include "outputparams.h" #include "sgml.h" -#include "textpainter.h" +#include "TextPainter.h" #include "undo.h" #include "insets/render_preview.h" diff --git a/src/mathed/math_hullinset.h b/src/mathed/InsetMathHull.h similarity index 98% rename from src/mathed/math_hullinset.h rename to src/mathed/InsetMathHull.h index 99e4fd4fb6..9add217f75 100644 --- a/src/mathed/math_hullinset.h +++ b/src/mathed/InsetMathHull.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_hullinset.h + * \file InsetMathHull.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_HULLINSET_H #define MATH_HULLINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" #include class RenderPreview; diff --git a/src/mathed/math_kerninset.C b/src/mathed/InsetMathKern.C similarity index 88% rename from src/mathed/math_kerninset.C rename to src/mathed/InsetMathKern.C index 3dfd470699..326f1e747c 100644 --- a/src/mathed/math_kerninset.C +++ b/src/mathed/InsetMathKern.C @@ -1,5 +1,5 @@ /** - * \file math_kerninset.C + * \file InsetMathKern.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_kerninset.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathKern.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" #include "dimension.h" using std::string; diff --git a/src/mathed/math_kerninset.h b/src/mathed/InsetMathKern.h similarity index 94% rename from src/mathed/math_kerninset.h rename to src/mathed/InsetMathKern.h index 94aebac529..0e559afe92 100644 --- a/src/mathed/math_kerninset.h +++ b/src/mathed/InsetMathKern.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_kerninset.h + * \file InsetMathKern.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_CHEATINSET_H #define MATH_CHEATINSET_H -#include "math_inset.h" +#include "InsetMath.h" #include "lyxlength.h" diff --git a/src/mathed/math_lefteqninset.C b/src/mathed/InsetMathLefteqn.C similarity index 91% rename from src/mathed/math_lefteqninset.C rename to src/mathed/InsetMathLefteqn.C index cdd8970ac7..121b9953ab 100644 --- a/src/mathed/math_lefteqninset.C +++ b/src/mathed/InsetMathLefteqn.C @@ -1,5 +1,5 @@ /** - * \file math_lefteqninset.C + * \file InsetMathLefteqn.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "math_lefteqninset.h" -#include "math_data.h" +#include "InsetMathLefteqn.h" +#include "MathData.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_lefteqninset.h b/src/mathed/InsetMathLefteqn.h similarity index 92% rename from src/mathed/math_lefteqninset.h rename to src/mathed/InsetMathLefteqn.h index 3ab4017239..076b0be940 100644 --- a/src/mathed/math_lefteqninset.h +++ b/src/mathed/InsetMathLefteqn.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_lefteqninset.h + * \file InsetMathLefteqn.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_LEFTEQNINSET_H #define MATH_LEFTEQNINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Support for LaTeX's \\lefteqn command diff --git a/src/mathed/math_liminset.C b/src/mathed/InsetMathLim.C similarity index 93% rename from src/mathed/math_liminset.C rename to src/mathed/InsetMathLim.C index c1355e2598..f0f203f72f 100644 --- a/src/mathed/math_liminset.C +++ b/src/mathed/InsetMathLim.C @@ -1,5 +1,5 @@ /** - * \file math_liminset.C + * \file InsetMathLim.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_liminset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathLim.h" +#include "MathData.h" +#include "MathMLStream.h" #include "debug.h" using std::auto_ptr; diff --git a/src/mathed/math_liminset.h b/src/mathed/InsetMathLim.h similarity index 94% rename from src/mathed/math_liminset.h rename to src/mathed/InsetMathLim.h index 7e4eb44e38..9914e216ca 100644 --- a/src/mathed/math_liminset.h +++ b/src/mathed/InsetMathLim.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_liminset.h + * \file InsetMathLim.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -16,7 +16,7 @@ // lim_{x->x0} f(x) in one block // for interfacing external programs -#include "math_nestinset.h" +#include "InsetMathNest.h" class InsetMathLim : public InsetMathNest { public: diff --git a/src/mathed/math_mboxinset.C b/src/mathed/InsetMathMBox.C similarity index 95% rename from src/mathed/math_mboxinset.C rename to src/mathed/InsetMathMBox.C index 7b7c16ee84..970ffc4a06 100644 --- a/src/mathed/math_mboxinset.C +++ b/src/mathed/InsetMathMBox.C @@ -1,5 +1,5 @@ /** - * \file math_mboxinset.C + * \file InsetMathMBox.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_mboxinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathMBox.h" +#include "MathData.h" +#include "MathMLStream.h" #include "BufferView.h" #include "buffer.h" diff --git a/src/mathed/math_mboxinset.h b/src/mathed/InsetMathMBox.h similarity index 95% rename from src/mathed/math_mboxinset.h rename to src/mathed/InsetMathMBox.h index 4e6b34f4c5..39fa6e996a 100644 --- a/src/mathed/math_mboxinset.h +++ b/src/mathed/InsetMathMBox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_mboxinset.h + * \file InsetMathMBox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_MBOXINSET_H #define MATH_MBOXINSET_H -#include "math_diminset.h" +#include "InsetMathDim.h" #include "lyxtext.h" diff --git a/src/mathed/math_macro.C b/src/mathed/InsetMathMacro.C similarity index 96% rename from src/mathed/math_macro.C rename to src/mathed/InsetMathMacro.C index 19ec6a3ebe..7a0110eea1 100644 --- a/src/mathed/math_macro.C +++ b/src/mathed/InsetMathMacro.C @@ -1,5 +1,5 @@ /** - * \file math_macro.C + * \file InsetMathMacro.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,10 +11,10 @@ #include -#include "math_macro.h" -#include "math_support.h" -#include "math_extern.h" -#include "math_mathmlstream.h" +#include "InsetMathMacro.h" +#include "MathSupport.h" +#include "MathExtern.h" +#include "MathMLStream.h" #include "buffer.h" #include "cursor.h" diff --git a/src/mathed/math_macro.h b/src/mathed/InsetMathMacro.h similarity index 92% rename from src/mathed/math_macro.h rename to src/mathed/InsetMathMacro.h index 102a9a0904..3c82d9ac24 100644 --- a/src/mathed/math_macro.h +++ b/src/mathed/InsetMathMacro.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_macro.h + * \file InsetMathMacro.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,10 +13,10 @@ #ifndef MATH_MACRO_H #define MATH_MACRO_H -#include "math_nestinset.h" -#include "math_data.h" -#include "math_nestinset.h" -#include "math_macrotable.h" +#include "InsetMathNest.h" +#include "MathData.h" +#include "InsetMathNest.h" +#include "MathMacroTable.h" /// This class contains the data for a macro. diff --git a/src/mathed/math_makeboxinset.C b/src/mathed/InsetMathMakebox.C similarity index 92% rename from src/mathed/math_makeboxinset.C rename to src/mathed/InsetMathMakebox.C index c83715f7f3..4fca51552e 100644 --- a/src/mathed/math_makeboxinset.C +++ b/src/mathed/InsetMathMakebox.C @@ -1,5 +1,5 @@ /** - * \file math_makeboxinset.C + * \file InsetMathMakebox.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_makeboxinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_support.h" +#include "InsetMathMakebox.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathSupport.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_makeboxinset.h b/src/mathed/InsetMathMakebox.h similarity index 93% rename from src/mathed/math_makeboxinset.h rename to src/mathed/InsetMathMakebox.h index cf7b4bbe4d..840060ad74 100644 --- a/src/mathed/math_makeboxinset.h +++ b/src/mathed/InsetMathMakebox.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_makeboxinset.h + * \file InsetMathMakebox.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_MAKEBOXINSET_H #define MATH_MAKEBOXINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// Extra nesting: \\makebox. // consolidate with InsetMathFrameBox? diff --git a/src/mathed/math_matrixinset.C b/src/mathed/InsetMathMatrix.C similarity index 94% rename from src/mathed/math_matrixinset.C rename to src/mathed/InsetMathMatrix.C index 2fa7f10d08..57394cc586 100644 --- a/src/mathed/math_matrixinset.C +++ b/src/mathed/InsetMathMatrix.C @@ -1,5 +1,5 @@ /** - * \file math_matrixinset.C + * \file InsetMathMatrix.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_matrixinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathMatrix.h" +#include "MathData.h" +#include "MathMLStream.h" using std::auto_ptr; diff --git a/src/mathed/math_matrixinset.h b/src/mathed/InsetMathMatrix.h similarity index 94% rename from src/mathed/math_matrixinset.h rename to src/mathed/InsetMathMatrix.h index 95de7a48d3..e8c542130c 100644 --- a/src/mathed/math_matrixinset.h +++ b/src/mathed/InsetMathMatrix.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_matrixinset.h + * \file InsetMathMatrix.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_MATRIXINSET_H #define MATH_MATRIXINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" // "shortcut" for DelimInset("(",ArrayInset,")") diff --git a/src/mathed/math_nestinset.C b/src/mathed/InsetMathNest.C similarity index 98% rename from src/mathed/math_nestinset.C rename to src/mathed/InsetMathNest.C index 5b6de1a04b..787b0b11a5 100644 --- a/src/mathed/math_nestinset.C +++ b/src/mathed/InsetMathNest.C @@ -1,5 +1,5 @@ /** - * \file math_nestinset.C + * \file InsetMathNest.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,28 +10,28 @@ #include -#include "math_nestinset.h" +#include "InsetMathNest.h" -#include "math_arrayinset.h" -#include "math_biginset.h" -#include "math_boxinset.h" -#include "math_braceinset.h" -#include "math_colorinset.h" -#include "math_commentinset.h" -#include "math_data.h" -#include "math_deliminset.h" -#include "math_factory.h" -#include "math_hullinset.h" -#include "math_mathmlstream.h" -#include "math_macroarg.h" -//#include "math_mboxinset.h" -#include "math_parser.h" -#include "math_scriptinset.h" -#include "math_spaceinset.h" -#include "math_symbolinset.h" -#include "math_support.h" -#include "math_unknowninset.h" -#include "ref_inset.h" +#include "InsetMathArray.h" +#include "InsetMathBig.h" +#include "InsetMathBox.h" +#include "InsetMathBrace.h" +#include "InsetMathColor.h" +#include "InsetMathComment.h" +#include "MathData.h" +#include "InsetMathDelim.h" +#include "MathFactory.h" +#include "InsetMathHull.h" +#include "MathMLStream.h" +#include "MathMacroArgument.h" +//#include "InsetMathMBox.h" +#include "MathParser.h" +#include "InsetMathScript.h" +#include "InsetMathSpace.h" +#include "InsetMathSymbol.h" +#include "MathSupport.h" +#include "InsetMathUnknown.h" +#include "InsetMathRef.h" #include "BufferView.h" #include "CutAndPaste.h" diff --git a/src/mathed/math_nestinset.h b/src/mathed/InsetMathNest.h similarity index 98% rename from src/mathed/math_nestinset.h rename to src/mathed/InsetMathNest.h index f86e9fd030..7790be0872 100644 --- a/src/mathed/math_nestinset.h +++ b/src/mathed/InsetMathNest.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_nestinset.h + * \file InsetMathNest.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_NESTINSET_H #define MATH_NESTINSET_H -#include "math_diminset.h" +#include "InsetMathDim.h" /** Abstract base class for all math objects that contain nested items. diff --git a/src/mathed/math_numberinset.C b/src/mathed/InsetMathNumber.C similarity index 89% rename from src/mathed/math_numberinset.C rename to src/mathed/InsetMathNumber.C index 13ef842476..8b8fb9b8b4 100644 --- a/src/mathed/math_numberinset.C +++ b/src/mathed/InsetMathNumber.C @@ -1,5 +1,5 @@ /** - * \file math_numberinset.C + * \file InsetMathNumber.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_numberinset.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathNumber.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" using lyx::docstring; diff --git a/src/mathed/math_numberinset.h b/src/mathed/InsetMathNumber.h similarity index 95% rename from src/mathed/math_numberinset.h rename to src/mathed/InsetMathNumber.h index de78449e60..5bd373c2e0 100644 --- a/src/mathed/math_numberinset.h +++ b/src/mathed/InsetMathNumber.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_numberinset.h + * \file InsetMathNumber.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_NUMBERINSET_H #define MATH_NUMBERINSET_H -#include "math_inset.h" +#include "InsetMath.h" /** Some inset that "is" a number diff --git a/src/mathed/math_oversetinset.C b/src/mathed/InsetMathOverset.C similarity index 93% rename from src/mathed/math_oversetinset.C rename to src/mathed/InsetMathOverset.C index 696edde3f0..b92c683e50 100644 --- a/src/mathed/math_oversetinset.C +++ b/src/mathed/InsetMathOverset.C @@ -1,5 +1,5 @@ /** - * \file math_oversetinset.C + * \file InsetMathOverset.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_oversetinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathOverset.h" +#include "MathData.h" +#include "MathMLStream.h" #include "cursor.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_oversetinset.h b/src/mathed/InsetMathOverset.h similarity index 92% rename from src/mathed/math_oversetinset.h rename to src/mathed/InsetMathOverset.h index 3e3e39c2ed..4f397fdbf7 100644 --- a/src/mathed/math_oversetinset.h +++ b/src/mathed/InsetMathOverset.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_oversetinset.h + * \file InsetMathOverset.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define MATH_OVERSETINSET_H -#include "math_fracbase.h" +#include "InsetMathFracBase.h" /// Inset for overset class InsetMathOverset : public InsetMathFracBase { diff --git a/src/mathed/math_parinset.C b/src/mathed/InsetMathPar.C similarity index 90% rename from src/mathed/math_parinset.C rename to src/mathed/InsetMathPar.C index 4064b99cba..7cc279774e 100644 --- a/src/mathed/math_parinset.C +++ b/src/mathed/InsetMathPar.C @@ -1,5 +1,5 @@ /** - * \file math_parinset.C + * \file InsetMathPar.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_parinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathPar.h" +#include "MathData.h" +#include "MathMLStream.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_parinset.h b/src/mathed/InsetMathPar.h similarity index 93% rename from src/mathed/math_parinset.h rename to src/mathed/InsetMathPar.h index eb03ffe42a..4fc791d7e7 100644 --- a/src/mathed/math_parinset.h +++ b/src/mathed/InsetMathPar.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_parinset.h + * \file InsetMathPar.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define MATH_PARINSET_H -#include "math_hullinset.h" +#include "InsetMathHull.h" class InsetMathPar : public InsetMathHull { public: diff --git a/src/mathed/math_phantominset.C b/src/mathed/InsetMathPhantom.C similarity index 96% rename from src/mathed/math_phantominset.C rename to src/mathed/InsetMathPhantom.C index f87f357c71..19c6c15a9f 100644 --- a/src/mathed/math_phantominset.C +++ b/src/mathed/InsetMathPhantom.C @@ -1,5 +1,5 @@ /** - * \file math_phantominset.C + * \file InsetMathPhantom.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_phantominset.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathPhantom.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "LColor.h" diff --git a/src/mathed/math_phantominset.h b/src/mathed/InsetMathPhantom.h similarity index 93% rename from src/mathed/math_phantominset.h rename to src/mathed/InsetMathPhantom.h index ad5906afa9..09d352deac 100644 --- a/src/mathed/math_phantominset.h +++ b/src/mathed/InsetMathPhantom.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_phantominset.h + * \file InsetMathPhantom.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_PHANTOMINSET_H #define MATH_PHANTOMINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" class InsetMathPhantom : public InsetMathNest { public: diff --git a/src/mathed/ref_inset.C b/src/mathed/InsetMathRef.C similarity index 97% rename from src/mathed/ref_inset.C rename to src/mathed/InsetMathRef.C index 4111c01ccd..606a1f5c79 100644 --- a/src/mathed/ref_inset.C +++ b/src/mathed/InsetMathRef.C @@ -1,5 +1,5 @@ /** - * \file ref_inset.C + * \file InsetMathRef.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "ref_inset.h" +#include "InsetMathRef.h" #include "BufferView.h" #include "LaTeXFeatures.h" @@ -20,9 +20,9 @@ #include "funcrequest.h" #include "FuncStatus.h" #include "gettext.h" -#include "math_data.h" -#include "math_factory.h" -#include "math_support.h" +#include "MathData.h" +#include "MathFactory.h" +#include "MathSupport.h" #include "outputparams.h" #include "sgml.h" diff --git a/src/mathed/ref_inset.h b/src/mathed/InsetMathRef.h similarity index 96% rename from src/mathed/ref_inset.h rename to src/mathed/InsetMathRef.h index 80e6aa3d40..daf0c8c316 100644 --- a/src/mathed/ref_inset.h +++ b/src/mathed/InsetMathRef.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file ref_inset.h + * \file InsetMathRef.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define REF_INSET_H -#include "command_inset.h" +#include "InsetMathCommand.h" class Buffer; // for \ref diff --git a/src/mathed/math_rootinset.C b/src/mathed/InsetMathRoot.C similarity index 95% rename from src/mathed/math_rootinset.C rename to src/mathed/InsetMathRoot.C index ac38bad208..d5dde92049 100644 --- a/src/mathed/math_rootinset.C +++ b/src/mathed/InsetMathRoot.C @@ -1,5 +1,5 @@ /** - * \file math_rootinset.C + * \file InsetMathRoot.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,9 +11,9 @@ #include -#include "math_rootinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathRoot.h" +#include "MathData.h" +#include "MathMLStream.h" #include "cursor.h" #include "LColor.h" diff --git a/src/mathed/math_rootinset.h b/src/mathed/InsetMathRoot.h similarity index 94% rename from src/mathed/math_rootinset.h rename to src/mathed/InsetMathRoot.h index 952401089b..419a26cd19 100644 --- a/src/mathed/math_rootinset.h +++ b/src/mathed/InsetMathRoot.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_rootinset.h + * \file InsetMathRoot.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATH_ROOT_H #define MATH_ROOT_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// The general n-th root inset. diff --git a/src/mathed/math_scriptinset.C b/src/mathed/InsetMathScript.C similarity index 98% rename from src/mathed/math_scriptinset.C rename to src/mathed/InsetMathScript.C index 5c09f268c0..b55962fb21 100644 --- a/src/mathed/math_scriptinset.C +++ b/src/mathed/InsetMathScript.C @@ -1,5 +1,5 @@ /** - * \file math_scriptinset.C + * \file InsetMathScript.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_scriptinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_support.h" -#include "math_symbolinset.h" +#include "InsetMathScript.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathSupport.h" +#include "InsetMathSymbol.h" #include "dispatchresult.h" #include "cursor.h" #include "debug.h" diff --git a/src/mathed/math_scriptinset.h b/src/mathed/InsetMathScript.h similarity index 98% rename from src/mathed/math_scriptinset.h rename to src/mathed/InsetMathScript.h index 88fc3b3d5f..e3272aa0eb 100644 --- a/src/mathed/math_scriptinset.h +++ b/src/mathed/InsetMathScript.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_scriptinset.h + * \file InsetMathScript.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_SCRIPTINSET_H #define MATH_SCRIPTINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" // An inset for super- and subscripts or both. The 'nucleus' is always diff --git a/src/mathed/math_sizeinset.C b/src/mathed/InsetMathSize.C similarity index 88% rename from src/mathed/math_sizeinset.C rename to src/mathed/InsetMathSize.C index ff098a0151..ea95f598e6 100644 --- a/src/mathed/math_sizeinset.C +++ b/src/mathed/InsetMathSize.C @@ -1,5 +1,5 @@ /** - * \file math_sizeinset.C + * \file InsetMathSize.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_sizeinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_parser.h" -#include "math_streamstr.h" +#include "InsetMathSize.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathParser.h" +#include "MathStream.h" #include "support/convert.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_sizeinset.h b/src/mathed/InsetMathSize.h similarity index 94% rename from src/mathed/math_sizeinset.h rename to src/mathed/InsetMathSize.h index 3864038d16..280c9f039c 100644 --- a/src/mathed/math_sizeinset.h +++ b/src/mathed/InsetMathSize.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_sizeinset.h + * \file InsetMathSize.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATHSIZEINSET_H #define MATHSIZEINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include "metricsinfo.h" diff --git a/src/mathed/math_spaceinset.C b/src/mathed/InsetMathSpace.C similarity index 96% rename from src/mathed/math_spaceinset.C rename to src/mathed/InsetMathSpace.C index 6bb8a8c217..70e46b82d6 100644 --- a/src/mathed/math_spaceinset.C +++ b/src/mathed/InsetMathSpace.C @@ -1,5 +1,5 @@ /** - * \file math_spaceinset.C + * \file InsetMathSpace.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_spaceinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathSpace.h" +#include "MathData.h" +#include "MathMLStream.h" #include "LaTeXFeatures.h" #include "LColor.h" diff --git a/src/mathed/math_spaceinset.h b/src/mathed/InsetMathSpace.h similarity index 95% rename from src/mathed/math_spaceinset.h rename to src/mathed/InsetMathSpace.h index fd4d3b0aa7..9b6d6c70b3 100644 --- a/src/mathed/math_spaceinset.h +++ b/src/mathed/InsetMathSpace.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_spaceinset.h + * \file InsetMathSpace.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_SPACEINSET_H #define MATH_SPACEINSET_H -#include "math_inset.h" +#include "InsetMath.h" /// Smart spaces diff --git a/src/mathed/math_splitinset.C b/src/mathed/InsetMathSplit.C similarity index 94% rename from src/mathed/math_splitinset.C rename to src/mathed/InsetMathSplit.C index c8fe0fa98f..b78c5708f3 100644 --- a/src/mathed/math_splitinset.C +++ b/src/mathed/InsetMathSplit.C @@ -1,5 +1,5 @@ /** - * \file math_splitinset.C + * \file InsetMathSplit.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_splitinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathSplit.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "funcrequest.h" #include "FuncStatus.h" diff --git a/src/mathed/math_splitinset.h b/src/mathed/InsetMathSplit.h similarity index 93% rename from src/mathed/math_splitinset.h rename to src/mathed/InsetMathSplit.h index 41dd8d334f..b77b0db3f1 100644 --- a/src/mathed/math_splitinset.h +++ b/src/mathed/InsetMathSplit.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_splitinset.h + * \file InsetMathSplit.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_SPLITINSET_H #define MATH_SPLITINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" class InsetMathSplit : public InsetMathGrid { diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/InsetMathSqrt.C similarity index 94% rename from src/mathed/math_sqrtinset.C rename to src/mathed/InsetMathSqrt.C index 8e2a9eec3a..5055147cf8 100644 --- a/src/mathed/math_sqrtinset.C +++ b/src/mathed/InsetMathSqrt.C @@ -1,5 +1,5 @@ /** - * \file math_sqrtinset.C + * \file InsetMathSqrt.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_sqrtinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "textpainter.h" +#include "InsetMathSqrt.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "TextPainter.h" #include "LColor.h" #include "frontends/Painter.h" diff --git a/src/mathed/math_sqrtinset.h b/src/mathed/InsetMathSqrt.h similarity index 94% rename from src/mathed/math_sqrtinset.h rename to src/mathed/InsetMathSqrt.h index c61e9c842e..6c15f6bc42 100644 --- a/src/mathed/math_sqrtinset.h +++ b/src/mathed/InsetMathSqrt.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_sqrtinset.h + * \file InsetMathSqrt.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATH_SQRTINSET_H #define MATH_SQRTINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" /// \c InsetMathSqrt The square root inset. diff --git a/src/mathed/math_stackrelinset.C b/src/mathed/InsetMathStackrel.C similarity index 91% rename from src/mathed/math_stackrelinset.C rename to src/mathed/InsetMathStackrel.C index 2274f11e9a..0290d9292e 100644 --- a/src/mathed/math_stackrelinset.C +++ b/src/mathed/InsetMathStackrel.C @@ -1,5 +1,5 @@ /** - * \file math_stackrelinset.C + * \file InsetMathStackrel.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_stackrelinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathStackrel.h" +#include "MathData.h" +#include "MathMLStream.h" using std::max; diff --git a/src/mathed/math_stackrelinset.h b/src/mathed/InsetMathStackrel.h similarity index 92% rename from src/mathed/math_stackrelinset.h rename to src/mathed/InsetMathStackrel.h index baead40ab2..8d9cfc006f 100644 --- a/src/mathed/math_stackrelinset.h +++ b/src/mathed/InsetMathStackrel.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_stackrelinset.h + * \file InsetMathStackrel.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_STACKRELINSET_H #define MATH_STACKRELINSET_H -#include "math_fracbase.h" +#include "InsetMathFracBase.h" /** Stackrel objects diff --git a/src/mathed/math_stringinset.C b/src/mathed/InsetMathString.C similarity index 93% rename from src/mathed/math_stringinset.C rename to src/mathed/InsetMathString.C index 86a04606e7..9f5afa70b9 100644 --- a/src/mathed/math_stringinset.C +++ b/src/mathed/InsetMathString.C @@ -1,5 +1,5 @@ /** - * \file math_stringinset.C + * \file InsetMathString.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_stringinset.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathString.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" using lyx::docstring; diff --git a/src/mathed/math_stringinset.h b/src/mathed/InsetMathString.h similarity index 95% rename from src/mathed/math_stringinset.h rename to src/mathed/InsetMathString.h index 35a8baab78..50d92d6710 100644 --- a/src/mathed/math_stringinset.h +++ b/src/mathed/InsetMathString.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_stringinset.h + * \file InsetMathString.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_STRINGINSET_H #define MATH_STRINGINSET_H -#include "math_inset.h" +#include "InsetMath.h" /** Some collection of chars with similar properties diff --git a/src/mathed/math_substackinset.C b/src/mathed/InsetMathSubstack.C similarity index 94% rename from src/mathed/math_substackinset.C rename to src/mathed/InsetMathSubstack.C index 748f3fdcc5..da840a9637 100644 --- a/src/mathed/math_substackinset.C +++ b/src/mathed/InsetMathSubstack.C @@ -1,5 +1,5 @@ /** - * \file math_substackinset.C + * \file InsetMathSubstack.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,9 +11,9 @@ #include #include "LaTeXFeatures.h" -#include "math_substackinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathSubstack.h" +#include "MathData.h" +#include "MathMLStream.h" #include "support/std_ostream.h" #include "funcrequest.h" diff --git a/src/mathed/math_substackinset.h b/src/mathed/InsetMathSubstack.h similarity index 94% rename from src/mathed/math_substackinset.h rename to src/mathed/InsetMathSubstack.h index cfb0f158d5..6d279a6cee 100644 --- a/src/mathed/math_substackinset.h +++ b/src/mathed/InsetMathSubstack.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_substackinset.h + * \file InsetMathSubstack.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_SUBSTACK_H #define MATH_SUBSTACK_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" /// support for AMS's \\substack diff --git a/src/mathed/math_symbolinset.C b/src/mathed/InsetMathSymbol.C similarity index 95% rename from src/mathed/math_symbolinset.C rename to src/mathed/InsetMathSymbol.C index e0c681f581..1aa9ba0f85 100644 --- a/src/mathed/math_symbolinset.C +++ b/src/mathed/InsetMathSymbol.C @@ -1,5 +1,5 @@ /** - * \file math_symbolinset.C + * \file InsetMathSymbol.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,13 +10,13 @@ #include -#include "math_symbolinset.h" +#include "InsetMathSymbol.h" #include "dimension.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" -#include "math_parser.h" -#include "math_atom.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" +#include "MathParser.h" +#include "MathAtom.h" #include "LaTeXFeatures.h" #include "debug.h" diff --git a/src/mathed/math_symbolinset.h b/src/mathed/InsetMathSymbol.h similarity index 97% rename from src/mathed/math_symbolinset.h rename to src/mathed/InsetMathSymbol.h index 996380fb40..33cb4d9f3c 100644 --- a/src/mathed/math_symbolinset.h +++ b/src/mathed/InsetMathSymbol.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_symbolinset.h + * \file InsetMathSymbol.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_SYMBOLINSET_H #define MATH_SYMBOLINSET_H -#include "math_inset.h" +#include "InsetMath.h" class latexkeys; diff --git a/src/mathed/math_tfracinset.C b/src/mathed/InsetMathTFrac.C similarity index 93% rename from src/mathed/math_tfracinset.C rename to src/mathed/InsetMathTFrac.C index 48f5030e4e..daf7772ae8 100644 --- a/src/mathed/math_tfracinset.C +++ b/src/mathed/InsetMathTFrac.C @@ -1,5 +1,5 @@ /** - * \file math_dfracinset.C + * \file InsetMathDFrac.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_tfracinset.h" +#include "InsetMathTFrac.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "MathData.h" +#include "MathMLStream.h" #include "LaTeXFeatures.h" #include "LColor.h" diff --git a/src/mathed/math_tfracinset.h b/src/mathed/InsetMathTFrac.h similarity index 92% rename from src/mathed/math_tfracinset.h rename to src/mathed/InsetMathTFrac.h index 5333716ca0..018fe37721 100644 --- a/src/mathed/math_tfracinset.h +++ b/src/mathed/InsetMathTFrac.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_tfracinset.h + * \file InsetMathTFrac.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_TFRACINSET_H #define MATH_TFRACINSET_H -#include "math_fracinset.h" +#include "InsetMathFrac.h" /// \dfrac support diff --git a/src/mathed/math_tabularinset.C b/src/mathed/InsetMathTabular.C similarity index 93% rename from src/mathed/math_tabularinset.C rename to src/mathed/InsetMathTabular.C index 4f88f3a232..00f0d73d30 100644 --- a/src/mathed/math_tabularinset.C +++ b/src/mathed/InsetMathTabular.C @@ -1,5 +1,5 @@ /** - * \file math_tabularinset.C + * \file InsetMathTabular.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_tabularinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathTabular.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "support/lstrings.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_tabularinset.h b/src/mathed/InsetMathTabular.h similarity index 95% rename from src/mathed/math_tabularinset.h rename to src/mathed/InsetMathTabular.h index 66fb3580b6..da12246d6d 100644 --- a/src/mathed/math_tabularinset.h +++ b/src/mathed/InsetMathTabular.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_tabularinset.h + * \file InsetMathTabular.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_TABULARINSET_H #define MATH_TABULARINSET_H -#include "math_gridinset.h" +#include "InsetMathGrid.h" /// Inset for things like \begin{tabular}...\end{tabular} diff --git a/src/mathed/math_undersetinset.C b/src/mathed/InsetMathUnderset.C similarity index 94% rename from src/mathed/math_undersetinset.C rename to src/mathed/InsetMathUnderset.C index 764f0c1d3b..2f8518b90d 100644 --- a/src/mathed/math_undersetinset.C +++ b/src/mathed/InsetMathUnderset.C @@ -1,5 +1,5 @@ /** - * \file math_undersetinset.C + * \file InsetMathUnderset.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_undersetinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" +#include "InsetMathUnderset.h" +#include "MathData.h" +#include "MathMLStream.h" #include "cursor.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_undersetinset.h b/src/mathed/InsetMathUnderset.h similarity index 93% rename from src/mathed/math_undersetinset.h rename to src/mathed/InsetMathUnderset.h index dd5eb1d24b..ba0d223a70 100644 --- a/src/mathed/math_undersetinset.h +++ b/src/mathed/InsetMathUnderset.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_undersetinset.h + * \file InsetMathUnderset.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define MATH_UNDERSETINSET_H -#include "math_fracbase.h" +#include "InsetMathFracBase.h" /// Inset for underset class InsetMathUnderset : public InsetMathFracBase { diff --git a/src/mathed/math_unknowninset.C b/src/mathed/InsetMathUnknown.C similarity index 90% rename from src/mathed/math_unknowninset.C rename to src/mathed/InsetMathUnknown.C index 3daf48edac..14cee3c3e9 100644 --- a/src/mathed/math_unknowninset.C +++ b/src/mathed/InsetMathUnknown.C @@ -1,5 +1,5 @@ /** - * \file math_unknowninset.C + * \file InsetMathUnknown.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_unknowninset.h" -#include "math_support.h" -#include "math_atom.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathUnknown.h" +#include "MathSupport.h" +#include "MathAtom.h" +#include "MathMLStream.h" +#include "MathStream.h" using std::string; using std::auto_ptr; diff --git a/src/mathed/math_unknowninset.h b/src/mathed/InsetMathUnknown.h similarity index 95% rename from src/mathed/math_unknowninset.h rename to src/mathed/InsetMathUnknown.h index eb5a0c819a..86573b42d1 100644 --- a/src/mathed/math_unknowninset.h +++ b/src/mathed/InsetMathUnknown.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_unknowninset.h + * \file InsetMathUnknown.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_UNKNOWNINSET_H #define MATH_UNKNOWNINSET_H -#include "math_diminset.h" +#include "InsetMathDim.h" /// LaTeX names for objects that we really don't know diff --git a/src/mathed/math_xarrowinset.C b/src/mathed/InsetMathXArrow.C similarity index 90% rename from src/mathed/math_xarrowinset.C rename to src/mathed/InsetMathXArrow.C index 6299e82688..948370c2cb 100644 --- a/src/mathed/math_xarrowinset.C +++ b/src/mathed/InsetMathXArrow.C @@ -1,5 +1,5 @@ /** - * \file math_xarrowinset.C + * \file InsetMathXArrow.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_xarrowinset.h" -#include "math_data.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathXArrow.h" +#include "MathData.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" #include "LaTeXFeatures.h" diff --git a/src/mathed/math_xarrowinset.h b/src/mathed/InsetMathXArrow.h similarity index 93% rename from src/mathed/math_xarrowinset.h rename to src/mathed/InsetMathXArrow.h index 27f0fa4d04..5f6c112486 100644 --- a/src/mathed/math_xarrowinset.h +++ b/src/mathed/InsetMathXArrow.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_xarrowinset.h + * \file InsetMathXArrow.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_XARROWINSET_H #define MATH_XARROWINSET_H -#include "math_fracbase.h" +#include "InsetMathFracBase.h" /// Wide arrows like \xrightarrow diff --git a/src/mathed/math_xyarrowinset.C b/src/mathed/InsetMathXYArrow.C similarity index 95% rename from src/mathed/math_xyarrowinset.C rename to src/mathed/InsetMathXYArrow.C index afa4d22e97..205b9265ee 100644 --- a/src/mathed/math_xyarrowinset.C +++ b/src/mathed/InsetMathXYArrow.C @@ -1,5 +1,5 @@ /** - * \file math_xyarrowinset.C + * \file InsetMathXYArrow.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_xyarrowinset.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" -#include "math_support.h" +#include "InsetMathXYArrow.h" +#include "MathMLStream.h" +#include "MathStream.h" +#include "MathSupport.h" #include "frontends/Painter.h" #include "debug.h" diff --git a/src/mathed/math_xyarrowinset.h b/src/mathed/InsetMathXYArrow.h similarity index 94% rename from src/mathed/math_xyarrowinset.h rename to src/mathed/InsetMathXYArrow.h index 13613b2a20..b314cf7313 100644 --- a/src/mathed/math_xyarrowinset.h +++ b/src/mathed/InsetMathXYArrow.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_xyarrowinset.h + * \file InsetMathXYArrow.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -12,7 +12,7 @@ #ifndef MATH_XYARROWINSET_H #define MATH_ARROWINSET_H -#include "math_nestinset.h" +#include "InsetMathNest.h" #include "metricsinfo.h" diff --git a/src/mathed/math_xymatrixinset.C b/src/mathed/InsetMathXYMatrix.C similarity index 91% rename from src/mathed/math_xymatrixinset.C rename to src/mathed/InsetMathXYMatrix.C index d4ac730411..7c71762638 100644 --- a/src/mathed/math_xymatrixinset.C +++ b/src/mathed/InsetMathXYMatrix.C @@ -1,5 +1,5 @@ /** - * \file math_xymatrixinset.C + * \file InsetMathXYMatrix.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,9 +10,9 @@ #include -#include "math_xymatrixinset.h" -#include "math_mathmlstream.h" -#include "math_streamstr.h" +#include "InsetMathXYMatrix.h" +#include "MathMLStream.h" +#include "MathStream.h" #include "LaTeXFeatures.h" #include "support/std_ostream.h" diff --git a/src/mathed/math_xymatrixinset.h b/src/mathed/InsetMathXYMatrix.h similarity index 93% rename from src/mathed/math_xymatrixinset.h rename to src/mathed/InsetMathXYMatrix.h index 21a6499875..1928af1aa3 100644 --- a/src/mathed/math_xymatrixinset.h +++ b/src/mathed/InsetMathXYMatrix.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_xymatrixinset.h + * \file InsetMathXYMatrix.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define MATH_XYMATRIX_H #include "lyxlength.h" -#include "math_gridinset.h" +#include "InsetMathGrid.h" class InsetMathXYMatrix : public InsetMathGrid { diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am index a9214e8475..ec08b84041 100644 --- a/src/mathed/Makefile.am +++ b/src/mathed/Makefile.am @@ -1,6 +1,6 @@ include $(top_srcdir)/config/common.am -EXTRA_DIST = pch.h formulamacro.C +EXTRA_DIST = pch.h InsetFormulaMacro.C BUILT_SOURCES = $(PCH_FILE) @@ -9,152 +9,152 @@ noinst_LTLIBRARIES = libmathed.la AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES) libmathed_la_SOURCES = \ - textpainter.C \ - textpainter.h \ - math_amsarrayinset.C \ - math_amsarrayinset.h \ - math_arrayinset.C \ - math_arrayinset.h \ - math_atom.C \ - math_atom.h \ - math_autocorrect.C \ - math_autocorrect.h \ - math_biginset.C \ - math_biginset.h \ - math_binominset.C \ - math_binominset.h \ - math_boldsymbolinset.C \ - math_boldsymbolinset.h \ - math_boxinset.C \ - math_boxinset.h \ - math_boxedinset.C \ - math_boxedinset.h \ - math_braceinset.C \ - math_braceinset.h \ - math_casesinset.C \ - math_casesinset.h \ - math_charinset.C \ - math_charinset.h \ - math_colorinset.C \ - math_colorinset.h \ - math_commentinset.C \ - math_commentinset.h \ - math_data.C \ - math_data.h \ - math_decorationinset.C \ - math_decorationinset.h \ - math_deliminset.C \ - math_deliminset.h \ - math_dfracinset.C \ - math_dfracinset.h \ - math_diffinset.C \ - math_diffinset.h \ - math_diminset.C \ - math_diminset.h \ - math_dotsinset.C \ - math_dotsinset.h \ - math_envinset.C \ - math_envinset.h \ - math_extern.C \ - math_extern.h \ - math_exfuncinset.C \ - math_exfuncinset.h \ - math_exintinset.C \ - math_exintinset.h \ - math_factory.C \ - math_factory.h \ - math_fboxinset.C \ - math_fboxinset.h \ - math_frameboxinset.C \ - math_frameboxinset.h \ - math_fontinset.C \ - math_fontinset.h \ - math_fontoldinset.C \ - math_fontoldinset.h \ - math_fracinset.C \ - math_fracinset.h \ - math_fracbase.C \ - math_fracbase.h \ - math_gridinfo.h \ - math_gridinset.C \ - math_gridinset.h \ - math_hullinset.C \ - math_hullinset.h \ - math_inset.C \ - math_inset.h \ - math_kerninset.C \ - math_kerninset.h \ - math_lefteqninset.C \ - math_lefteqninset.h \ - math_liminset.C \ - math_liminset.h \ - math_macro.C \ - math_macro.h \ - math_macroarg.C \ - math_macroarg.h \ - math_macrotemplate.C \ - math_macrotemplate.h \ - math_macrotable.C \ - math_macrotable.h \ - math_makeboxinset.C \ - math_makeboxinset.h \ - math_mathmlstream.C \ - math_mathmlstream.h \ - math_matrixinset.C \ - math_matrixinset.h \ - math_nestinset.C \ - math_nestinset.h \ - math_numberinset.C \ - math_numberinset.h \ - math_oversetinset.C \ - math_oversetinset.h \ - math_parinset.C \ - math_parinset.h \ - math_parser.C \ - math_parser.h \ - math_phantominset.C \ - math_phantominset.h \ - math_replace.h \ - math_rootinset.C \ - math_rootinset.h \ - math_scriptinset.C \ - math_scriptinset.h \ - math_sizeinset.C \ - math_sizeinset.h \ - math_spaceinset.C \ - math_spaceinset.h \ - math_splitinset.C \ - math_splitinset.h \ - math_sqrtinset.C \ - math_sqrtinset.h \ - math_stackrelinset.C \ - math_stackrelinset.h \ - math_streamstr.C \ - math_streamstr.h \ - math_stringinset.C \ - math_stringinset.h \ - math_substackinset.C \ - math_substackinset.h \ - math_support.C \ - math_support.h \ - math_symbolinset.C \ - math_symbolinset.h \ - math_tabularinset.C \ - math_tabularinset.h \ - math_tfracinset.C \ - math_tfracinset.h \ - math_unknowninset.C \ - math_unknowninset.h \ - math_undersetinset.C \ - math_undersetinset.h \ - math_xarrowinset.C \ - math_xarrowinset.h \ - math_xymatrixinset.C \ - math_xymatrixinset.h \ - command_inset.h \ - command_inset.C \ - ref_inset.h \ - ref_inset.C -# math_mboxinset.C -# math_mboxinset.h + InsetMathAMSArray.C \ + InsetMathAMSArray.h \ + InsetMathArray.C \ + InsetMathArray.h \ + InsetMathBig.C \ + InsetMathBig.h \ + InsetMathBinom.C \ + InsetMathBinom.h \ + InsetMathBoldSymbol.C \ + InsetMathBoldSymbol.h \ + InsetMathBox.C \ + InsetMathBoxed.C \ + InsetMathBoxed.h \ + InsetMathBox.h \ + InsetMathBrace.C \ + InsetMathBrace.h \ + InsetMath.C \ + InsetMathCases.C \ + InsetMathCases.h \ + InsetMathChar.C \ + InsetMathChar.h \ + InsetMathColor.C \ + InsetMathColor.h \ + InsetMathCommand.C \ + InsetMathCommand.h \ + InsetMathComment.C \ + InsetMathComment.h \ + InsetMathDecoration.C \ + InsetMathDecoration.h \ + InsetMathDelim.C \ + InsetMathDelim.h \ + InsetMathDFrac.C \ + InsetMathDFrac.h \ + InsetMathDiff.C \ + InsetMathDiff.h \ + InsetMathDim.C \ + InsetMathDim.h \ + InsetMathDots.C \ + InsetMathDots.h \ + InsetMathEnv.C \ + InsetMathEnv.h \ + InsetMathExFunc.C \ + InsetMathExFunc.h \ + InsetMathExInt.C \ + InsetMathExInt.h \ + InsetMathFBox.C \ + InsetMathFBox.h \ + InsetMathFont.C \ + InsetMathFont.h \ + InsetMathFontOld.C \ + InsetMathFontOld.h \ + InsetMathFracBase.C \ + InsetMathFracBase.h \ + InsetMathFrac.C \ + InsetMathFrac.h \ + InsetMathFrameBox.C \ + InsetMathFrameBox.h \ + InsetMathGrid.C \ + InsetMathGrid.h \ + InsetMath.h \ + InsetMathHull.C \ + InsetMathHull.h \ + InsetMathKern.C \ + InsetMathKern.h \ + InsetMathLefteqn.C \ + InsetMathLefteqn.h \ + InsetMathLim.C \ + InsetMathLim.h \ + InsetMathMacro.C \ + InsetMathMacro.h \ + InsetMathMakebox.C \ + InsetMathMakebox.h \ + InsetMathMatrix.C \ + InsetMathMatrix.h \ + InsetMathNest.C \ + InsetMathNest.h \ + InsetMathNumber.C \ + InsetMathNumber.h \ + InsetMathOverset.C \ + InsetMathOverset.h \ + InsetMathPar.C \ + InsetMathPar.h \ + InsetMathPhantom.C \ + InsetMathPhantom.h \ + InsetMathRef.C \ + InsetMathRef.h \ + InsetMathRoot.C \ + InsetMathRoot.h \ + InsetMathScript.C \ + InsetMathScript.h \ + InsetMathSize.C \ + InsetMathSize.h \ + InsetMathSpace.C \ + InsetMathSpace.h \ + InsetMathSplit.C \ + InsetMathSplit.h \ + InsetMathSqrt.C \ + InsetMathSqrt.h \ + InsetMathStackrel.C \ + InsetMathStackrel.h \ + InsetMathString.C \ + InsetMathString.h \ + InsetMathSubstack.C \ + InsetMathSubstack.h \ + InsetMathSymbol.C \ + InsetMathSymbol.h \ + InsetMathTabular.C \ + InsetMathTabular.h \ + InsetMathTFrac.C \ + InsetMathTFrac.h \ + InsetMathUnderset.C \ + InsetMathUnderset.h \ + InsetMathUnknown.C \ + InsetMathUnknown.h \ + InsetMathXArrow.C \ + InsetMathXArrow.h \ + InsetMathXYMatrix.C \ + InsetMathXYMatrix.h \ + MathAtom.C \ + MathAtom.h \ + MathAutoCorrect.C \ + MathAutoCorrect.h \ + MathData.C \ + MathData.h \ + MathExtern.C \ + MathExtern.h \ + MathFactory.C \ + MathFactory.h \ + MathGridInfo.h \ + MathMacroArgument.C \ + MathMacroArgument.h \ + MathMacroTable.C \ + MathMacroTable.h \ + MathMacroTemplate.C \ + MathMacroTemplate.h \ + MathMLStream.C \ + MathMLStream.h \ + MathParser.C \ + MathParser.h \ + MathReplace.h \ + MathStream.C \ + MathStream.h \ + MathSupport.C \ + MathSupport.h \ + TextPainter.C \ + TextPainter.h +# InsetMathMBox.C +# InsetMathMBox.h diff --git a/src/mathed/math_atom.C b/src/mathed/MathAtom.C similarity index 91% rename from src/mathed/math_atom.C rename to src/mathed/MathAtom.C index bdf81d25ae..76a126ff8d 100644 --- a/src/mathed/math_atom.C +++ b/src/mathed/MathAtom.C @@ -1,5 +1,5 @@ /** - * \file math_atom.C + * \file MathAtom.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "math_atom.h" -#include "math_inset.h" +#include "MathAtom.h" +#include "InsetMath.h" using std::swap; diff --git a/src/mathed/math_atom.h b/src/mathed/MathAtom.h similarity index 98% rename from src/mathed/math_atom.h rename to src/mathed/MathAtom.h index 3457a2181c..757a9d33b9 100644 --- a/src/mathed/math_atom.h +++ b/src/mathed/MathAtom.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_atom.h + * \file MathAtom.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_autocorrect.C b/src/mathed/MathAutoCorrect.C similarity index 95% rename from src/mathed/math_autocorrect.C rename to src/mathed/MathAutoCorrect.C index 2c4c50040a..7be3cae6f3 100644 --- a/src/mathed/math_autocorrect.C +++ b/src/mathed/MathAutoCorrect.C @@ -1,5 +1,5 @@ /** - * \file math_autocorrect.C + * \file MathAutoCorrect.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_autocorrect.h" -#include "math_data.h" -#include "math_inset.h" -#include "math_support.h" -#include "math_parser.h" +#include "MathAutoCorrect.h" +#include "MathData.h" +#include "InsetMath.h" +#include "MathSupport.h" +#include "MathParser.h" #include "debug.h" #include "support/filetools.h" // LibFileSearch diff --git a/src/mathed/math_autocorrect.h b/src/mathed/MathAutoCorrect.h similarity index 93% rename from src/mathed/math_autocorrect.h rename to src/mathed/MathAutoCorrect.h index 8812722ce0..63d0484a95 100644 --- a/src/mathed/math_autocorrect.h +++ b/src/mathed/MathAutoCorrect.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_autocorrect.h + * \file MathAutoCorrect.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_data.C b/src/mathed/MathData.C similarity index 97% rename from src/mathed/math_data.C rename to src/mathed/MathData.C index fda679d7eb..86597d7fd0 100644 --- a/src/mathed/math_data.C +++ b/src/mathed/MathData.C @@ -1,5 +1,5 @@ /** - * \file math_data.C + * \file MathData.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,14 +10,14 @@ #include -#include "math_data.h" -#include "math_fontinset.h" -#include "math_scriptinset.h" -#include "math_macro.h" -#include "math_macrotable.h" -#include "math_mathmlstream.h" -#include "math_support.h" -#include "math_replace.h" +#include "MathData.h" +#include "InsetMathFont.h" +#include "InsetMathScript.h" +#include "InsetMathMacro.h" +#include "MathMacroTable.h" +#include "MathMLStream.h" +#include "MathSupport.h" +#include "MathReplace.h" #include "coordcache.h" #include "LColor.h" diff --git a/src/mathed/math_data.h b/src/mathed/MathData.h similarity index 99% rename from src/mathed/math_data.h rename to src/mathed/MathData.h index 1720ba4423..9889b1a2f0 100644 --- a/src/mathed/math_data.h +++ b/src/mathed/MathData.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_data.h + * \file MathData.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -17,7 +17,7 @@ #include #include -#include "math_atom.h" +#include "MathAtom.h" #include "dimension.h" class LaTeXFeatures; diff --git a/src/mathed/math_extern.C b/src/mathed/MathExtern.C similarity index 98% rename from src/mathed/math_extern.C rename to src/mathed/MathExtern.C index 6849fd952c..41fba8c55b 100644 --- a/src/mathed/math_extern.C +++ b/src/mathed/MathExtern.C @@ -1,5 +1,5 @@ /** - * \file math_extern.C + * \file MathExtern.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -14,24 +14,24 @@ #include -#include "math_extern.h" -#include "math_arrayinset.h" -#include "math_charinset.h" -#include "math_deliminset.h" -#include "math_data.h" -#include "math_diffinset.h" -#include "math_exfuncinset.h" -#include "math_exintinset.h" -#include "math_fontinset.h" -#include "math_fracinset.h" -#include "math_liminset.h" -#include "math_matrixinset.h" -#include "math_mathmlstream.h" -#include "math_numberinset.h" -#include "math_scriptinset.h" -#include "math_stringinset.h" -#include "math_symbolinset.h" -#include "math_parser.h" +#include "MathExtern.h" +#include "InsetMathArray.h" +#include "InsetMathChar.h" +#include "InsetMathDelim.h" +#include "MathData.h" +#include "InsetMathDiff.h" +#include "InsetMathExFunc.h" +#include "InsetMathExInt.h" +#include "InsetMathFont.h" +#include "InsetMathFrac.h" +#include "InsetMathLim.h" +#include "InsetMathMatrix.h" +#include "MathMLStream.h" +#include "InsetMathNumber.h" +#include "InsetMathScript.h" +#include "InsetMathString.h" +#include "InsetMathSymbol.h" +#include "MathParser.h" #include "debug.h" #include "support/filetools.h" #include "support/lstrings.h" diff --git a/src/mathed/math_extern.h b/src/mathed/MathExtern.h similarity index 97% rename from src/mathed/math_extern.h rename to src/mathed/MathExtern.h index 3fcf32a5b1..33c710a170 100644 --- a/src/mathed/math_extern.h +++ b/src/mathed/MathExtern.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_extern.h + * \file MathExtern.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_factory.C b/src/mathed/MathFactory.C similarity index 87% rename from src/mathed/math_factory.C rename to src/mathed/MathFactory.C index d8ea93e818..cd02c94e75 100644 --- a/src/mathed/math_factory.C +++ b/src/mathed/MathFactory.C @@ -1,5 +1,5 @@ /** - * \file math_factory.C + * \file MathFactory.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,54 +10,54 @@ #include -#include "math_factory.h" -#include "math_parser.h" -#include "math_arrayinset.h" -#include "math_amsarrayinset.h" -#include "math_binominset.h" -#include "math_boxinset.h" -#include "math_boxedinset.h" -#include "math_boldsymbolinset.h" -#include "math_casesinset.h" -#include "math_colorinset.h" -#include "math_decorationinset.h" -#include "math_dfracinset.h" -#include "math_dotsinset.h" -#include "math_fboxinset.h" -#include "math_frameboxinset.h" -#include "math_fontinset.h" -#include "math_fontoldinset.h" -#include "math_fracinset.h" -#include "math_kerninset.h" -#include "math_lefteqninset.h" -#include "math_macro.h" -#include "math_macroarg.h" -#include "math_macrotable.h" -#include "math_macrotemplate.h" -#include "math_makeboxinset.h" -#include "math_oversetinset.h" -#include "math_parser.h" -#include "math_phantominset.h" -#include "math_rootinset.h" -#include "math_sizeinset.h" -#include "math_spaceinset.h" -#include "math_splitinset.h" -#include "math_sqrtinset.h" -#include "math_stackrelinset.h" -#include "math_substackinset.h" -#include "math_symbolinset.h" -#include "math_tabularinset.h" -#include "math_tfracinset.h" -#include "math_undersetinset.h" -#include "math_unknowninset.h" -#include "math_xarrowinset.h" -#include "math_xymatrixinset.h" +#include "MathFactory.h" +#include "MathParser.h" +#include "InsetMathArray.h" +#include "InsetMathAMSArray.h" +#include "InsetMathBinom.h" +#include "InsetMathBox.h" +#include "InsetMathBoxed.h" +#include "InsetMathBoldSymbol.h" +#include "InsetMathCases.h" +#include "InsetMathColor.h" +#include "InsetMathDecoration.h" +#include "InsetMathDFrac.h" +#include "InsetMathDots.h" +#include "InsetMathFBox.h" +#include "InsetMathFrameBox.h" +#include "InsetMathFont.h" +#include "InsetMathFontOld.h" +#include "InsetMathFrac.h" +#include "InsetMathKern.h" +#include "InsetMathLefteqn.h" +#include "InsetMathMacro.h" +#include "MathMacroArgument.h" +#include "MathMacroTable.h" +#include "MatheMacroTemplate.h" +#include "InsetMathMakebox.h" +#include "InsetMathOverset.h" +#include "MathParser.h" +#include "InsetMathPhantom.h" +#include "InsetMathRoot.h" +#include "InsetMathSize.h" +#include "InsetMathSpace.h" +#include "InsetMathSplit.h" +#include "InsetMathSqrt.h" +#include "InsetMathStackrel.h" +#include "InsetMathSubstack.h" +#include "InsetMathSymbol.h" +#include "InsetMathTabular.h" +#include "InsetMathTFrac.h" +#include "InsetMathUnderset.h" +#include "InsetMathUnknown.h" +#include "InsetMathXArrow.h" +#include "InsetMathXYMatrix.h" //#include "insets/insetref.h" -#include "ref_inset.h" +#include "InsetMathRef.h" #include "debug.h" -#include "math_support.h" +#include "MathSupport.h" #include "support/filetools.h" // LibFileSearch #include "support/lstrings.h" diff --git a/src/mathed/math_factory.h b/src/mathed/MathFactory.h similarity index 96% rename from src/mathed/math_factory.h rename to src/mathed/MathFactory.h index 20fd5c9ad9..0139490e6f 100644 --- a/src/mathed/math_factory.h +++ b/src/mathed/MathFactory.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_factory.h + * \file MathFactory.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_gridinfo.h b/src/mathed/MathGridInfo.h similarity index 98% rename from src/mathed/math_gridinfo.h rename to src/mathed/MathGridInfo.h index 2c9c8874ea..c9ad6b4a40 100644 --- a/src/mathed/math_gridinfo.h +++ b/src/mathed/MathGridInfo.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_gridinfo.h + * \file MathGridInfo.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_mathmlstream.C b/src/mathed/MathMLStream.C similarity index 97% rename from src/mathed/math_mathmlstream.C rename to src/mathed/MathMLStream.C index 9f538ab799..c519b4c39c 100644 --- a/src/mathed/math_mathmlstream.C +++ b/src/mathed/MathMLStream.C @@ -1,5 +1,5 @@ /** - * \file math_mathmlstream.C + * \file MathMLStream.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,10 +10,10 @@ #include -#include "math_mathmlstream.h" -#include "math_inset.h" -#include "math_data.h" -#include "math_extern.h" +#include "MathMLStream.h" +#include "InsetMath.h" +#include "MathData.h" +#include "MathExtern.h" #include "support/lyxalgo.h" using std::strlen; diff --git a/src/mathed/math_mathmlstream.h b/src/mathed/MathMLStream.h similarity index 99% rename from src/mathed/math_mathmlstream.h rename to src/mathed/MathMLStream.h index 8369e047cf..ab4bef8f5b 100644 --- a/src/mathed/math_mathmlstream.h +++ b/src/mathed/MathMLStream.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_mathmlstream.h + * \file MathMLStream.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_macroarg.C b/src/mathed/MathMacroArgument.C similarity index 89% rename from src/mathed/math_macroarg.C rename to src/mathed/MathMacroArgument.C index d4b7adf986..5f0cf20102 100644 --- a/src/mathed/math_macroarg.C +++ b/src/mathed/MathMacroArgument.C @@ -1,5 +1,5 @@ /** - * \file math_macroarg.C + * \file MathMacroArgument.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,10 +11,10 @@ #include -#include "math_macroarg.h" -#include "math_macro.h" -#include "math_mathmlstream.h" -#include "math_support.h" +#include "MathMacroArgument.h" +#include "InsetMathMacro.h" +#include "MathMLStream.h" +#include "MathSupport.h" #include "debug.h" using std::endl; diff --git a/src/mathed/math_macroarg.h b/src/mathed/MathMacroArgument.h similarity index 94% rename from src/mathed/math_macroarg.h rename to src/mathed/MathMacroArgument.h index 56c57f7c5a..bb5b058f67 100644 --- a/src/mathed/math_macroarg.h +++ b/src/mathed/MathMacroArgument.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_macroarg.h + * \file MathMacroArgument.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #ifndef MATHMACROARGUMENT_H #define MATHMACROARGUMENT_H -#include "math_diminset.h" +#include "InsetMathDim.h" /// A macro argument. diff --git a/src/mathed/math_macrotable.C b/src/mathed/MathMacroTable.C similarity index 94% rename from src/mathed/math_macrotable.C rename to src/mathed/MathMacroTable.C index 74bc46bd88..c22ce605cb 100644 --- a/src/mathed/math_macrotable.C +++ b/src/mathed/MathMacroTable.C @@ -1,5 +1,5 @@ /** - * \file math_macrotable.C + * \file MathMacroTable.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,11 +10,11 @@ #include -#include "math_macrotable.h" -#include "math_macrotemplate.h" -#include "math_macroarg.h" -#include "math_support.h" -#include "math_sqrtinset.h" +#include "MathMacroTable.h" +#include "MathMacroTemplate.h" +#include "MathMacroArgument.h" +#include "MathSupport.h" +#include "InsetMathSqrt.h" #include "debug.h" #include "dociterator.h" diff --git a/src/mathed/math_macrotable.h b/src/mathed/MathMacroTable.h similarity index 98% rename from src/mathed/math_macrotable.h rename to src/mathed/MathMacroTable.h index 4deb1cfde1..bdabb80966 100644 --- a/src/mathed/math_macrotable.h +++ b/src/mathed/MathMacroTable.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_macrotable.h + * \file MathMacroTable.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_macrotemplate.C b/src/mathed/MathMacroTemplate.C similarity index 97% rename from src/mathed/math_macrotemplate.C rename to src/mathed/MathMacroTemplate.C index 717d0bc65d..35e433b2ee 100644 --- a/src/mathed/math_macrotemplate.C +++ b/src/mathed/MathMacroTemplate.C @@ -10,10 +10,10 @@ #include -#include "math_macrotemplate.h" -#include "math_mathmlstream.h" -#include "math_parser.h" -#include "math_support.h" +#include "MathMacroTemplate.h" +#include "MathMLStream.h" +#include "MathParser.h" +#include "MathSupport.h" #include "cursor.h" #include "debug.h" diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/MathMacroTemplate.h similarity index 95% rename from src/mathed/math_macrotemplate.h rename to src/mathed/MathMacroTemplate.h index d2c2a4ed22..580b6b16d4 100644 --- a/src/mathed/math_macrotemplate.h +++ b/src/mathed/MathMacroTemplate.h @@ -13,9 +13,9 @@ #ifndef MATH_MACROTEMPLATE_H #define MATH_MACROTEMPLATE_H -#include "math_data.h" -#include "math_macrotable.h" -#include "math_nestinset.h" +#include "MathData.h" +#include "MathMacroTable.h" +#include "InsetMathNest.h" #include "support/types.h" diff --git a/src/mathed/math_parser.C b/src/mathed/MathParser.C similarity index 98% rename from src/mathed/math_parser.C rename to src/mathed/MathParser.C index 8b1da5111a..1c55e39353 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/MathParser.C @@ -1,5 +1,5 @@ /** - * \file math_parser.C + * \file MathParser.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -38,29 +38,29 @@ following hack as starting point to write some macros: #include -#include "math_parser.h" -#include "math_arrayinset.h" -#include "math_biginset.h" -#include "math_braceinset.h" -#include "math_charinset.h" -#include "math_colorinset.h" -#include "math_commentinset.h" -#include "math_deliminset.h" -#include "math_envinset.h" -#include "math_factory.h" -#include "math_kerninset.h" -#include "math_macro.h" -#include "math_macroarg.h" -#include "math_macrotemplate.h" -#include "math_parinset.h" -#include "math_rootinset.h" -#include "math_scriptinset.h" -#include "math_sqrtinset.h" -#include "math_support.h" -#include "math_tabularinset.h" +#include "MathParser.h" +#include "InsetMathArray.h" +#include "InsetMathBig.h" +#include "InsetMathBrace.h" +#include "InsetMathChar.h" +#include "InsetMathColor.h" +#include "InsetMathComment.h" +#include "InsetMathDelim.h" +#include "InsetMathEnv.h" +#include "MathFactory.h" +#include "InsetMathKern.h" +#include "InsetMathMacro.h" +#include "MathMacroArgument.h" +#include "MatheMacroTemplate.h" +#include "InsetMathPar.h" +#include "InsetMathRoot.h" +#include "InsetMathScript.h" +#include "InsetMathSqrt.h" +#include "MathSupport.h" +#include "InsetMathTabular.h" //#include "insets/insetref.h" -#include "ref_inset.h" +#include "InsetMathRef.h" #include "lyxlex.h" #include "debug.h" diff --git a/src/mathed/math_parser.h b/src/mathed/MathParser.h similarity index 98% rename from src/mathed/math_parser.h rename to src/mathed/MathParser.h index 422ddea788..911608c398 100644 --- a/src/mathed/math_parser.h +++ b/src/mathed/MathParser.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_parser.h + * \file MathParser.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_replace.h b/src/mathed/MathReplace.h similarity index 88% rename from src/mathed/math_replace.h rename to src/mathed/MathReplace.h index 034945a6f3..3a57d4c9d3 100644 --- a/src/mathed/math_replace.h +++ b/src/mathed/MathReplace.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_replace.h + * \file MathReplace.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -13,7 +13,7 @@ #define MATH_REPLACE_H -#include "math_data.h" +#include "MathData.h" class ReplaceData { public: diff --git a/src/mathed/math_streamstr.C b/src/mathed/MathStream.C similarity index 91% rename from src/mathed/math_streamstr.C rename to src/mathed/MathStream.C index 5208ba7592..21af399570 100644 --- a/src/mathed/math_streamstr.C +++ b/src/mathed/MathStream.C @@ -1,5 +1,5 @@ /** - * \file math_streamstr.C + * \file MathStream.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,8 +10,8 @@ #include -#include "math_streamstr.h" -#include "math_mathmlstream.h" +#include "MathStream.h" +#include "MathMLStream.h" #include "support/std_ostream.h" using std::string; diff --git a/src/mathed/math_streamstr.h b/src/mathed/MathStream.h similarity index 97% rename from src/mathed/math_streamstr.h rename to src/mathed/MathStream.h index 32c6cf7a0a..e9b7fd3ba9 100644 --- a/src/mathed/math_streamstr.h +++ b/src/mathed/MathStream.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_streamstr.h + * \file MathStream.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/math_support.C b/src/mathed/MathSupport.C similarity index 99% rename from src/mathed/math_support.C rename to src/mathed/MathSupport.C index c3ab018ac5..99bb7e43c0 100644 --- a/src/mathed/math_support.C +++ b/src/mathed/MathSupport.C @@ -1,5 +1,5 @@ /** - * \file math_support.C + * \file MathSupport.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -11,11 +11,11 @@ #include -#include "math_support.h" -#include "math_data.h" -#include "math_inset.h" -#include "math_mathmlstream.h" -#include "math_parser.h" +#include "MathSupport.h" +#include "MathData.h" +#include "InsetMath.h" +#include "MathMLStream.h" +#include "MathParser.h" #include "debug.h" #include "LColor.h" diff --git a/src/mathed/math_support.h b/src/mathed/MathSupport.h similarity index 98% rename from src/mathed/math_support.h rename to src/mathed/MathSupport.h index 009d646252..3874735e1e 100644 --- a/src/mathed/math_support.h +++ b/src/mathed/MathSupport.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file math_support.h + * \file MathSupport.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/mathed/textpainter.C b/src/mathed/TextPainter.C similarity index 96% rename from src/mathed/textpainter.C rename to src/mathed/TextPainter.C index 224cca9cec..e2403f625c 100644 --- a/src/mathed/textpainter.C +++ b/src/mathed/TextPainter.C @@ -1,5 +1,5 @@ /** - * \file textpainter.C + * \file TextPainter.C * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * @@ -10,7 +10,7 @@ #include -#include "textpainter.h" +#include "TextPainter.h" #include "support/std_ostream.h" diff --git a/src/mathed/textpainter.h b/src/mathed/TextPainter.h similarity index 97% rename from src/mathed/textpainter.h rename to src/mathed/TextPainter.h index 3ae9ab3f5e..d9da7234bc 100644 --- a/src/mathed/textpainter.h +++ b/src/mathed/TextPainter.h @@ -1,6 +1,6 @@ // -*- C++ -*- /** - * \file textpainter.h + * \file TextPainter.h * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * diff --git a/src/metricsinfo.C b/src/metricsinfo.C index bb14576342..bf4ed3dd8a 100644 --- a/src/metricsinfo.C +++ b/src/metricsinfo.C @@ -14,7 +14,7 @@ #include "LColor.h" #include "metricsinfo.h" -#include "mathed/math_support.h" +#include "mathed/MathSupport.h" #include "frontends/Painter.h" @@ -113,6 +113,7 @@ ArrayChanger::ArrayChanger(MetricsBase & mb) {} + ShapeChanger::ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape) : Changer(font) { @@ -120,6 +121,7 @@ ShapeChanger::ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape) orig_.setShape(shape); } + ShapeChanger::~ShapeChanger() { orig_.setShape(save_); diff --git a/src/text2.C b/src/text2.C index 55bde061df..09b9a2ce93 100644 --- a/src/text2.C +++ b/src/text2.C @@ -51,7 +51,7 @@ #include "insets/insetenv.h" -#include "mathed/math_hullinset.h" +#include "mathed/InsetMathHull.h" #include "support/textutils.h" diff --git a/src/text3.C b/src/text3.C index ebb0864f68..9917005793 100644 --- a/src/text3.C +++ b/src/text3.C @@ -65,8 +65,8 @@ #include "support/convert.h" #include "support/lyxtime.h" -#include "mathed/math_hullinset.h" -#include "mathed/math_macrotemplate.h" +#include "mathed/InsetMathHull.h" +#include "mathed/MathMacroTemplate.h" #include diff --git a/src/undo.C b/src/undo.C index 7cf939e43f..29b3c7b640 100644 --- a/src/undo.C +++ b/src/undo.C @@ -24,7 +24,7 @@ #include "paragraph.h" #include "ParagraphList.h" -#include "mathed/math_support.h" +#include "mathed/MathSupport.h" #include "insets/inset.h" #include