From 07f2dab5f630308783923a1978288bb7b37a2e28 Mon Sep 17 00:00:00 2001
From: Mark Hindess <soft-github@temporalanomaly.com>
Date: Sat, 30 Jun 2012 23:18:15 +0100
Subject: [PATCH] Fix perimeters_* options to be singular to be consistent.

---
 lib/Slic3r.pm                |  4 ++--
 lib/Slic3r/Config.pm         | 20 +++++++++++---------
 lib/Slic3r/GUI/SkeinPanel.pm |  2 +-
 lib/Slic3r/Print.pm          |  2 +-
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lib/Slic3r.pm b/lib/Slic3r.pm
index 42702898b..3d6de5e4b 100644
--- a/lib/Slic3r.pm
+++ b/lib/Slic3r.pm
@@ -82,7 +82,7 @@ our $temperature            = [200];
 our $first_layer_temperature= [];
 
 # extruder mapping (1-based indexes)
-our $perimeters_extruder        = 1;
+our $perimeter_extruder         = 1;
 our $infill_extruder            = 1;
 our $support_material_extruder  = 1;
 
@@ -114,7 +114,7 @@ our $infill_every_layers    = 1;
 # flow options
 our $extrusion_width                = 0;
 our $first_layer_extrusion_width    = 0;
-our $perimeters_extrusion_width     = 0;
+our $perimeter_extrusion_width      = 0;
 our $infill_extrusion_width         = 0;
 our $support_material_extrusion_width = 0;
 our $bridge_flow_ratio              = 1;
diff --git a/lib/Slic3r/Config.pm b/lib/Slic3r/Config.pm
index b348c379b..45021d18d 100644
--- a/lib/Slic3r/Config.pm
+++ b/lib/Slic3r/Config.pm
@@ -122,10 +122,11 @@ our $Options = {
     },
     
     # extruder mapping
-    'perimeters_extruder' => {
-        label   => 'Perimeters extruder',
-        cli     => 'perimeters-extruder=i',
+    'perimeter_extruder' => {
+        label   => 'Perimeter extruder',
+        cli     => 'perimeter-extruder=i',
         type    => 'i',
+        aliases => [qw(perimeters_extruder)],
     },
     'infill_extruder' => {
         label   => 'Infill extruder',
@@ -252,10 +253,11 @@ our $Options = {
         cli     => 'first-layer-extrusion-width=s',
         type    => 'f',
     },
-    'perimeters_extrusion_width' => {
-        label   => 'Perimeters extrusion width (mm or % or 0 for default)',
-        cli     => 'perimeters-extrusion-width=s',
+    'perimeter_extrusion_width' => {
+        label   => 'Perimeter extrusion width (mm or % or 0 for default)',
+        cli     => 'perimeter-extrusion-width=s',
         type    => 'f',
+        aliases => [qw(perimeters_extrusion_width)],
     },
     'infill_extrusion_width' => {
         label   => 'Infill extrusion width (mm or % or 0 for default)',
@@ -700,7 +702,7 @@ sub validate {
     
     # initialize extruder(s)
     $Slic3r::extruders = [];
-    for my $t (0, map $_-1, $Slic3r::perimeters_extruder, $Slic3r::infill_extruder, $Slic3r::support_material_extruder) {
+    for my $t (0, map $_-1, $Slic3r::perimeter_extruder, $Slic3r::infill_extruder, $Slic3r::support_material_extruder) {
         $Slic3r::extruders->[$t] ||= Slic3r::Extruder->new(
             map { $_ => Slic3r::Config->get($_)->[$t] // Slic3r::Config->get($_)->[0] } #/
                 qw(nozzle_diameter filament_diameter extrusion_multiplier temperature first_layer_temperature)
@@ -715,8 +717,8 @@ sub validate {
             width        => $Slic3r::first_layer_extrusion_width,
         );
     }
-    $Slic3r::perimeters_flow = $Slic3r::extruders->[ $Slic3r::perimeters_extruder-1 ]
-        ->make_flow(width => $Slic3r::perimeters_extrusion_width || $Slic3r::extrusion_width);
+    $Slic3r::perimeters_flow = $Slic3r::extruders->[ $Slic3r::perimeter_extruder-1 ]
+        ->make_flow(width => $Slic3r::perimeter_extrusion_width || $Slic3r::extrusion_width);
     $Slic3r::infill_flow = $Slic3r::extruders->[ $Slic3r::infill_extruder-1 ]
         ->make_flow(width => $Slic3r::infill_extrusion_width || $Slic3r::extrusion_width);
     $Slic3r::support_material_flow = $Slic3r::extruders->[ $Slic3r::support_material_extruder-1 ]
diff --git a/lib/Slic3r/GUI/SkeinPanel.pm b/lib/Slic3r/GUI/SkeinPanel.pm
index c54341d15..3ed7a5130 100644
--- a/lib/Slic3r/GUI/SkeinPanel.pm
+++ b/lib/Slic3r/GUI/SkeinPanel.pm
@@ -71,7 +71,7 @@ sub new {
         },
         extrusion => {
             title => 'Extrusion',
-            options => [qw(extrusion_width first_layer_extrusion_width perimeters_extrusion_width infill_extrusion_width support_material_extrusion_width bridge_flow_ratio)],
+            options => [qw(extrusion_width first_layer_extrusion_width perimeter_extrusion_width infill_extrusion_width support_material_extrusion_width bridge_flow_ratio)],
         },
         output => {
             title => 'Output',
diff --git a/lib/Slic3r/Print.pm b/lib/Slic3r/Print.pm
index 61bd5bfda..a1904cd10 100644
--- a/lib/Slic3r/Print.pm
+++ b/lib/Slic3r/Print.pm
@@ -598,7 +598,7 @@ sub write_gcode {
             $gcodegen->shift_y($shift[Y] + unscale $copy->[Y]);
             
             # extrude perimeters
-            $gcode .= $gcodegen->set_tool($Slic3r::perimeters_extruder-1);
+            $gcode .= $gcodegen->set_tool($Slic3r::perimeter_extruder-1);
             $gcode .= $gcodegen->extrude($_, 'perimeter') for @{ $layer->perimeters };
             
             # extrude fills