From: Steven R. Loomis Date: Thu, 26 Jun 2014 01:17:03 +0000 (+0000) Subject: ICU-10530 Deprecate LayoutEngine X-Git-Tag: milestone-59-0-1~1836 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=34b4644cac851a52974c02358e0557c899b35d62;p=icu ICU-10530 Deprecate LayoutEngine X-SVN-Rev: 35951 --- diff --git a/icu4c/readme.html b/icu4c/readme.html index 12b74e4a05a..41d91e9f8b1 100644 --- a/icu4c/readme.html +++ b/icu4c/readme.html @@ -3,7 +3,7 @@ - ReadMe for ICU 53.1 + ReadMe for ICU 54.1 (m1)

International Components for Unicode
- ICU 53.1 ReadMe

+ ICU 54.1 (m1) ReadMe - -

Note: This is a release candidate version of ICU4C 53. +

Note: This is a development milestone release of ICU4C 54 + This milestone is intended for those wishing to get an early look at ICU 54 new features and API changes. It is not recommended for production use.

+ + -

Last updated: 2014-Mar-19
+

Last updated: 2014-June-25
Copyright © 1997-2014 International Business Machines Corporation and others. All Rights Reserved.

@@ -222,6 +222,14 @@ ICU download page.

+ + +

Layout Engine deprecation

+

The LayoutEngine is now deprecated. Please + see the + User's Guide for more details and migration recommendations. + Passing "--enable-layout" to configure is required to enable the layout + engine, it is not built by default.

ICU4C now requires C99

