change paint examples to use different font

monospace draws different from default, so
use that as the argument to SkTypeface::MakeFromName
in bookmaker examples

Docs-Preview: https://skia.org/?cl=91422
Bug: skia:7464
Change-Id: Id25a6b7ea146134c14f4ee3005a7e1caa7a38ba4
Reviewed-on: https://skia-review.googlesource.com/91422
Reviewed-by: Cary Clark <caryclark@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Reviewed-by: Cary Clark <caryclark@skia.org>
Commit-Queue: Cary Clark <caryclark@skia.org>

3 files changed, 9 insertions, 60 deletions

diff --git a/site/user/api/SkMatrix_Reference.md b/site/user/api/SkMatrix_Reference.md
index c9ac60f9c7..da308ba5a7 100644
--- a/site/user/api/SkMatrix_Reference.md
+++ b/site/user/api/SkMatrix_Reference.md
@@ -3308,49 +3308,6 @@ number of <a href="#Point">Points</a> to transform</td>
 
 ---
 
-<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
-void mapPointsWithStride(SkPoint dst[], const SkPoint src[], size_t stride, int count) const
-</pre>
-
-Maps <a href="#SkMatrix_mapPointsWithStride_2_src">src</a> <a href="SkPoint_Reference#Point">Point</a> array of length <a href="#SkMatrix_mapPointsWithStride_2_count">count</a> to <a href="#SkMatrix_mapPointsWithStride_2_dst">dst</a> <a href="SkPoint_Reference#Point">Point</a> array, skipping <a href="#SkMatrix_mapPointsWithStride_2_stride">stride</a> bytes
-to advance from one <a href="SkPoint_Reference#Point">Point</a> to the next.
-<a href="#Point">Points</a> are mapped by multiplying each <a href="SkPoint_Reference#Point">Point</a> by <a href="#Matrix">Matrix</a>. Given:
-
-<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
-         | A B C |         | x |
-Matrix = | D E F |,  src = | y |
-         | G H I |         | 1 |</pre>
-
-each resulting <a href="#SkMatrix_mapPointsWithStride_2_dst">dst</a> <a href="SkPoint_Reference#Point">Point</a> is computed as:
-
-<pre style="padding: 1em 1em 1em 1em;width: 62.5em; background-color: #f0f0f0">
-              |A B C| |x|                               Ax+By+C   Dx+Ey+F
-Matrix * pt = |D E F| |y| = |Ax+By+C Dx+Ey+F Gx+Hy+I| = ------- , -------
-              |G H I| |1|                               Gx+Hy+I   Gx+Hy+I</pre>
-
-### Parameters
-
-<table>  <tr>    <td><a name="SkMatrix_mapPointsWithStride_2_dst"> <code><strong>dst </strong></code> </a></td> <td>
-storage for mapped <a href="#Point">Points</a></td>
-  </tr>  <tr>    <td><a name="SkMatrix_mapPointsWithStride_2_src"> <code><strong>src </strong></code> </a></td> <td>
-<a href="#Point">Points</a> to transform</td>
-  </tr>  <tr>    <td><a name="SkMatrix_mapPointsWithStride_2_stride"> <code><strong>stride </strong></code> </a></td> <td>
-size of record starting with <a href="SkPoint_Reference#Point">Point</a>, in bytes</td>
-  </tr>  <tr>    <td><a name="SkMatrix_mapPointsWithStride_2_count"> <code><strong>count </strong></code> </a></td> <td>
-number of <a href="#Point">Points</a> to transform</td>
-  </tr>
-</table>
-
-### Example
-
-<div><fiddle-embed name="08e32de52131e6859db16729b2e56e4e"></fiddle-embed></div>
-
-### See Also
-
-<a href="#SkMatrix_mapPoints">mapPoints</a> <a href="#SkMatrix_mapXY">mapXY</a> <a href="#SkMatrix_mapHomogeneousPoints">mapHomogeneousPoints</a> <a href="#SkMatrix_mapVectors">mapVectors</a>
-
----
-
 <a name="SkMatrix_mapHomogeneousPoints"></a>
 ## mapHomogeneousPoints
 
