AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix capitalization

Browse Source 
Fix 'arcs' at sentence start to Arcs.
This fix corrected other capitalizations as well,
and exposed some mis-capitalizations in the bmh
doc.

R=brianosman@google.com
TBR=reed@google.com
Bug: skia:
Change-Id: I4d51388556f7e8ff868a9236ce76745915560327
Reviewed-on: https://skia-review.googlesource.com/28241
Commit-Queue: Cary Clark <caryclark@skia.org>
Reviewed-by: Cary Clark <caryclark@skia.org>
This commit is contained in:
Cary Clark 2017-07-31 07:52:43 -04:00 committed by Skia Commit-Bot
parent 50b2084bd1
commit 1eace2db48
4 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/SkPaint_Reference.bmh
View File

@ -1458,7 +1458,7 @@ kEmbeddedBitmapText_Flag at compile time.
#Substitute auto-hinting #Substitute auto-hinting
If Hinting is set to kNormal_Hinting or kFull_Hinting, Automatic_Hinting If Hinting is set to kNormal_Hinting or kFull_Hinting, Automatic_Hinting
instructs the Font_Manager to always hint Glyphs. instructs the Font_Manager to always hint glyphs.
Automatic_Hinting has no effect if Hinting is set to kNo_Hinting or Automatic_Hinting has no effect if Hinting is set to kNo_Hinting or
kSlight_Hinting. kSlight_Hinting.
@ -1468,7 +1468,7 @@ Automatic_Hinting only affects platforms that use FreeType as the Font_Manager.
If true, and if Hinting is set to kNormal_Hinting or kFull_Hinting, and if If true, and if Hinting is set to kNormal_Hinting or kFull_Hinting, and if
platform uses FreeType as the Font_Manager, instruct the Font_Manager to always hint platform uses FreeType as the Font_Manager, instruct the Font_Manager to always hint
Glyphs. glyphs.
Equivalent to getFlags masked with kAutoHinting_Flag. Equivalent to getFlags masked with kAutoHinting_Flag.
@ -1496,7 +1496,7 @@ Automatic_Hinting only affects platforms that use FreeType as the Font_Manager.
#Method void setAutohinted(bool useAutohinter) #Method void setAutohinted(bool useAutohinter)
If Hinting is set to kNormal_Hinting or kFull_Hinting and useAutohinter is set, If Hinting is set to kNormal_Hinting or kFull_Hinting and useAutohinter is set,
instruct the Font_Manager to always hint Glyphs. instruct the Font_Manager to always hint glyphs.
Automatic_Hinting has no effect if Hinting is set to kNo_Hinting or Automatic_Hinting has no effect if Hinting is set to kNo_Hinting or
kSlight_Hinting. kSlight_Hinting.
@ -2525,7 +2525,7 @@ the following curve, the pair of curves meet at Stroke_Join.
static constexpr int kJoinCount = kLast_Join + 1; static constexpr int kJoinCount = kLast_Join + 1;
## ##
Join specifies how corners are drawn when a shape is stroked. The paint's Join setting Join specifies how corners are drawn when a shape is stroked. Join
affects the four corners of a stroked rectangle, and the connected segments in a affects the four corners of a stroked rectangle, and the connected segments in a
stroked path. stroked path.

36
include/core/SkPaint.h
View File

