/trunk/Scribus/scribus/CMakeLists.txt |
---|
30,12 → 30,13 |
${HARFBUZZ_INCLUDE_DIRS} |
) |
include(text/CMakeLists.txt) |
add_subdirectory(dtd) |
add_subdirectory(colormgmt) |
add_subdirectory(desaxe) |
add_subdirectory(fonts) |
add_subdirectory(styles) |
add_subdirectory(text) |
add_subdirectory(ui/qml) |
if(WITH_TESTS) |
add_subdirectory(tests) |
581,6 → 582,7 |
ui/weldedit.h |
# #{SCRIBUS_ITEMSETTERS_CLASS} |
${SCRIBUS_OSG_CLASS} |
${SCRIBUS_TEXT_MOC_CLASSES} |
) |
set(SCRIBUS_SOURCES |
1097,6 → 1099,7 |
# #{SCRIBUS_ITEMSETTERS_SRC} |
${SCRIBUS_OSG_SRC} |
${SCRIBUS_GMAGICK_SRC} |
${SCRIBUS_TEXT_LIB_SOURCES} |
) |
if(NOT HAVE_HYPHEN) |
1136,7 → 1139,6 |
${CMAKE_CURRENT_BINARY_DIR}/desaxe |
${CMAKE_CURRENT_BINARY_DIR}/fonts |
${CMAKE_CURRENT_BINARY_DIR}/styles |
${CMAKE_CURRENT_BINARY_DIR}/text |
${CMAKE_CURRENT_BINARY_DIR}/third_party/wpg |
${CMAKE_CURRENT_BINARY_DIR}/third_party/pgf |
${CMAKE_CURRENT_BINARY_DIR}/third_party/rtf-qt |
1158,7 → 1160,7 |
endif () |
set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib") |
set(SCRIBUS_TEXT_LIB "scribus_text_lib") |
if(WITH_TESTS) |
set(SCRIBUS_TESTS_LIB "scribus_tests_lib") |
else() |
1232,7 → 1234,6 |
${SCRIBUS_SOURCES} |
${SCRIBUS_MAIN_CPP} |
${SCRIBUS_UI_SOURCES} |
${SCRIBUS_TEXT_SOURCES} |
${SCRIBUS_STYLES_SOURCES} |
${SCRIBUS_COLORMGMT_SOURCES} |
${SCRIBUS_FONTS_SOURCES} |
1247,7 → 1248,6 |
${SCRIBUS_SOURCES} |
${SCRIBUS_MAIN_CPP} |
${SCRIBUS_UI_SOURCES} |
${SCRIBUS_TEXT_SOURCES} |
${SCRIBUS_STYLES_SOURCES} |
${SCRIBUS_COLORMGMT_SOURCES} |
${SCRIBUS_FONTS_SOURCES} |
1363,7 → 1363,6 |
target_link_libraries(${EXE_NAME} |
${SCRIBUS_COLORMGMT_LIB} |
${SCRIBUS_DESAXE_LIB} |
${SCRIBUS_TEXT_LIB} |
${SCRIBUS_STYLES_LIB} |
${SCRIBUS_FONTS_LIB} |
${SCRIBUS_WPG_LIB} |
/trunk/Scribus/scribus/text/CMakeLists.txt |
---|
1,47 → 1,25 |
include_directories( |
${CMAKE_SOURCE_DIR} |
${CMAKE_SOURCE_DIR}/scribus |
${FREETYPE_INCLUDE_DIRS} |
${CAIRO_INCLUDE_DIRS} |
${HARFBUZZ_INCLUDE_DIRS} |
${ICU_INCLUDE_DIRS} |
) |
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
set(SCRIBUS_TEXT_MOC_CLASSES |
storytext.h |
text/storytext.h |
) |
set(SCRIBUS_TEXT_LIB_SOURCES |
boxes.cpp |
frect.cpp |
fsize.cpp |
glyphcluster.cpp |
index.cpp |
screenpainter.cpp |
scrptrun.cpp |
sctext_shared.cpp |
scworditerator.cpp |
shapedtext.cpp |
shapedtextcache.cpp |
shapedtextfeed.cpp |
specialchars.cpp |
storytext.cpp |
textlayout.cpp |
textlayoutpainter.cpp |
textshaper.cpp |
textcontext.cpp |
text/boxes.cpp |
text/frect.cpp |
text/fsize.cpp |
text/glyphcluster.cpp |
text/index.cpp |
text/screenpainter.cpp |
text/scrptrun.cpp |
text/sctext_shared.cpp |
text/scworditerator.cpp |
text/shapedtext.cpp |
text/shapedtextcache.cpp |
text/shapedtextfeed.cpp |
text/specialchars.cpp |
text/storytext.cpp |
text/textlayout.cpp |
text/textlayoutpainter.cpp |
text/textshaper.cpp |
text/textcontext.cpp |
) |
QT5_WRAP_CPP(SCRIBUS_TEXT_MOC_SOURCES ${SCRIBUS_TEXT_MOC_CLASSES}) |
set(SCRIBUS_TEXT_LIB "scribus_text_lib") |
add_library(${SCRIBUS_TEXT_LIB} STATIC ${SCRIBUS_TEXT_LIB_SOURCES} ${SCRIBUS_TEXT_MOC_SOURCES}) |
# This is a convenience library that for linkage purposes is part of Scribus's |
# main API. |
set_target_properties(${SCRIBUS_TEXT_LIB} |
PROPERTIES |
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP |
) |
/trunk/Scribus/scribus/text/storytext.cpp |
---|
32,7 → 32,6 |
#include "scfonts.h" |
#include "scribusdoc.h" |
#include "sctext_shared.h" |
#include "scworditerator.h" |
#include "selection.h" |
#include "storytext.h" |
// |
2030,11 → 2029,6 |
d->selLast += 1; |
} |
ScWordIterator* StoryText::createWordIterator() |
{ |
return new ScWordIterator(*this); |
} |
BreakIterator* StoryText::m_graphemeIterator = nullptr; |
BreakIterator* StoryText::getGraphemeIterator() |
/trunk/Scribus/scribus/text/storytext.h |
---|
46,7 → 46,6 |
class PageItem; |
class ScribusDoc; |
class ScText_Shared; |
class ScWordIterator; |
class ResourceCollection; |
class ShapedTextCache; |
268,8 → 267,6 |
static icu::BreakIterator* getSentenceIterator(); |
static icu::BreakIterator* getLineIterator(); |
ScWordIterator* createWordIterator(); |
// layout helpers |
ShapedTextCache* shapedTextCache() { return m_shapedTextCache; } |