diff --git a/site/user/api/SkPaint_Reference.md b/site/user/api/SkPaint_Reference.md
index 0f4236e876..a3c1c70f11 100644
--- a/site/user/api/SkPaint_Reference.md
+++ b/site/user/api/SkPaint_Reference.md
@@ -3266,7 +3266,7 @@ Increments <a href="undocumented#Typeface">Typeface</a> <a href="undocumented#Re
 
 ### Example
 
-<div><fiddle-embed name="4d9ffb5761b62a9e3bc9b0bca8787bce">
+<div><fiddle-embed name="5ce718e5a184baaac80e7098d7dad67b">
 
 #### Example Output
 
@@ -3294,7 +3294,7 @@ Increases <a href="undocumented#Typeface">Typeface</a> <a href="undocumented#Ref
 
 ### Example
 
-<div><fiddle-embed name="c8edce7b36a3ffda8af4fe89d7187dbc">
+<div><fiddle-embed name="4bf8ed109c4b46d8a05c8b7763c1982c">
 
 #### Example Output
 
@@ -3327,7 +3327,7 @@ font and style used to draw text</td>
 
 ### Example
 
-<div><fiddle-embed name="3d2656ec4c555ed2c7ec086720124a2a"></fiddle-embed></div>
+<div><fiddle-embed name="0e6fbb7773cd925b274552f4cd1abef2"></fiddle-embed></div>
 
 ---
 
diff --git a/site/user/api/catalog.htm b/site/user/api/catalog.htm
index cb1bec3b9b..2ebe88c6e6 100644
--- a/site/user/api/catalog.htm
+++ b/site/user/api/catalog.htm
@@ -1576,8 +1576,8 @@
         "stdout": "0 == default text skew x\\n"
     },
         "SkPaint_getTypeface": {
-    "code": "void draw(SkCanvas* canvas) {\n   SkPaint paint;\n   SkDebugf(\"nullptr %c= typeface\\n\", paint.getTypeface() ? '!' : '=');\n   paint.setTypeface(SkTypeface::MakeFromName(\"Times New Roman\", SkFontStyle()));\n   SkDebugf(\"nullptr %c= typeface\\n\", paint.getTypeface() ? '!' : '=');\n}\n",
-    "hash": "4d9ffb5761b62a9e3bc9b0bca8787bce",
+    "code": "void draw(SkCanvas* canvas) {\n   SkPaint paint;\n   SkDebugf(\"nullptr %c= typeface\\n\", paint.getTypeface() ? '!' : '=');\n   paint.setTypeface(SkTypeface::MakeFromName(\"monospace\", SkFontStyle()));\n   SkDebugf(\"nullptr %c= typeface\\n\", paint.getTypeface() ? '!' : '=');\n}\n",
+    "hash": "5ce718e5a184baaac80e7098d7dad67b",
     "file": "SkPaint_Reference",
     "name": "SkPaint::getTypeface",
         "stdout": "nullptr == typeface\\nnullptr != typeface\\n"
@@ -1737,8 +1737,8 @@
         "stdout": "shader unique: true\\nshader unique: false\\n"
     },
         "SkPaint_refTypeface": {
-    "code": "void draw(SkCanvas* canvas) {\n   SkPaint paint1, paint2;\n   paint1.setTypeface(SkTypeface::MakeFromName(\"Times New Roman\", \n            SkFontStyle(SkFontStyle::kNormal_Weight, SkFontStyle::kNormal_Width,\n            SkFontStyle::kItalic_Slant)));\n   SkDebugf(\"typeface1 %c= typeface2\\n\",\n            paint1.getTypeface() == paint2.getTypeface() ? '=' : '!');\n   paint2.setTypeface(paint1.refTypeface());\n   SkDebugf(\"typeface1 %c= typeface2\\n\",\n            paint1.getTypeface() == paint2.getTypeface() ? '=' : '!');\n}\n",
-    "hash": "c8edce7b36a3ffda8af4fe89d7187dbc",
+    "code": "void draw(SkCanvas* canvas) {\n   SkPaint paint1, paint2;\n   paint1.setTypeface(SkTypeface::MakeFromName(\"monospace\", \n            SkFontStyle(SkFontStyle::kNormal_Weight, SkFontStyle::kNormal_Width,\n            SkFontStyle::kItalic_Slant)));\n   SkDebugf(\"typeface1 %c= typeface2\\n\",\n            paint1.getTypeface() == paint2.getTypeface() ? '=' : '!');\n   paint2.setTypeface(paint1.refTypeface());\n   SkDebugf(\"typeface1 %c= typeface2\\n\",\n            paint1.getTypeface() == paint2.getTypeface() ? '=' : '!');\n}\n",
+    "hash": "4bf8ed109c4b46d8a05c8b7763c1982c",
     "file": "SkPaint_Reference",
     "name": "SkPaint::refTypeface",
         "stdout": "typeface1 != typeface2\\ntypeface1 == typeface2\\n"
@@ -5224,14 +5224,6 @@
     "file": "SkMatrix_Reference",
     "name": "SkMatrix::mapPointsWithStride"
 },
