mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-22 13:18:28 +00:00
merge {mathed,insets,graphics}/Makefile.am into src/Makefile.am
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19424 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz
parent
12b09d5251
commit
5d80a87ceb
@ -415,9 +415,6 @@ AC_CONFIG_FILES([Makefile
|
|||||||
src/Makefile \
|
src/Makefile \
|
||||||
src/version.cpp-tmp:src/version.cpp.in \
|
src/version.cpp-tmp:src/version.cpp.in \
|
||||||
src/tex2lyx/Makefile \
|
src/tex2lyx/Makefile \
|
||||||
src/mathed/Makefile \
|
|
||||||
src/graphics/Makefile \
|
|
||||||
src/insets/Makefile \
|
|
||||||
src/support/Makefile \
|
src/support/Makefile \
|
||||||
src/frontends/Makefile \
|
src/frontends/Makefile \
|
||||||
src/frontends/controllers/Makefile \
|
src/frontends/controllers/Makefile \
|
||||||
|
|||||||
@ -1077,7 +1077,7 @@ bool Cursor::upDownInMath(bool up)
|
|||||||
|
|
||||||
// We want to keep the x-target on subsequent up/down movements
|
// We want to keep the x-target on subsequent up/down movements
|
||||||
// that cross beyond the end of short lines. Thus a special
|
// that cross beyond the end of short lines. Thus a special
|
||||||
// handling when the cursor is at the end of line: Use the new
|
// handling when the cursor is at the end of line: Use the new
|
||||||
// x-target only if the old one was before the end of line
|
// x-target only if the old one was before the end of line
|
||||||
// or the old one was after the beginning of the line
|
// or the old one was after the beginning of the line
|
||||||
bool inRTL = isWithinRtlParagraph(*this);
|
bool inRTL = isWithinRtlParagraph(*this);
|
||||||
@ -1091,12 +1091,12 @@ bool Cursor::upDownInMath(bool up)
|
|||||||
right = pos() == textRow().endpos();
|
right = pos() == textRow().endpos();
|
||||||
}
|
}
|
||||||
if ((!left && !right) ||
|
if ((!left && !right) ||
|
||||||
(left && !right && xo < x_target_) ||
|
(left && !right && xo < x_target_) ||
|
||||||
(!left && right && x_target_ < xo))
|
(!left && right && x_target_ < xo))
|
||||||
setTargetX(xo);
|
setTargetX(xo);
|
||||||
else
|
else
|
||||||
xo = targetX();
|
xo = targetX();
|
||||||
} else
|
} else
|
||||||
xo = targetX();
|
xo = targetX();
|
||||||
|
|
||||||
// try neigbouring script insets
|
// try neigbouring script insets
|
||||||
@ -1169,7 +1169,7 @@ bool Cursor::upDownInMath(bool up)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool Cursor::upDownInText(bool up, bool & updateNeeded)
|
bool Cursor::upDownInText(bool up, bool & updateNeeded)
|
||||||
{
|
{
|
||||||
BOOST_ASSERT(text());
|
BOOST_ASSERT(text());
|
||||||
|
|
||||||
@ -1184,14 +1184,14 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
|
|||||||
// if we cannot move up/down inside this inset anymore
|
// if we cannot move up/down inside this inset anymore
|
||||||
if (x_target_ == -1)
|
if (x_target_ == -1)
|
||||||
setTargetX(xo);
|
setTargetX(xo);
|
||||||
else if (xo - textTargetOffset() != x_target() &&
|
else if (xo - textTargetOffset() != x_target() &&
|
||||||
depth() == beforeDispatchCursor_.depth()) {
|
depth() == beforeDispatchCursor_.depth()) {
|
||||||
// In text mode inside the line (not left or right) possibly set a new target_x,
|
// In text mode inside the line (not left or right) possibly set a new target_x,
|
||||||
// but only if we are somewhere else than the previous target-offset.
|
// but only if we are somewhere else than the previous target-offset.
|
||||||
|
|
||||||
// We want to keep the x-target on subsequent up/down movements
|
// We want to keep the x-target on subsequent up/down movements
|
||||||
// that cross beyond the end of short lines. Thus a special
|
// that cross beyond the end of short lines. Thus a special
|
||||||
// handling when the cursor is at the end of line: Use the new
|
// handling when the cursor is at the end of line: Use the new
|
||||||
// x-target only if the old one was before the end of line
|
// x-target only if the old one was before the end of line
|
||||||
// or the old one was after the beginning of the line
|
// or the old one was after the beginning of the line
|
||||||
bool inRTL = isWithinRtlParagraph(*this);
|
bool inRTL = isWithinRtlParagraph(*this);
|
||||||
@ -1205,12 +1205,12 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
|
|||||||
right = pos() == textRow().endpos();
|
right = pos() == textRow().endpos();
|
||||||
}
|
}
|
||||||
if ((!left && !right) ||
|
if ((!left && !right) ||
|
||||||
(left && !right && xo < x_target_) ||
|
(left && !right && xo < x_target_) ||
|
||||||
(!left && right && x_target_ < xo))
|
(!left && right && x_target_ < xo))
|
||||||
setTargetX(xo);
|
setTargetX(xo);
|
||||||
else
|
else
|
||||||
xo = targetX();
|
xo = targetX();
|
||||||
} else
|
} else
|
||||||
xo = targetX();
|
xo = targetX();
|
||||||
|
|
||||||
// first get the current line
|
// first get the current line
|
||||||
@ -1227,7 +1227,7 @@ bool Cursor::upDownInText(bool up, bool & updateNeeded)
|
|||||||
if (pit() == 0 && row == 0)
|
if (pit() == 0 && row == 0)
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
if (pit() + 1 >= int(text()->paragraphs().size()) &&
|
if (pit() + 1 >= int(text()->paragraphs().size()) &&
|
||||||
row + 1 >= int(pm.rows().size()))
|
row + 1 >= int(pm.rows().size()))
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1463,7 +1463,7 @@ Font Cursor::getFont() const
|
|||||||
// on space? Take the font before (only for RTL boundary stay)
|
// on space? Take the font before (only for RTL boundary stay)
|
||||||
if (pos > 0) {
|
if (pos > 0) {
|
||||||
if (pos == sl.lastpos()
|
if (pos == sl.lastpos()
|
||||||
|| (par.isSeparator(pos) &&
|
|| (par.isSeparator(pos) &&
|
||||||
!text.isRTLBoundary(buffer(), par, pos)))
|
!text.isRTLBoundary(buffer(), par, pos)))
|
||||||
--pos;
|
--pos;
|
||||||
}
|
}
|
||||||
|
|||||||
307
src/Makefile.am
307
src/Makefile.am
@ -1,10 +1,12 @@
|
|||||||
include $(top_srcdir)/config/common.am
|
include $(top_srcdir)/config/common.am
|
||||||
|
|
||||||
|
############################### Core ##############################
|
||||||
|
|
||||||
DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp
|
DISTCLEANFILES += config.h libintl.h version.cpp stamp-version version.cpp-tmp
|
||||||
|
|
||||||
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
|
MAINTAINERCLEANFILES += $(srcdir)/config.h.in
|
||||||
|
|
||||||
SUBDIRS = mathed insets graphics support frontends .
|
SUBDIRS = support frontends .
|
||||||
|
|
||||||
EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
|
EXTRA_DIST = config.h.in stamp-h.in version.cpp.in \
|
||||||
Section.h \
|
Section.h \
|
||||||
@ -266,3 +268,306 @@ stamp-version: version.cpp-tmp
|
|||||||
cp $< version.cpp ;\
|
cp $< version.cpp ;\
|
||||||
fi
|
fi
|
||||||
echo timestamp > $@
|
echo timestamp > $@
|
||||||
|
|
||||||
|
|
||||||
|
############################### Graphics ##############################
|
||||||
|
|
||||||
|
pkglib_LTLIBRARIES += liblyxgraphics.la
|
||||||
|
|
||||||
|
liblyxgraphics_la_SOURCES = \
|
||||||
|
graphics/GraphicsCache.h \
|
||||||
|
graphics/GraphicsCache.cpp \
|
||||||
|
graphics/GraphicsCacheItem.h \
|
||||||
|
graphics/GraphicsCacheItem.cpp \
|
||||||
|
graphics/GraphicsConverter.h \
|
||||||
|
graphics/GraphicsConverter.cpp \
|
||||||
|
graphics/GraphicsImage.h \
|
||||||
|
graphics/GraphicsImage.cpp \
|
||||||
|
graphics/GraphicsLoader.h \
|
||||||
|
graphics/GraphicsLoader.cpp \
|
||||||
|
graphics/GraphicsParams.cpp \
|
||||||
|
graphics/GraphicsParams.h \
|
||||||
|
graphics/LoaderQueue.h \
|
||||||
|
graphics/LoaderQueue.cpp \
|
||||||
|
graphics/GraphicsTypes.h \
|
||||||
|
graphics/GraphicsTypes.cpp \
|
||||||
|
graphics/PreviewImage.h \
|
||||||
|
graphics/PreviewImage.cpp \
|
||||||
|
graphics/PreviewLoader.h \
|
||||||
|
graphics/PreviewLoader.cpp \
|
||||||
|
graphics/Previews.h \
|
||||||
|
graphics/Previews.cpp
|
||||||
|
|
||||||
|
|
||||||
|
############################### Mathed ##############################
|
||||||
|
|
||||||
|
EXTRA_DIST += mathed/InsetFormulaMacro.cpp
|
||||||
|
|
||||||
|
pkglib_LTLIBRARIES += liblyxmathed.la
|
||||||
|
|
||||||
|
liblyxmathed_la_SOURCES = \
|
||||||
|
mathed/InsetMathAMSArray.cpp \
|
||||||
|
mathed/InsetMathAMSArray.h \
|
||||||
|
mathed/InsetMathArray.cpp \
|
||||||
|
mathed/InsetMathArray.h \
|
||||||
|
mathed/InsetMathBig.cpp \
|
||||||
|
mathed/InsetMathBig.h \
|
||||||
|
mathed/InsetMathBinom.cpp \
|
||||||
|
mathed/InsetMathBinom.h \
|
||||||
|
mathed/InsetMathBoldSymbol.cpp \
|
||||||
|
mathed/InsetMathBoldSymbol.h \
|
||||||
|
mathed/InsetMathBox.cpp \
|
||||||
|
mathed/InsetMathBoxed.cpp \
|
||||||
|
mathed/InsetMathBoxed.h \
|
||||||
|
mathed/InsetMathBox.h \
|
||||||
|
mathed/InsetMathBrace.cpp \
|
||||||
|
mathed/InsetMathBrace.h \
|
||||||
|
mathed/InsetMath.cpp \
|
||||||
|
mathed/InsetMathCases.cpp \
|
||||||
|
mathed/InsetMathCases.h \
|
||||||
|
mathed/InsetMathChar.cpp \
|
||||||
|
mathed/InsetMathChar.h \
|
||||||
|
mathed/InsetMathColor.cpp \
|
||||||
|
mathed/InsetMathColor.h \
|
||||||
|
mathed/CommandInset.cpp \
|
||||||
|
mathed/CommandInset.h \
|
||||||
|
mathed/InsetMathComment.cpp \
|
||||||
|
mathed/InsetMathComment.h \
|
||||||
|
mathed/InsetMathDecoration.cpp \
|
||||||
|
mathed/InsetMathDecoration.h \
|
||||||
|
mathed/InsetMathDelim.cpp \
|
||||||
|
mathed/InsetMathDelim.h \
|
||||||
|
mathed/InsetMathDFrac.cpp \
|
||||||
|
mathed/InsetMathDFrac.h \
|
||||||
|
mathed/InsetMathDiff.cpp \
|
||||||
|
mathed/InsetMathDiff.h \
|
||||||
|
mathed/InsetMathDots.cpp \
|
||||||
|
mathed/InsetMathDots.h \
|
||||||
|
mathed/InsetMathEnv.cpp \
|
||||||
|
mathed/InsetMathEnv.h \
|
||||||
|
mathed/InsetMathExFunc.cpp \
|
||||||
|
mathed/InsetMathExFunc.h \
|
||||||
|
mathed/InsetMathExInt.cpp \
|
||||||
|
mathed/InsetMathExInt.h \
|
||||||
|
mathed/InsetMathFBox.cpp \
|
||||||
|
mathed/InsetMathFBox.h \
|
||||||
|
mathed/InsetMathFont.cpp \
|
||||||
|
mathed/InsetMathFont.h \
|
||||||
|
mathed/InsetMathFontOld.cpp \
|
||||||
|
mathed/InsetMathFontOld.h \
|
||||||
|
mathed/InsetMathFracBase.cpp \
|
||||||
|
mathed/InsetMathFracBase.h \
|
||||||
|
mathed/InsetMathFrac.cpp \
|
||||||
|
mathed/InsetMathFrac.h \
|
||||||
|
mathed/InsetMathFrameBox.cpp \
|
||||||
|
mathed/InsetMathFrameBox.h \
|
||||||
|
mathed/InsetMathGrid.cpp \
|
||||||
|
mathed/InsetMathGrid.h \
|
||||||
|
mathed/InsetMath.h \
|
||||||
|
mathed/InsetMathHull.cpp \
|
||||||
|
mathed/InsetMathHull.h \
|
||||||
|
mathed/InsetMathKern.cpp \
|
||||||
|
mathed/InsetMathKern.h \
|
||||||
|
mathed/InsetMathLefteqn.cpp \
|
||||||
|
mathed/InsetMathLefteqn.h \
|
||||||
|
mathed/InsetMathLim.cpp \
|
||||||
|
mathed/InsetMathLim.h \
|
||||||
|
mathed/MathMacro.cpp \
|
||||||
|
mathed/MathMacro.h \
|
||||||
|
mathed/InsetMathMakebox.cpp \
|
||||||
|
mathed/InsetMathMakebox.h \
|
||||||
|
mathed/InsetMathMatrix.cpp \
|
||||||
|
mathed/InsetMathMatrix.h \
|
||||||
|
mathed/InsetMathNest.cpp \
|
||||||
|
mathed/InsetMathNest.h \
|
||||||
|
mathed/InsetMathNumber.cpp \
|
||||||
|
mathed/InsetMathNumber.h \
|
||||||
|
mathed/InsetMathOverset.cpp \
|
||||||
|
mathed/InsetMathOverset.h \
|
||||||
|
mathed/InsetMathPar.cpp \
|
||||||
|
mathed/InsetMathPar.h \
|
||||||
|
mathed/InsetMathPhantom.cpp \
|
||||||
|
mathed/InsetMathPhantom.h \
|
||||||
|
mathed/InsetMathRef.cpp \
|
||||||
|
mathed/InsetMathRef.h \
|
||||||
|
mathed/InsetMathRoot.cpp \
|
||||||
|
mathed/InsetMathRoot.h \
|
||||||
|
mathed/InsetMathScript.cpp \
|
||||||
|
mathed/InsetMathScript.h \
|
||||||
|
mathed/InsetMathSize.cpp \
|
||||||
|
mathed/InsetMathSize.h \
|
||||||
|
mathed/InsetMathSpace.cpp \
|
||||||
|
mathed/InsetMathSpace.h \
|
||||||
|
mathed/InsetMathSplit.cpp \
|
||||||
|
mathed/InsetMathSplit.h \
|
||||||
|
mathed/InsetMathSqrt.cpp \
|
||||||
|
mathed/InsetMathSqrt.h \
|
||||||
|
mathed/InsetMathStackrel.cpp \
|
||||||
|
mathed/InsetMathStackrel.h \
|
||||||
|
mathed/InsetMathString.cpp \
|
||||||
|
mathed/InsetMathString.h \
|
||||||
|
mathed/InsetMathSubstack.cpp \
|
||||||
|
mathed/InsetMathSubstack.h \
|
||||||
|
mathed/InsetMathSymbol.cpp \
|
||||||
|
mathed/InsetMathSymbol.h \
|
||||||
|
mathed/InsetMathTabular.cpp \
|
||||||
|
mathed/InsetMathTabular.h \
|
||||||
|
mathed/InsetMathTFrac.cpp \
|
||||||
|
mathed/InsetMathTFrac.h \
|
||||||
|
mathed/InsetMathUnderset.cpp \
|
||||||
|
mathed/InsetMathUnderset.h \
|
||||||
|
mathed/InsetMathUnknown.cpp \
|
||||||
|
mathed/InsetMathUnknown.h \
|
||||||
|
mathed/InsetMathXArrow.cpp \
|
||||||
|
mathed/InsetMathXArrow.h \
|
||||||
|
mathed/InsetMathXYMatrix.cpp \
|
||||||
|
mathed/InsetMathXYMatrix.h \
|
||||||
|
mathed/MathAtom.cpp \
|
||||||
|
mathed/MathAtom.h \
|
||||||
|
mathed/MathAutoCorrect.cpp \
|
||||||
|
mathed/MathAutoCorrect.h \
|
||||||
|
mathed/MathData.cpp \
|
||||||
|
mathed/MathData.h \
|
||||||
|
mathed/MathExtern.cpp \
|
||||||
|
mathed/MathExtern.h \
|
||||||
|
mathed/MathFactory.cpp \
|
||||||
|
mathed/MathFactory.h \
|
||||||
|
mathed/MathGridInfo.h \
|
||||||
|
mathed/MathMacroArgument.cpp \
|
||||||
|
mathed/MathMacroArgument.h \
|
||||||
|
mathed/MacroTable.cpp \
|
||||||
|
mathed/MacroTable.h \
|
||||||
|
mathed/MathMacroTemplate.cpp \
|
||||||
|
mathed/MathMacroTemplate.h \
|
||||||
|
mathed/MathParser.cpp \
|
||||||
|
mathed/MathParser.h \
|
||||||
|
mathed/ReplaceData.h \
|
||||||
|
mathed/MathStream.cpp \
|
||||||
|
mathed/MathStream.h \
|
||||||
|
mathed/MathSupport.cpp \
|
||||||
|
mathed/MathSupport.h \
|
||||||
|
mathed/TextPainter.cpp \
|
||||||
|
mathed/TextPainter.h
|
||||||
|
# mathed/InsetMathMBox.cpp
|
||||||
|
# mathed/InsetMathMBox.h
|
||||||
|
|
||||||
|
############################### Insets ##############################
|
||||||
|
|
||||||
|
pkglib_LTLIBRARIES += liblyxinsets.la
|
||||||
|
|
||||||
|
EXTRA_DIST += \
|
||||||
|
insets/InsetTheorem.cpp \
|
||||||
|
insets/InsetTheorem.h
|
||||||
|
|
||||||
|
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
|
||||||
|
|
||||||
|
liblyxinsets_la_SOURCES = \
|
||||||
|
insets/MailInset.cpp \
|
||||||
|
insets/MailInset.h \
|
||||||
|
insets/ExternalSupport.cpp \
|
||||||
|
insets/ExternalSupport.h \
|
||||||
|
insets/ExternalTemplate.cpp \
|
||||||
|
insets/ExternalTemplate.h \
|
||||||
|
insets/ExternalTransforms.cpp \
|
||||||
|
insets/ExternalTransforms.h \
|
||||||
|
insets/RenderBase.h \
|
||||||
|
insets/RenderButton.cpp \
|
||||||
|
insets/RenderButton.h \
|
||||||
|
insets/RenderGraphic.cpp \
|
||||||
|
insets/RenderGraphic.h \
|
||||||
|
insets/RenderPreview.cpp \
|
||||||
|
insets/RenderPreview.h \
|
||||||
|
insets/Inset.h \
|
||||||
|
insets/Inset.cpp \
|
||||||
|
insets/InsetBibitem.cpp \
|
||||||
|
insets/InsetBibitem.h \
|
||||||
|
insets/InsetBibtex.cpp \
|
||||||
|
insets/InsetBibtex.h \
|
||||||
|
insets/InsetBox.cpp \
|
||||||
|
insets/InsetBox.h \
|
||||||
|
insets/InsetBranch.cpp \
|
||||||
|
insets/InsetBranch.h \
|
||||||
|
insets/InsetCaption.cpp \
|
||||||
|
insets/InsetCaption.h \
|
||||||
|
insets/InsetCharStyle.cpp \
|
||||||
|
insets/InsetCharStyle.h \
|
||||||
|
insets/InsetCitation.cpp \
|
||||||
|
insets/InsetCitation.h \
|
||||||
|
insets/InsetCollapsable.cpp \
|
||||||
|
insets/InsetCollapsable.h \
|
||||||
|
insets/InsetCommand.cpp \
|
||||||
|
insets/InsetCommand.h \
|
||||||
|
insets/InsetCommandParams.cpp \
|
||||||
|
insets/InsetCommandParams.h \
|
||||||
|
insets/InsetEnvironment.cpp \
|
||||||
|
insets/InsetEnvironment.h \
|
||||||
|
insets/InsetERT.cpp \
|
||||||
|
insets/InsetERT.h \
|
||||||
|
insets/InsetExternal.cpp \
|
||||||
|
insets/InsetExternal.h \
|
||||||
|
insets/InsetFloat.h \
|
||||||
|
insets/InsetFloat.cpp \
|
||||||
|
insets/InsetFloatList.cpp \
|
||||||
|
insets/InsetFloatList.h \
|
||||||
|
insets/InsetFoot.cpp \
|
||||||
|
insets/InsetFoot.h \
|
||||||
|
insets/InsetFootlike.cpp \
|
||||||
|
insets/InsetFootlike.h \
|
||||||
|
insets/InsetGraphicsParams.h \
|
||||||
|
insets/InsetGraphicsParams.cpp \
|
||||||
|
insets/InsetGraphics.cpp \
|
||||||
|
insets/InsetGraphics.h \
|
||||||
|
insets/InsetHFill.cpp \
|
||||||
|
insets/InsetHFill.h \
|
||||||
|
insets/InsetInclude.cpp \
|
||||||
|
insets/InsetInclude.h \
|
||||||
|
insets/InsetIndex.cpp \
|
||||||
|
insets/InsetIndex.h \
|
||||||
|
insets/InsetLabel.cpp \
|
||||||
|
insets/InsetLabel.h \
|
||||||
|
insets/InsetLine.cpp \
|
||||||
|
insets/InsetLine.h \
|
||||||
|
insets/InsetListings.h \
|
||||||
|
insets/InsetListings.cpp \
|
||||||
|
insets/InsetListingsParams.h \
|
||||||
|
insets/InsetListingsParams.cpp \
|
||||||
|
insets/InsetMarginal.h \
|
||||||
|
insets/InsetMarginal.cpp \
|
||||||
|
insets/InsetNewline.cpp \
|
||||||
|
insets/InsetNewline.h \
|
||||||
|
insets/InsetNomencl.cpp \
|
||||||
|
insets/InsetNomencl.h \
|
||||||
|
insets/InsetNote.cpp \
|
||||||
|
insets/InsetNote.h \
|
||||||
|
insets/InsetOptArg.cpp \
|
||||||
|
insets/InsetOptArg.h \
|
||||||
|
insets/InsetPagebreak.cpp \
|
||||||
|
insets/InsetPagebreak.h \
|
||||||
|
insets/InsetQuotes.cpp \
|
||||||
|
insets/InsetQuotes.h \
|
||||||
|
insets/InsetRef.cpp \
|
||||||
|
insets/InsetRef.h \
|
||||||
|
insets/InsetSpace.cpp \
|
||||||
|
insets/InsetSpace.h \
|
||||||
|
insets/InsetSpecialChar.cpp \
|
||||||
|
insets/InsetSpecialChar.h \
|
||||||
|
insets/InsetTabular.cpp \
|
||||||
|
insets/InsetTabular.h \
|
||||||
|
insets/InsetText.cpp \
|
||||||
|
insets/InsetText.h \
|
||||||
|
insets/InsetTOC.cpp \
|
||||||
|
insets/InsetTOC.h \
|
||||||
|
insets/InsetUrl.cpp \
|
||||||
|
insets/InsetUrl.h \
|
||||||
|
insets/InsetVSpace.cpp \
|
||||||
|
insets/InsetVSpace.h \
|
||||||
|
insets/InsetWrap.h \
|
||||||
|
insets/InsetWrap.cpp
|
||||||
|
|
||||||
|
# insets/insetlist.C \
|
||||||
|
# insets/insetlist.h \
|
||||||
|
# insets/insetsection.h \
|
||||||
|
# insets/insetsection.C \
|
||||||
|
# insets/InsetTheorem.cpp \
|
||||||
|
# insets/InsetTheorem.h
|
||||||
|
|
||||||
|
|||||||
@ -1,33 +0,0 @@
|
|||||||
include $(top_srcdir)/config/common.am
|
|
||||||
|
|
||||||
EXTRA_DIST = pch.h
|
|
||||||
|
|
||||||
BUILT_SOURCES = $(PCH_FILE)
|
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = liblyxgraphics.la
|
|
||||||
|
|
||||||
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
|
|
||||||
|
|
||||||
liblyxgraphics_la_SOURCES = \
|
|
||||||
GraphicsCache.h \
|
|
||||||
GraphicsCache.cpp \
|
|
||||||
GraphicsCacheItem.h \
|
|
||||||
GraphicsCacheItem.cpp \
|
|
||||||
GraphicsConverter.h \
|
|
||||||
GraphicsConverter.cpp \
|
|
||||||
GraphicsImage.h \
|
|
||||||
GraphicsImage.cpp \
|
|
||||||
GraphicsLoader.h \
|
|
||||||
GraphicsLoader.cpp \
|
|
||||||
GraphicsParams.cpp \
|
|
||||||
GraphicsParams.h \
|
|
||||||
LoaderQueue.h \
|
|
||||||
LoaderQueue.cpp \
|
|
||||||
GraphicsTypes.h \
|
|
||||||
GraphicsTypes.cpp \
|
|
||||||
PreviewImage.h \
|
|
||||||
PreviewImage.cpp \
|
|
||||||
PreviewLoader.h \
|
|
||||||
PreviewLoader.cpp \
|
|
||||||
Previews.h \
|
|
||||||
Previews.cpp
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
#include <config.h>
|
|
||||||
|
|
||||||
#include <boost/function.hpp>
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
#include <boost/shared_ptr.hpp>
|
|
||||||
#include <boost/signal.hpp>
|
|
||||||
#include <boost/utility.hpp>
|
|
||||||
|
|
||||||
#include <fstream>
|
|
||||||
#include <iomanip>
|
|
||||||
#include <iosfwd>
|
|
||||||
#include <queue>
|
|
||||||
#include <set>
|
|
||||||
#include <sstream>
|
|
||||||
#include <string>
|
|
||||||
#include <utility>
|
|
||||||
#include <vector>
|
|
||||||
@ -1,123 +0,0 @@
|
|||||||
include $(top_srcdir)/config/common.am
|
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = liblyxinsets.la
|
|
||||||
|
|
||||||
EXTRA_DIST = \
|
|
||||||
pch.h \
|
|
||||||
InsetTheorem.cpp \
|
|
||||||
InsetTheorem.h
|
|
||||||
|
|
||||||
BUILT_SOURCES = $(PCH_FILE)
|
|
||||||
|
|
||||||
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
|
|
||||||
|
|
||||||
liblyxinsets_la_SOURCES = \
|
|
||||||
MailInset.cpp \
|
|
||||||
MailInset.h \
|
|
||||||
ExternalSupport.cpp \
|
|
||||||
ExternalSupport.h \
|
|
||||||
ExternalTemplate.cpp \
|
|
||||||
ExternalTemplate.h \
|
|
||||||
ExternalTransforms.cpp \
|
|
||||||
ExternalTransforms.h \
|
|
||||||
RenderBase.h \
|
|
||||||
RenderButton.cpp \
|
|
||||||
RenderButton.h \
|
|
||||||
RenderGraphic.cpp \
|
|
||||||
RenderGraphic.h \
|
|
||||||
RenderPreview.cpp \
|
|
||||||
RenderPreview.h \
|
|
||||||
Inset.h \
|
|
||||||
Inset.cpp \
|
|
||||||
InsetBibitem.cpp \
|
|
||||||
InsetBibitem.h \
|
|
||||||
InsetBibtex.cpp \
|
|
||||||
InsetBibtex.h \
|
|
||||||
InsetBox.cpp \
|
|
||||||
InsetBox.h \
|
|
||||||
InsetBranch.cpp \
|
|
||||||
InsetBranch.h \
|
|
||||||
InsetCaption.cpp \
|
|
||||||
InsetCaption.h \
|
|
||||||
InsetCharStyle.cpp \
|
|
||||||
InsetCharStyle.h \
|
|
||||||
InsetCitation.cpp \
|
|
||||||
InsetCitation.h \
|
|
||||||
InsetCollapsable.cpp \
|
|
||||||
InsetCollapsable.h \
|
|
||||||
InsetCommand.cpp \
|
|
||||||
InsetCommand.h \
|
|
||||||
InsetCommandParams.cpp \
|
|
||||||
InsetCommandParams.h \
|
|
||||||
InsetEnvironment.cpp \
|
|
||||||
InsetEnvironment.h \
|
|
||||||
InsetERT.cpp \
|
|
||||||
InsetERT.h \
|
|
||||||
InsetExternal.cpp \
|
|
||||||
InsetExternal.h \
|
|
||||||
InsetFloat.h \
|
|
||||||
InsetFloat.cpp \
|
|
||||||
InsetFloatList.cpp \
|
|
||||||
InsetFloatList.h \
|
|
||||||
InsetFoot.cpp \
|
|
||||||
InsetFoot.h \
|
|
||||||
InsetFootlike.cpp \
|
|
||||||
InsetFootlike.h \
|
|
||||||
InsetGraphicsParams.h \
|
|
||||||
InsetGraphicsParams.cpp \
|
|
||||||
InsetGraphics.cpp \
|
|
||||||
InsetGraphics.h \
|
|
||||||
InsetHFill.cpp \
|
|
||||||
InsetHFill.h \
|
|
||||||
InsetInclude.cpp \
|
|
||||||
InsetInclude.h \
|
|
||||||
InsetIndex.cpp \
|
|
||||||
InsetIndex.h \
|
|
||||||
InsetLabel.cpp \
|
|
||||||
InsetLabel.h \
|
|
||||||
InsetLine.cpp \
|
|
||||||
InsetLine.h \
|
|
||||||
InsetListings.h \
|
|
||||||
InsetListings.cpp \
|
|
||||||
InsetListingsParams.h \
|
|
||||||
InsetListingsParams.cpp \
|
|
||||||
InsetMarginal.h \
|
|
||||||
InsetMarginal.cpp \
|
|
||||||
InsetNewline.cpp \
|
|
||||||
InsetNewline.h \
|
|
||||||
InsetNomencl.cpp \
|
|
||||||
InsetNomencl.h \
|
|
||||||
InsetNote.cpp \
|
|
||||||
InsetNote.h \
|
|
||||||
InsetOptArg.cpp \
|
|
||||||
InsetOptArg.h \
|
|
||||||
InsetPagebreak.cpp \
|
|
||||||
InsetPagebreak.h \
|
|
||||||
InsetQuotes.cpp \
|
|
||||||
InsetQuotes.h \
|
|
||||||
InsetRef.cpp \
|
|
||||||
InsetRef.h \
|
|
||||||
InsetSpace.cpp \
|
|
||||||
InsetSpace.h \
|
|
||||||
InsetSpecialChar.cpp \
|
|
||||||
InsetSpecialChar.h \
|
|
||||||
InsetTabular.cpp \
|
|
||||||
InsetTabular.h \
|
|
||||||
InsetText.cpp \
|
|
||||||
InsetText.h \
|
|
||||||
InsetTOC.cpp \
|
|
||||||
InsetTOC.h \
|
|
||||||
InsetUrl.cpp \
|
|
||||||
InsetUrl.h \
|
|
||||||
InsetVSpace.cpp \
|
|
||||||
InsetVSpace.h \
|
|
||||||
InsetWrap.h \
|
|
||||||
InsetWrap.cpp
|
|
||||||
|
|
||||||
# insetlist.C \
|
|
||||||
# insetlist.h \
|
|
||||||
# insetsection.h \
|
|
||||||
# insetsection.C \
|
|
||||||
# InsetTheorem.cpp \
|
|
||||||
# InsetTheorem.h
|
|
||||||
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
#include <config.h>
|
|
||||||
|
|
||||||
#include "Inset.h"
|
|
||||||
|
|
||||||
#include <boost/any.hpp>
|
|
||||||
#include <boost/assert.hpp>
|
|
||||||
#include <boost/function.hpp>
|
|
||||||
#include <boost/regex.hpp>
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
#include <boost/signals/connection.hpp>
|
|
||||||
#include <boost/signal.hpp>
|
|
||||||
#include <boost/signals/trackable.hpp>
|
|
||||||
#include <boost/tuple/tuple.hpp>
|
|
||||||
#include <boost/utility.hpp>
|
|
||||||
|
|
||||||
#include <cmath>
|
|
||||||
#include <fstream>
|
|
||||||
#include <iosfwd>
|
|
||||||
#include <iostream>
|
|
||||||
#include <map>
|
|
||||||
#include <memory>
|
|
||||||
#include <sstream>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
@ -1,156 +0,0 @@
|
|||||||
include $(top_srcdir)/config/common.am
|
|
||||||
|
|
||||||
EXTRA_DIST = pch.h InsetFormulaMacro.cpp
|
|
||||||
|
|
||||||
BUILT_SOURCES = $(PCH_FILE)
|
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = liblyxmathed.la
|
|
||||||
|
|
||||||
AM_CPPFLAGS += $(PCH_FLAGS) -I$(srcdir)/.. $(BOOST_INCLUDES)
|
|
||||||
|
|
||||||
liblyxmathed_la_SOURCES = \
|
|
||||||
InsetMathAMSArray.cpp \
|
|
||||||
InsetMathAMSArray.h \
|
|
||||||
InsetMathArray.cpp \
|
|
||||||
InsetMathArray.h \
|
|
||||||
InsetMathBig.cpp \
|
|
||||||
InsetMathBig.h \
|
|
||||||
InsetMathBinom.cpp \
|
|
||||||
InsetMathBinom.h \
|
|
||||||
InsetMathBoldSymbol.cpp \
|
|
||||||
InsetMathBoldSymbol.h \
|
|
||||||
InsetMathBox.cpp \
|
|
||||||
InsetMathBoxed.cpp \
|
|
||||||
InsetMathBoxed.h \
|
|
||||||
InsetMathBox.h \
|
|
||||||
InsetMathBrace.cpp \
|
|
||||||
InsetMathBrace.h \
|
|
||||||
InsetMath.cpp \
|
|
||||||
InsetMathCases.cpp \
|
|
||||||
InsetMathCases.h \
|
|
||||||
InsetMathChar.cpp \
|
|
||||||
InsetMathChar.h \
|
|
||||||
InsetMathColor.cpp \
|
|
||||||
InsetMathColor.h \
|
|
||||||
CommandInset.cpp \
|
|
||||||
CommandInset.h \
|
|
||||||
InsetMathComment.cpp \
|
|
||||||
InsetMathComment.h \
|
|
||||||
InsetMathDecoration.cpp \
|
|
||||||
InsetMathDecoration.h \
|
|
||||||
InsetMathDelim.cpp \
|
|
||||||
InsetMathDelim.h \
|
|
||||||
InsetMathDFrac.cpp \
|
|
||||||
InsetMathDFrac.h \
|
|
||||||
InsetMathDiff.cpp \
|
|
||||||
InsetMathDiff.h \
|
|
||||||
InsetMathDots.cpp \
|
|
||||||
InsetMathDots.h \
|
|
||||||
InsetMathEnv.cpp \
|
|
||||||
InsetMathEnv.h \
|
|
||||||
InsetMathExFunc.cpp \
|
|
||||||
InsetMathExFunc.h \
|
|
||||||
InsetMathExInt.cpp \
|
|
||||||
InsetMathExInt.h \
|
|
||||||
InsetMathFBox.cpp \
|
|
||||||
InsetMathFBox.h \
|
|
||||||
InsetMathFont.cpp \
|
|
||||||
InsetMathFont.h \
|
|
||||||
InsetMathFontOld.cpp \
|
|
||||||
InsetMathFontOld.h \
|
|
||||||
InsetMathFracBase.cpp \
|
|
||||||
InsetMathFracBase.h \
|
|
||||||
InsetMathFrac.cpp \
|
|
||||||
InsetMathFrac.h \
|
|
||||||
InsetMathFrameBox.cpp \
|
|
||||||
InsetMathFrameBox.h \
|
|
||||||
InsetMathGrid.cpp \
|
|
||||||
InsetMathGrid.h \
|
|
||||||
InsetMath.h \
|
|
||||||
InsetMathHull.cpp \
|
|
||||||
InsetMathHull.h \
|
|
||||||
InsetMathKern.cpp \
|
|
||||||
InsetMathKern.h \
|
|
||||||
InsetMathLefteqn.cpp \
|
|
||||||
InsetMathLefteqn.h \
|
|
||||||
InsetMathLim.cpp \
|
|
||||||
InsetMathLim.h \
|
|
||||||
MathMacro.cpp \
|
|
||||||
MathMacro.h \
|
|
||||||
InsetMathMakebox.cpp \
|
|
||||||
InsetMathMakebox.h \
|
|
||||||
InsetMathMatrix.cpp \
|
|
||||||
InsetMathMatrix.h \
|
|
||||||
InsetMathNest.cpp \
|
|
||||||
InsetMathNest.h \
|
|
||||||
InsetMathNumber.cpp \
|
|
||||||
InsetMathNumber.h \
|
|
||||||
InsetMathOverset.cpp \
|
|
||||||
InsetMathOverset.h \
|
|
||||||
InsetMathPar.cpp \
|
|
||||||
InsetMathPar.h \
|
|
||||||
InsetMathPhantom.cpp \
|
|
||||||
InsetMathPhantom.h \
|
|
||||||
InsetMathRef.cpp \
|
|
||||||
InsetMathRef.h \
|
|
||||||
InsetMathRoot.cpp \
|
|
||||||
InsetMathRoot.h \
|
|
||||||
InsetMathScript.cpp \
|
|
||||||
InsetMathScript.h \
|
|
||||||
InsetMathSize.cpp \
|
|
||||||
InsetMathSize.h \
|
|
||||||
InsetMathSpace.cpp \
|
|
||||||
InsetMathSpace.h \
|
|
||||||
InsetMathSplit.cpp \
|
|
||||||
InsetMathSplit.h \
|
|
||||||
InsetMathSqrt.cpp \
|
|
||||||
InsetMathSqrt.h \
|
|
||||||
InsetMathStackrel.cpp \
|
|
||||||
InsetMathStackrel.h \
|
|
||||||
InsetMathString.cpp \
|
|
||||||
InsetMathString.h \
|
|
||||||
InsetMathSubstack.cpp \
|
|
||||||
InsetMathSubstack.h \
|
|
||||||
InsetMathSymbol.cpp \
|
|
||||||
InsetMathSymbol.h \
|
|
||||||
InsetMathTabular.cpp \
|
|
||||||
InsetMathTabular.h \
|
|
||||||
InsetMathTFrac.cpp \
|
|
||||||
InsetMathTFrac.h \
|
|
||||||
InsetMathUnderset.cpp \
|
|
||||||
InsetMathUnderset.h \
|
|
||||||
InsetMathUnknown.cpp \
|
|
||||||
InsetMathUnknown.h \
|
|
||||||
InsetMathXArrow.cpp \
|
|
||||||
InsetMathXArrow.h \
|
|
||||||
InsetMathXYMatrix.cpp \
|
|
||||||
InsetMathXYMatrix.h \
|
|
||||||
MathAtom.cpp \
|
|
||||||
MathAtom.h \
|
|
||||||
MathAutoCorrect.cpp \
|
|
||||||
MathAutoCorrect.h \
|
|
||||||
MathData.cpp \
|
|
||||||
MathData.h \
|
|
||||||
MathExtern.cpp \
|
|
||||||
MathExtern.h \
|
|
||||||
MathFactory.cpp \
|
|
||||||
MathFactory.h \
|
|
||||||
MathGridInfo.h \
|
|
||||||
MathMacroArgument.cpp \
|
|
||||||
MathMacroArgument.h \
|
|
||||||
MacroTable.cpp \
|
|
||||||
MacroTable.h \
|
|
||||||
MathMacroTemplate.cpp \
|
|
||||||
MathMacroTemplate.h \
|
|
||||||
MathParser.cpp \
|
|
||||||
MathParser.h \
|
|
||||||
ReplaceData.h \
|
|
||||||
MathStream.cpp \
|
|
||||||
MathStream.h \
|
|
||||||
MathSupport.cpp \
|
|
||||||
MathSupport.h \
|
|
||||||
TextPainter.cpp \
|
|
||||||
TextPainter.h
|
|
||||||
# InsetMathMBox.cpp
|
|
||||||
# InsetMathMBox.h
|
|
||||||
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
#include <config.h>
|
|
||||||
|
|
||||||
#include <boost/assert.hpp>
|
|
||||||
#include <boost/scoped_ptr.hpp>
|
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
#include <fstream>
|
|
||||||
#include <iosfwd>
|
|
||||||
#include <iterator>
|
|
||||||
#include <map>
|
|
||||||
#include <sstream>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
25
src/pch.h
25
src/pch.h
@ -6,7 +6,6 @@
|
|||||||
#include <boost/crc.hpp>
|
#include <boost/crc.hpp>
|
||||||
#include <boost/cregex.hpp>
|
#include <boost/cregex.hpp>
|
||||||
#include <boost/current_function.hpp>
|
#include <boost/current_function.hpp>
|
||||||
// #include <boost/format.hpp> // mult def symbols problem (_1, _2 etc)
|
|
||||||
#include <boost/function.hpp>
|
#include <boost/function.hpp>
|
||||||
#include <boost/iterator/indirect_iterator.hpp>
|
#include <boost/iterator/indirect_iterator.hpp>
|
||||||
#include <boost/optional.hpp>
|
#include <boost/optional.hpp>
|
||||||
@ -14,35 +13,18 @@
|
|||||||
#include <boost/scoped_array.hpp>
|
#include <boost/scoped_array.hpp>
|
||||||
#include <boost/scoped_ptr.hpp>
|
#include <boost/scoped_ptr.hpp>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#include <boost/signals/connection.hpp>
|
|
||||||
#include <boost/signal.hpp>
|
#include <boost/signal.hpp>
|
||||||
|
#include <boost/signals/connection.hpp>
|
||||||
#include <boost/signals/trackable.hpp>
|
#include <boost/signals/trackable.hpp>
|
||||||
#include <boost/version.hpp>
|
|
||||||
|
|
||||||
#if BOOST_VERSION < 103300
|
|
||||||
# include <boost/test/detail/nullstream.hpp>
|
|
||||||
#else
|
|
||||||
# include <boost/test/utils/nullstream.hpp>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <boost/tokenizer.hpp>
|
#include <boost/tokenizer.hpp>
|
||||||
#include <boost/tuple/tuple.hpp>
|
#include <boost/tuple/tuple.hpp>
|
||||||
#include <boost/utility.hpp>
|
#include <boost/utility.hpp>
|
||||||
|
#include <boost/version.hpp>
|
||||||
#include <fcntl.h>
|
|
||||||
#ifdef HAVE_SYS_SELECT_H
|
|
||||||
# include <sys/select.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_STAT_H
|
|
||||||
# include <sys/stat.h>
|
|
||||||
#endif
|
|
||||||
#ifdef HAVE_SYS_TIME_H
|
|
||||||
# include <sys/time.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cerrno>
|
#include <cerrno>
|
||||||
#include <clocale>
|
#include <clocale>
|
||||||
|
#include <cmath>
|
||||||
#include <csignal>
|
#include <csignal>
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
@ -58,6 +40,7 @@
|
|||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <list>
|
#include <list>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
#include <queue>
|
#include <queue>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <sstream>
|
#include <sstream>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user