[autofit] Fix Savannah bug #41138, part 1.

* src/tools/afblue.pl <Handling #endif>: Produce correct auxiliary
enumeration names for generated `#else'.

* src/autofit/afblue.h: Regenerated.
This commit is contained in:
Werner Lemberg 2014-01-08 08:45:40 +01:00
parent 3e5a374848
commit c46fa86bd5
3 changed files with 16 additions and 5 deletions

View File

@ -1,3 +1,12 @@
2014-01-08 Werner Lemberg <wl@gnu.org>
[autofit] Fix Savannah bug #41138, part 1.
* src/tools/afblue.pl <Handling #endif>: Produce correct auxiliary
enumeration names for generated `#else'.
* src/autofit/afblue.h: Regenerated.
2014-01-06 Werner Lemberg <wl@gnu.org>
Add manual page for `freetype-config'.

View File

@ -109,7 +109,7 @@ FT_BEGIN_HEADER
#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
af_blue_1_2 = af_blue_1_1_2 + 0,
#else
af_blue_1_2 = af_blue_1_1_2 + 0,
af_blue_1_2 = af_blue_1_1 + 0,
#endif /* AF_CONFIG_OPTION_CJK */
@ -168,7 +168,7 @@ FT_BEGIN_HEADER
#endif /* AF_CONFIG_OPTION_CJK_BLUE_HANI_VERT */
af_blue_2_2 = af_blue_2_1_2 + 1,
#else
af_blue_2_2 = af_blue_2_1_2 + 0,
af_blue_2_2 = af_blue_2_1 + 0,
#endif /* AF_CONFIG_OPTION_CJK */

View File

@ -5,7 +5,7 @@
#
# Process a blue zone character data file.
#
# Copyright 2013 by
# Copyright 2013, 2014 by
# David Turner, Robert Wilhelm, and Werner Lemberg.
#
# This file is part of the FreeType project, and may only be used,
@ -350,19 +350,21 @@ while (<DATA>)
Die("unbalanced #endif") unless defined($prev_else);
pop @name_stack;
$name_stack[$#name_stack]++;
# If there is no else-clause for an if-clause, we add one. This is
# necessary to have correct offsets.
if (!$prev_else)
{
# Use amount of whitespace from `endif'.
push @{$diversions{$curr_enum}}, enum_val_string(aux_name())
push @{$diversions{$curr_enum}}, enum_val_string(aux_name_next())
. $1 . "else\n";
$last_aux = aux_name();
$curr_offset = 0;
}
$name_stack[$#name_stack]++;
push @{$diversions{$curr_enum}}, enum_val_string(aux_name());
$last_aux = aux_name();