diff --git a/app/core/core-enums.c b/app/core/core-enums.c index 17c518ad96..6eb7ad0d98 100644 --- a/app/core/core-enums.c +++ b/app/core/core-enums.c @@ -289,7 +289,7 @@ gimp_layer_mode_get_type (void) { static const GEnumValue values[] = { - { GIMP_LAYER_MODE_NORMAL_NON_LINEAR, "GIMP_LAYER_MODE_NORMAL_NON_LINEAR", "normal-non-linear" }, + { GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" }, { GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" }, { GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" }, { GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" }, @@ -317,7 +317,7 @@ gimp_layer_mode_get_type (void) { GIMP_LAYER_MODE_LCH_CHROMA, "GIMP_LAYER_MODE_LCH_CHROMA", "lch-chroma" }, { GIMP_LAYER_MODE_LCH_COLOR, "GIMP_LAYER_MODE_LCH_COLOR", "lch-color" }, { GIMP_LAYER_MODE_LCH_LIGHTNESS, "GIMP_LAYER_MODE_LCH_LIGHTNESS", "lch-lightness" }, - { GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" }, + { GIMP_LAYER_MODE_NORMAL_LINEAR, "GIMP_LAYER_MODE_NORMAL_LINEAR", "normal-linear" }, { GIMP_LAYER_MODE_BEHIND_LINEAR, "GIMP_LAYER_MODE_BEHIND_LINEAR", "behind-linear" }, { GIMP_LAYER_MODE_MULTIPLY, "GIMP_LAYER_MODE_MULTIPLY", "multiply" }, { GIMP_LAYER_MODE_MULTIPLY_LINEAR, "GIMP_LAYER_MODE_MULTIPLY_LINEAR", "multiply-linear" }, @@ -368,7 +368,7 @@ gimp_layer_mode_get_type (void) static const GimpEnumDesc descs[] = { - { GIMP_LAYER_MODE_NORMAL_NON_LINEAR, NC_("layer-mode", "Normal"), NULL }, + { GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL }, { GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL }, { GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL }, { GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply (legacy)"), NULL }, @@ -396,7 +396,7 @@ gimp_layer_mode_get_type (void) { GIMP_LAYER_MODE_LCH_CHROMA, NC_("layer-mode", "Chroma (LCH)"), NULL }, { GIMP_LAYER_MODE_LCH_COLOR, NC_("layer-mode", "Color (LCH)"), NULL }, { GIMP_LAYER_MODE_LCH_LIGHTNESS, NC_("layer-mode", "Lightness (LCH)"), NULL }, - { GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal (linear)"), NULL }, + { GIMP_LAYER_MODE_NORMAL_LINEAR, NC_("layer-mode", "Normal (linear)"), NULL }, { GIMP_LAYER_MODE_BEHIND_LINEAR, NC_("layer-mode", "Behind (linear)"), NULL }, { GIMP_LAYER_MODE_MULTIPLY, NC_("layer-mode", "Multiply"), NULL }, { GIMP_LAYER_MODE_MULTIPLY_LINEAR, NC_("layer-mode", "Multiply (linear)"), NULL }, diff --git a/app/core/core-enums.h b/app/core/core-enums.h index 836a28503f..68337daf18 100644 --- a/app/core/core-enums.h +++ b/app/core/core-enums.h @@ -155,7 +155,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST; typedef enum { /* Modes that exist since ancient times */ - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, /*< desc="Normal" >*/ + GIMP_LAYER_MODE_NORMAL, /*< desc="Normal" >*/ GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/ GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/ GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply (legacy)" >*/ @@ -187,7 +187,7 @@ typedef enum GIMP_LAYER_MODE_LCH_LIGHTNESS, /*< desc="Lightness (LCH)" >*/ /* Since 2.10 */ - GIMP_LAYER_MODE_NORMAL, /*< desc="Normal (linear)" >*/ + GIMP_LAYER_MODE_NORMAL_LINEAR, /*< desc="Normal (linear)" >*/ GIMP_LAYER_MODE_BEHIND_LINEAR, /*< desc="Behind (linear)" >*/ GIMP_LAYER_MODE_MULTIPLY, /*< desc="Multiply" >*/ GIMP_LAYER_MODE_MULTIPLY_LINEAR, /*< desc="Multiply (linear)" >*/ diff --git a/app/core/gimp-layer-modes.c b/app/core/gimp-layer-modes.c index 3661385c14..adbd7705b4 100644 --- a/app/core/gimp-layer-modes.c +++ b/app/core/gimp-layer-modes.c @@ -66,7 +66,7 @@ gimp_layer_mode_is_linear (GimpLayerMode mode) { switch (mode) { - case GIMP_LAYER_MODE_NORMAL_NON_LINEAR: + case GIMP_LAYER_MODE_NORMAL: return FALSE; case GIMP_LAYER_MODE_DISSOLVE: @@ -108,7 +108,7 @@ gimp_layer_mode_is_linear (GimpLayerMode mode) case GIMP_LAYER_MODE_LCH_LIGHTNESS: return TRUE; - case GIMP_LAYER_MODE_NORMAL: + case GIMP_LAYER_MODE_NORMAL_LINEAR: return TRUE; case GIMP_LAYER_MODE_MULTIPLY: @@ -171,7 +171,7 @@ gimp_layer_mode_get_blend_space (GimpLayerMode mode) { switch (mode) { - case GIMP_LAYER_MODE_NORMAL_NON_LINEAR: + case GIMP_LAYER_MODE_NORMAL: return GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL; case GIMP_LAYER_MODE_DISSOLVE: @@ -211,7 +211,7 @@ gimp_layer_mode_get_blend_space (GimpLayerMode mode) case GIMP_LAYER_MODE_LCH_LIGHTNESS: return GIMP_LAYER_COLOR_SPACE_LAB; - case GIMP_LAYER_MODE_NORMAL: + case GIMP_LAYER_MODE_NORMAL_LINEAR: return GIMP_LAYER_COLOR_SPACE_RGB_LINEAR; case GIMP_LAYER_MODE_MULTIPLY: @@ -280,8 +280,8 @@ gimp_layer_mode_get_composite_mode (GimpLayerMode mode) { switch (mode) { - case GIMP_LAYER_MODE_NORMAL_NON_LINEAR: case GIMP_LAYER_MODE_NORMAL: + case GIMP_LAYER_MODE_NORMAL_LINEAR: case GIMP_LAYER_MODE_DISSOLVE: case GIMP_LAYER_MODE_BEHIND: case GIMP_LAYER_MODE_BEHIND_LINEAR: @@ -369,8 +369,8 @@ gimp_layer_mode_get_operation (GimpLayerMode mode) { switch (mode) { - case GIMP_LAYER_MODE_NORMAL_NON_LINEAR: case GIMP_LAYER_MODE_NORMAL: + case GIMP_LAYER_MODE_NORMAL_LINEAR: return "gimp:normal"; case GIMP_LAYER_MODE_DISSOLVE: @@ -481,10 +481,10 @@ gimp_layer_mode_get_for_group (GimpLayerMode old_mode, static GimpLayerMode mode_groups[][4] = { { - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, GIMP_LAYER_MODE_NORMAL, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR + GIMP_LAYER_MODE_NORMAL_LINEAR, + GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL }, { diff --git a/app/operations/layer-modes/gimplayermodefunctions.c b/app/operations/layer-modes/gimplayermodefunctions.c index 2b3ac630a7..0b7ccc2a5e 100644 --- a/app/operations/layer-modes/gimplayermodefunctions.c +++ b/app/operations/layer-modes/gimplayermodefunctions.c @@ -62,7 +62,7 @@ gimp_get_layer_mode_function (GimpLayerMode paint_mode) switch (paint_mode) { case GIMP_LAYER_MODE_NORMAL: - case GIMP_LAYER_MODE_NORMAL_NON_LINEAR: + case GIMP_LAYER_MODE_NORMAL_LINEAR: func = gimp_operation_normal_process; break; diff --git a/app/operations/layer-modes/gimpoperationlayermode.c b/app/operations/layer-modes/gimpoperationlayermode.c index b6a6f3e7d2..6207ff900f 100644 --- a/app/operations/layer-modes/gimpoperationlayermode.c +++ b/app/operations/layer-modes/gimpoperationlayermode.c @@ -1687,7 +1687,7 @@ static inline GimpBlendFunc gimp_layer_mode_get_blend_fun (GimpLayerMode mode) case GIMP_LAYER_MODE_SUBTRACT: return blendfun_subtract; case GIMP_LAYER_MODE_MULTIPLY_LINEAR: case GIMP_LAYER_MODE_MULTIPLY: return blendfun_multiply; - case GIMP_LAYER_MODE_NORMAL_NON_LINEAR: + case GIMP_LAYER_MODE_NORMAL_LINEAR: case GIMP_LAYER_MODE_NORMAL: return blendfun_normal; case GIMP_LAYER_MODE_BURN_LINEAR: case GIMP_LAYER_MODE_BURN: return blendfun_burn; diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c index 412391ca28..86bd7ae352 100644 --- a/app/pdb/brush-select-cmds.c +++ b/app/pdb/brush-select-cmds.c @@ -204,7 +204,7 @@ register_brush_select_procs (GimpPDB *pdb) "paint mode", "The initial paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); @@ -278,7 +278,7 @@ register_brush_select_procs (GimpPDB *pdb) "paint mode", "The initial paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c index f0e42e85c3..e03c8987c5 100644 --- a/app/pdb/brushes-cmds.c +++ b/app/pdb/brushes-cmds.c @@ -440,7 +440,7 @@ register_brushes_procs (GimpPDB *pdb) "paint mode", "The paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_procedure_add_return_value (procedure, gimp_param_spec_int32 ("width", diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c index d02d2aa2db..6fc4288043 100644 --- a/app/pdb/context-cmds.c +++ b/app/pdb/context-cmds.c @@ -3139,7 +3139,7 @@ register_context_procs (GimpPDB *pdb) "paint mode", "The paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); @@ -3163,7 +3163,7 @@ register_context_procs (GimpPDB *pdb) "paint mode", "The paint mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c index f9d3526f93..bf3f0ec749 100644 --- a/app/pdb/edit-cmds.c +++ b/app/pdb/edit-cmds.c @@ -1349,7 +1349,7 @@ register_edit_procs (GimpPDB *pdb) "paint mode", "The paint application mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("opacity", @@ -1416,7 +1416,7 @@ register_edit_procs (GimpPDB *pdb) "paint mode", "The paint application mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_double ("opacity", @@ -1496,7 +1496,7 @@ register_edit_procs (GimpPDB *pdb) "paint mode", "The paint application mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_procedure_add_argument (procedure, g_param_spec_enum ("gradient-type", diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c index a92b457144..4126217a91 100644 --- a/app/pdb/layer-cmds.c +++ b/app/pdb/layer-cmds.c @@ -1212,7 +1212,7 @@ register_layer_procs (GimpPDB *pdb) "mode", "The layer combination mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_procedure_add_return_value (procedure, gimp_param_spec_layer_id ("layer", @@ -2148,7 +2148,7 @@ register_layer_procs (GimpPDB *pdb) "mode", "The layer combination mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); @@ -2178,7 +2178,7 @@ register_layer_procs (GimpPDB *pdb) "mode", "The new layer combination mode", GIMP_TYPE_LAYER_MODE, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_PARAM_READWRITE)); gimp_pdb_register_procedure (pdb, procedure); g_object_unref (procedure); diff --git a/app/widgets/gimplayermodecombobox.c b/app/widgets/gimplayermodecombobox.c index 87dd418b80..1c69c8588b 100644 --- a/app/widgets/gimplayermodecombobox.c +++ b/app/widgets/gimplayermodecombobox.c @@ -321,7 +321,7 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo) store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE, 30, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_LIGHTEN_ONLY, GIMP_LAYER_MODE_SCREEN, @@ -386,7 +386,7 @@ gimp_layer_mode_combo_box_create_default_model (GimpLayerModeComboBox *combo) if (combo->priv->with_replace) { gimp_layer_mode_combo_box_insert_value (store, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_REPLACE); gimp_layer_mode_combo_box_insert_value (store, GIMP_LAYER_MODE_COLOR_ERASE, @@ -406,7 +406,7 @@ gimp_layer_mode_combo_box_create_linear_model (GimpLayerModeComboBox *combo) store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE, 22, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LINEAR, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_LIGHTEN_ONLY, GIMP_LAYER_MODE_SCREEN_LINEAR, @@ -454,7 +454,7 @@ gimp_layer_mode_combo_box_create_linear_model (GimpLayerModeComboBox *combo) if (combo->priv->with_replace) { gimp_layer_mode_combo_box_insert_value (store, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LINEAR, GIMP_LAYER_MODE_REPLACE); gimp_layer_mode_combo_box_insert_value (store, GIMP_LAYER_MODE_REPLACE, @@ -474,7 +474,7 @@ gimp_layer_mode_combo_box_create_perceptual_model (GimpLayerModeComboBox *combo) store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE, 30, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_LIGHTEN_ONLY, GIMP_LAYER_MODE_SCREEN, @@ -546,7 +546,7 @@ gimp_layer_mode_combo_box_create_legacy_model (GimpLayerModeComboBox *combo) store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE, 20, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, GIMP_LAYER_MODE_SCREEN_LEGACY, diff --git a/app/widgets/gimpwidgets-constructors.c b/app/widgets/gimpwidgets-constructors.c index 80e4fa3ece..699b4b5da9 100644 --- a/app/widgets/gimpwidgets-constructors.c +++ b/app/widgets/gimpwidgets-constructors.c @@ -105,8 +105,8 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode, store = gimp_enum_store_new_with_values (GIMP_TYPE_LAYER_MODE, 45, - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LINEAR, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_LIGHTEN_ONLY, GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, @@ -190,7 +190,7 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode, if (with_replace_modes) { gimp_enum_store_insert_value_after (GIMP_ENUM_STORE (store), - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LINEAR, GIMP_LAYER_MODE_REPLACE); gimp_enum_store_insert_value_after (GIMP_ENUM_STORE (store), GIMP_LAYER_MODE_COLOR_ERASE, diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index 0f856ccc5e..45161e6e16 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -69,7 +69,7 @@ GType gimp_layer_mode_get_type (void) G_GNUC_CONST; typedef enum { - GIMP_LAYER_MODE_NORMAL_NON_LINEAR, + GIMP_LAYER_MODE_NORMAL, GIMP_LAYER_MODE_DISSOLVE, GIMP_LAYER_MODE_BEHIND, GIMP_LAYER_MODE_MULTIPLY_LEGACY, @@ -97,7 +97,7 @@ typedef enum GIMP_LAYER_MODE_LCH_CHROMA, GIMP_LAYER_MODE_LCH_COLOR, GIMP_LAYER_MODE_LCH_LIGHTNESS, - GIMP_LAYER_MODE_NORMAL, + GIMP_LAYER_MODE_NORMAL_LINEAR, GIMP_LAYER_MODE_BEHIND_LINEAR, GIMP_LAYER_MODE_MULTIPLY, GIMP_LAYER_MODE_MULTIPLY_LINEAR, diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index 82498ff6aa..77513c1f8c 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -695,8 +695,8 @@ package Gimp::CodeGen::enums; GimpLayerMode => { contig => 1, header => 'core/core-enums.h', - symbols => [ qw(GIMP_LAYER_MODE_NORMAL_NON_LINEAR - GIMP_LAYER_MODE_DISSOLVE GIMP_LAYER_MODE_BEHIND + symbols => [ qw(GIMP_LAYER_MODE_NORMAL GIMP_LAYER_MODE_DISSOLVE + GIMP_LAYER_MODE_BEHIND GIMP_LAYER_MODE_MULTIPLY_LEGACY GIMP_LAYER_MODE_SCREEN_LEGACY GIMP_LAYER_MODE_OVERLAY_LEGACY @@ -721,7 +721,7 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_LCH_CHROMA GIMP_LAYER_MODE_LCH_COLOR GIMP_LAYER_MODE_LCH_LIGHTNESS - GIMP_LAYER_MODE_NORMAL + GIMP_LAYER_MODE_NORMAL_LINEAR GIMP_LAYER_MODE_BEHIND_LINEAR GIMP_LAYER_MODE_MULTIPLY GIMP_LAYER_MODE_MULTIPLY_LINEAR @@ -761,7 +761,7 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_EXCLUSION_LINEAR GIMP_LAYER_MODE_LINEAR_BURN GIMP_LAYER_MODE_LINEAR_BURN_LINEAR) ], - mapping => { GIMP_LAYER_MODE_NORMAL_NON_LINEAR => '0', + mapping => { GIMP_LAYER_MODE_NORMAL => '0', GIMP_LAYER_MODE_DISSOLVE => '1', GIMP_LAYER_MODE_BEHIND => '2', GIMP_LAYER_MODE_MULTIPLY_LEGACY => '3', @@ -789,7 +789,7 @@ package Gimp::CodeGen::enums; GIMP_LAYER_MODE_LCH_CHROMA => '25', GIMP_LAYER_MODE_LCH_COLOR => '26', GIMP_LAYER_MODE_LCH_LIGHTNESS => '27', - GIMP_LAYER_MODE_NORMAL => '28', + GIMP_LAYER_MODE_NORMAL_LINEAR => '28', GIMP_LAYER_MODE_BEHIND_LINEAR => '29', GIMP_LAYER_MODE_MULTIPLY => '30', GIMP_LAYER_MODE_MULTIPLY_LINEAR => '31',