diff --git a/icu4c/source/allinone/icucheck.bat b/icu4c/source/allinone/icucheck.bat index c5ff9784689..d4e96a38f74 100644 --- a/icu4c/source/allinone/icucheck.bat +++ b/icu4c/source/allinone/icucheck.bat @@ -1,7 +1,7 @@ @echo off REM ******************************************************************** REM * COPYRIGHT: -REM * Copyright (c) 2010-2012, International Business Machines Corporation +REM * Copyright (c) 2010-2014, International Business Machines Corporation REM * and others. All Rights Reserved. REM ******************************************************************** @@ -89,16 +89,17 @@ set ICUFAILCNT=0 :OK_cintltst @set ICURUN=%ICURUN% %THT% -@set THT=letest -@echo ==== %THT% ========================================================================= -@cd %ICU_ICUDIR%\source\test\letest -%LETST_CMD% %LETEST_OPTS% - -@IF NOT ERRORLEVEL 1 GOTO OK_%THT% -@set ICUFAILED=%ICUFAILED% %THT% -@set ICUFAILCNT=1 -:OK_letest -@set ICURUN=%ICURUN% %THT% +@REM (Layout is deprecated) +@REM @set THT=letest +@REM @echo ==== %THT% ========================================================================= +@REM @cd %ICU_ICUDIR%\source\test\letest +@REM %LETST_CMD% %LETEST_OPTS% + +@REM @IF NOT ERRORLEVEL 1 GOTO OK_%THT% +@REM @set ICUFAILED=%ICUFAILED% %THT% +@REM @set ICUFAILCNT=1 +@REM :OK_letest +@REM @set ICURUN=%ICURUN% %THT% @echo off diff --git a/icu4c/source/configure b/icu4c/source/configure index 70192ade7ab..863a42b73cd 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68. +# Generated by GNU Autoconf 2.69. # # Copyright (c) 1999-2013, International Business Machines Corporation and others. All Rights Reserved. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -214,21 +238,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -330,6 +358,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -451,6 +487,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -485,16 +525,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -506,28 +546,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -1229,8 +1249,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1402,7 +1420,7 @@ Optional Features: --enable-weak-threads weakly reference the threading library default=no --enable-extras build ICU extras default=yes --enable-icuio build ICU's icuio library default=yes - --enable-layout build ICU's layout library default=yes + --enable-layout build ICU's layout library default=no --enable-tools build ICU's tools default=yes --enable-tests build ICU tests default=yes --enable-samples build ICU samples default=yes @@ -1497,9 +1515,9 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF configure -generated by GNU Autoconf 2.68 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -1652,7 +1670,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -1730,7 +1748,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1746,7 +1765,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1772,7 +1792,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1788,7 +1809,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1822,7 +1844,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -1949,7 +1972,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2180,7 +2203,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2782,7 +2805,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -2826,7 +2849,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3270,8 +3293,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include #include -#include -#include +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -3386,7 +3408,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3430,7 +3452,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3812,7 +3834,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3933,7 +3955,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_U_MAKE="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4009,7 +4031,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DOXYGEN="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4137,7 +4159,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -4203,7 +4225,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5210,7 +5232,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5250,7 +5272,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5304,7 +5326,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="${ac_tool_prefix}ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5344,7 +5366,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="ar" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7212,7 +7234,7 @@ if test "${enable_layout+set}" = set; then : *) as_fn_error $? "bad value ${enableval} for --enable-layout" "$LINENO" 5 ;; esac else - layout=true + layout=false fi @@ -7899,16 +7921,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -7968,28 +7990,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -8011,7 +8021,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # values after options handling. ac_log=" This file was extended by $as_me, which was -generated by GNU Autoconf 2.68. Invocation command line was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -8064,10 +8074,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.68, +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -8145,7 +8155,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' diff --git a/icu4c/source/configure.ac b/icu4c/source/configure.ac index d52b1e6958a..0b0fc49f9ce 100644 --- a/icu4c/source/configure.ac +++ b/icu4c/source/configure.ac @@ -1063,13 +1063,13 @@ ICU_CONDITIONAL(ICUIO, test "$icuio" = true) # Enable/disable layout AC_ARG_ENABLE(layout, - [ --enable-layout build ICU's layout library [default=yes]], + [ --enable-layout build ICU's layout library [default=no]], [case "${enableval}" in yes) layout=true ;; no) layout=false ;; *) AC_MSG_ERROR(bad value ${enableval} for --enable-layout) ;; esac], - layout=true) + layout=false) ICU_CONDITIONAL(LAYOUT, test "$layout" = true) # Enable/disable tools diff --git a/icu4c/source/layout/ArabicLayoutEngine.h b/icu4c/source/layout/ArabicLayoutEngine.h index 0264b6275de..937289aed64 100644 --- a/icu4c/source/layout/ArabicLayoutEngine.h +++ b/icu4c/source/layout/ArabicLayoutEngine.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -79,14 +79,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/ContextualGlyphInsertionProc2.h b/icu4c/source/layout/ContextualGlyphInsertionProc2.h index 42ceade8154..7ac76587f0d 100644 --- a/icu4c/source/layout/ContextualGlyphInsertionProc2.h +++ b/icu4c/source/layout/ContextualGlyphInsertionProc2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 2013-2014 - All Rights Reserved * */ @@ -39,14 +39,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/ContextualGlyphSubstProc.h b/icu4c/source/layout/ContextualGlyphSubstProc.h index 23d7e45eea7..23cd546c6a0 100644 --- a/icu4c/source/layout/ContextualGlyphSubstProc.h +++ b/icu4c/source/layout/ContextualGlyphSubstProc.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -37,14 +37,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/ContextualGlyphSubstProc2.h b/icu4c/source/layout/ContextualGlyphSubstProc2.h index 40ed087d622..696958013e1 100644 --- a/icu4c/source/layout/ContextualGlyphSubstProc2.h +++ b/icu4c/source/layout/ContextualGlyphSubstProc2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -37,14 +37,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/GXLayoutEngine.h b/icu4c/source/layout/GXLayoutEngine.h index 0634a02f56f..6a02f4b007e 100644 --- a/icu4c/source/layout/GXLayoutEngine.h +++ b/icu4c/source/layout/GXLayoutEngine.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -61,14 +61,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/GXLayoutEngine2.h b/icu4c/source/layout/GXLayoutEngine2.h index f01e025eed4..82bef73cf65 100644 --- a/icu4c/source/layout/GXLayoutEngine2.h +++ b/icu4c/source/layout/GXLayoutEngine2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -60,14 +60,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/HanLayoutEngine.h b/icu4c/source/layout/HanLayoutEngine.h index 5accc6358dc..d0334db78fc 100644 --- a/icu4c/source/layout/HanLayoutEngine.h +++ b/icu4c/source/layout/HanLayoutEngine.h @@ -2,7 +2,7 @@ /* * HanLayoutEngine.h: OpenType processing for Han fonts. * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved. + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved. */ #ifndef __HANLAYOUTENGINE_H @@ -61,14 +61,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/HangulLayoutEngine.h b/icu4c/source/layout/HangulLayoutEngine.h index e9449bcccf3..844b38e7888 100644 --- a/icu4c/source/layout/HangulLayoutEngine.h +++ b/icu4c/source/layout/HangulLayoutEngine.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -84,14 +84,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/IndicLayoutEngine.h b/icu4c/source/layout/IndicLayoutEngine.h index 29e82d49950..0d5a9efc231 100644 --- a/icu4c/source/layout/IndicLayoutEngine.h +++ b/icu4c/source/layout/IndicLayoutEngine.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -85,14 +85,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/IndicRearrangementProcessor.h b/icu4c/source/layout/IndicRearrangementProcessor.h index 0543889de46..2c6047eaec7 100644 --- a/icu4c/source/layout/IndicRearrangementProcessor.h +++ b/icu4c/source/layout/IndicRearrangementProcessor.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -39,14 +39,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/IndicRearrangementProcessor2.h b/icu4c/source/layout/IndicRearrangementProcessor2.h index 01f28830156..814cb10b0a8 100644 --- a/icu4c/source/layout/IndicRearrangementProcessor2.h +++ b/icu4c/source/layout/IndicRearrangementProcessor2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -39,14 +39,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/KhmerLayoutEngine.h b/icu4c/source/layout/KhmerLayoutEngine.h index c355d2e59fc..d74135983b1 100644 --- a/icu4c/source/layout/KhmerLayoutEngine.h +++ b/icu4c/source/layout/KhmerLayoutEngine.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * * This file is a modification of the ICU file IndicLayoutEngine.h * by Jens Herden and Javier Sola for Khmer language @@ -87,14 +87,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/LEFontInstance.h b/icu4c/source/layout/LEFontInstance.h index ec1f975c9b8..4b435cabbfc 100644 --- a/icu4c/source/layout/LEFontInstance.h +++ b/icu4c/source/layout/LEFontInstance.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -23,14 +23,14 @@ U_NAMESPACE_BEGIN * and character mirroring - replacing a character which has both a left and a right * hand form with the opposite form. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ class LECharMapper /* not : public UObject because this is an interface/mixin class */ { public: /** * Destructor. - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual ~LECharMapper(); @@ -41,7 +41,7 @@ public: * * @return the adjusted character * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual LEUnicode32 mapChar(LEUnicode32 ch) const = 0; }; @@ -50,7 +50,7 @@ public: * This is a forward reference to the class which holds the per-glyph * storage. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ class LEGlyphStorage; @@ -76,7 +76,7 @@ class LEGlyphStorage; * methods with some default behavior such as returning constant values, or using the * values from the first subfont. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ class U_LAYOUT_API LEFontInstance : public UObject { @@ -86,7 +86,7 @@ public: * This virtual destructor is here so that the subclass * destructors can be invoked through the base class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual ~LEFontInstance(); @@ -139,7 +139,7 @@ public: * * @see LEScripts.h * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual const LEFontInstance *getSubFont(const LEUnicode chars[], le_int32 *offset, le_int32 limit, le_int32 script, LEErrorCode &success) const; @@ -165,7 +165,7 @@ public: * @return the address of the table in memory, or NULL * if the table doesn't exist. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual const void *getFontTable(LETag tableTag) const = 0; @@ -204,7 +204,7 @@ public: * * @return TRUE if the font can render ch. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual le_bool canDisplay(LEUnicode32 ch) const; @@ -214,7 +214,7 @@ public: * * @return the number of design units pre EM. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual le_int32 getUnitsPerEM() const = 0; @@ -239,7 +239,7 @@ public: * * @see LECharMapper * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ virtual void mapCharsToGlyphs(const LEUnicode chars[], le_int32 offset, le_int32 count, le_bool reverse, const LECharMapper *mapper, le_bool filterZeroWidth, LEGlyphStorage &glyphStorage) const; @@ -256,7 +256,7 @@ public: * * @see LECharMapper * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper, le_bool filterZeroWidth) const; @@ -272,7 +272,7 @@ public: * * @see LECharMapper * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch, const LECharMapper *mapper) const; @@ -286,7 +286,7 @@ public: * * @return the glyph index * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual LEGlyphID mapCharToGlyph(LEUnicode32 ch) const = 0; @@ -300,7 +300,7 @@ public: * @param glyph - the glyph index * @param advance - the X and Y pixel values will be stored here * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual void getGlyphAdvance(LEGlyphID glyph, LEPoint &advance) const = 0; @@ -314,7 +314,7 @@ public: * * @return TRUE if the point coordinates could be stored. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual le_bool getGlyphPoint(LEGlyphID glyph, le_int32 pointNumber, LEPoint &point) const = 0; @@ -324,7 +324,7 @@ public: * * @return the pixel width of the EM square * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual float getXPixelsPerEm() const = 0; @@ -334,7 +334,7 @@ public: * * @return the pixel height of the EM square * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual float getYPixelsPerEm() const = 0; @@ -346,7 +346,7 @@ public: * * @return points in the X direction * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual float xUnitsToPoints(float xUnits) const; @@ -358,7 +358,7 @@ public: * * @return points in the Y direction * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual float yUnitsToPoints(float yUnits) const; @@ -368,7 +368,7 @@ public: * @param units - X and Y design units * @param points - set to X and Y points * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual void unitsToPoints(LEPoint &units, LEPoint &points) const; @@ -380,7 +380,7 @@ public: * * @return font design units in the X direction * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual float xPixelsToUnits(float xPixels) const; @@ -392,7 +392,7 @@ public: * * @return font design units in the Y direction * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual float yPixelsToUnits(float yPixels) const; @@ -402,7 +402,7 @@ public: * @param pixels - X and Y pixel * @param units - set to X and Y font design units * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual void pixelsToUnits(LEPoint &pixels, LEPoint &units) const; @@ -415,7 +415,7 @@ public: * * @see transformFunits * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual float getScaleFactorX() const = 0; @@ -427,7 +427,7 @@ public: * * @see transformFunits * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual float getScaleFactorY() const = 0; @@ -444,7 +444,7 @@ public: * @see getScaleFactorX * @see getScaleFactorY * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual void transformFunits(float xFunits, float yFunits, LEPoint &pixels) const; @@ -456,7 +456,7 @@ public: * * @return the floating point value * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static inline float fixedToFloat(le_int32 fixed); @@ -468,7 +468,7 @@ public: * * @return the fixed point value * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static inline le_int32 floatToFixed(float theFloat); @@ -484,7 +484,7 @@ public: * @return the font's ascent, in points. This value * will always be positive. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual le_int32 getAscent() const = 0; @@ -494,7 +494,7 @@ public: * @return the font's descent, in points. This value * will always be positive. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual le_int32 getDescent() const = 0; @@ -504,7 +504,7 @@ public: * @return the font's leading, in points. This value * will always be positive. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual le_int32 getLeading() const = 0; @@ -516,21 +516,21 @@ public: * @return the line height, in points. This vaule will * always be positive. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual le_int32 getLineHeight() const; /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/LEGlyphStorage.h b/icu4c/source/layout/LEGlyphStorage.h index 8828b3f7acd..12861fea5ad 100644 --- a/icu4c/source/layout/LEGlyphStorage.h +++ b/icu4c/source/layout/LEGlyphStorage.h @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 1998-2010, International Business Machines + * Copyright (C) 1998-2014, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -29,7 +29,7 @@ U_NAMESPACE_BEGIN * * @see LEInsertionList.h * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ class U_LAYOUT_API LEGlyphStorage : public UObject, protected LEInsertionCallback { @@ -105,7 +105,7 @@ protected: * * @see LEInsertionList.h * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ virtual le_bool applyInsertion(le_int32 atPosition, le_int32 count, LEGlyphID newGlyphs[]); @@ -116,14 +116,14 @@ public: * allocateGlyphArray, allocatePositions and allocateAuxData * to allocate the data. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ LEGlyphStorage(); /** * The destructor. This will deallocate all of the arrays. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ ~LEGlyphStorage(); @@ -132,7 +132,7 @@ public: * * @return the number of glyphs in the glyph array * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ inline le_int32 getGlyphCount() const; @@ -144,7 +144,7 @@ public: * @param glyphs - the destiniation glyph array * @param success - set to an error code if the operation fails * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void getGlyphs(LEGlyphID glyphs[], LEErrorCode &success) const; @@ -158,7 +158,7 @@ public: * @param extraBits - this value will be ORed with each glyph index * @param success - set to an error code if the operation fails * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void getGlyphs(le_uint32 glyphs[], le_uint32 extraBits, LEErrorCode &success) const; @@ -170,7 +170,7 @@ public: * @param charIndices - the destiniation character index array * @param success - set to an error code if the operation fails * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void getCharIndices(le_int32 charIndices[], LEErrorCode &success) const; @@ -183,7 +183,7 @@ public: * @param indexBase - an offset which will be added to each index * @param success - set to an error code if the operation fails * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void getCharIndices(le_int32 charIndices[], le_int32 indexBase, LEErrorCode &success) const; @@ -196,7 +196,7 @@ public: * @param positions - the destiniation position array * @param success - set to an error code if the operation fails * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void getGlyphPositions(float positions[], LEErrorCode &success) const; @@ -212,7 +212,7 @@ public: * @param y - the glyph's Y position * @param success - set to an error code if the operation fails * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void getGlyphPosition(le_int32 glyphIndex, float &x, float &y, LEErrorCode &success) const; @@ -226,7 +226,7 @@ public: * @param success set to an error code if the storage cannot be allocated of if the initial * glyph count is not positive. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void allocateGlyphArray(le_int32 initialGlyphCount, le_bool rightToLeft, LEErrorCode &success); @@ -238,7 +238,7 @@ public: * * @return the number of X, Y position pairs allocated. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ le_int32 allocatePositions(LEErrorCode &success); @@ -249,7 +249,7 @@ public: * * @return the size of the auxillary data array. * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ le_int32 allocateAuxData(LEErrorCode &success); @@ -259,7 +259,7 @@ public: * @param auxData the auxillary data array will be copied to this address * @param success set to an error code if the data cannot be copied * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ void getAuxData(le_uint32 auxData[], LEErrorCode &success) const; @@ -271,7 +271,7 @@ public: * * @return the glyph ID * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ LEGlyphID getGlyphID(le_int32 glyphIndex, LEErrorCode &success) const; @@ -283,7 +283,7 @@ public: * * @return the character index * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ le_int32 getCharIndex(le_int32 glyphIndex, LEErrorCode &success) const; @@ -296,7 +296,7 @@ public: * * @return the auxillary data * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ le_uint32 getAuxData(le_int32 glyphIndex, LEErrorCode &success) const; @@ -308,7 +308,7 @@ public: * * @return a reference to the given location in the glyph array * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ inline LEGlyphID &operator[](le_int32 glyphIndex) const; @@ -327,7 +327,7 @@ public: * * @see LEInsertionList.h * - * @stable ICU 4.2 + * @deprecated see {@link LayoutEngine} */ LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount, LEErrorCode& success); @@ -347,7 +347,7 @@ public: * * @see LEInsertionList.h * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ LEGlyphID *insertGlyphs(le_int32 atIndex, le_int32 insertCount); @@ -362,7 +362,7 @@ public: * @param toPosition - target position of the glyph * @param marker marker bit * - * @stable ICU 4.2 + * @deprecated see {@link LayoutEngine} */ void moveGlyph(le_int32 fromPosition, le_int32 toPosition, le_uint32 marker); @@ -376,7 +376,7 @@ public: * * @see LEInsertionList.h * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ le_int32 applyInsertions(); @@ -387,7 +387,7 @@ public: * @param glyphID the new glyph ID * @param success will be set to an error code if the glyph ID cannot be set. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void setGlyphID(le_int32 glyphIndex, LEGlyphID glyphID, LEErrorCode &success); @@ -398,7 +398,7 @@ public: * @param charIndex the new char index * @param success will be set to an error code if the char index cannot be set. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void setCharIndex(le_int32 glyphIndex, le_int32 charIndex, LEErrorCode &success); @@ -410,7 +410,7 @@ public: * @param y the new Y position * @param success will be set to an error code if the position cannot be set. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void setPosition(le_int32 glyphIndex, float x, float y, LEErrorCode &success); @@ -422,7 +422,7 @@ public: * @param yAdjust the adjustment to the glyph's Y position * @param success will be set to an error code if the glyph's position cannot be adjusted. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adjustPosition(le_int32 glyphIndex, float xAdjust, float yAdjust, LEErrorCode &success); @@ -433,7 +433,7 @@ public: * @param auxData the new auxillary data * @param success will be set to an error code if the auxillary data cannot be set. * - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ void setAuxData(le_int32 glyphIndex, le_uint32 auxData, LEErrorCode &success); @@ -445,7 +445,7 @@ public: * @param from the LEGlyphStorage object from which * to get the new glyph array. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adoptGlyphArray(LEGlyphStorage &from); @@ -457,7 +457,7 @@ public: * @param from the LEGlyphStorage object from which * to get the new char indices array. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adoptCharIndicesArray(LEGlyphStorage &from); @@ -469,7 +469,7 @@ public: * @param from the LEGlyphStorage object from which * to get the new position array. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adoptPositionArray(LEGlyphStorage &from); @@ -481,7 +481,7 @@ public: * @param from the LEGlyphStorage object from which * to get the new auxillary data array. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adoptAuxDataArray(LEGlyphStorage &from); @@ -492,7 +492,7 @@ public: * @param from the LEGlyphStorage object from which * to get the new glyph count. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adoptGlyphCount(LEGlyphStorage &from); @@ -501,7 +501,7 @@ public: * * @param newGlyphCount the new glyph count. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void adoptGlyphCount(le_int32 newGlyphCount); @@ -511,21 +511,21 @@ public: * to layout a different characer array. (This method is also called * by the destructor) * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ void reset(); /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); }; diff --git a/icu4c/source/layout/LEInsertionList.h b/icu4c/source/layout/LEInsertionList.h index 0dce5984ea5..e25b8e98d92 100644 --- a/icu4c/source/layout/LEInsertionList.h +++ b/icu4c/source/layout/LEInsertionList.h @@ -1,6 +1,6 @@ /* ********************************************************************** - * Copyright (C) 1998-2011, International Business Machines + * Copyright (C) 1998-2014, International Business Machines * Corporation and others. All Rights Reserved. ********************************************************************** */ @@ -126,14 +126,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/LELanguages.h b/icu4c/source/layout/LELanguages.h index 6ec166b8dfd..a2bf9767e6d 100644 --- a/icu4c/source/layout/LELanguages.h +++ b/icu4c/source/layout/LELanguages.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2010. All Rights Reserved. + * (C) Copyright IBM Corp. 1998-2014. All Rights Reserved. * * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS * YOU REALLY KNOW WHAT YOU'RE DOING. @@ -25,7 +25,7 @@ U_NAMESPACE_BEGIN * this is just a list of languages which the LayoutEngine * supports. * - * @stable ICU 2.6 + * @deprecated see {@link LayoutEngine} */ enum LanguageCodes { @@ -60,7 +60,7 @@ enum LanguageCodes { zhsLanguageCode = 28, zhtLanguageCode = 29, - /** New language codes added 03/13/2008 @stable ICU 4.0 */ + /** New language codes added 03/13/2008 @deprecated see {@link LayoutEngine} */ afkLanguageCode = 30, belLanguageCode = 31, bgrLanguageCode = 32, diff --git a/icu4c/source/layout/LEScripts.h b/icu4c/source/layout/LEScripts.h index 662c774124c..583d1fa62e5 100644 --- a/icu4c/source/layout/LEScripts.h +++ b/icu4c/source/layout/LEScripts.h @@ -24,7 +24,7 @@ U_NAMESPACE_BEGIN * Constants for Unicode script values, generated using * ICU4J's UScript class. * - * @stable ICU 2.2 + * @deprecated see {@link LayoutEngine} */ enum ScriptCodes { @@ -70,12 +70,12 @@ enum ScriptCodes { thaiScriptCode = 38, tibtScriptCode = 39, /** - * @stable ICU 2.6 + * @deprecated see {@link LayoutEngine} */ cansScriptCode = 40, /** - * @stable ICU 2.2 + * @deprecated see {@link LayoutEngine} */ yiiiScriptCode = 41, @@ -84,7 +84,7 @@ enum ScriptCodes { buhdScriptCode = 44, tagbScriptCode = 45, /** - * @stable ICU 2.6 + * @deprecated see {@link LayoutEngine} */ braiScriptCode = 46, @@ -96,12 +96,12 @@ enum ScriptCodes { taleScriptCode = 52, ugarScriptCode = 53, /** - * @stable ICU 3.0 + * @deprecated see {@link LayoutEngine} */ hrktScriptCode = 54, /** - * @stable ICU 3.4 + * @deprecated see {@link LayoutEngine} */ bugiScriptCode = 55, @@ -112,7 +112,7 @@ enum ScriptCodes { tfngScriptCode = 60, xpeoScriptCode = 61, /** - * @stable ICU 3.6 + * @deprecated see {@link LayoutEngine} */ baliScriptCode = 62, @@ -158,7 +158,7 @@ enum ScriptCodes { zxxxScriptCode = 102, zzzzScriptCode = 103, /** - * @stable ICU 3.8 + * @deprecated see {@link LayoutEngine} */ cariScriptCode = 104, @@ -174,7 +174,7 @@ enum ScriptCodes { moonScriptCode = 114, mteiScriptCode = 115, /** - * @stable ICU 4.0 + * @deprecated see {@link LayoutEngine} */ armiScriptCode = 116, @@ -192,7 +192,7 @@ enum ScriptCodes { zmthScriptCode = 128, zsymScriptCode = 129, /** - * @stable ICU 4.4 + * @deprecated see {@link LayoutEngine} */ bamuScriptCode = 130, @@ -200,7 +200,7 @@ enum ScriptCodes { nkgbScriptCode = 132, sarbScriptCode = 133, /** - * @stable ICU 4.6 + * @deprecated see {@link LayoutEngine} */ bassScriptCode = 134, @@ -217,7 +217,7 @@ enum ScriptCodes { sindScriptCode = 145, waraScriptCode = 146, /** - * @stable ICU 4.8 + * @deprecated see {@link LayoutEngine} */ afakScriptCode = 147, @@ -230,20 +230,20 @@ enum ScriptCodes { tangScriptCode = 154, woleScriptCode = 155, /** - * @stable ICU 49 + * @deprecated see {@link LayoutEngine} */ hluwScriptCode = 156, khojScriptCode = 157, tirhScriptCode = 158, /** - * @stable ICU 52 + * @deprecated see {@link LayoutEngine} */ aghbScriptCode = 159, mahjScriptCode = 160, /** - * @stable ICU 54 + * @deprecated see {@link LayoutEngine} */ ahomScriptCode = 161, @@ -254,7 +254,7 @@ enum ScriptCodes { siddScriptCode = 166, /** - * @stable ICU 2.2 + * @deprecated see {@link LayoutEngine} */ scriptCodeCount }; diff --git a/icu4c/source/layout/LESwaps.h b/icu4c/source/layout/LESwaps.h index b9b133f4f72..f1051ad494a 100644 --- a/icu4c/source/layout/LESwaps.h +++ b/icu4c/source/layout/LESwaps.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2011 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -20,7 +20,7 @@ U_NAMESPACE_BEGIN * A convenience macro which invokes the swapWord member function * from a concise call. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ #define SWAPW(value) LESwaps::swapWord((le_uint16)(value)) @@ -28,7 +28,7 @@ U_NAMESPACE_BEGIN * A convenience macro which invokes the swapLong member function * from a concise call. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ #define SWAPL(value) LESwaps::swapLong((le_uint32)(value)) @@ -39,7 +39,7 @@ U_NAMESPACE_BEGIN * All methods are static and inline in an attempt to induce the compiler * to do most of the calculations at compile time. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ class U_LAYOUT_API LESwaps /* not : public UObject because all methods are static */ { public: @@ -52,7 +52,7 @@ public: * * @return the byte swapped word * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static le_uint16 swapWord(le_uint16 value) { @@ -76,7 +76,7 @@ public: * * @return the byte swapped long * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static le_uint32 swapLong(le_uint32 value) { diff --git a/icu4c/source/layout/LETypes.h b/icu4c/source/layout/LETypes.h index 604a622d633..67fa5e9dcb0 100644 --- a/icu4c/source/layout/LETypes.h +++ b/icu4c/source/layout/LETypes.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -29,42 +29,42 @@ /** * A type used for signed, 32-bit integers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef int32_t le_int32; /** * A type used for unsigned, 32-bit integers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef uint32_t le_uint32; /** * A type used for signed, 16-bit integers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef int16_t le_int16; /** * A type used for unsigned, 16-bit integers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef uint16_t le_uint16; /** * A type used for signed, 8-bit integers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef int8_t le_int8; /** * A type used for unsigned, 8-bit integers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef uint8_t le_uint8; @@ -72,7 +72,7 @@ typedef uint8_t le_uint8; /** * A type used for boolean values. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef UBool le_bool; @@ -80,7 +80,7 @@ typedef UBool le_bool; /** * Used to represent empty pointers. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ #define NULL 0 #endif @@ -88,7 +88,7 @@ typedef UBool le_bool; /** * Used for four character tags. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef le_uint32 LETag; @@ -96,7 +96,7 @@ typedef le_uint32 LETag; * Used for 16-bit glyph indices as they're represented * in TrueType font tables. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ typedef le_uint16 TTGlyphID; @@ -107,7 +107,7 @@ typedef le_uint16 TTGlyphID; * order 8 bits are client defined. The LayoutEngine * will never change or look at the client defined bits. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ typedef le_uint32 LEGlyphID; @@ -115,7 +115,7 @@ typedef le_uint32 LEGlyphID; * Used to mask off the glyph ID part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_GLYPH_MASK 0x0000FFFF @@ -124,7 +124,7 @@ typedef le_uint32 LEGlyphID; * into the low-order bits. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_GLYPH_SHIFT 0 @@ -133,7 +133,7 @@ typedef le_uint32 LEGlyphID; * Used to mask off the sub-font ID part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_SUB_FONT_MASK 0x00FF0000 @@ -142,7 +142,7 @@ typedef le_uint32 LEGlyphID; * into the low-order bits. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_SUB_FONT_SHIFT 16 @@ -151,7 +151,7 @@ typedef le_uint32 LEGlyphID; * Used to mask off the client-defined part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_CLIENT_MASK 0xFF000000 @@ -160,7 +160,7 @@ typedef le_uint32 LEGlyphID; * into the low-order bits. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_CLIENT_SHIFT 24 @@ -169,7 +169,7 @@ typedef le_uint32 LEGlyphID; * A convenience macro to get the Glyph ID part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_GET_GLYPH(gid) ((gid & LE_GLYPH_MASK) >> LE_GLYPH_SHIFT) @@ -177,7 +177,7 @@ typedef le_uint32 LEGlyphID; * A convenience macro to get the sub-font ID part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_GET_SUB_FONT(gid) ((gid & LE_SUB_FONT_MASK) >> LE_SUB_FONT_SHIFT) @@ -185,7 +185,7 @@ typedef le_uint32 LEGlyphID; * A convenience macro to get the client-defined part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_GET_CLIENT(gid) ((gid & LE_CLIENT_MASK) >> LE_CLIENT_SHIFT) @@ -194,7 +194,7 @@ typedef le_uint32 LEGlyphID; * A convenience macro to set the Glyph ID part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_SET_GLYPH(gid, glyph) ((gid & ~LE_GLYPH_MASK) | ((glyph << LE_GLYPH_SHIFT) & LE_GLYPH_MASK)) @@ -202,7 +202,7 @@ typedef le_uint32 LEGlyphID; * A convenience macro to set the sub-font ID part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_SET_SUB_FONT(gid, font) ((gid & ~LE_SUB_FONT_MASK) | ((font << LE_SUB_FONT_SHIFT) & LE_SUB_FONT_MASK)) @@ -210,7 +210,7 @@ typedef le_uint32 LEGlyphID; * A convenience macro to set the client-defined part of an LEGlyphID. * * @see LEGlyphID - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_SET_CLIENT(gid, client) ((gid & ~LE_CLIENT_MASK) | ((client << LE_CLIENT_SHIFT) & LE_CLIENT_MASK)) @@ -218,14 +218,14 @@ typedef le_uint32 LEGlyphID; /** * Used to represent 16-bit Unicode code points. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef UChar LEUnicode16; /** * Used to represent 32-bit Unicode code points. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef UChar32 LEUnicode32; @@ -241,21 +241,21 @@ typedef UChar LEUnicode; /** * Used to hold a pair of (x, y) values which represent a point. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ struct LEPoint { /** * The x coordinate of the point. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ float fX; /** * The y coordinate of the point. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ float fY; }; @@ -264,7 +264,7 @@ struct LEPoint /** * Used to hold a pair of (x, y) values which represent a point. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef struct LEPoint LEPoint; #endif @@ -406,7 +406,7 @@ typedef struct LEPoint LEPoint; * WARNING: THIS MACRO WILL ONLY WORK CORRECTLY IF * THE ARGUMENT CHARACTERS ARE ASCII. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ #define LE_MAKE_TAG(a, b, c, d) \ (((le_uint32)(a) << 24) | \ @@ -418,7 +418,7 @@ typedef struct LEPoint LEPoint; * This enumeration defines constants for the standard * TrueType, OpenType and AAT table tags. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ enum LETableTags { LE_ACNT_TABLE_TAG = 0x61636E74UL, /**< 'acnt' */ @@ -480,7 +480,7 @@ enum LETableTags { * This enumeration defines constants for all * the common OpenType feature tags. * - * @stable ICU 3.2 + * @deprecated see {@link LayoutEngine} */ enum LEFeatureTags { LE_AALT_FEATURE_TAG = 0x61616C74UL, /**< 'aalt' */ @@ -682,7 +682,7 @@ enum LEFeatureENUMs { /** * Error codes returned by the LayoutEngine. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ enum LEErrorCode { /* informational */ @@ -705,7 +705,7 @@ enum LEErrorCode { /** * Error codes returned by the LayoutEngine. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ typedef enum LEErrorCode LEErrorCode; #endif @@ -713,14 +713,14 @@ typedef enum LEErrorCode LEErrorCode; /** * A convenience macro to test for the success of a LayoutEngine call. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ #define LE_SUCCESS(code) (U_SUCCESS((UErrorCode)code)) /** * A convenience macro to test for the failure of a LayoutEngine call. * - * @stable ICU 2.4 + * @deprecated see {@link LayoutEngine} */ #define LE_FAILURE(code) (U_FAILURE((UErrorCode)code)) diff --git a/icu4c/source/layout/LayoutEngine.h b/icu4c/source/layout/LayoutEngine.h index 2eb6ea42061..ff2dcb173fe 100644 --- a/icu4c/source/layout/LayoutEngine.h +++ b/icu4c/source/layout/LayoutEngine.h @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved */ #ifndef __LAYOUTENGINE_H @@ -9,7 +9,7 @@ /** * \file - * \brief C++ API: Virtual base class for complex text layout. + * \brief C++ API: DEPRECATED: Virtual base class for complex text layout. */ U_NAMESPACE_BEGIN @@ -59,7 +59,9 @@ class LEGlyphStorage; * @see LEFontInstance * @see ScriptAndLanguageTags.h * - * @stable ICU 2.8 + * @deprecated please use HarfBuzz instead. + * see http://www.freedesktop.org/wiki/Software/HarfBuzz/ + * and http://userguide.icu-project.org/layoutengine */ class U_LAYOUT_API LayoutEngine : public UObject { public: @@ -336,7 +338,7 @@ public: * method. It is declared virtual so that it will be invoked by the * subclass destructors. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual ~LayoutEngine(); @@ -363,7 +365,7 @@ public: * method first to free the glyph, character index and position arrays * allocated by the previous call. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual le_int32 layoutChars(const LEUnicode chars[], le_int32 offset, le_int32 count, le_int32 max, le_bool rightToLeft, float x, float y, LEErrorCode &success); @@ -374,7 +376,7 @@ public: * * @return the number of glyphs in the glyph array * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ le_int32 getGlyphCount() const; @@ -386,7 +388,7 @@ public: * @param glyphs - the destiniation glyph array * @param success - set to an error code if the operation fails * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ void getGlyphs(LEGlyphID glyphs[], LEErrorCode &success) const; @@ -400,7 +402,7 @@ public: * @param extraBits - this value will be ORed with each glyph index * @param success - set to an error code if the operation fails * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual void getGlyphs(le_uint32 glyphs[], le_uint32 extraBits, LEErrorCode &success) const; @@ -412,7 +414,7 @@ public: * @param charIndices - the destiniation character index array * @param success - set to an error code if the operation fails * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ void getCharIndices(le_int32 charIndices[], LEErrorCode &success) const; @@ -425,7 +427,7 @@ public: * @param indexBase - an offset which will be added to each index * @param success - set to an error code if the operation fails * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ void getCharIndices(le_int32 charIndices[], le_int32 indexBase, LEErrorCode &success) const; @@ -438,7 +440,7 @@ public: * @param positions - the destiniation position array * @param success - set to an error code if the operation fails * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ void getGlyphPositions(float positions[], LEErrorCode &success) const; @@ -454,7 +456,7 @@ public: * @param y - the glyph's Y position * @param success - set to an error code if the operation fails * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ void getGlyphPosition(le_int32 glyphIndex, float &x, float &y, LEErrorCode &success) const; @@ -463,7 +465,7 @@ public: * so that the LayoutEngine can be reused to layout a different * characer array. (This method is also called by the destructor) * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual void reset(); @@ -481,27 +483,27 @@ public: * * @see LEFontInstance * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static LayoutEngine *layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, LEErrorCode &success); /** * Override of existing call that provides flags to control typography. - * @stable ICU 3.4 + * @deprecated see {@link LayoutEngine} */ static LayoutEngine *layoutEngineFactory(const LEFontInstance *fontInstance, le_int32 scriptCode, le_int32 languageCode, le_int32 typo_flags, LEErrorCode &success); /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/LigatureSubstProc.h b/icu4c/source/layout/LigatureSubstProc.h index da3aa451dc3..d98132eb493 100644 --- a/icu4c/source/layout/LigatureSubstProc.h +++ b/icu4c/source/layout/LigatureSubstProc.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -39,14 +39,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/LigatureSubstProc2.h b/icu4c/source/layout/LigatureSubstProc2.h index cb487791d7e..b55d68e79da 100644 --- a/icu4c/source/layout/LigatureSubstProc2.h +++ b/icu4c/source/layout/LigatureSubstProc2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -40,14 +40,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/OpenTypeLayoutEngine.h b/icu4c/source/layout/OpenTypeLayoutEngine.h index e9be064a826..10d737454d5 100644 --- a/icu4c/source/layout/OpenTypeLayoutEngine.h +++ b/icu4c/source/layout/OpenTypeLayoutEngine.h @@ -1,5 +1,5 @@ /* - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -129,14 +129,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SegmentArrayProcessor.h b/icu4c/source/layout/SegmentArrayProcessor.h index 94031d05ddd..0be80698d0a 100644 --- a/icu4c/source/layout/SegmentArrayProcessor.h +++ b/icu4c/source/layout/SegmentArrayProcessor.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SegmentArrayProcessor2.h b/icu4c/source/layout/SegmentArrayProcessor2.h index 6f6ed0e8e26..4927a8cb879 100644 --- a/icu4c/source/layout/SegmentArrayProcessor2.h +++ b/icu4c/source/layout/SegmentArrayProcessor2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SegmentSingleProcessor.h b/icu4c/source/layout/SegmentSingleProcessor.h index 9e18b76f298..a0908e73401 100644 --- a/icu4c/source/layout/SegmentSingleProcessor.h +++ b/icu4c/source/layout/SegmentSingleProcessor.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SegmentSingleProcessor2.h b/icu4c/source/layout/SegmentSingleProcessor2.h index 41acbf29c22..cc4022032f5 100644 --- a/icu4c/source/layout/SegmentSingleProcessor2.h +++ b/icu4c/source/layout/SegmentSingleProcessor2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SimpleArrayProcessor.h b/icu4c/source/layout/SimpleArrayProcessor.h index 2a188b8bdba..dfb00f2895d 100644 --- a/icu4c/source/layout/SimpleArrayProcessor.h +++ b/icu4c/source/layout/SimpleArrayProcessor.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SimpleArrayProcessor2.h b/icu4c/source/layout/SimpleArrayProcessor2.h index fc84e738d21..504f76e6ccf 100644 --- a/icu4c/source/layout/SimpleArrayProcessor2.h +++ b/icu4c/source/layout/SimpleArrayProcessor2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SingleTableProcessor.h b/icu4c/source/layout/SingleTableProcessor.h index e1cb5926456..6491a0346fa 100644 --- a/icu4c/source/layout/SingleTableProcessor.h +++ b/icu4c/source/layout/SingleTableProcessor.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/SingleTableProcessor2.h b/icu4c/source/layout/SingleTableProcessor2.h index cd24902fd34..528ad312856 100644 --- a/icu4c/source/layout/SingleTableProcessor2.h +++ b/icu4c/source/layout/SingleTableProcessor2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/ThaiLayoutEngine.h b/icu4c/source/layout/ThaiLayoutEngine.h index 08a154d2272..f6408491ecc 100644 --- a/icu4c/source/layout/ThaiLayoutEngine.h +++ b/icu4c/source/layout/ThaiLayoutEngine.h @@ -1,7 +1,7 @@ /* * - * (C) Copyright IBM Corp. 1998-2008 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -56,14 +56,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/TrimmedArrayProcessor.h b/icu4c/source/layout/TrimmedArrayProcessor.h index ab24de23a6f..7a09ae2d84f 100644 --- a/icu4c/source/layout/TrimmedArrayProcessor.h +++ b/icu4c/source/layout/TrimmedArrayProcessor.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID(); diff --git a/icu4c/source/layout/TrimmedArrayProcessor2.h b/icu4c/source/layout/TrimmedArrayProcessor2.h index 2a88fa62efb..d9d95572ba8 100644 --- a/icu4c/source/layout/TrimmedArrayProcessor2.h +++ b/icu4c/source/layout/TrimmedArrayProcessor2.h @@ -1,6 +1,6 @@ /* * - * (C) Copyright IBM Corp. and others 1998-2013 - All Rights Reserved + * (C) Copyright IBM Corp. and others 1998-2014 - All Rights Reserved * */ @@ -34,14 +34,14 @@ public: /** * ICU "poor man's RTTI", returns a UClassID for the actual class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ virtual UClassID getDynamicClassID() const; /** * ICU "poor man's RTTI", returns a UClassID for this class. * - * @stable ICU 2.8 + * @deprecated see {@link LayoutEngine} */ static UClassID getStaticClassID();