-    "SkMatrix_mapPointsWithStride_2": {
-    "code": "void draw(SkCanvas* canvas) {\n    struct PointZ {\n        SkPoint fPt;\n        const SkPoint fStationary;\n    };\n    const PointZ src[] = {{{40, 70}, {40, 70}}, {{180, 70}, {180, 70}}, {{180, 220}, {180, 220}},\n               {{40, 220}, {40, 220}}};\n    PointZ dst[] = {{{0, 0}, {60, 80}}, {{0, 0}, {150, 40}}, {{0, 0}, {100, 240}},\n               {{0, 0}, {10, 250}}};\n    constexpr int count = SK_ARRAY_COUNT(src);\n    SkPaint paint;\n    paint.setARGB(77, 23, 99, 154);\n    for (int i = 0; i < 5; ++i) {\n    SkMatrix matrix;\n        matrix.setRotate(10 * i, 128, 128);\n        matrix.mapPointsWithStride(&dst[0].fPt, &src[0].fPt, sizeof(PointZ), count);\n        canvas->drawPoints(SkCanvas::kPolygon_PointMode, count * 2, &dst[0].fPt, paint);\n    }\n}",
-    "width": 256,
-    "height": 256,
-    "hash": "08e32de52131e6859db16729b2e56e4e",
-    "file": "SkMatrix_Reference",
-    "name": "SkMatrix::mapPointsWithStride_2"
-},
     "SkMatrix_mapPoints_2": {
     "code": "void draw(SkCanvas* canvas) {\n    SkMatrix matrix;\n    matrix.setRotate(35, 128, 128);\n    const int count = 4;\n    SkPoint pts[count];\n    matrix.mapRectToQuad(pts, {40, 70, 180, 220} );\n    SkPaint paint;\n    paint.setARGB(77, 23, 99, 154);\n    for (int i = 0; i < 5; ++i) {\n        canvas->drawPoints(SkCanvas::kPolygon_PointMode, count, pts, paint);\n        matrix.mapPoints(pts, count);\n    }\n}",
     "width": 256,
@@ -5873,10 +5865,10 @@
     "name": "SkPaint::setTextAlign"
 },
     "SkPaint_setTypeface": {
-    "code": "void draw(SkCanvas* canvas) {\n    SkPaint paint;\n    paint.setTypeface(SkTypeface::MakeFromName(\"Courier New\", SkFontStyle()));\n    canvas->drawString(\"Courier New\", 10, 30, paint);\n    paint.setTypeface(nullptr);\n    canvas->drawString(\"default\", 10, 50, paint);\n}\n",
+    "code": "void draw(SkCanvas* canvas) {\n    SkPaint paint;\n    paint.setTypeface(SkTypeface::MakeFromName(\"monospace\", SkFontStyle()));\n    canvas->drawString(\"hamburgerfons\", 10, 30, paint);\n    paint.setTypeface(nullptr);\n    canvas->drawString(\"hamburgerfons\", 10, 50, paint);\n}\n",
     "width": 256,
     "height": 64,
-    "hash": "3d2656ec4c555ed2c7ec086720124a2a",
+    "hash": "0e6fbb7773cd925b274552f4cd1abef2",
     "file": "SkPaint_Reference",
     "name": "SkPaint::setTypeface"
 },