[goffice] Fix Y-axis label position. [#669325]

[Jean BrÃfort <jbrefort src gnome org>]

commit 1dd71674b4df4aca89eda7d1ec3ae92c92f81627
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Feb 6 08:01:22 2012 +0100

    Fix Y-axis label position. [#669325]

 ChangeLog                |    6 ++++++
 NEWS                     |    1 +
 goffice/graph/gog-axis.c |    4 ++--
 goffice/utils/go-line.c  |    2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8b0afba..c22f3dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-06  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/graph/gog-axis.c (gog_axis_view_size_allocate): fix Y-axis label
+	position. [#669325]
+	* goffice/utils/go-line.c: fix documentation.
+
 2012-02-05  Jean Brefort  <jean brefort normalesup org>
 	* goffice/graph/gog-axis-line.c (axis_line_render): limit the axis line
 	to its actual span.
diff --git a/NEWS b/NEWS
index 7a4a637..d388650 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ Jean:
 	* Add automatic Bezier spline interpolation. [663356]
 	* Fixed graph type selector position. [#667793]
 	* Fix bounds for partial range logarithmic axes. [#669257]
+	* Fix Y-axis label position. [#669325]
 
 Morten:
 	* Embed library ui files into library.
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index a6d4802..1b25fd3 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -3433,8 +3433,8 @@ gog_axis_view_size_allocate (GogView *view, GogViewAllocation const *bbox)
 						}
 						tmp.h -= req.h + pad_h;
 					} else {
-						child_bbox.y = plot_area->y +
-							(plot_area->h * (start + end) - req.h) / 2.0;
+						child_bbox.y = plot_area->y + plot_area->h -
+							(plot_area->h * (start + end) + req.h) / 2.0;
 						child_bbox.h = req.h;
 						child_bbox.w = req.w;
 						switch (axis_pos) {
diff --git a/goffice/utils/go-line.c b/goffice/utils/go-line.c
index 4261721..4ec1c47 100644
--- a/goffice/utils/go-line.c
+++ b/goffice/utils/go-line.c
@@ -47,6 +47,7 @@
  * @GO_LINE_INTERPOLATION_LINEAR: Linear interpolation.
  * @GO_LINE_INTERPOLATION_SPLINE: Bezier cubic spline interpolation.
  * @GO_LINE_INTERPOLATION_CLOSED_SPLINE: Closed Bezier cubic spline interpolation.
+ * @GO_LINE_INTERPOLATION_ODF_SPLINE: ODF compatible Bezier cubic spline interpolation, cyclic if first and last points are identical.
  * @GO_LINE_INTERPOLATION_CUBIC_SPLINE: Cubic spline interpolation with natural limits.
  * @GO_LINE_INTERPOLATION_PARABOLIC_CUBIC_SPLINE: Cubic spline interpolation with parabolic limits.
  * @GO_LINE_INTERPOLATION_CUBIC_CUBIC_SPLINE: Cubic spline interpolation with cubic limits.
@@ -56,7 +57,6 @@
  * @GO_LINE_INTERPOLATION_STEP_CENTER_X: Steps centered around each point.
  * @GO_LINE_INTERPOLATION_STEP_CENTER_Y: Steps using mean y value.
  * @GO_LINE_INTERPOLATION_MAX: First invalid value.
- * @GO_LINE_INTERPOLATION_ODF_SPLINE: ODF compatible Bezier cubic spline interpolation, cyclic if first and last points are identical.
  **/
 
 typedef struct {