case TOP_OF_SCREEN:
vp = rint (line.vertical_position.proportional.get() * ROWS);
break;
- case CENTRE_OF_SCREEN:
+ case VERTICAL_CENTRE_OF_SCREEN:
vp = rint (line.vertical_position.proportional.get() * ROWS + (ROWS / 2.0));
break;
case BOTTOM_OF_SCREEN:
case TOP_OF_SCREEN:
vp = prop * ROWS;
break;
- case CENTRE_OF_SCREEN:
+ case VERTICAL_CENTRE_OF_SCREEN:
vp = (prop + 0.5) * ROWS;
break;
case BOTTOM_OF_SCREEN:
/* Justification code */
/* XXX: this assumes the first line has the right value */
- switch (i->lines.front().horizontal_position) {
- case LEFT:
+ switch (i->lines.front().horizontal_position.reference) {
+ case LEFT_OF_SCREEN:
put_int_as_int (buffer + 14, tables.justification_enum_to_file (JUSTIFICATION_LEFT), 1);
break;
- case CENTRE:
+ case HORIZONTAL_CENTRE_OF_SCREEN:
put_int_as_int (buffer + 14, tables.justification_enum_to_file (JUSTIFICATION_CENTRE), 1);
break;
- case RIGHT:
+ case RIGHT_OF_SCREEN:
put_int_as_int (buffer + 14, tables.justification_enum_to_file (JUSTIFICATION_RIGHT), 1);
break;
}