[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master 1dcda70: [autofit] Ordering, whitespace.
|
From: |
Werner LEMBERG |
|
Subject: |
[freetype2] master 1dcda70: [autofit] Ordering, whitespace. |
|
Date: |
Tue, 24 May 2016 21:11:53 +0000 (UTC) |
branch: master
commit 1dcda70ef9a81aac52ba0efb91147c371cc16577
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[autofit] Ordering, whitespace.
---
src/autofit/afblue.c | 44 ++++++++++++++++++++++----------------------
src/autofit/afblue.dat | 48 ++++++++++++++++++++++++------------------------
src/autofit/afblue.h | 4 ++--
3 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/src/autofit/afblue.c b/src/autofit/afblue.c
index 31be8bf..11c7ecf 100644
--- a/src/autofit/afblue.c
+++ b/src/autofit/afblue.c
@@ -273,13 +273,6 @@
{ AF_BLUE_STRING_ARABIC_BOTTOM, 0 },
{ AF_BLUE_STRING_ARABIC_JOIN, AF_BLUE_PROPERTY_LATIN_NEUTRAL },
{ AF_BLUE_STRING_MAX, 0 },
- { AF_BLUE_STRING_BENGALI_TOP, AF_BLUE_PROPERTY_LATIN_TOP },
- { AF_BLUE_STRING_BENGALI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP },
- { AF_BLUE_STRING_BENGALI_BASE, AF_BLUE_PROPERTY_LATIN_TOP |
- AF_BLUE_PROPERTY_LATIN_NEUTRAL |
- AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
- { AF_BLUE_STRING_BENGALI_BASE, 0 },
- { AF_BLUE_STRING_MAX, 0 },
{ AF_BLUE_STRING_ARMENIAN_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
{ AF_BLUE_STRING_ARMENIAN_CAPITAL_BOTTOM, 0
},
{ AF_BLUE_STRING_ARMENIAN_SMALL_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP
},
@@ -288,6 +281,13 @@
{ AF_BLUE_STRING_ARMENIAN_SMALL_BOTTOM, 0
},
{ AF_BLUE_STRING_ARMENIAN_SMALL_DESCENDER, 0
},
{ AF_BLUE_STRING_MAX, 0
},
+ { AF_BLUE_STRING_BENGALI_TOP, AF_BLUE_PROPERTY_LATIN_TOP },
+ { AF_BLUE_STRING_BENGALI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP },
+ { AF_BLUE_STRING_BENGALI_BASE, AF_BLUE_PROPERTY_LATIN_TOP |
+ AF_BLUE_PROPERTY_LATIN_NEUTRAL |
+ AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
+ { AF_BLUE_STRING_BENGALI_BASE, 0 },
+ { AF_BLUE_STRING_MAX, 0 },
{ AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
{ AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM, 0
},
{ AF_BLUE_STRING_CYRILLIC_SMALL, AF_BLUE_PROPERTY_LATIN_TOP
|
@@ -309,14 +309,14 @@
{ AF_BLUE_STRING_GEORGIAN_MKHEDRULI_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP
},
{ AF_BLUE_STRING_GEORGIAN_MKHEDRULI_DESCENDER, 0
},
{ AF_BLUE_STRING_MAX, 0
},
- { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP,
AF_BLUE_PROPERTY_LATIN_TOP },
- { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM, 0
},
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP,
AF_BLUE_PROPERTY_LATIN_TOP |
-
AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM, 0
},
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER,
AF_BLUE_PROPERTY_LATIN_TOP },
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER, 0
},
- { AF_BLUE_STRING_MAX, 0
},
+ { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
+ { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM, 0
},
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP, AF_BLUE_PROPERTY_LATIN_TOP
|
+
AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM, 0
},
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP
},
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER, 0
},
+ { AF_BLUE_STRING_MAX, 0
},
{ AF_BLUE_STRING_GREEK_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
{ AF_BLUE_STRING_GREEK_CAPITAL_BOTTOM, 0
},
{ AF_BLUE_STRING_GREEK_SMALL_BETA_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
@@ -359,13 +359,13 @@
AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
{ AF_BLUE_STRING_KHMER_SYMBOLS_WANING_BOTTOM, 0
},
{ AF_BLUE_STRING_MAX, 0
},
- { AF_BLUE_STRING_LAO_TOP, AF_BLUE_PROPERTY_LATIN_TOP |
- AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
- { AF_BLUE_STRING_LAO_BOTTOM, 0 },
- { AF_BLUE_STRING_LAO_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP },
- { AF_BLUE_STRING_LAO_LARGE_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP },
- { AF_BLUE_STRING_LAO_DESCENDER, 0 },
- { AF_BLUE_STRING_MAX, 0 },
+ { AF_BLUE_STRING_LAO_TOP, AF_BLUE_PROPERTY_LATIN_TOP |
+ AF_BLUE_PROPERTY_LATIN_X_HEIGHT },
+ { AF_BLUE_STRING_LAO_BOTTOM, 0 },
+ { AF_BLUE_STRING_LAO_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP },
+ { AF_BLUE_STRING_LAO_LARGE_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP },
+ { AF_BLUE_STRING_LAO_DESCENDER, 0 },
+ { AF_BLUE_STRING_MAX, 0 },
{ AF_BLUE_STRING_LATIN_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
{ AF_BLUE_STRING_LATIN_CAPITAL_BOTTOM, 0
},
{ AF_BLUE_STRING_LATIN_SMALL_F_TOP, AF_BLUE_PROPERTY_LATIN_TOP
},
diff --git a/src/autofit/afblue.dat b/src/autofit/afblue.dat
index a2ad634..991f5a2 100644
--- a/src/autofit/afblue.dat
+++ b/src/autofit/afblue.dat
@@ -475,15 +475,6 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY
AF_BLUE_STRINGSET_MAX_LEN:
{ AF_BLUE_STRING_ARABIC_JOIN, AF_BLUE_PROPERTY_LATIN_NEUTRAL }
{ AF_BLUE_STRING_MAX, 0 }
- AF_BLUE_STRINGSET_BENG
- { AF_BLUE_STRING_BENGALI_TOP, AF_BLUE_PROPERTY_LATIN_TOP }
- { AF_BLUE_STRING_BENGALI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP }
- { AF_BLUE_STRING_BENGALI_BASE, AF_BLUE_PROPERTY_LATIN_TOP |
- AF_BLUE_PROPERTY_LATIN_NEUTRAL |
- AF_BLUE_PROPERTY_LATIN_X_HEIGHT }
- { AF_BLUE_STRING_BENGALI_BASE, 0 }
- { AF_BLUE_STRING_MAX, 0 }
-
AF_BLUE_STRINGSET_ARMN
{ AF_BLUE_STRING_ARMENIAN_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP
}
{ AF_BLUE_STRING_ARMENIAN_CAPITAL_BOTTOM, 0
}
@@ -494,6 +485,15 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY
AF_BLUE_STRINGSET_MAX_LEN:
{ AF_BLUE_STRING_ARMENIAN_SMALL_DESCENDER, 0
}
{ AF_BLUE_STRING_MAX, 0
}
+ AF_BLUE_STRINGSET_BENG
+ { AF_BLUE_STRING_BENGALI_TOP, AF_BLUE_PROPERTY_LATIN_TOP }
+ { AF_BLUE_STRING_BENGALI_HEAD, AF_BLUE_PROPERTY_LATIN_TOP }
+ { AF_BLUE_STRING_BENGALI_BASE, AF_BLUE_PROPERTY_LATIN_TOP |
+ AF_BLUE_PROPERTY_LATIN_NEUTRAL |
+ AF_BLUE_PROPERTY_LATIN_X_HEIGHT }
+ { AF_BLUE_STRING_BENGALI_BASE, 0 }
+ { AF_BLUE_STRING_MAX, 0 }
+
AF_BLUE_STRINGSET_CYRL
{ AF_BLUE_STRING_CYRILLIC_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP
}
{ AF_BLUE_STRING_CYRILLIC_CAPITAL_BOTTOM, 0
}
@@ -523,14 +523,14 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY
AF_BLUE_STRINGSET_MAX_LEN:
{ AF_BLUE_STRING_MAX, 0
}
AF_BLUE_STRINGSET_GEOK
- { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP,
AF_BLUE_PROPERTY_LATIN_TOP }
- { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM, 0
}
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP,
AF_BLUE_PROPERTY_LATIN_TOP |
-
AF_BLUE_PROPERTY_LATIN_X_HEIGHT }
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM, 0
}
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER,
AF_BLUE_PROPERTY_LATIN_TOP }
- { AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER, 0
}
- { AF_BLUE_STRING_MAX, 0
}
+ { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_TOP, AF_BLUE_PROPERTY_LATIN_TOP
}
+ { AF_BLUE_STRING_GEORGIAN_ASOMTAVRULI_BOTTOM, 0
}
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_TOP, AF_BLUE_PROPERTY_LATIN_TOP
|
+
AF_BLUE_PROPERTY_LATIN_X_HEIGHT }
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_BOTTOM, 0
}
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP
}
+ { AF_BLUE_STRING_GEORGIAN_NUSKHURI_DESCENDER, 0
}
+ { AF_BLUE_STRING_MAX, 0
}
AF_BLUE_STRINGSET_GREK
{ AF_BLUE_STRING_GREEK_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP }
@@ -589,13 +589,13 @@ AF_BLUE_STRINGSET_ENUM AF_BLUE_STRINGSETS_ARRAY
AF_BLUE_STRINGSET_MAX_LEN:
{ AF_BLUE_STRING_MAX, 0
}
AF_BLUE_STRINGSET_LAO
- { AF_BLUE_STRING_LAO_TOP, AF_BLUE_PROPERTY_LATIN_TOP |
- AF_BLUE_PROPERTY_LATIN_X_HEIGHT }
- { AF_BLUE_STRING_LAO_BOTTOM, 0 }
- { AF_BLUE_STRING_LAO_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }
- { AF_BLUE_STRING_LAO_LARGE_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }
- { AF_BLUE_STRING_LAO_DESCENDER, 0 }
- { AF_BLUE_STRING_MAX, 0 }
+ { AF_BLUE_STRING_LAO_TOP, AF_BLUE_PROPERTY_LATIN_TOP |
+ AF_BLUE_PROPERTY_LATIN_X_HEIGHT }
+ { AF_BLUE_STRING_LAO_BOTTOM, 0 }
+ { AF_BLUE_STRING_LAO_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }
+ { AF_BLUE_STRING_LAO_LARGE_ASCENDER, AF_BLUE_PROPERTY_LATIN_TOP }
+ { AF_BLUE_STRING_LAO_DESCENDER, 0 }
+ { AF_BLUE_STRING_MAX, 0 }
AF_BLUE_STRINGSET_LATN
{ AF_BLUE_STRING_LATIN_CAPITAL_TOP, AF_BLUE_PROPERTY_LATIN_TOP }
diff --git a/src/autofit/afblue.h b/src/autofit/afblue.h
index 96e8ed3..00b41e9 100644
--- a/src/autofit/afblue.h
+++ b/src/autofit/afblue.h
@@ -234,8 +234,8 @@ FT_BEGIN_HEADER
typedef enum AF_Blue_Stringset_
{
AF_BLUE_STRINGSET_ARAB = 0,
- AF_BLUE_STRINGSET_BENG = 4,
- AF_BLUE_STRINGSET_ARMN = 9,
+ AF_BLUE_STRINGSET_ARMN = 4,
+ AF_BLUE_STRINGSET_BENG = 11,
AF_BLUE_STRINGSET_CYRL = 16,
AF_BLUE_STRINGSET_DEVA = 22,
AF_BLUE_STRINGSET_GEOR = 28,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master 1dcda70: [autofit] Ordering, whitespace.,
Werner LEMBERG <=