Merge "Bidirectional support interface added." into new_text
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 13 Feb 2015 15:16:20 +0000 (07:16 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 13 Feb 2015 15:16:20 +0000 (07:16 -0800)
1  2 
base/dali-toolkit/public-api/file.list

@@@ -38,16 -38,15 +38,17 @@@ public_api_base_src_files = 
    $(public_api_base_src_dir)/controls/scrollable/scroll-view/scroll-view-wobble-effect.cpp \
    $(public_api_base_src_dir)/controls/table-view/table-view.cpp \
    $(public_api_base_src_dir)/controls/text-controls/text-label.cpp \
+   $(public_api_base_src_dir)/text/bidirectional-support.cpp \
    $(public_api_base_src_dir)/text/character-set-conversion.cpp \
    $(public_api_base_src_dir)/text/logical-model.cpp \
    $(public_api_base_src_dir)/text/multi-language-support.cpp \
 +  $(public_api_base_src_dir)/text/script.cpp \
    $(public_api_base_src_dir)/text/segmentation.cpp \
    $(public_api_base_src_dir)/text/text-controller.cpp \
    $(public_api_base_src_dir)/text/text-view.cpp \
    $(public_api_base_src_dir)/text/text-view-interface.cpp \
    $(public_api_base_src_dir)/text/visual-model.cpp \
 +  $(public_api_base_src_dir)/text/layouts/layout-engine.cpp \
    $(public_api_base_src_dir)/text/rendering/text-renderer.cpp \
    $(public_api_base_src_dir)/text/rendering/basic/text-basic-renderer.cpp \
    $(public_api_base_src_dir)/text/rendering/shaders/text-basic-shader.cpp \
@@@ -126,13 -125,13 +127,14 @@@ public_api_base_text_controls_header_fi
    $(public_api_base_src_dir)/controls/text-controls/text-label.h
  
  public_api_base_text_header_files = \
+   $(public_api_base_src_dir)/text/bidirectional-support.h \
    $(public_api_base_src_dir)/text/character-run.h \
    $(public_api_base_src_dir)/text/character-set-conversion.h \
    $(public_api_base_src_dir)/text/font-run.h \
    $(public_api_base_src_dir)/text/logical-model.h \
    $(public_api_base_src_dir)/text/multi-language-support.h \
    $(public_api_base_src_dir)/text/script.h \
 +  $(public_api_base_src_dir)/text/script-run.h \
    $(public_api_base_src_dir)/text/segmentation.h \
    $(public_api_base_src_dir)/text/text-controller.h \
    $(public_api_base_src_dir)/text/text-definitions.h \
    $(public_api_base_src_dir)/text/text-view-interface.h \
    $(public_api_base_src_dir)/text/visual-model.h
  
 +public_api_base_text_layouts_header_files = \
 +  $(public_api_base_src_dir)/text/layouts/layout-engine.h
 +
  public_api_base_text_rendering_header_files = \
    $(public_api_base_src_dir)/text/rendering/text-renderer.h