2002-03-13 18:24:44 +00:00
|
|
|
include $(top_srcdir)/config/common.am
|
|
|
|
|
|
2007-08-11 10:32:36 +00:00
|
|
|
############################### Core ##############################
|
|
|
|
|
|
2016-05-05 17:43:24 +00:00
|
|
|
AM_CPPFLAGS += -I$(top_srcdir)/src
|
|
|
|
|
AM_CPPFLAGS += $(BOOST_INCLUDES) $(ICONV_INCLUDES) $(ZLIB_INCLUDES)
|
2017-03-06 16:08:38 +00:00
|
|
|
AM_CPPFLAGS += $(ENCHANT_CFLAGS) $(HUNSPELL_CFLAGS) $(MYTHES_INCLUDES)
|
2014-07-19 01:34:28 +00:00
|
|
|
AM_CPPFLAGS += $(QT_CPPFLAGS) $(QT_CORE_INCLUDES)
|
2007-08-12 18:42:57 +00:00
|
|
|
|
2008-04-29 09:56:55 +00:00
|
|
|
if BUILD_CLIENT_SUBDIR
|
|
|
|
|
CLIENT = client
|
|
|
|
|
endif
|
|
|
|
|
|
2017-09-30 16:13:21 +00:00
|
|
|
SUBDIRS = support frontends . $(CLIENT) tex2lyx convert
|
2002-03-13 18:24:44 +00:00
|
|
|
|
2014-11-24 17:39:18 +00:00
|
|
|
EXTRA_DIST = lyx_commit_hash.h.in \
|
2014-08-31 13:21:20 +00:00
|
|
|
CMakeLists.txt \
|
|
|
|
|
graphics/CMakeLists.txt \
|
|
|
|
|
insets/CMakeLists.txt \
|
|
|
|
|
mathed/CMakeLists.txt \
|
|
|
|
|
tests/CMakeLists.txt
|
2003-05-08 18:05:07 +00:00
|
|
|
|
2013-05-10 22:15:57 +00:00
|
|
|
OTHERLIBS = $(BOOST_LIBS) $(MYTHES_LIBS) $(ENCHANT_LIBS) $(HUNSPELL_LIBS) \
|
2016-05-05 17:43:24 +00:00
|
|
|
@LIBS@ $(ICONV_LIBS) $(ZLIB_LIBS) $(SOCKET_LIBS) \
|
|
|
|
|
$(LIBSHLWAPI) $(LIBPSAPI)
|
2002-03-25 11:15:27 +00:00
|
|
|
|
2008-11-15 17:45:55 +00:00
|
|
|
noinst_LIBRARIES = liblyxcore.a
|
2007-08-14 23:24:38 +00:00
|
|
|
bin_PROGRAMS = lyx
|
2003-08-02 20:01:52 +00:00
|
|
|
|
2007-08-14 23:24:38 +00:00
|
|
|
lyx_LDADD = \
|
2008-11-15 17:45:55 +00:00
|
|
|
liblyxcore.a \
|
2010-04-14 14:25:11 +00:00
|
|
|
liblyxmathed.a \
|
|
|
|
|
liblyxinsets.a \
|
2008-11-15 17:45:55 +00:00
|
|
|
frontends/liblyxfrontends.a \
|
|
|
|
|
frontends/qt4/liblyxqt4.a \
|
2010-04-14 14:25:11 +00:00
|
|
|
liblyxgraphics.a \
|
2008-11-15 17:45:55 +00:00
|
|
|
support/liblyxsupport.a \
|
2007-08-13 19:08:35 +00:00
|
|
|
$(OTHERLIBS) \
|
2014-07-19 01:34:28 +00:00
|
|
|
$(QT_LDFLAGS) \
|
|
|
|
|
$(QT_LIB)
|
2006-03-05 17:29:08 +00:00
|
|
|
|
2007-08-14 01:34:26 +00:00
|
|
|
if LYX_WIN_RESOURCE
|
|
|
|
|
.rc.o:
|
|
|
|
|
cp $(top_srcdir)/development/Win32/packaging/icons/lyx_*32x32.ico .
|
2016-05-08 08:16:12 +00:00
|
|
|
$(RC) -I$(top_builddir) --preprocessor "$(CPP) -xc-header -DRC_INVOKED" $< -o $@
|
2007-08-14 01:34:26 +00:00
|
|
|
endif
|
|
|
|
|
|
2011-09-27 07:27:19 +00:00
|
|
|
if INSTALL_MACOSX
|
2015-07-08 15:56:26 +00:00
|
|
|
lyx_LDFLAGS = -framework AppKit -framework ApplicationServices \
|
|
|
|
|
-Wl,-rpath,@loader_path/../Frameworks \
|
|
|
|
|
-Wl,-rpath,@executable_path/../Frameworks
|
2011-09-27 07:27:19 +00:00
|
|
|
endif
|
|
|
|
|
|
2010-07-08 07:44:34 +00:00
|
|
|
if INSTALL_MACOSX
|
2010-07-08 07:54:42 +00:00
|
|
|
APPLESPELL = AppleSpellChecker.cpp AppleSpellChecker.h
|
2010-07-08 07:44:34 +00:00
|
|
|
endif
|
|
|
|
|
|
2005-05-02 13:35:30 +00:00
|
|
|
if USE_ASPELL
|
2009-08-01 17:24:13 +00:00
|
|
|
ASPELL = AspellChecker.cpp AspellChecker.h
|
2010-12-02 18:52:31 +00:00
|
|
|
PWL = PersonalWordList.cpp PersonalWordList.h
|
2005-05-02 13:35:30 +00:00
|
|
|
endif
|
|
|
|
|
|
2010-01-22 15:26:38 +00:00
|
|
|
if USE_ENCHANT
|
|
|
|
|
ENCHANT = EnchantChecker.cpp EnchantChecker.h
|
2010-12-02 18:52:31 +00:00
|
|
|
PWL = PersonalWordList.cpp PersonalWordList.h
|
2010-01-22 15:26:38 +00:00
|
|
|
endif
|
|
|
|
|
|
2009-07-12 22:46:01 +00:00
|
|
|
if USE_HUNSPELL
|
2009-08-01 17:24:13 +00:00
|
|
|
HUNSPELL = HunspellChecker.cpp HunspellChecker.h
|
2010-12-02 18:52:31 +00:00
|
|
|
PWL = PersonalWordList.cpp PersonalWordList.h
|
2009-07-12 22:46:01 +00:00
|
|
|
endif
|
|
|
|
|
|
2007-08-14 23:24:38 +00:00
|
|
|
lyx_SOURCES = \
|
2007-08-13 19:08:35 +00:00
|
|
|
main.cpp \
|
2010-07-08 07:54:42 +00:00
|
|
|
$(APPLESPELL) \
|
2009-03-29 19:49:52 +00:00
|
|
|
$(ASPELL) \
|
2008-04-25 20:03:03 +00:00
|
|
|
BiblioInfo.h \
|
|
|
|
|
BiblioInfo.cpp \
|
2007-08-13 19:08:35 +00:00
|
|
|
Box.cpp \
|
|
|
|
|
Box.h \
|
2009-10-26 15:45:33 +00:00
|
|
|
Compare.cpp \
|
|
|
|
|
Compare.h \
|
2007-08-13 19:08:35 +00:00
|
|
|
Dimension.cpp \
|
|
|
|
|
Dimension.h \
|
2010-01-22 15:26:38 +00:00
|
|
|
$(ENCHANT) \
|
2009-07-12 22:46:01 +00:00
|
|
|
$(HUNSPELL) \
|
2010-12-02 18:52:31 +00:00
|
|
|
$(PWL) \
|
2012-08-16 11:23:39 +00:00
|
|
|
LaTeXFonts.cpp \
|
|
|
|
|
LaTeXFonts.h \
|
2007-08-13 19:08:35 +00:00
|
|
|
PrinterParams.cpp \
|
|
|
|
|
PrinterParams.h \
|
|
|
|
|
Thesaurus.cpp \
|
|
|
|
|
Thesaurus.h
|
2005-05-02 13:35:30 +00:00
|
|
|
|
2007-08-14 01:34:26 +00:00
|
|
|
if LYX_WIN_RESOURCE
|
2007-08-14 23:24:38 +00:00
|
|
|
lyx_SOURCES += lyxwinres.rc
|
2007-08-14 01:34:26 +00:00
|
|
|
endif
|
|
|
|
|
|
2007-11-17 15:37:29 +00:00
|
|
|
SOURCEFILESCORE = \
|
2007-04-26 04:41:58 +00:00
|
|
|
Author.cpp \
|
2007-04-25 18:04:04 +00:00
|
|
|
boost.cpp \
|
2007-04-26 19:21:38 +00:00
|
|
|
BranchList.cpp \
|
2007-04-26 04:41:58 +00:00
|
|
|
Buffer.cpp \
|
|
|
|
|
buffer_funcs.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
BufferList.cpp \
|
|
|
|
|
BufferParams.cpp \
|
|
|
|
|
BufferView.cpp \
|
|
|
|
|
Bullet.cpp \
|
|
|
|
|
Changes.cpp \
|
|
|
|
|
Chktex.cpp \
|
2016-12-30 15:22:08 +00:00
|
|
|
CiteEnginesList.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
CmdDef.cpp \
|
|
|
|
|
Color.cpp \
|
|
|
|
|
ConverterCache.cpp \
|
|
|
|
|
Converter.cpp \
|
|
|
|
|
CoordCache.cpp \
|
|
|
|
|
Counters.cpp \
|
|
|
|
|
Cursor.cpp \
|
|
|
|
|
CursorSlice.cpp \
|
|
|
|
|
CutAndPaste.cpp \
|
|
|
|
|
DepTable.cpp \
|
|
|
|
|
DocIterator.cpp \
|
|
|
|
|
Encoding.cpp \
|
2013-08-23 05:46:35 +00:00
|
|
|
BufferEncodings.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
ErrorList.cpp \
|
|
|
|
|
Exporter.cpp \
|
|
|
|
|
factory.cpp \
|
|
|
|
|
Floating.cpp \
|
|
|
|
|
FloatList.cpp \
|
|
|
|
|
FontInfo.cpp \
|
|
|
|
|
FontList.cpp \
|
|
|
|
|
Font.cpp \
|
|
|
|
|
Format.cpp \
|
|
|
|
|
FuncRequest.cpp \
|
|
|
|
|
FuncStatus.cpp \
|
|
|
|
|
Graph.cpp \
|
2009-04-16 07:29:01 +00:00
|
|
|
IndicesList.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
InsetIterator.cpp \
|
|
|
|
|
InsetList.cpp \
|
|
|
|
|
Intl.cpp \
|
|
|
|
|
KeyMap.cpp \
|
|
|
|
|
KeySequence.cpp \
|
|
|
|
|
Language.cpp \
|
|
|
|
|
LaTeX.cpp \
|
|
|
|
|
LaTeXFeatures.cpp \
|
2011-11-06 17:03:59 +00:00
|
|
|
LaTeXPackages.cpp \
|
2008-03-07 03:53:21 +00:00
|
|
|
LayoutFile.cpp \
|
2009-02-21 16:45:37 +00:00
|
|
|
LayoutModuleList.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
Length.cpp \
|
|
|
|
|
lengthcommon.cpp \
|
|
|
|
|
Lexer.cpp \
|
|
|
|
|
LyX.cpp \
|
2008-02-25 18:42:57 +00:00
|
|
|
LyXAction.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
lyxfind.cpp \
|
|
|
|
|
LyXRC.cpp \
|
|
|
|
|
LyXVC.cpp \
|
|
|
|
|
MetricsInfo.cpp \
|
|
|
|
|
ModuleList.cpp \
|
|
|
|
|
Mover.cpp \
|
|
|
|
|
output_docbook.cpp \
|
|
|
|
|
output.cpp \
|
|
|
|
|
output_latex.cpp \
|
2009-06-05 17:44:35 +00:00
|
|
|
output_xhtml.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
OutputParams.cpp \
|
|
|
|
|
output_plaintext.cpp \
|
|
|
|
|
Paragraph.cpp \
|
2008-02-25 01:56:53 +00:00
|
|
|
ParagraphMetrics.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
ParagraphParameters.cpp \
|
|
|
|
|
ParIterator.cpp \
|
|
|
|
|
PDFOptions.cpp \
|
|
|
|
|
Row.cpp \
|
2014-07-25 19:55:08 +00:00
|
|
|
RowPainter.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
Server.cpp \
|
|
|
|
|
ServerSocket.cpp \
|
|
|
|
|
sgml.cpp \
|
|
|
|
|
Session.cpp \
|
|
|
|
|
Spacing.cpp \
|
|
|
|
|
TexRow.cpp \
|
2015-01-09 20:07:59 +00:00
|
|
|
texstream.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
Text.cpp \
|
|
|
|
|
Text2.cpp \
|
|
|
|
|
Text3.cpp \
|
2008-03-01 17:22:19 +00:00
|
|
|
TextClass.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
TextMetrics.cpp \
|
|
|
|
|
TocBackend.cpp \
|
2017-01-09 22:15:16 +00:00
|
|
|
TocBuilder.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
Trans.cpp \
|
|
|
|
|
Undo.cpp \
|
|
|
|
|
VCBackend.cpp \
|
|
|
|
|
version.cpp \
|
|
|
|
|
VSpace.cpp \
|
2008-02-25 01:56:53 +00:00
|
|
|
WordList.cpp
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
HEADERFILESCORE = \
|
|
|
|
|
Author.h \
|
|
|
|
|
BranchList.h \
|
2003-06-20 12:46:28 +00:00
|
|
|
buffer_funcs.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Buffer.h \
|
2013-08-23 05:46:35 +00:00
|
|
|
BufferEncodings.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
BufferList.h \
|
|
|
|
|
BufferParams.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
BufferView.h \
|
|
|
|
|
Bullet.h \
|
2008-04-20 15:00:11 +00:00
|
|
|
Citation.h \
|
2016-12-30 15:22:08 +00:00
|
|
|
CiteEnginesList.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Changes.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Chktex.h \
|
2007-10-20 23:27:03 +00:00
|
|
|
CmdDef.h \
|
2007-10-25 12:41:02 +00:00
|
|
|
ColorCode.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Color.h \
|
2009-02-09 23:30:24 +00:00
|
|
|
ColorSet.h \
|
2008-03-21 14:05:41 +00:00
|
|
|
CompletionList.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
ConverterCache.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Converter.h \
|
|
|
|
|
CoordCache.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Counters.h \
|
2007-04-26 14:56:30 +00:00
|
|
|
Cursor.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
CursorSlice.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
CutAndPaste.h \
|
|
|
|
|
DepTable.h \
|
|
|
|
|
DispatchResult.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
DocIterator.h \
|
2012-03-13 16:13:31 +00:00
|
|
|
DocumentClassPtr.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Encoding.h \
|
|
|
|
|
ErrorList.h \
|
|
|
|
|
Exporter.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
factory.h \
|
|
|
|
|
Floating.h \
|
|
|
|
|
FloatList.h \
|
2007-04-29 18:17:15 +00:00
|
|
|
Font.h \
|
2007-10-28 18:51:54 +00:00
|
|
|
FontEnums.h \
|
|
|
|
|
FontInfo.h \
|
2007-10-19 14:35:05 +00:00
|
|
|
FontList.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Format.h \
|
2008-03-19 19:37:35 +00:00
|
|
|
FuncCode.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
FuncRequest.h \
|
|
|
|
|
FuncStatus.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Graph.h \
|
2009-04-16 07:29:01 +00:00
|
|
|
IndicesList.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
InsetIterator.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
InsetList.h \
|
|
|
|
|
Intl.h \
|
2007-04-27 08:05:58 +00:00
|
|
|
KeyMap.h \
|
2007-04-27 08:19:12 +00:00
|
|
|
KeySequence.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Language.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
LaTeXFeatures.h \
|
2011-11-06 17:03:59 +00:00
|
|
|
LaTeXPackages.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
LaTeX.h \
|
2007-04-29 22:04:32 +00:00
|
|
|
Layout.h \
|
2007-10-17 19:32:46 +00:00
|
|
|
LayoutEnums.h \
|
2008-03-07 03:53:21 +00:00
|
|
|
LayoutFile.h \
|
2009-02-11 23:22:10 +00:00
|
|
|
LayoutModuleList.h \
|
2007-04-28 12:58:49 +00:00
|
|
|
Length.h \
|
2007-04-26 11:30:54 +00:00
|
|
|
Lexer.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
LyXAction.h \
|
2001-03-06 10:20:33 +00:00
|
|
|
lyxfind.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
LyX.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
LyXRC.h \
|
|
|
|
|
LyXVC.h \
|
|
|
|
|
MetricsInfo.h \
|
This is one of a series of patches that will merge the layout modules development in personal/branches/rgheck back into the tree.
Design goal: Allow the use of layout "modules", which are to LaTeX packages as layout files are to LaTeX document classes. Thus, one could have a module that defined certain character styles, environments, commands, or what have you, and include it in various documents, each of which uses a different document class, without having to modify the layout files themselves. For example, a theorems.module could be used with article.layout to provide support for theorem-type environments, without having to modify article.layout itself, and the same module could be used with book.layout, etc.
This patch adds the backend. The ModuleList class holds a list of the available modules, which are retrieved from lyxmodules.lst, itself generated by configure.py. There are two LFUNs available: modules-clear and module-add, which do the obvious thing; you can test by typing these into the minibuffer, along with the name of one of the available modules: URL (a CharStyle), Endnote (a Custom Inset), and---with the spaces---End To Foot (View>LaTeX and look at the user preamble), which are themselves in lib/layouts. There are some others, too, that allow theorems to be added to classes like article and book.
The GUI will come next.
Issues: (i) The configure.py script could be improved. It'd be nice, for example, if it tested for the presence of the LaTeX packages a particular module needs. But this would mean re-working the LaTeX script, and I don't know how to do that. Note that at present, the packages are ignored. This will change shortly. (ii) I've used std::string in LyXModule, following what seemed to be a precedent in TextClass. If some of these should be docstrings, please let me know, and I'll change them. (iii) There is at present no distinction between LaTeX and DocBook modules. Should there be? That is: Should there be modules that are available when the document class is a LaTeX class and others that are available only when it is DocBook? Or should there just be one set of modules? Each module can of course indicate for what it is suitable in its description.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@19893 a592a061-630c-0410-9148-cb99ea01b6c8
2007-08-29 17:59:49 +00:00
|
|
|
ModuleList.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Mover.h \
|
2003-11-05 12:06:20 +00:00
|
|
|
output_docbook.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
output.h \
|
2010-01-20 19:41:44 +00:00
|
|
|
OutputEnums.h \
|
2003-11-05 12:06:20 +00:00
|
|
|
output_latex.h \
|
2009-06-05 17:44:35 +00:00
|
|
|
output_xhtml.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
OutputParams.h \
|
2003-11-05 12:06:20 +00:00
|
|
|
output_plaintext.h \
|
2003-08-02 21:29:24 +00:00
|
|
|
paper.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Paragraph.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
ParagraphList.h \
|
2006-12-29 23:54:48 +00:00
|
|
|
ParagraphMetrics.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
ParagraphParameters.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
ParIterator.h \
|
2007-09-20 22:31:18 +00:00
|
|
|
PDFOptions.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Row.h \
|
2014-07-25 19:55:08 +00:00
|
|
|
RowPainter.h \
|
2007-11-02 23:42:27 +00:00
|
|
|
Server.h \
|
|
|
|
|
ServerSocket.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Session.h \
|
2002-08-09 00:42:12 +00:00
|
|
|
sgml.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
Spacing.h \
|
2009-03-29 19:49:52 +00:00
|
|
|
SpellChecker.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
TexRow.h \
|
2015-01-09 20:07:59 +00:00
|
|
|
texstream.h \
|
2007-04-29 23:33:02 +00:00
|
|
|
Text.h \
|
|
|
|
|
TextClass.h \
|
2006-12-29 23:54:48 +00:00
|
|
|
TextMetrics.h \
|
2016-01-08 19:06:50 +00:00
|
|
|
Toc.h \
|
2006-04-22 18:48:28 +00:00
|
|
|
TocBackend.h \
|
2017-01-09 22:15:16 +00:00
|
|
|
TocBuilder.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
Trans.h \
|
|
|
|
|
Undo.h \
|
2007-04-28 20:44:46 +00:00
|
|
|
update_flags.h \
|
2007-04-26 04:41:58 +00:00
|
|
|
VCBackend.h \
|
1999-09-27 18:44:28 +00:00
|
|
|
version.h \
|
2008-02-25 01:56:53 +00:00
|
|
|
VSpace.h \
|
2007-04-26 19:21:38 +00:00
|
|
|
WordLangTuple.h \
|
2008-02-25 01:56:53 +00:00
|
|
|
WordList.h
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
STANDALONEFILES = \
|
2008-03-01 17:22:19 +00:00
|
|
|
Layout.cpp
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2014-11-24 17:39:18 +00:00
|
|
|
|
2015-03-10 18:11:48 +00:00
|
|
|
.PHONY: update_commit_hash
|
|
|
|
|
|
2017-07-13 15:58:49 +00:00
|
|
|
LCH_V_CHK = $(lch__v_CHK_@AM_V@)
|
|
|
|
|
lch__v_CHK_ = $(lch__v_CHK_@AM_DEFAULT_V@)
|
|
|
|
|
lch__v_CHK_0 = @echo " CHK lyx_commit_hash.h";
|
|
|
|
|
lch__v_CHK_1 =
|
2015-03-10 18:11:48 +00:00
|
|
|
|
|
|
|
|
update_commit_hash:
|
2017-07-13 15:58:49 +00:00
|
|
|
$(LCH_V_CHK)rm -f hash-temp ; \
|
|
|
|
|
hash=`cd "$(top_srcdir)" && git log -1 --pretty=format:%H 2>/dev/null || echo none` ; \
|
2015-03-10 18:11:48 +00:00
|
|
|
sed s/@LYX_GIT_COMMIT_HASH@/$$hash/ "$(srcdir)"/lyx_commit_hash.h.in >hash-temp ; \
|
|
|
|
|
cmp -s lyx_commit_hash.h hash-temp || cp hash-temp lyx_commit_hash.h ; \
|
|
|
|
|
rm -f hash-temp
|
|
|
|
|
|
|
|
|
|
lyx_commit_hash.h: update_commit_hash
|
|
|
|
|
|
2015-09-25 08:58:17 +00:00
|
|
|
BUILT_SOURCES = lyx_commit_hash.h
|
|
|
|
|
CLEANFILES = lyx_commit_hash.h
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
lyxcore.cpp:
|
2016-04-13 16:27:42 +00:00
|
|
|
$(AM_V_GEN)for file in $(SOURCEFILESCORE) ; do echo '#include "'$${file}'"' ; done >$@
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2008-02-09 18:04:14 +00:00
|
|
|
if MONOLITHIC_CORE
|
|
|
|
|
|
2007-11-17 15:37:29 +00:00
|
|
|
BUILT_SOURCES += lyxcore.cpp $(STANDALONEFILES)
|
2007-12-10 00:53:12 +00:00
|
|
|
CLEANFILES += lyxcore.cpp
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2016-06-16 19:34:38 +00:00
|
|
|
nodist_liblyxcore_a_SOURCES = lyxcore.cpp
|
|
|
|
|
liblyxcore_a_SOURCES = $(STANDALONEFILES) $(HEADERFILESCORE)
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
2008-11-15 17:45:55 +00:00
|
|
|
liblyxcore_a_SOURCES = $(SOURCEFILESCORE) $(STANDALONEFILES) $(HEADERFILESCORE)
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
######################### Qt stuff ##############################
|
|
|
|
|
|
2015-06-10 17:21:27 +00:00
|
|
|
MOCHEADER = Compare.h PreviewLoader.h
|
2009-10-25 10:43:16 +00:00
|
|
|
|
2009-08-21 22:58:38 +00:00
|
|
|
if INSTALL_WINDOWS
|
|
|
|
|
|
2009-10-25 10:43:16 +00:00
|
|
|
MOCHEADER += Server.h
|
|
|
|
|
MOCFLAG = -D_WIN32
|
|
|
|
|
|
|
|
|
|
endif
|
2009-08-21 22:58:38 +00:00
|
|
|
|
|
|
|
|
MOCEDFILES = $(MOCHEADER:%.h=moc_%.cpp)
|
|
|
|
|
|
|
|
|
|
BUILT_SOURCES += $(MOCEDFILES)
|
|
|
|
|
CLEANFILES += $(MOCEDFILES)
|
|
|
|
|
|
2015-06-10 17:21:27 +00:00
|
|
|
moc_PreviewLoader.cpp: graphics/PreviewLoader.h
|
|
|
|
|
$(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
|
|
|
|
|
|
2009-08-21 22:58:38 +00:00
|
|
|
moc_%.cpp: %.h
|
2014-11-24 17:39:18 +00:00
|
|
|
$(AM_V_GEN)$(QT_MOC) $(MOCFLAG) -o $@ $<
|
2009-08-21 22:58:38 +00:00
|
|
|
|
|
|
|
|
liblyxcore_a_DEPENDENCIES = $(MOCEDFILES)
|
|
|
|
|
|
2007-08-11 10:32:36 +00:00
|
|
|
############################### Graphics ##############################
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
noinst_LIBRARIES += liblyxgraphics.a
|
2007-08-11 10:32:36 +00:00
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
liblyxgraphics_a_SOURCES = \
|
2012-02-15 20:50:52 +00:00
|
|
|
graphics/epstools.h \
|
|
|
|
|
graphics/epstools.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
graphics/GraphicsCache.h \
|
|
|
|
|
graphics/GraphicsCache.cpp \
|
|
|
|
|
graphics/GraphicsCacheItem.h \
|
|
|
|
|
graphics/GraphicsCacheItem.cpp \
|
|
|
|
|
graphics/GraphicsConverter.h \
|
|
|
|
|
graphics/GraphicsConverter.cpp \
|
|
|
|
|
graphics/GraphicsImage.h \
|
|
|
|
|
graphics/GraphicsLoader.h \
|
|
|
|
|
graphics/GraphicsLoader.cpp \
|
|
|
|
|
graphics/GraphicsParams.cpp \
|
|
|
|
|
graphics/GraphicsParams.h \
|
|
|
|
|
graphics/GraphicsTypes.h \
|
|
|
|
|
graphics/PreviewImage.h \
|
|
|
|
|
graphics/PreviewImage.cpp \
|
|
|
|
|
graphics/PreviewLoader.h \
|
2011-07-12 12:43:11 +00:00
|
|
|
graphics/PreviewLoader.cpp
|
2007-08-11 10:32:36 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
############################### Mathed ##############################
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
noinst_LIBRARIES += liblyxmathed.a
|
2007-08-11 10:32:36 +00:00
|
|
|
|
2007-11-17 15:37:29 +00:00
|
|
|
SOURCEFILESMATHED = \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathAMSArray.cpp \
|
|
|
|
|
mathed/InsetMathArray.cpp \
|
|
|
|
|
mathed/InsetMathBig.cpp \
|
|
|
|
|
mathed/InsetMathBoldSymbol.cpp \
|
|
|
|
|
mathed/InsetMathBox.cpp \
|
|
|
|
|
mathed/InsetMathBrace.cpp \
|
|
|
|
|
mathed/InsetMath.cpp \
|
2016-10-19 12:21:24 +00:00
|
|
|
mathed/InsetMathCancel.cpp \
|
|
|
|
|
mathed/InsetMathCancelto.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathCases.cpp \
|
|
|
|
|
mathed/InsetMathChar.cpp \
|
2016-10-04 22:25:38 +00:00
|
|
|
mathed/InsetMathClass.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathColor.cpp \
|
2017-07-05 12:31:28 +00:00
|
|
|
mathed/InsetMathCommand.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathComment.cpp \
|
|
|
|
|
mathed/InsetMathDecoration.cpp \
|
|
|
|
|
mathed/InsetMathDecoration.h \
|
|
|
|
|
mathed/InsetMathDelim.cpp \
|
2017-08-12 08:22:45 +00:00
|
|
|
mathed/InsetMathDiagram.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathDiff.cpp \
|
|
|
|
|
mathed/InsetMathDots.cpp \
|
2008-09-04 22:24:07 +00:00
|
|
|
mathed/InsetMathEnsureMath.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathEnv.cpp \
|
|
|
|
|
mathed/InsetMathExFunc.cpp \
|
|
|
|
|
mathed/InsetMathExInt.cpp \
|
|
|
|
|
mathed/InsetMathFont.cpp \
|
|
|
|
|
mathed/InsetMathFontOld.cpp \
|
|
|
|
|
mathed/InsetMathFrac.cpp \
|
|
|
|
|
mathed/InsetMathGrid.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathHull.cpp \
|
|
|
|
|
mathed/InsetMathKern.cpp \
|
|
|
|
|
mathed/InsetMathLefteqn.cpp \
|
|
|
|
|
mathed/InsetMathLim.cpp \
|
2017-07-05 12:31:28 +00:00
|
|
|
mathed/InsetMathMacro.cpp \
|
|
|
|
|
mathed/InsetMathMacroArgument.cpp \
|
|
|
|
|
mathed/InsetMathMacroTemplate.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathMatrix.cpp \
|
|
|
|
|
mathed/InsetMathNest.cpp \
|
|
|
|
|
mathed/InsetMathNumber.cpp \
|
|
|
|
|
mathed/InsetMathOverset.cpp \
|
|
|
|
|
mathed/InsetMathPar.cpp \
|
|
|
|
|
mathed/InsetMathPhantom.cpp \
|
|
|
|
|
mathed/InsetMathRef.cpp \
|
|
|
|
|
mathed/InsetMathRoot.cpp \
|
|
|
|
|
mathed/InsetMathScript.cpp \
|
2013-02-17 10:08:58 +00:00
|
|
|
mathed/InsetMathSideset.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathSize.cpp \
|
|
|
|
|
mathed/InsetMathSpace.cpp \
|
2008-10-23 00:48:06 +00:00
|
|
|
mathed/InsetMathSpecialChar.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathSplit.cpp \
|
|
|
|
|
mathed/InsetMathSqrt.cpp \
|
|
|
|
|
mathed/InsetMathStackrel.cpp \
|
|
|
|
|
mathed/InsetMathString.cpp \
|
|
|
|
|
mathed/InsetMathSubstack.cpp \
|
|
|
|
|
mathed/InsetMathSymbol.cpp \
|
|
|
|
|
mathed/InsetMathTabular.cpp \
|
|
|
|
|
mathed/InsetMathUnderset.cpp \
|
|
|
|
|
mathed/InsetMathUnknown.cpp \
|
|
|
|
|
mathed/InsetMathXArrow.cpp \
|
|
|
|
|
mathed/InsetMathXYMatrix.cpp \
|
2016-05-30 08:33:35 +00:00
|
|
|
mathed/MacroTable.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/MathAtom.cpp \
|
|
|
|
|
mathed/MathAutoCorrect.cpp \
|
2016-05-30 08:33:35 +00:00
|
|
|
mathed/MathClass.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/MathData.cpp \
|
|
|
|
|
mathed/MathExtern.cpp \
|
|
|
|
|
mathed/MathFactory.cpp \
|
|
|
|
|
mathed/MathParser.cpp \
|
2016-11-16 14:07:00 +00:00
|
|
|
mathed/MathRow.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/MathStream.cpp \
|
|
|
|
|
mathed/MathSupport.cpp \
|
|
|
|
|
mathed/TextPainter.cpp
|
|
|
|
|
|
|
|
|
|
HEADERFILESMATHED = \
|
|
|
|
|
mathed/InsetMathAMSArray.h \
|
|
|
|
|
mathed/InsetMathArray.h \
|
|
|
|
|
mathed/InsetMathBig.h \
|
|
|
|
|
mathed/InsetMathBoldSymbol.h \
|
|
|
|
|
mathed/InsetMathBox.h \
|
|
|
|
|
mathed/InsetMathBrace.h \
|
2012-01-23 01:49:49 +00:00
|
|
|
mathed/InsetMathCancel.h \
|
|
|
|
|
mathed/InsetMathCancelto.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathCases.h \
|
|
|
|
|
mathed/InsetMathChar.h \
|
2016-10-04 22:25:38 +00:00
|
|
|
mathed/InsetMathClass.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathColor.h \
|
2017-07-05 12:31:28 +00:00
|
|
|
mathed/InsetMathCommand.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathComment.h \
|
|
|
|
|
mathed/InsetMathDelim.h \
|
|
|
|
|
mathed/InsetMathDiff.h \
|
|
|
|
|
mathed/InsetMathDots.h \
|
2008-09-04 22:24:07 +00:00
|
|
|
mathed/InsetMathEnsureMath.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
mathed/InsetMathEnv.h \
|
|
|
|
|
mathed/InsetMathExFunc.h \
|
|
|
|
|
mathed/InsetMathExInt.h \
|
|
|
|
|
mathed/InsetMathFont.h \
|
|
|
|
|
mathed/InsetMathFontOld.h \
|
|
|
|
|
mathed/InsetMathFrac.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathGrid.h \
|
|
|
|
|
mathed/InsetMath.h \
|
|
|
|
|
mathed/InsetMathHull.h \
|
|
|
|
|
mathed/InsetMathKern.h \
|
|
|
|
|
mathed/InsetMathLefteqn.h \
|
|
|
|
|
mathed/InsetMathLim.h \
|
2017-07-05 12:31:28 +00:00
|
|
|
mathed/InsetMathMacro.h \
|
|
|
|
|
mathed/InsetMathMacroArgument.h \
|
|
|
|
|
mathed/InsetMathMacroTemplate.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathMatrix.h \
|
|
|
|
|
mathed/InsetMathNest.h \
|
|
|
|
|
mathed/InsetMathNumber.h \
|
|
|
|
|
mathed/InsetMathOverset.h \
|
|
|
|
|
mathed/InsetMathPar.h \
|
|
|
|
|
mathed/InsetMathPhantom.h \
|
|
|
|
|
mathed/InsetMathRef.h \
|
|
|
|
|
mathed/InsetMathRoot.h \
|
|
|
|
|
mathed/InsetMathScript.h \
|
2013-02-17 10:08:58 +00:00
|
|
|
mathed/InsetMathSideset.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathSize.h \
|
|
|
|
|
mathed/InsetMathSpace.h \
|
2008-10-23 00:48:06 +00:00
|
|
|
mathed/InsetMathSpecialChar.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/InsetMathSplit.h \
|
|
|
|
|
mathed/InsetMathSqrt.h \
|
|
|
|
|
mathed/InsetMathStackrel.h \
|
|
|
|
|
mathed/InsetMathString.h \
|
|
|
|
|
mathed/InsetMathSubstack.h \
|
|
|
|
|
mathed/InsetMathSymbol.h \
|
|
|
|
|
mathed/InsetMathTabular.h \
|
|
|
|
|
mathed/InsetMathUnderset.h \
|
|
|
|
|
mathed/InsetMathUnknown.h \
|
|
|
|
|
mathed/InsetMathXArrow.h \
|
|
|
|
|
mathed/InsetMathXYMatrix.h \
|
2010-09-19 22:12:06 +00:00
|
|
|
mathed/InsetMathDiagram.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/MathAtom.h \
|
|
|
|
|
mathed/MathAutoCorrect.h \
|
2016-05-30 08:33:35 +00:00
|
|
|
mathed/MathClass.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/MathData.h \
|
2008-03-21 14:05:41 +00:00
|
|
|
mathed/MathCompletionList.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/MathExtern.h \
|
|
|
|
|
mathed/MathFactory.h \
|
|
|
|
|
mathed/MacroTable.h \
|
|
|
|
|
mathed/MathParser.h \
|
2008-10-18 12:28:17 +00:00
|
|
|
mathed/MathParser_flags.h \
|
2016-11-16 14:07:00 +00:00
|
|
|
mathed/MathRow.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
mathed/ReplaceData.h \
|
|
|
|
|
mathed/MathStream.h \
|
|
|
|
|
mathed/MathSupport.h \
|
2009-07-12 22:46:01 +00:00
|
|
|
mathed/TextPainter.h
|
2007-08-11 10:32:36 +00:00
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
lyxmathed.cpp:
|
2016-04-13 16:27:42 +00:00
|
|
|
$(AM_V_GEN)for file in $(SOURCEFILESMATHED) ; do echo '#include "'$${file}'"' ; done >$@
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2008-02-09 18:04:14 +00:00
|
|
|
if MONOLITHIC_MATHED
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
BUILT_SOURCES += lyxmathed.cpp
|
|
|
|
|
CLEANFILES += lyxmathed.cpp
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2016-06-16 19:34:38 +00:00
|
|
|
nodist_liblyxmathed_a_SOURCES = lyxmathed.cpp
|
|
|
|
|
liblyxmathed_a_SOURCES = $(HEADERFILESMATHED)
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
liblyxmathed_a_SOURCES = $(SOURCEFILESMATHED) $(HEADERFILESMATHED)
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
endif
|
|
|
|
|
|
2007-08-11 10:32:36 +00:00
|
|
|
############################### Insets ##############################
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
noinst_LIBRARIES += liblyxinsets.a
|
2007-08-11 10:32:36 +00:00
|
|
|
|
2007-11-17 15:37:29 +00:00
|
|
|
SOURCEFILESINSETS = \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/ExternalSupport.cpp \
|
|
|
|
|
insets/ExternalTemplate.cpp \
|
|
|
|
|
insets/ExternalTransforms.cpp \
|
|
|
|
|
insets/RenderButton.cpp \
|
|
|
|
|
insets/RenderGraphic.cpp \
|
|
|
|
|
insets/RenderPreview.cpp \
|
|
|
|
|
insets/Inset.cpp \
|
2010-06-04 22:44:58 +00:00
|
|
|
insets/InsetArgument.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetBibitem.cpp \
|
|
|
|
|
insets/InsetBibtex.cpp \
|
|
|
|
|
insets/InsetBox.cpp \
|
|
|
|
|
insets/InsetBranch.cpp \
|
|
|
|
|
insets/InsetCaption.cpp \
|
2015-09-02 18:53:13 +00:00
|
|
|
insets/InsetCaptionable.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetCitation.cpp \
|
|
|
|
|
insets/InsetCollapsable.cpp \
|
|
|
|
|
insets/InsetCommand.cpp \
|
|
|
|
|
insets/InsetCommandParams.cpp \
|
|
|
|
|
insets/InsetERT.cpp \
|
|
|
|
|
insets/InsetExternal.cpp \
|
2007-09-05 15:46:20 +00:00
|
|
|
insets/InsetFlex.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetFloat.cpp \
|
|
|
|
|
insets/InsetFloatList.cpp \
|
|
|
|
|
insets/InsetFoot.cpp \
|
|
|
|
|
insets/InsetFootlike.cpp \
|
|
|
|
|
insets/InsetGraphicsParams.cpp \
|
|
|
|
|
insets/InsetGraphics.cpp \
|
2007-10-13 19:06:09 +00:00
|
|
|
insets/InsetHyperlink.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetInclude.cpp \
|
|
|
|
|
insets/InsetIndex.cpp \
|
2007-10-11 14:52:00 +00:00
|
|
|
insets/InsetInfo.cpp \
|
2012-03-06 07:54:22 +00:00
|
|
|
insets/InsetIPA.cpp \
|
2012-08-23 15:42:53 +00:00
|
|
|
insets/InsetIPAMacro.cpp \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetLabel.cpp \
|
2008-02-22 02:32:52 +00:00
|
|
|
insets/InsetLayout.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetLine.cpp \
|
|
|
|
|
insets/InsetListings.cpp \
|
|
|
|
|
insets/InsetListingsParams.cpp \
|
|
|
|
|
insets/InsetMarginal.cpp \
|
|
|
|
|
insets/InsetNewline.cpp \
|
2007-11-23 02:10:00 +00:00
|
|
|
insets/InsetNewpage.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetNomencl.cpp \
|
|
|
|
|
insets/InsetNote.cpp \
|
2009-01-30 00:56:37 +00:00
|
|
|
insets/InsetPhantom.cpp \
|
2010-03-28 13:47:50 +00:00
|
|
|
insets/InsetPreview.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetQuotes.cpp \
|
|
|
|
|
insets/InsetRef.cpp \
|
2010-11-21 17:00:12 +00:00
|
|
|
insets/InsetScript.cpp \
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
insets/InsetSeparator.cpp \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetSpace.cpp \
|
|
|
|
|
insets/InsetSpecialChar.cpp \
|
|
|
|
|
insets/InsetTabular.cpp \
|
|
|
|
|
insets/InsetText.cpp \
|
|
|
|
|
insets/InsetTOC.cpp \
|
|
|
|
|
insets/InsetVSpace.cpp \
|
|
|
|
|
insets/InsetWrap.cpp
|
|
|
|
|
|
|
|
|
|
HEADERFILESINSETS = \
|
|
|
|
|
insets/ExternalSupport.h \
|
|
|
|
|
insets/ExternalTemplate.h \
|
|
|
|
|
insets/ExternalTransforms.h \
|
|
|
|
|
insets/RenderBase.h \
|
|
|
|
|
insets/RenderButton.h \
|
|
|
|
|
insets/RenderGraphic.h \
|
|
|
|
|
insets/RenderPreview.h \
|
|
|
|
|
insets/Inset.h \
|
2010-06-04 22:44:58 +00:00
|
|
|
insets/InsetArgument.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetBibitem.h \
|
|
|
|
|
insets/InsetBibtex.h \
|
|
|
|
|
insets/InsetBox.h \
|
|
|
|
|
insets/InsetBranch.h \
|
|
|
|
|
insets/InsetCaption.h \
|
2015-09-02 18:53:13 +00:00
|
|
|
insets/InsetCaptionable.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetCitation.h \
|
|
|
|
|
insets/InsetCode.h \
|
|
|
|
|
insets/InsetCollapsable.h \
|
|
|
|
|
insets/InsetCommand.h \
|
|
|
|
|
insets/InsetCommandParams.h \
|
|
|
|
|
insets/InsetERT.h \
|
|
|
|
|
insets/InsetExternal.h \
|
|
|
|
|
insets/InsetFlex.h \
|
|
|
|
|
insets/InsetFloat.h \
|
|
|
|
|
insets/InsetFoot.h \
|
|
|
|
|
insets/InsetFloatList.h \
|
|
|
|
|
insets/InsetFootlike.h \
|
|
|
|
|
insets/InsetGraphicsParams.h \
|
|
|
|
|
insets/InsetGraphics.h \
|
|
|
|
|
insets/InsetHyperlink.h \
|
|
|
|
|
insets/InsetInclude.h \
|
|
|
|
|
insets/InsetIndex.h \
|
|
|
|
|
insets/InsetInfo.h \
|
2012-03-06 07:54:22 +00:00
|
|
|
insets/InsetIPA.h \
|
2012-08-23 15:42:53 +00:00
|
|
|
insets/InsetIPAMacro.h \
|
2010-03-28 13:47:50 +00:00
|
|
|
insets/InsetPreview.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetLabel.h \
|
2007-11-07 22:31:07 +00:00
|
|
|
insets/InsetLayout.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetLine.h \
|
|
|
|
|
insets/InsetListings.h \
|
|
|
|
|
insets/InsetListingsParams.h \
|
|
|
|
|
insets/InsetMarginal.h \
|
|
|
|
|
insets/InsetNewline.h \
|
2007-11-23 02:10:00 +00:00
|
|
|
insets/InsetNewpage.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetNomencl.h \
|
|
|
|
|
insets/InsetNote.h \
|
2009-01-30 00:56:37 +00:00
|
|
|
insets/InsetPhantom.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetQuotes.h \
|
|
|
|
|
insets/InsetRef.h \
|
2010-11-21 17:00:12 +00:00
|
|
|
insets/InsetScript.h \
|
Fix bugs #8546 and #9055, and introduce new separator inset.
The algorithm used for breaking a paragraph in LaTeX export is changed
for avoiding spurious blank lines causing too much vertical space.
This change is tied to the introduction of a new inset (with two
different specializations) helping in either outputing LaTeX paragraph
breaks or separating environments in LyX. Both of the above goals were
previously achieved by the ---Separator--- layout and can now be
accomplished by the new inset in a more natural way. As an example,
after leaving an environment by hitting the Return key for two times,
a third return automatically inserts a parbreak inset, which is
equivalent to the old separator layout, i.e., it also introduces a
blank line in the output. If this blank line is not wanted, the
parbreak separator can be changed to a plain separator by a right
click of the mouse. Of course, an environment can still be separated
by the following one by using the Alt+P+Return shortcut (or the
corresponding menu key), but now the plain separator inset is used
instead of the old separator layout, such that no blank line occurs in
the LaTeX output.
Old documents are converted such that the LaTeX output remains unchanged.
As a result of this conversion, the old separator layout is replaced by
the new parbreak inset, which may also appear in places where the old
algorithm was introducing blank lines while the new one is not.
Note that not all blank lines were actually affecting the LaTeX output,
because a blank line is simply ignored by the TeX engine when it occurs
in the so called "vertical mode" (e.g., after an alignment environment).
The old ---Separator--- layout is now gone and old layout files using it
are also automatically converted.
Round trip conversions between old and new format should leave a document
unchanged. This means that the new behavior about paragraph breaking is
not "carried back" to the old format. Indeed, this would need introducing
special LaTeX commands in ERT that would accumulate in roundtrip
conversions, horribly cluttering the document. So, when converting a
modified document to old formats, the LaTeX output may slightly differ in
vertical spacing if the document is processed by an old version of LyX.
In other words, forward compatibility is guaranteed, but not backwards.
2014-05-10 21:25:11 +00:00
|
|
|
insets/InsetSeparator.h \
|
2007-08-11 10:32:36 +00:00
|
|
|
insets/InsetSpace.h \
|
|
|
|
|
insets/InsetSpecialChar.h \
|
|
|
|
|
insets/InsetTabular.h \
|
|
|
|
|
insets/InsetText.h \
|
|
|
|
|
insets/InsetTOC.h \
|
|
|
|
|
insets/InsetVSpace.h \
|
2007-11-17 15:37:29 +00:00
|
|
|
insets/InsetWrap.h
|
2007-08-11 10:32:36 +00:00
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
lyxinsets.cpp:
|
2016-04-13 16:27:42 +00:00
|
|
|
$(AM_V_GEN)for file in $(SOURCEFILESINSETS) ; do echo '#include "'$${file}'"' ; done >$@
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2008-02-09 18:04:14 +00:00
|
|
|
if MONOLITHIC_INSETS
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
BUILT_SOURCES += lyxinsets.cpp
|
|
|
|
|
CLEANFILES += lyxinsets.cpp
|
2007-11-17 15:37:29 +00:00
|
|
|
|
2016-06-16 19:34:38 +00:00
|
|
|
nodist_liblyxinsets_a_SOURCES = lyxinsets.cpp
|
|
|
|
|
liblyxinsets_a_SOURCES = $(HEADERFILESINSETS)
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
else
|
|
|
|
|
|
2010-04-14 14:25:11 +00:00
|
|
|
liblyxinsets_a_SOURCES = $(SOURCEFILESINSETS) $(HEADERFILESINSETS)
|
2007-11-17 15:37:29 +00:00
|
|
|
|
|
|
|
|
endif
|
2013-05-13 19:53:28 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
############################## Tests ##################################
|
|
|
|
|
|
|
|
|
|
EXTRA_DIST += \
|
2014-12-28 12:23:35 +00:00
|
|
|
tests/test_ExternalTransforms \
|
2015-11-22 16:34:46 +00:00
|
|
|
tests/test_ListingsCaption \
|
2017-04-06 11:48:32 +00:00
|
|
|
tests/test_layout \
|
|
|
|
|
tests/test_Length \
|
2014-12-28 12:23:35 +00:00
|
|
|
tests/regfiles/ExternalTransforms \
|
2015-07-12 16:08:41 +00:00
|
|
|
tests/regfiles/Length \
|
2015-11-22 16:34:46 +00:00
|
|
|
tests/regfiles/ListingsCaption \
|
2017-04-06 11:48:32 +00:00
|
|
|
tests/dummy_functions.cpp \
|
|
|
|
|
tests/boost.cpp
|
2013-05-13 19:53:28 +00:00
|
|
|
|
2017-04-06 11:48:32 +00:00
|
|
|
TESTS = tests/test_ExternalTransforms tests/test_ListingsCaption \
|
|
|
|
|
tests/test_layout tests/test_Length
|
2014-12-28 12:23:35 +00:00
|
|
|
|
2013-09-09 19:00:11 +00:00
|
|
|
alltests: check alltests-recursive
|
2013-05-13 19:53:28 +00:00
|
|
|
|
2013-09-09 19:00:11 +00:00
|
|
|
alltests-recursive: check_layout
|
|
|
|
|
@srcdir=$(srcdir) $(srcdir)/tests/test_layout; \
|
|
|
|
|
if test $$? -eq 0; then \
|
|
|
|
|
echo -e "====================\nlayout tests passed.\n===================="; \
|
|
|
|
|
else \
|
|
|
|
|
echo -e "====================\nlayout tests failed.\n===================="; \
|
|
|
|
|
fi
|
|
|
|
|
cd tex2lyx; $(MAKE) alltests-recursive
|
|
|
|
|
|
|
|
|
|
updatetests:
|
|
|
|
|
cd tex2lyx; $(MAKE) updatetests
|
2013-05-13 19:53:28 +00:00
|
|
|
|
|
|
|
|
check_PROGRAMS = \
|
2014-12-28 12:23:35 +00:00
|
|
|
check_ExternalTransforms \
|
2015-07-12 16:08:41 +00:00
|
|
|
check_Length \
|
2015-11-22 16:34:46 +00:00
|
|
|
check_ListingsCaption \
|
2013-05-14 16:41:33 +00:00
|
|
|
check_layout
|
2013-05-13 19:53:28 +00:00
|
|
|
|
2013-07-18 11:05:50 +00:00
|
|
|
if INSTALL_MACOSX
|
|
|
|
|
ADD_FRAMEWORKS = -framework QtGui -framework QtCore -framework AppKit -framework ApplicationServices
|
|
|
|
|
endif
|
|
|
|
|
|
2017-04-06 11:48:32 +00:00
|
|
|
TESTS_LIBS = support/liblyxsupport.a \
|
|
|
|
|
$(LIBICONV) $(BOOST_LIBS) @LIBS@ \
|
2016-05-05 17:43:24 +00:00
|
|
|
$(ICONV_LIBS) $(ZLIB_LIBS) $(QT_LIB) $(LIBSHLWAPI)
|
2017-04-06 11:48:32 +00:00
|
|
|
|
|
|
|
|
check_layout_CPPFLAGS = $(AM_CPPFLAGS)
|
|
|
|
|
check_layout_LDADD = $(check_layout_LYX_OBJS) $(TESTS_LIBS)
|
2015-03-23 20:23:03 +00:00
|
|
|
check_layout_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
2013-05-14 16:41:33 +00:00
|
|
|
check_layout_SOURCES = \
|
2017-04-06 11:48:32 +00:00
|
|
|
tests/check_layout.cpp
|
|
|
|
|
check_layout_LYX_OBJS = \
|
|
|
|
|
insets/InsetLayout.o \
|
|
|
|
|
CiteEnginesList.o \
|
|
|
|
|
Color.o \
|
|
|
|
|
Counters.o \
|
|
|
|
|
Floating.o \
|
|
|
|
|
FloatList.o \
|
|
|
|
|
FontInfo.o \
|
|
|
|
|
Layout.o \
|
|
|
|
|
LayoutFile.o \
|
|
|
|
|
Lexer.o \
|
|
|
|
|
ModuleList.o \
|
|
|
|
|
Spacing.o \
|
|
|
|
|
TextClass.o \
|
|
|
|
|
tests/dummy_functions.o \
|
|
|
|
|
tests/boost.o
|
2013-05-13 19:53:28 +00:00
|
|
|
|
2014-12-28 12:23:35 +00:00
|
|
|
check_ExternalTransforms_CPPFLAGS = $(AM_CPPFLAGS)
|
2017-04-06 11:48:32 +00:00
|
|
|
check_ExternalTransforms_LDADD = $(check_ExternalTransforms_LYX_OBJS) $(TESTS_LIBS)
|
2015-03-23 20:23:03 +00:00
|
|
|
check_ExternalTransforms_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
2014-12-28 12:23:35 +00:00
|
|
|
check_ExternalTransforms_SOURCES = \
|
2017-04-06 11:48:32 +00:00
|
|
|
tests/check_ExternalTransforms.cpp
|
|
|
|
|
check_ExternalTransforms_LYX_OBJS = \
|
|
|
|
|
tests/dummy_functions.o \
|
|
|
|
|
tests/boost.o \
|
|
|
|
|
graphics/GraphicsParams.o \
|
|
|
|
|
insets/ExternalTransforms.o \
|
|
|
|
|
Length.o \
|
|
|
|
|
lengthcommon.o
|
2014-12-28 12:23:35 +00:00
|
|
|
|
2015-07-12 16:08:41 +00:00
|
|
|
check_Length_CPPFLAGS = $(AM_CPPFLAGS)
|
2017-04-06 11:48:32 +00:00
|
|
|
check_Length_LDADD = $(check_Length_LYX_OBJS) $(TESTS_LIBS)
|
2015-07-12 16:08:41 +00:00
|
|
|
check_Length_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
|
|
|
|
check_Length_SOURCES = \
|
2017-04-06 11:48:32 +00:00
|
|
|
tests/check_Length.cpp
|
|
|
|
|
check_Length_LYX_OBJS = \
|
|
|
|
|
tests/dummy_functions.o \
|
|
|
|
|
tests/boost.o \
|
|
|
|
|
Length.o \
|
|
|
|
|
lengthcommon.o
|
2015-07-12 16:08:41 +00:00
|
|
|
|
2015-11-22 16:34:46 +00:00
|
|
|
check_ListingsCaption_CPPFLAGS = $(AM_CPPFLAGS)
|
2017-04-06 11:48:32 +00:00
|
|
|
check_ListingsCaption_LDADD = $(check_ListingsCaption_LYX_OBJS) $(TESTS_LIBS)
|
2015-11-22 16:34:46 +00:00
|
|
|
check_ListingsCaption_LDFLAGS = $(QT_LDFLAGS) $(ADD_FRAMEWORKS)
|
|
|
|
|
check_ListingsCaption_SOURCES = \
|
2017-04-06 11:48:32 +00:00
|
|
|
tests/check_ListingsCaption.cpp
|
|
|
|
|
check_ListingsCaption_LYX_OBJS = \
|
|
|
|
|
tests/dummy_functions.o \
|
|
|
|
|
tests/boost.o
|
2015-11-22 16:34:46 +00:00
|
|
|
|
2013-09-09 19:00:11 +00:00
|
|
|
.PHONY: alltests alltests-recursive updatetests
|
