Index: nodewords_basic/includes/nodewords_basic.nodewords.tags.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodewords/nodewords_basic/includes/Attic/nodewords_basic.nodewords.tags.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 nodewords_basic.nodewords.tags.inc
--- nodewords_basic/includes/nodewords_basic.nodewords.tags.inc	16 Feb 2010 15:32:17 -0000	1.1.2.2
+++ nodewords_basic/includes/nodewords_basic.nodewords.tags.inc	21 Feb 2010 18:29:16 -0000
@@ -64,6 +64,19 @@ function nodewords_basic_canonical_form_
   }
 }
 
+function nodewords_basic_canonical_settings_form(&$form, $form_id, $options) {
+  switch ($form_id) {
+    case 'nodewords_settings_form':
+      $form['metatags_creation']['nodewords_canonical_alias'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Canonical URL use path alias'),
+        '#description' => t('By default canonical URLs will use the internal Drupal path, e.g. "node/123" and "taxonomy/term/123".  Enabling this option will instead make the canonical URLs use the URL alias if one exists.'),
+        '#default_value' => variable_get('nodewords_canonical_alias', FALSE),
+      );
+      break;
+  }
+}
+
 /**
  * Set the meta tag content.
  */
@@ -98,7 +111,13 @@ function nodewords_basic_canonical_prepa
     }
 
     if ($path) {
-      $content['value'] = $path;
+      // Use the url alias?
+      if (variable_get('nodewords_canonical_alias', FALSE)) {
+        $content['value'] = drupal_get_path_alias($path);
+      }
+      else {
+        $content['value'] = $path;
+      }
     }
   }
   elseif (!empty($content['value']) && strpos($content['value'], '/') === 0) {