[lasem] mathml_view: stub for max/min size handling
- From: Emmanuel Pacaud <emmanuel src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [lasem] mathml_view: stub for max/min size handling
- Date: Wed, 11 Feb 2015 21:49:39 +0000 (UTC)
commit 807cd752596ca59b51e1d7fd566959c4287b0f6e
Author: Emmanuel Pacaud <emmanuel gnome org>
Date: Wed Feb 11 22:48:46 2015 +0100
mathml_view: stub for max/min size handling
src/lsmmathmlfencedelement.c | 14 ++++++++------
src/lsmmathmloperatorelement.c | 14 ++++++++------
src/lsmmathmlview.c | 19 ++++++++++++-------
src/lsmmathmlview.h | 2 ++
4 files changed, 30 insertions(+), 19 deletions(-)
---
diff --git a/src/lsmmathmlfencedelement.c b/src/lsmmathmlfencedelement.c
index 4c3bb9a..b08af8e 100644
--- a/src/lsmmathmlfencedelement.c
+++ b/src/lsmmathmlfencedelement.c
@@ -55,18 +55,20 @@ lsm_mathml_fenced_element_measure (LsmMathmlElement *self, LsmMathmlView *view,
if (open != NULL && open[0] != '\0') {
lsm_mathml_view_measure_operator (view, &self->style,
- open, FALSE, TRUE,
- axis_offset,
- &stretch_bbox, &fenced->open_bbox);
+ open, FALSE, TRUE,
+ axis_offset,
+ 0, G_MAXDOUBLE,
+ &stretch_bbox, &fenced->open_bbox);
spacing += self->style.math_size * LSM_MATHML_SPACE_EM_THIN;
} else
fenced->open_bbox = lsm_mathml_bbox_null;
if (close != NULL && close[0] != '\0') {
lsm_mathml_view_measure_operator (view, &self->style,
- close, FALSE, TRUE,
- axis_offset,
- &stretch_bbox, &fenced->close_bbox);
+ close, FALSE, TRUE,
+ axis_offset,
+ 0, G_MAXDOUBLE,
+ &stretch_bbox, &fenced->close_bbox);
spacing += self->style.math_size * LSM_MATHML_SPACE_EM_THIN;
} else
fenced->close_bbox = lsm_mathml_bbox_null;
diff --git a/src/lsmmathmloperatorelement.c b/src/lsmmathmloperatorelement.c
index 63158d3..6bb9483 100644
--- a/src/lsmmathmloperatorelement.c
+++ b/src/lsmmathmloperatorelement.c
@@ -152,12 +152,14 @@ lsm_mathml_operator_element_measure (LsmMathmlElement *self, LsmMathmlView *view
self->bbox = lsm_mathml_bbox_null;
lsm_mathml_view_measure_operator (view, &self->style,
- text,
- operator_element->is_large_op,
- operator_element->symmetric.value,
- lsm_mathml_view_measure_axis_offset (view, self->style.math_size),
- operator_element->stretchy.value ? stretch_bbox :
&lsm_mathml_bbox_null,
- &self->bbox);
+ text,
+ operator_element->is_large_op,
+ operator_element->symmetric.value,
+ lsm_mathml_view_measure_axis_offset (view, self->style.math_size),
+ operator_element->min_size.value,
+ operator_element->max_size.value,
+ operator_element->stretchy.value ? stretch_bbox :
&lsm_mathml_bbox_null,
+ &self->bbox);
g_free (text);
diff --git a/src/lsmmathmlview.c b/src/lsmmathmlview.c
index c4ba526..471d3f2 100644
--- a/src/lsmmathmlview.c
+++ b/src/lsmmathmlview.c
@@ -361,12 +361,15 @@ lsm_mathml_view_update_layout_for_operator (LsmMathmlView *view,
void
lsm_mathml_view_measure_operator (LsmMathmlView *view,
- const LsmMathmlElementStyle *style,
- char const *text,
- gboolean large,
- gboolean symmetric,
- double axis_offset,
- LsmMathmlBbox const *stretch_bbox, LsmMathmlBbox *bbox)
+ const LsmMathmlElementStyle *style,
+ char const *text,
+ gboolean large,
+ gboolean symmetric,
+ double axis_offset,
+ double min_size, /* TODO actually use this parameter */
+ double max_size, /* TODO actually use this parameter */
+ LsmMathmlBbox const *stretch_bbox,
+ LsmMathmlBbox *bbox)
{
PangoFontDescription *font_description;
PangoLayout *pango_layout;
@@ -658,7 +661,9 @@ lsm_mathml_view_measure_radical (LsmMathmlView *view,
radical_stretch_bbox.depth += LSM_MATHML_SPACE_EM_THICK * style->math_size;
lsm_mathml_view_measure_operator (view, style, LSM_MATHML_RADICAL_UTF8,
- FALSE, FALSE, 0.0, &radical_stretch_bbox, bbox);
+ FALSE, FALSE, 0.0,
+ 0, G_MAXDOUBLE,
+ &radical_stretch_bbox, bbox);
if (x_offset != NULL) {
*x_offset = bbox->width * LSM_MATHML_RADICAL_ORDER_X_OFFSET;
diff --git a/src/lsmmathmlview.h b/src/lsmmathmlview.h
index df19beb..fa8ae61 100644
--- a/src/lsmmathmlview.h
+++ b/src/lsmmathmlview.h
@@ -111,6 +111,8 @@ void lsm_mathml_view_measure_operator (LsmMathmlView *view,
char const *text,
gboolean large, gboolean symmetric,
double axis_offset,
+ double min_size,
+ double max_size,
const LsmMathmlBbox *stretch_bbox,
LsmMathmlBbox *bbox);
void lsm_mathml_view_show_operator (LsmMathmlView *view,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]