diff --git a/legend.go b/legend.go index 4dd6b4e0..daaff758 100644 --- a/legend.go +++ b/legend.go @@ -106,7 +106,7 @@ func (l *Legend) Draw(c draw.Canvas) { iconx += l.XOffs descent := sty.Font.Extents().Descent - enth := l.entryHeight() + descent + enth := l.entryHeight() y := c.Max.Y - enth if !l.Top { y = c.Min.Y + (enth+l.Padding)*(vg.Length(len(l.entries))-1) @@ -131,7 +131,7 @@ func (l *Legend) Draw(c draw.Canvas) { for _, t := range e.thumbs { t.Thumbnail(icon) } - yoffs := (enth - sty.Rectangle(e.text).Max.Y) / 2 + yoffs := (enth + descent - sty.Rectangle(e.text).Max.Y) / 2 yoffs += yoff c.FillText(sty, vg.Point{X: textx, Y: icon.Min.Y + yoffs}, e.text) icon.Min.Y -= enth + l.Padding diff --git a/plotter/label_example_test.go b/plotter/labels_example_test.go similarity index 100% rename from plotter/label_example_test.go rename to plotter/labels_example_test.go diff --git a/plotter/labels_test.go b/plotter/labels_test.go index 1e7ca3f2..c4de511a 100644 --- a/plotter/labels_test.go +++ b/plotter/labels_test.go @@ -5,12 +5,125 @@ package plotter_test import ( + "image/color" "testing" + "gonum.org/v1/plot" "gonum.org/v1/plot/cmpimg" + "gonum.org/v1/plot/plotter" + "gonum.org/v1/plot/vg" + "gonum.org/v1/plot/vg/draw" ) func TestLabels(t *testing.T) { cmpimg.CheckPlot(ExampleLabels, t, "labels.png") cmpimg.CheckPlot(ExampleLabels_inCanvasCoordinates, t, "labels_cnv_coords.png") } + +// TestLabelsWithGlyphBoxes tests the position of the glyphbox around +// a block of text, checking whether we correctly take into account +// the descent+ascent of a glyph. +func TestLabelsWithGlyphBoxes(t *testing.T) { + cmpimg.CheckPlot( + func() { + const fontSize = 24 + + p, err := plot.New() + if err != nil { + t.Fatalf("could not create plot: %+v", err) + } + + p.Title.Text = "Labels" + p.X.Min = -1 + p.X.Max = +1 + p.Y.Min = -1 + p.Y.Max = +1 + + const ( + left = 0.00 + middle = 0.02 + right = 0.04 + ) + + labels, err := plotter.NewLabels(plotter.XYLabels{ + XYs: []plotter.XY{ + {X: -0.8 + left, Y: -0.5}, // Aq + y-align bottom + {X: -0.6 + middle, Y: -0.5}, // Aq + y-align center + {X: -0.4 + right, Y: -0.5}, // Aq + y-align top + + {X: -0.8 + left, Y: +0.5}, // ditto for Aq\nAq + {X: -0.6 + middle, Y: +0.5}, + {X: -0.4 + right, Y: +0.5}, + + {X: +0.0 + left, Y: +0}, // ditto for Bg\nBg\nBg + {X: +0.2 + middle, Y: +0}, + {X: +0.4 + right, Y: +0}, + }, + Labels: []string{ + "Aq", "Aq", "Aq", + "Aq\nAq", "Aq\nAq", "Aq\nAq", + + "Bg\nBg\nBg", + "Bg\nBg\nBg", + "Bg\nBg\nBg", + }, + }) + if err != nil { + t.Fatalf("could not creates labels plotter: %+v", err) + } + for i := range labels.TextStyle { + sty := &labels.TextStyle[i] + sty.Font.Size = vg.Length(fontSize) + } + labels.TextStyle[0].YAlign = draw.YBottom + labels.TextStyle[1].YAlign = draw.YCenter + labels.TextStyle[2].YAlign = draw.YTop + + labels.TextStyle[3].YAlign = draw.YBottom + labels.TextStyle[4].YAlign = draw.YCenter + labels.TextStyle[5].YAlign = draw.YTop + + labels.TextStyle[6].YAlign = draw.YBottom + labels.TextStyle[7].YAlign = draw.YCenter + labels.TextStyle[8].YAlign = draw.YTop + + lred, err := plotter.NewLabels(plotter.XYLabels{ + XYs: []plotter.XY{ + {X: -0.8 + left, Y: +0.5}, + {X: +0.0 + left, Y: +0}, + }, + Labels: []string{ + "Aq", "Bg", + }, + }) + if err != nil { + t.Fatalf("could not creates labels plotter: %+v", err) + } + for i := range lred.TextStyle { + sty := &lred.TextStyle[i] + sty.Font.Size = vg.Length(fontSize) + sty.Color = color.RGBA{R: 255, A: 255} + sty.YAlign = draw.YBottom + } + + m5 := plotter.NewFunction(func(float64) float64 { return -0.5 }) + m5.LineStyle.Color = color.RGBA{R: 255, A: 255} + + l0 := plotter.NewFunction(func(float64) float64 { return 0 }) + l0.LineStyle.Color = color.RGBA{G: 255, A: 255} + + p5 := plotter.NewFunction(func(float64) float64 { return +0.5 }) + p5.LineStyle.Color = color.RGBA{B: 255, A: 255} + + p.Add(labels, lred, m5, l0, p5) + p.Add(plotter.NewGrid()) + p.Add(plotter.NewGlyphBoxes()) + + err = p.Save(10*vg.Centimeter, 10*vg.Centimeter, "testdata/labels_glyphboxes.png") + if err != nil { + t.Fatalf("could save plot: %+v", err) + } + }, + t, "labels_glyphboxes.png", + ) +} diff --git a/plotter/testdata/barChart_positiveNegative_golden.png b/plotter/testdata/barChart_positiveNegative_golden.png index d9fdeece..5dce7a31 100644 Binary files a/plotter/testdata/barChart_positiveNegative_golden.png and b/plotter/testdata/barChart_positiveNegative_golden.png differ diff --git a/plotter/testdata/clippedFilledLine_golden.png b/plotter/testdata/clippedFilledLine_golden.png index bd4d0b45..c3352107 100644 Binary files a/plotter/testdata/clippedFilledLine_golden.png and b/plotter/testdata/clippedFilledLine_golden.png differ diff --git a/plotter/testdata/colorBarVertical_golden.png b/plotter/testdata/colorBarVertical_golden.png index f929515a..d4bb483b 100644 Binary files a/plotter/testdata/colorBarVertical_golden.png and b/plotter/testdata/colorBarVertical_golden.png differ diff --git a/plotter/testdata/contour_golden.svg b/plotter/testdata/contour_golden.svg new file mode 100644 index 00000000..c75977d7 --- /dev/null +++ b/plotter/testdata/contour_golden.svg @@ -0,0 +1,477 @@ + + + + + +Contour +0.00 +25.00 +50.00 +75.00 + + + + + + + + + + + + + + + + + +0.00 +25.00 +50.00 +75.00 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plotter/testdata/field_golden.png b/plotter/testdata/field_golden.png index 00ab21ae..bf5994ce 100644 Binary files a/plotter/testdata/field_golden.png and b/plotter/testdata/field_golden.png differ diff --git a/plotter/testdata/functions_golden.png b/plotter/testdata/functions_golden.png index 26ac9ade..071a1913 100644 Binary files a/plotter/testdata/functions_golden.png and b/plotter/testdata/functions_golden.png differ diff --git a/plotter/testdata/groupedQuartPlot_golden.png b/plotter/testdata/groupedQuartPlot_golden.png index 391cb674..15ef264d 100644 Binary files a/plotter/testdata/groupedQuartPlot_golden.png and b/plotter/testdata/groupedQuartPlot_golden.png differ diff --git a/plotter/testdata/horizontalBoxPlot_golden.png b/plotter/testdata/horizontalBoxPlot_golden.png index c0ee97dc..46d3aa6c 100644 Binary files a/plotter/testdata/horizontalBoxPlot_golden.png and b/plotter/testdata/horizontalBoxPlot_golden.png differ diff --git a/plotter/testdata/horizontalQuartPlot_golden.png b/plotter/testdata/horizontalQuartPlot_golden.png index 70e62688..cabae74e 100644 Binary files a/plotter/testdata/horizontalQuartPlot_golden.png and b/plotter/testdata/horizontalQuartPlot_golden.png differ diff --git a/plotter/testdata/image_plot_golden.png b/plotter/testdata/image_plot_golden.png index 61c0ea7f..d7f9f5e9 100644 Binary files a/plotter/testdata/image_plot_golden.png and b/plotter/testdata/image_plot_golden.png differ diff --git a/plotter/testdata/image_plot_log_golden.png b/plotter/testdata/image_plot_log_golden.png index 910deddd..e047fb9f 100644 Binary files a/plotter/testdata/image_plot_log_golden.png and b/plotter/testdata/image_plot_log_golden.png differ diff --git a/plotter/testdata/labels_cnv_coords_golden.png b/plotter/testdata/labels_cnv_coords_golden.png index 10d5f9ab..736a81eb 100644 Binary files a/plotter/testdata/labels_cnv_coords_golden.png and b/plotter/testdata/labels_cnv_coords_golden.png differ diff --git a/plotter/testdata/labels_glyphboxes_golden.png b/plotter/testdata/labels_glyphboxes_golden.png new file mode 100644 index 00000000..b8cebe6a Binary files /dev/null and b/plotter/testdata/labels_glyphboxes_golden.png differ diff --git a/plotter/testdata/labels_golden.png b/plotter/testdata/labels_golden.png index 946f09f4..b2470b16 100644 Binary files a/plotter/testdata/labels_golden.png and b/plotter/testdata/labels_golden.png differ diff --git a/plotter/testdata/plotLogo_golden.png b/plotter/testdata/plotLogo_golden.png index 86ef622c..81adb4cb 100644 Binary files a/plotter/testdata/plotLogo_golden.png and b/plotter/testdata/plotLogo_golden.png differ diff --git a/plotter/testdata/polygon_hexagons_golden.png b/plotter/testdata/polygon_hexagons_golden.png index c3ef5886..429d9b9d 100644 Binary files a/plotter/testdata/polygon_hexagons_golden.png and b/plotter/testdata/polygon_hexagons_golden.png differ diff --git a/plotter/testdata/polygon_holes_golden.eps b/plotter/testdata/polygon_holes_golden.eps index d39a02c6..d2ffe340 100644 --- a/plotter/testdata/polygon_holes_golden.eps +++ b/plotter/testdata/polygon_holes_golden.eps @@ -2,7 +2,7 @@ %%Creator gonum.org/v1/plot/vg/vgeps %%Title: %%BoundingBox: 0 0 100 100 -%%CreationDate: 2020-11-02 12:45:40.941971207 +1030 ACDT m=+2.016279260 +%%CreationDate: 2020-12-14 16:10:53.813225989 +0100 CET m=+3.425219129 %%Orientation: Portrait %%EndComments @@ -57,55 +57,55 @@ stroke gsave 90 rotate /Times-Roman findfont 12 scalefont setfont -57.323 -11.555 moveto +58.839 -11.555 moveto (Y) show grestore 19.055 41.946 moveto (0) show -19.055 58.45 moveto +19.055 59.967 moveto (2) show -19.055 74.955 moveto +19.055 77.987 moveto (4) show newpath 26.555 45.151 moveto 34.555 45.151 lineto stroke newpath -26.555 61.656 moveto -34.555 61.656 lineto +26.555 63.172 moveto +34.555 63.172 lineto stroke newpath -26.555 78.161 moveto -34.555 78.161 lineto +26.555 81.193 moveto +34.555 81.193 lineto stroke newpath -30.555 53.404 moveto -34.555 53.404 lineto +30.555 54.162 moveto +34.555 54.162 lineto stroke newpath -30.555 69.908 moveto -34.555 69.908 lineto +30.555 72.182 moveto +34.555 72.182 lineto stroke newpath 34.555 45.151 moveto -34.555 78.161 lineto +34.555 81.193 lineto stroke 0 0 1 setrgbcolor newpath 40.305 45.151 moveto 97.5 45.151 lineto -97.5 78.161 lineto -40.305 78.161 lineto +97.5 81.193 lineto +40.305 81.193 lineto closepath -47.454 49.278 moveto -61.753 49.278 lineto -61.753 57.53 lineto -47.454 57.53 lineto +47.454 49.657 moveto +61.753 49.657 lineto +61.753 58.667 lineto +47.454 58.667 lineto closepath -90.351 65.782 moveto -76.052 65.782 lineto -76.052 74.034 lineto -90.351 74.034 lineto +90.351 67.677 moveto +76.052 67.677 lineto +76.052 76.688 lineto +90.351 76.688 lineto closepath fill 0 0 0 setrgbcolor @@ -113,23 +113,23 @@ fill newpath 40.305 45.151 moveto 97.5 45.151 lineto -97.5 78.161 lineto -40.305 78.161 lineto +97.5 81.193 lineto +40.305 81.193 lineto 40.305 45.151 lineto stroke newpath -47.454 49.278 moveto -61.753 49.278 lineto -61.753 57.53 lineto -47.454 57.53 lineto -47.454 49.278 lineto +47.454 49.657 moveto +61.753 49.657 lineto +61.753 58.667 lineto +47.454 58.667 lineto +47.454 49.657 lineto stroke newpath -90.351 65.782 moveto -76.052 65.782 lineto -76.052 74.034 lineto -90.351 74.034 lineto -90.351 65.782 lineto +90.351 67.677 moveto +76.052 67.677 lineto +76.052 76.688 lineto +90.351 76.688 lineto +90.351 67.677 lineto stroke 0 0 1 setrgbcolor newpath diff --git a/plotter/testdata/polygon_holes_golden.pdf b/plotter/testdata/polygon_holes_golden.pdf index dabca081..f97e72b9 100644 Binary files a/plotter/testdata/polygon_holes_golden.pdf and b/plotter/testdata/polygon_holes_golden.pdf differ diff --git a/plotter/testdata/polygon_holes_golden.png b/plotter/testdata/polygon_holes_golden.png index a6148277..53c87aec 100644 Binary files a/plotter/testdata/polygon_holes_golden.png and b/plotter/testdata/polygon_holes_golden.png differ diff --git a/plotter/testdata/polygon_holes_golden.svg b/plotter/testdata/polygon_holes_golden.svg index 4b93c70d..0f3dd9b1 100644 --- a/plotter/testdata/polygon_holes_golden.svg +++ b/plotter/testdata/polygon_holes_golden.svg @@ -22,25 +22,25 @@ -Y 0 -2 -4 - - - - - - - - - + + + + + + + + + -Y label 0.0 -0.5 -1.0 - - - - - - - - - - - + + + + + + + + + + + diff --git a/vg/testdata/width_-1.tiff b/vg/testdata/width_-1.tiff index 4cea785e..8c0787b5 100644 Binary files a/vg/testdata/width_-1.tiff and b/vg/testdata/width_-1.tiff differ diff --git a/vg/testdata/width_0.jpg b/vg/testdata/width_0.jpg index 96fef475..380e41e0 100644 Binary files a/vg/testdata/width_0.jpg and b/vg/testdata/width_0.jpg differ diff --git a/vg/testdata/width_0.pdf b/vg/testdata/width_0.pdf index 53f383c9..fc59ad66 100644 Binary files a/vg/testdata/width_0.pdf and b/vg/testdata/width_0.pdf differ diff --git a/vg/testdata/width_0.png b/vg/testdata/width_0.png index 7b2bacf1..497e401a 100644 Binary files a/vg/testdata/width_0.png and b/vg/testdata/width_0.png differ diff --git a/vg/testdata/width_0.svg b/vg/testdata/width_0.svg index a1d82d80..862aea3b 100644 --- a/vg/testdata/width_0.svg +++ b/vg/testdata/width_0.svg @@ -26,26 +26,26 @@ -Y label 0.0 -0.5 -1.0 - - - - - - - - - - - + + + + + + + + + + + diff --git a/vg/testdata/width_0.tiff b/vg/testdata/width_0.tiff index 4cea785e..8c0787b5 100644 Binary files a/vg/testdata/width_0.tiff and b/vg/testdata/width_0.tiff differ diff --git a/vg/testdata/width_1.jpg b/vg/testdata/width_1.jpg index f85b0ddc..9e0b029a 100644 Binary files a/vg/testdata/width_1.jpg and b/vg/testdata/width_1.jpg differ diff --git a/vg/testdata/width_1.pdf b/vg/testdata/width_1.pdf index d415c649..7def14b0 100644 Binary files a/vg/testdata/width_1.pdf and b/vg/testdata/width_1.pdf differ diff --git a/vg/testdata/width_1.png b/vg/testdata/width_1.png index b6e34cca..be7da5aa 100644 Binary files a/vg/testdata/width_1.png and b/vg/testdata/width_1.png differ diff --git a/vg/testdata/width_1.svg b/vg/testdata/width_1.svg index cd3da63f..23f745e2 100644 --- a/vg/testdata/width_1.svg +++ b/vg/testdata/width_1.svg @@ -26,27 +26,27 @@ -Y label 0.0 -0.5 -1.0 - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/vg/testdata/width_1.tiff b/vg/testdata/width_1.tiff index 87a557eb..cb81da73 100644 Binary files a/vg/testdata/width_1.tiff and b/vg/testdata/width_1.tiff differ diff --git a/vg/vggio/testdata/func_golden.png b/vg/vggio/testdata/func_golden.png index f6aacdc3..d67d90fd 100644 Binary files a/vg/vggio/testdata/func_golden.png and b/vg/vggio/testdata/func_golden.png differ diff --git a/vg/vgpdf/testdata/arc_golden.pdf b/vg/vgpdf/testdata/arc_golden.pdf index 82dba6ac..189ad59f 100644 Binary files a/vg/vgpdf/testdata/arc_golden.pdf and b/vg/vgpdf/testdata/arc_golden.pdf differ diff --git a/vg/vgpdf/testdata/disable-embedded-fonts_golden.pdf b/vg/vgpdf/testdata/disable-embedded-fonts_golden.pdf index b9a7d324..41455e8a 100644 Binary files a/vg/vgpdf/testdata/disable-embedded-fonts_golden.pdf and b/vg/vgpdf/testdata/disable-embedded-fonts_golden.pdf differ diff --git a/vg/vgpdf/testdata/enable-embedded-fonts_golden.pdf b/vg/vgpdf/testdata/enable-embedded-fonts_golden.pdf index 8c62dd4e..6e943f91 100644 Binary files a/vg/vgpdf/testdata/enable-embedded-fonts_golden.pdf and b/vg/vgpdf/testdata/enable-embedded-fonts_golden.pdf differ diff --git a/vg/vgpdf/testdata/issue540_golden.pdf b/vg/vgpdf/testdata/issue540_golden.pdf index 842ca872..3a563e0d 100644 Binary files a/vg/vgpdf/testdata/issue540_golden.pdf and b/vg/vgpdf/testdata/issue540_golden.pdf differ diff --git a/vg/vgpdf/testdata/multipage_golden.pdf b/vg/vgpdf/testdata/multipage_golden.pdf index fe88071d..f7931bdf 100644 Binary files a/vg/vgpdf/testdata/multipage_golden.pdf and b/vg/vgpdf/testdata/multipage_golden.pdf differ diff --git a/vg/vgsvg/testdata/scatter_golden.svg b/vg/vgsvg/testdata/scatter_golden.svg index bef2d3b9..7eaafb1c 100644 --- a/vg/vgsvg/testdata/scatter_golden.svg +++ b/vg/vgsvg/testdata/scatter_golden.svg @@ -28,29 +28,29 @@ -Y 0.0 -0.5 -1.0 - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/vg/vgsvg/testdata/scatter_line_golden.svg b/vg/vgsvg/testdata/scatter_line_golden.svg index 291fae66..d7894fa2 100644 --- a/vg/vgsvg/testdata/scatter_line_golden.svg +++ b/vg/vgsvg/testdata/scatter_line_golden.svg @@ -28,30 +28,30 @@ -Y 0.0 -0.5 -1.0 - - - - - - - - - - - - - + + + + + + + + + + + + + - + diff --git a/vg/vgtex/testdata/linestyle_golden.png b/vg/vgtex/testdata/linestyle_golden.png index cc5c64c7..a1a1e44c 100644 Binary files a/vg/vgtex/testdata/linestyle_golden.png and b/vg/vgtex/testdata/linestyle_golden.png differ diff --git a/vg/vgtex/testdata/linestyle_golden.tex b/vg/vgtex/testdata/linestyle_golden.tex index e8625b27..d0dbb805 100644 --- a/vg/vgtex/testdata/linestyle_golden.tex +++ b/vg/vgtex/testdata/linestyle_golden.tex @@ -182,14 +182,14 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgftext[base,at={\pgfpoint{10.830078125pt}{77.49724524790847pt}}]{{\fontsize{10pt}{10pt}\selectfont 0}} + \pgftext[base,at={\pgfpoint{10.830078125pt}{79.01335852915847pt}}]{{\fontsize{10pt}{10pt}\selectfont 0}} \end{pgfscope} \begin{pgfscope} \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgftext[base,at={\pgfpoint{8.330078125pt}{132.10337721456693pt}}]{{\fontsize{10pt}{10pt}\selectfont 10}} + \pgftext[base,at={\pgfpoint{8.330078125pt}{135.13560377706693pt}}]{{\fontsize{10pt}{10pt}\selectfont 10}} \end{pgfscope} \begin{pgfscope} @@ -209,8 +209,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{15.830078125pt}{80.70281165415847pt}} - \pgflineto{\pgfpoint{23.830078125pt}{80.70281165415847pt}} + \pgfpathmoveto{\pgfpoint{15.830078125pt}{82.21892493540847pt}} + \pgflineto{\pgfpoint{23.830078125pt}{82.21892493540847pt}} \pgfusepath{stroke} \end{pgfscope} @@ -220,8 +220,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{15.830078125pt}{135.30894362081693pt}} - \pgflineto{\pgfpoint{23.830078125pt}{135.30894362081693pt}} + \pgfpathmoveto{\pgfpoint{15.830078125pt}{138.34117018331693pt}} + \pgflineto{\pgfpoint{23.830078125pt}{138.34117018331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -231,8 +231,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{37.01790608083169pt}} - \pgflineto{\pgfpoint{23.830078125pt}{37.01790608083169pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{37.32112873708169pt}} + \pgflineto{\pgfpoint{23.830078125pt}{37.32112873708169pt}} \pgfusepath{stroke} \end{pgfscope} @@ -242,8 +242,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{47.93913247416339pt}} - \pgflineto{\pgfpoint{23.830078125pt}{47.93913247416339pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{48.54557778666339pt}} + \pgflineto{\pgfpoint{23.830078125pt}{48.54557778666339pt}} \pgfusepath{stroke} \end{pgfscope} @@ -253,8 +253,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{58.86035886749508pt}} - \pgflineto{\pgfpoint{23.830078125pt}{58.86035886749508pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{59.77002683624508pt}} + \pgflineto{\pgfpoint{23.830078125pt}{59.77002683624508pt}} \pgfusepath{stroke} \end{pgfscope} @@ -264,8 +264,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{69.78158526082677pt}} - \pgflineto{\pgfpoint{23.830078125pt}{69.78158526082677pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{70.99447588582677pt}} + \pgflineto{\pgfpoint{23.830078125pt}{70.99447588582677pt}} \pgfusepath{stroke} \end{pgfscope} @@ -275,8 +275,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{91.62403804749016pt}} - \pgflineto{\pgfpoint{23.830078125pt}{91.62403804749016pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{93.44337398499016pt}} + \pgflineto{\pgfpoint{23.830078125pt}{93.44337398499016pt}} \pgfusepath{stroke} \end{pgfscope} @@ -286,8 +286,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{102.54526444082185pt}} - \pgflineto{\pgfpoint{23.830078125pt}{102.54526444082185pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{104.66782303457185pt}} + \pgflineto{\pgfpoint{23.830078125pt}{104.66782303457185pt}} \pgfusepath{stroke} \end{pgfscope} @@ -297,8 +297,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{113.46649083415355pt}} - \pgflineto{\pgfpoint{23.830078125pt}{113.46649083415355pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{115.89227208415355pt}} + \pgflineto{\pgfpoint{23.830078125pt}{115.89227208415355pt}} \pgfusepath{stroke} \end{pgfscope} @@ -308,8 +308,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{19.830078125pt}{124.38771722748524pt}} - \pgflineto{\pgfpoint{23.830078125pt}{124.38771722748524pt}} + \pgfpathmoveto{\pgfpoint{19.830078125pt}{127.11672113373524pt}} + \pgflineto{\pgfpoint{23.830078125pt}{127.11672113373524pt}} \pgfusepath{stroke} \end{pgfscope} @@ -320,7 +320,7 @@ \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} \pgfpathmoveto{\pgfpoint{23.830078125pt}{26.0966796875pt}} - \pgflineto{\pgfpoint{23.830078125pt}{135.30894362081693pt}} + \pgflineto{\pgfpoint{23.830078125pt}{138.34117018331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -330,56 +330,56 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{29.580078125pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{31.766857825807485pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{33.95363752661497pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{36.14041722742247pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{38.32719692822995pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{40.51397662903744pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{42.70075632984493pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{44.88753603065242pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{47.074315731459905pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{49.261095432267396pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{51.44787513307489pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{53.63465483388238pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{55.82143453468986pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{58.00821423549735pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{60.19499393630484pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{62.381773637112325pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{64.56855333791981pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{66.7553330387273pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{68.94211273953479pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{71.12889244034228pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{73.31567214114978pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{75.50245184195725pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{77.68923154276476pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{79.87601124357224pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{82.06279094437971pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{84.24957064518722pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{86.4363503459947pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{88.6231300468022pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{90.80990974760968pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{92.99668944841716pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{95.18346914922465pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{97.37024885003214pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{99.55702855083963pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{101.74380825164711pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{103.9305879524546pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{106.1173676532621pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{108.30414735406958pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{110.49092705487706pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{112.67770675568457pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{114.86448645649205pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{117.05126615729954pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{119.23804585810703pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{121.4248255589145pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{123.611605259722pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{125.7983849605295pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{127.985164661337pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{130.17194436214447pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{132.35872406295198pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{134.54550376375943pt}{42.47851927749754pt}} - \pgflineto{\pgfpoint{136.73228346456693pt}{42.47851927749754pt}} + \pgfpathmoveto{\pgfpoint{29.580078125pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{31.766857825807485pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{33.95363752661497pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{36.14041722742247pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{38.32719692822995pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{40.51397662903744pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{42.70075632984493pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{44.88753603065242pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{47.074315731459905pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{49.261095432267396pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{51.44787513307489pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{53.63465483388238pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{55.82143453468986pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{58.00821423549735pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{60.19499393630484pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{62.381773637112325pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{64.56855333791981pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{66.7553330387273pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{68.94211273953479pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{71.12889244034228pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{73.31567214114978pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{75.50245184195725pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{77.68923154276476pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{79.87601124357224pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{82.06279094437971pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{84.24957064518722pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{86.4363503459947pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{88.6231300468022pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{90.80990974760968pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{92.99668944841716pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{95.18346914922465pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{97.37024885003214pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{99.55702855083963pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{101.74380825164711pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{103.9305879524546pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{106.1173676532621pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{108.30414735406958pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{110.49092705487706pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{112.67770675568457pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{114.86448645649205pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{117.05126615729954pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{119.23804585810703pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{121.4248255589145pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{123.611605259722pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{125.7983849605295pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{127.985164661337pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{130.17194436214447pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{132.35872406295198pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{134.54550376375943pt}{42.93335326187254pt}} + \pgflineto{\pgfpoint{136.73228346456693pt}{42.93335326187254pt}} \pgfusepath{stroke} \end{pgfscope} @@ -389,56 +389,56 @@ \color[rgb]{1,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{29.580078125pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{31.766857825807485pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{33.95363752661497pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{36.14041722742247pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{38.32719692822995pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{40.51397662903744pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{42.70075632984493pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{44.88753603065242pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{47.074315731459905pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{49.261095432267396pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{51.44787513307489pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{53.63465483388238pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{55.82143453468986pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{58.00821423549735pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{60.19499393630484pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{62.381773637112325pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{64.56855333791981pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{66.7553330387273pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{68.94211273953479pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{71.12889244034228pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{73.31567214114978pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{75.50245184195725pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{77.68923154276476pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{79.87601124357224pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{82.06279094437971pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{84.24957064518722pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{86.4363503459947pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{88.6231300468022pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{90.80990974760968pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{92.99668944841716pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{95.18346914922465pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{97.37024885003214pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{99.55702855083963pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{101.74380825164711pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{103.9305879524546pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{106.1173676532621pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{108.30414735406958pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{110.49092705487706pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{112.67770675568457pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{114.86448645649205pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{117.05126615729954pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{119.23804585810703pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{121.4248255589145pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{123.611605259722pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{125.7983849605295pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{127.985164661337pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{130.17194436214447pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{132.35872406295198pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{134.54550376375943pt}{75.24219845749262pt}} - \pgflineto{\pgfpoint{136.73228346456693pt}{75.24219845749262pt}} + \pgfpathmoveto{\pgfpoint{29.580078125pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{31.766857825807485pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{33.95363752661497pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{36.14041722742247pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{38.32719692822995pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{40.51397662903744pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{42.70075632984493pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{44.88753603065242pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{47.074315731459905pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{49.261095432267396pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{51.44787513307489pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{53.63465483388238pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{55.82143453468986pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{58.00821423549735pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{60.19499393630484pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{62.381773637112325pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{64.56855333791981pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{66.7553330387273pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{68.94211273953479pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{71.12889244034228pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{73.31567214114978pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{75.50245184195725pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{77.68923154276476pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{79.87601124357224pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{82.06279094437971pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{84.24957064518722pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{86.4363503459947pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{88.6231300468022pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{90.80990974760968pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{92.99668944841716pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{95.18346914922465pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{97.37024885003214pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{99.55702855083963pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{101.74380825164711pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{103.9305879524546pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{106.1173676532621pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{108.30414735406958pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{110.49092705487706pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{112.67770675568457pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{114.86448645649205pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{117.05126615729954pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{119.23804585810703pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{121.4248255589145pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{123.611605259722pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{125.7983849605295pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{127.985164661337pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{130.17194436214447pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{132.35872406295198pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{134.54550376375943pt}{76.60670041061762pt}} + \pgflineto{\pgfpoint{136.73228346456693pt}{76.60670041061762pt}} \pgfusepath{stroke} \end{pgfscope} @@ -448,56 +448,56 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{29.580078125pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{31.766857825807485pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{33.95363752661497pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{36.14041722742247pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{38.32719692822995pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{40.51397662903744pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{42.70075632984493pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{44.88753603065242pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{47.074315731459905pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{49.261095432267396pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{51.44787513307489pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{53.63465483388238pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{55.82143453468986pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{58.00821423549735pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{60.19499393630484pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{62.381773637112325pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{64.56855333791981pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{66.7553330387273pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{68.94211273953479pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{71.12889244034228pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{73.31567214114978pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{75.50245184195725pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{77.68923154276476pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{79.87601124357224pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{82.06279094437971pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{84.24957064518722pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{86.4363503459947pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{88.6231300468022pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{90.80990974760968pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{92.99668944841716pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{95.18346914922465pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{97.37024885003214pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{99.55702855083963pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{101.74380825164711pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{103.9305879524546pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{106.1173676532621pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{108.30414735406958pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{110.49092705487706pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{112.67770675568457pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{114.86448645649205pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{117.05126615729954pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{119.23804585810703pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{121.4248255589145pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{123.611605259722pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{125.7983849605295pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{127.985164661337pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{130.17194436214447pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{132.35872406295198pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{134.54550376375943pt}{118.9271040308194pt}} - \pgflineto{\pgfpoint{136.73228346456693pt}{118.9271040308194pt}} + \pgfpathmoveto{\pgfpoint{29.580078125pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{31.766857825807485pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{33.95363752661497pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{36.14041722742247pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{38.32719692822995pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{40.51397662903744pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{42.70075632984493pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{44.88753603065242pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{47.074315731459905pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{49.261095432267396pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{51.44787513307489pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{53.63465483388238pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{55.82143453468986pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{58.00821423549735pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{60.19499393630484pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{62.381773637112325pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{64.56855333791981pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{66.7553330387273pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{68.94211273953479pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{71.12889244034228pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{73.31567214114978pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{75.50245184195725pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{77.68923154276476pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{79.87601124357224pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{82.06279094437971pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{84.24957064518722pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{86.4363503459947pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{88.6231300468022pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{90.80990974760968pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{92.99668944841716pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{95.18346914922465pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{97.37024885003214pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{99.55702855083963pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{101.74380825164711pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{103.9305879524546pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{106.1173676532621pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{108.30414735406958pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{110.49092705487706pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{112.67770675568457pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{114.86448645649205pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{117.05126615729954pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{119.23804585810703pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{121.4248255589145pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{123.611605259722pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{125.7983849605295pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{127.985164661337pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{130.17194436214447pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{132.35872406295198pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{134.54550376375943pt}{121.5044966089444pt}} + \pgflineto{\pgfpoint{136.73228346456693pt}{121.5044966089444pt}} \pgfusepath{stroke} \end{pgfscope} @@ -508,7 +508,7 @@ \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} \pgfpathmoveto{\pgfpoint{29.580078125pt}{26.0966796875pt}} - \pgflineto{\pgfpoint{29.580078125pt}{135.30894362081693pt}} + \pgflineto{\pgfpoint{29.580078125pt}{138.34117018331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -519,7 +519,7 @@ \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} \pgfpathmoveto{\pgfpoint{83.15618079478347pt}{26.0966796875pt}} - \pgflineto{\pgfpoint{83.15618079478347pt}{135.30894362081693pt}} + \pgflineto{\pgfpoint{83.15618079478347pt}{138.34117018331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -530,7 +530,7 @@ \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} \pgfpathmoveto{\pgfpoint{136.73228346456693pt}{26.0966796875pt}} - \pgflineto{\pgfpoint{136.73228346456693pt}{135.30894362081693pt}} + \pgflineto{\pgfpoint{136.73228346456693pt}{138.34117018331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -551,8 +551,8 @@ \color[rgb]{0.5019607843137255,0.5019607843137255,0.5019607843137255} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{29.580078125pt}{80.70281165415847pt}} - \pgflineto{\pgfpoint{136.73228346456693pt}{80.70281165415847pt}} + \pgfpathmoveto{\pgfpoint{29.580078125pt}{82.21892493540847pt}} + \pgflineto{\pgfpoint{136.73228346456693pt}{82.21892493540847pt}} \pgfusepath{stroke} \end{pgfscope} @@ -562,8 +562,8 @@ \color[rgb]{0.5019607843137255,0.5019607843137255,0.5019607843137255} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{29.580078125pt}{135.30894362081693pt}} - \pgflineto{\pgfpoint{136.73228346456693pt}{135.30894362081693pt}} + \pgfpathmoveto{\pgfpoint{29.580078125pt}{138.34117018331693pt}} + \pgflineto{\pgfpoint{136.73228346456693pt}{138.34117018331693pt}} \pgfusepath{stroke} \end{pgfscope} diff --git a/vg/vgtex/testdata/scatter_golden.tex b/vg/vgtex/testdata/scatter_golden.tex index 1b975905..87f57610 100644 --- a/vg/vgtex/testdata/scatter_golden.tex +++ b/vg/vgtex/testdata/scatter_golden.tex @@ -191,7 +191,7 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgftext[base,at={\pgfpoint{81.20281165415847pt}{-11.554687499999993pt}}]{{\fontsize{12pt}{12pt}\selectfont $y$ is some $\Phi$}} + \pgftext[base,at={\pgfpoint{82.71892493540847pt}{-11.554687499999993pt}}]{{\fontsize{12pt}{12pt}\selectfont $y$ is some $\Phi$}} \end{pgfscope} \end{pgfscope} @@ -207,14 +207,14 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgftext[base,at={\pgfpoint{25.3046875pt}{77.99724524790847pt}}]{{\fontsize{10pt}{10pt}\selectfont 0.5}} + \pgftext[base,at={\pgfpoint{25.3046875pt}{79.51335852915847pt}}]{{\fontsize{10pt}{10pt}\selectfont 0.5}} \end{pgfscope} \begin{pgfscope} \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgftext[base,at={\pgfpoint{25.3046875pt}{111.54868971456693pt}}]{{\fontsize{10pt}{10pt}\selectfont 1.0}} + \pgftext[base,at={\pgfpoint{25.3046875pt}{114.58091627706693pt}}]{{\fontsize{10pt}{10pt}\selectfont 1.0}} \end{pgfscope} \begin{pgfscope} @@ -234,8 +234,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{34.0546875pt}{81.20281165415847pt}} - \pgflineto{\pgfpoint{42.0546875pt}{81.20281165415847pt}} + \pgfpathmoveto{\pgfpoint{34.0546875pt}{82.71892493540847pt}} + \pgflineto{\pgfpoint{42.0546875pt}{82.71892493540847pt}} \pgfusepath{stroke} \end{pgfscope} @@ -245,8 +245,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{34.0546875pt}{114.75425612081693pt}} - \pgflineto{\pgfpoint{42.0546875pt}{114.75425612081693pt}} + \pgfpathmoveto{\pgfpoint{34.0546875pt}{117.78648268331693pt}} + \pgflineto{\pgfpoint{42.0546875pt}{117.78648268331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -256,8 +256,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{54.36165608083169pt}} - \pgflineto{\pgfpoint{42.0546875pt}{54.36165608083169pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{54.66487873708169pt}} + \pgflineto{\pgfpoint{42.0546875pt}{54.66487873708169pt}} \pgfusepath{stroke} \end{pgfscope} @@ -267,8 +267,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{61.07194497416339pt}} - \pgflineto{\pgfpoint{42.0546875pt}{61.07194497416339pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{61.67839028666339pt}} + \pgflineto{\pgfpoint{42.0546875pt}{61.67839028666339pt}} \pgfusepath{stroke} \end{pgfscope} @@ -278,8 +278,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{67.78223386749508pt}} - \pgflineto{\pgfpoint{42.0546875pt}{67.78223386749508pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{68.69190183624508pt}} + \pgflineto{\pgfpoint{42.0546875pt}{68.69190183624508pt}} \pgfusepath{stroke} \end{pgfscope} @@ -289,8 +289,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{74.49252276082677pt}} - \pgflineto{\pgfpoint{42.0546875pt}{74.49252276082677pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{75.70541338582677pt}} + \pgflineto{\pgfpoint{42.0546875pt}{75.70541338582677pt}} \pgfusepath{stroke} \end{pgfscope} @@ -300,8 +300,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{87.91310054749016pt}} - \pgflineto{\pgfpoint{42.0546875pt}{87.91310054749016pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{89.73243648499016pt}} + \pgflineto{\pgfpoint{42.0546875pt}{89.73243648499016pt}} \pgfusepath{stroke} \end{pgfscope} @@ -311,8 +311,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{94.62338944082185pt}} - \pgflineto{\pgfpoint{42.0546875pt}{94.62338944082185pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{96.74594803457185pt}} + \pgflineto{\pgfpoint{42.0546875pt}{96.74594803457185pt}} \pgfusepath{stroke} \end{pgfscope} @@ -322,8 +322,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{101.33367833415355pt}} - \pgflineto{\pgfpoint{42.0546875pt}{101.33367833415355pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{103.75945958415355pt}} + \pgflineto{\pgfpoint{42.0546875pt}{103.75945958415355pt}} \pgfusepath{stroke} \end{pgfscope} @@ -333,8 +333,8 @@ \color[rgb]{0,0,0} \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} - \pgfpathmoveto{\pgfpoint{38.0546875pt}{108.04396722748524pt}} - \pgflineto{\pgfpoint{42.0546875pt}{108.04396722748524pt}} + \pgfpathmoveto{\pgfpoint{38.0546875pt}{110.77297113373524pt}} + \pgflineto{\pgfpoint{42.0546875pt}{110.77297113373524pt}} \pgfusepath{stroke} \end{pgfscope} @@ -345,7 +345,7 @@ \pgfsetstrokeopacity{1} \pgfsetfillopacity{1} \pgfpathmoveto{\pgfpoint{42.0546875pt}{47.6513671875pt}} - \pgflineto{\pgfpoint{42.0546875pt}{114.75425612081693pt}} + \pgflineto{\pgfpoint{42.0546875pt}{117.78648268331693pt}} \pgfusepath{stroke} \end{pgfscope} @@ -355,7 +355,7 @@ \color[rgb]{1,0,0} \pgfsetstrokeopacity{0.7843137254901961} \pgfsetfillopacity{0.7843137254901961} - \pgfpathmoveto{\pgfpoint{137.98228346456693pt}{114.75425612081693pt}} + \pgfpathmoveto{\pgfpoint{137.98228346456693pt}{117.78648268331693pt}} \pgfpatharc{0}{360}{2.5pt} % path-close \pgfusepath{stroke} @@ -367,7 +367,7 @@ \color[rgb]{1,0,0} \pgfsetstrokeopacity{0.7843137254901961} \pgfsetfillopacity{0.7843137254901961} - \pgfpathmoveto{\pgfpoint{52.8046875pt}{114.75425612081693pt}} + \pgfpathmoveto{\pgfpoint{52.8046875pt}{117.78648268331693pt}} \pgfpatharc{0}{360}{2.5pt} % path-close \pgfusepath{stroke} @@ -404,9 +404,9 @@ \color[rgb]{0,0,1} \pgfsetstrokeopacity{0.7843137254901961} \pgfsetfillopacity{0.7843137254901961} - \pgfpathmoveto{\pgfpoint{135.48228346456693pt}{83.70281165413255pt}} - \pgflineto{\pgfpoint{133.3172199551657pt}{79.95281165410663pt}} - \pgflineto{\pgfpoint{137.64734697396815pt}{79.95281165410663pt}} + \pgfpathmoveto{\pgfpoint{135.48228346456693pt}{85.21892493538255pt}} + \pgflineto{\pgfpoint{133.3172199551657pt}{81.46892493535663pt}} + \pgflineto{\pgfpoint{137.64734697396815pt}{81.46892493535663pt}} % path-close \pgfusepath{fill} \end{pgfscope}