@ -247,8 +247,8 @@ public:
multiple settings at once. multiple settings at once.
*/ */
enum Flags { enum Flags {
kAntiAlias_Flag = 0x01, //!< mask for setting Anti-alias kAntiAlias_Flag = 0x01, //!< mask for setting anti-alias
kDither_Flag = 0x04, //!< mask for setting Dither kDither_Flag = 0x04, //!< mask for setting dither
kFakeBoldText_Flag = 0x20, //!< mask for setting fake bold kFakeBoldText_Flag = 0x20, //!< mask for setting fake bold
kLinearText_Flag = 0x40, //!< mask for setting linear text kLinearText_Flag = 0x40, //!< mask for setting linear text
kSubpixelText_Flag = 0x80, //!< mask for setting subpixel text kSubpixelText_Flag = 0x80, //!< mask for setting subpixel text
@ -404,7 +404,7 @@ public:
/** If true, and if SkPaint::Hinting is set to kNormal_Hinting or kFull_Hinting, and if /** If true, and if SkPaint::Hinting is set to kNormal_Hinting or kFull_Hinting, and if
platform uses FreeType as the font manager, instruct the font manager to always hint platform uses FreeType as the font manager, instruct the font manager to always hint
Glyphs. glyphs.
Equivalent to getFlags masked with kAutoHinting_Flag. Equivalent to getFlags masked with kAutoHinting_Flag.
@ -415,7 +415,7 @@ public:
} }
/** If SkPaint::Hinting is set to kNormal_Hinting or kFull_Hinting and useAutohinter is set, /** If SkPaint::Hinting is set to kNormal_Hinting or kFull_Hinting and useAutohinter is set,
instruct the font manager to always hint Glyphs. instruct the font manager to always hint glyphs.
auto-hinting has no effect if SkPaint::Hinting is set to kNo_Hinting or auto-hinting has no effect if SkPaint::Hinting is set to kNo_Hinting or
kSlight_Hinting. kSlight_Hinting.
@ -516,7 +516,7 @@ public:
*/ */
enum Style { enum Style {
/** Set to fill geometry. /** Set to fill geometry.
Applies to SkRect, SkRegion, SkRRect, circles, ovals, SkPath, and Text. Applies to SkRect, SkRegion, SkRRect, circles, ovals, SkPath, and text.
SkBitmap, SkImage, patches, SkRegion, sprites, and vertices are painted as if SkBitmap, SkImage, patches, SkRegion, sprites, and vertices are painted as if
kFill_Style is set, and ignore the set Style. kFill_Style is set, and ignore the set Style.
The FillType specifies additional rules to fill the area outside the path edge, The FillType specifies additional rules to fill the area outside the path edge,
@ -527,15 +527,15 @@ public:
/** Set to stroke geometry. /** Set to stroke geometry.
Applies to SkRect, SkRegion, SkRRect, arcs, circles, ovals, Applies to SkRect, SkRegion, SkRRect, arcs, circles, ovals,
SkPath, and Text. SkPath, and text.
arcs, lines, SkPoint, and SkPoint arrays are always drawn as if kStroke_Style is set, Arcs, lines, SkPoint, and SkPoint arrays are always drawn as if kStroke_Style is set,
and ignore the set Style. and ignore the set Style.
The stroke construction is unaffected by the FillType. The stroke construction is unaffected by the FillType.
*/ */
kStroke_Style, kStroke_Style,
/** Set to stroke and fill geometry. /** Set to stroke and fill geometry.
Applies to SkRect, SkRegion, SkRRect, circles, ovals, SkPath, and Text. Applies to SkRect, SkRegion, SkRRect, circles, ovals, SkPath, and text.
SkPath is treated as if it is set to SkPath::kWinding_FillType, SkPath is treated as if it is set to SkPath::kWinding_FillType,
and the set FillType is ignored. and the set FillType is ignored.
*/ */
@ -577,7 +577,7 @@ public:
*/ */
void setColor(SkColor color); void setColor(SkColor color);
/** Retrieves alpha from the Color used when stroking and filling. /** Retrieves alpha from the color used when stroking and filling.
@return alpha ranging from zero, fully transparent, to 255, fully opaque @return alpha ranging from zero, fully transparent, to 255, fully opaque
*/ */
@ -586,14 +586,14 @@ public:
/** Replaces alpha, leaving RGB /** Replaces alpha, leaving RGB
unchanged. An out of range value triggers an assert in the debug unchanged. An out of range value triggers an assert in the debug
build. a is a value from zero to 255. build. a is a value from zero to 255.
a set to zero makes Color fully transparent; a set to 255 makes Color a set to zero makes color fully transparent; a set to 255 makes color
fully opaque. fully opaque.
@param a alpha component of Color @param a alpha component of color
*/ */
void setAlpha(U8CPU a); void setAlpha(U8CPU a);
/** Sets Color used when drawing solid fills. The color components range from 0 to 255. /** Sets color used when drawing solid fills. The color components range from 0 to 255.
The color is unpremultiplied; The color is unpremultiplied;
alpha sets the transparency independent of RGB. alpha sets the transparency independent of RGB.
@ -607,7 +607,7 @@ public:
/** Returns the thickness of the pen used by SkPaint to /** Returns the thickness of the pen used by SkPaint to
outline the shape. outline the shape.
@return zero for Hairline, greater than zero for pen thickness @return zero for hairline, greater than zero for pen thickness
*/ */
SkScalar getStrokeWidth() const { return fWidth; } SkScalar getStrokeWidth() const { return fWidth; }
@ -615,7 +615,7 @@ public:
outline the shape. outline the shape.
Has no effect if width is less than zero. Has no effect if width is less than zero.
@param width zero thickness for Hairline; greater than zero for pen thickness @param width zero thickness for hairline; greater than zero for pen thickness
*/ */
void setStrokeWidth(SkScalar width); void setStrokeWidth(SkScalar width);
@ -660,7 +660,7 @@ public:
static constexpr int kCapCount = kLast_Cap + 1; static constexpr int kCapCount = kLast_Cap + 1;
/** \enum SkPaint::Join /** \enum SkPaint::Join
Join specifies how corners are drawn when a shape is stroked. The paint's Join setting Join specifies how corners are drawn when a shape is stroked. Join
affects the four corners of a stroked rectangle, and the connected segments in a affects the four corners of a stroked rectangle, and the connected segments in a
stroked path. stroked path.
@ -724,7 +724,7 @@ public:
@param cullRect optional limit passed to SkPathEffect @param cullRect optional limit passed to SkPathEffect
@param resScale if > 1, increase precision, else if (0 < res < 1) reduce precision @param resScale if > 1, increase precision, else if (0 < res < 1) reduce precision
to favor speed and size to favor speed and size
@return true if the path represents style fill, or false if it represents Hairline @return true if the path represents style fill, or false if it represents hairline
*/ */
bool getFillPath(const SkPath& src, SkPath* dst, const SkRect* cullRect, bool getFillPath(const SkPath& src, SkPath* dst, const SkRect* cullRect,
SkScalar resScale = 1) const; SkScalar resScale = 1) const;
@ -736,7 +736,7 @@ public:
@param src SkPath read to create a filled version @param src SkPath read to create a filled version
@param dst resulting SkPath dst may be the same as src, but may not be nullptr @param dst resulting SkPath dst may be the same as src, but may not be nullptr
@return true if the path represents style fill, or false if it represents Hairline @return true if the path represents style fill, or false if it represents hairline
*/ */
bool getFillPath(const SkPath& src, SkPath* dst) const { bool getFillPath(const SkPath& src, SkPath* dst) const {
return this->getFillPath(src, dst, NULL, 1); return this->getFillPath(src, dst, NULL, 1);
@ -763,7 +763,7 @@ public:
Sets SkShader to shader, decrementing SkRefCnt of the previous SkShader. Sets SkShader to shader, decrementing SkRefCnt of the previous SkShader.
Does not alter shader SkRefCnt. Does not alter shader SkRefCnt.
@param shader how geometry is filled with color; if nullptr, Color is used instead @param shader how geometry is filled with color; if nullptr, color is used instead
*/ */
void setShader(sk_sp<SkShader> shader); void setShader(sk_sp<SkShader> shader);

1
tools/bookmaker/bookmaker.h
View File

@ -1598,6 +1598,7 @@ public:
kStart, kStart,
kDelimiter, kDelimiter,
kPeriod, kPeriod,
kSpace,
}; };
enum class Wrote { enum class Wrote {

31
tools/bookmaker/includeWriter.cpp
View File

@ -709,6 +709,12 @@ bool IncludeWriter::populate(Definition* def, RootDefinition* root) {
if (MarkType::kTopic == parent->fMarkType || if (MarkType::kTopic == parent->fMarkType ||
MarkType::kSubtopic == parent->fMarkType) { MarkType::kSubtopic == parent->fMarkType) {
const char* commentStart = parent->fContentStart; const char* commentStart = parent->fContentStart;
for (auto child : parent->fChildren) {
if (MarkType::kClass == child->fMarkType) {
break;
}
commentStart = child->fTerminator;
}
const char* commentEnd = root->fStart; const char* commentEnd = root->fStart;
this->structOut(root, *root, commentStart, commentEnd); this->structOut(root, *root, commentStart, commentEnd);
} else { } else {
@ -905,7 +911,15 @@ string IncludeWriter::resolveMethod(const char* start, const char* end, bool fir
if (fBmhParser->fMethodMap.end() != rootDefIter) { if (fBmhParser->fMethodMap.end() != rootDefIter) {
substitute = methodname + "()"; substitute = methodname + "()";
} else { } else {
auto parent = fRootTopic->fChildren[0]->asRoot(); RootDefinition* parent = nullptr;
for (auto candidate : fRootTopic->fChildren) {
if (MarkType::kClass == candidate->fMarkType
|| MarkType::kStruct == candidate->fMarkType) {
parent = candidate->asRoot();
break;
}
}
SkASSERT(parent);
auto defRef = parent->find(parent->fName + "::" + methodname); auto defRef = parent->find(parent->fName + "::" + methodname);
if (defRef && MarkType::kMethod == defRef->fMarkType) { if (defRef && MarkType::kMethod == defRef->fMarkType) {
substitute = methodname + "()"; substitute = methodname + "()";
@ -984,11 +998,10 @@ string IncludeWriter::resolveRef(const char* start, const char* end, bool first)
} }
} }
} }
// start here; // Ensure first word after period is capitalized if substitute is lower cased.
// first I thought first meant first word after period, but the below doesn't work if (first && isupper(start[0]) && substitute.length() > 0 && islower(substitute[0])) {
// if (first && isupper(start[0]) && substitute.length() > 0 && islower(substitute[0])) { substitute[0] = start[0];
// substitute[0] = start[0]; }
// }
return substitute; return substitute;
} }
int IncludeWriter::lookupMethod(const PunctuationState punctuation, const Word word, int IncludeWriter::lookupMethod(const PunctuationState punctuation, const Word word,
@ -1115,7 +1128,9 @@ IncludeWriter::Wrote IncludeWriter::rewriteBlock(int size, const char* data) {
default: default:
SkASSERT(0); SkASSERT(0);
} }
punctuation = PunctuationState::kStart; punctuation = PunctuationState::kPeriod == punctuation ||
(PunctuationState::kStart == punctuation && ' ' >= last) ?
PunctuationState::kStart : PunctuationState::kSpace;
word = Word::kStart; word = Word::kStart;
hasLower = false; hasLower = false;
hasUpper = false; hasUpper = false;
@ -1226,8 +1241,6 @@ IncludeWriter::Wrote IncludeWriter::rewriteBlock(int size, const char* data) {
if (PunctuationState::kPeriod == punctuation || if (PunctuationState::kPeriod == punctuation ||
PunctuationState::kDelimiter == punctuation) { PunctuationState::kDelimiter == punctuation) {
word = Word::kMixed; word = Word::kMixed;
} else {
punctuation = PunctuationState::kStart;
} }
break; break;
case 'a': case 'b': case 'c': case 'd': case 'e': case 'a': case 'b': case 'c': case 'd': case 'e':