Changeset 2622 for trunk/vendor/Sensei

Timestamp:

09/23/07 22:38:11 (16 months ago)

Author:

jepso

Message:

Fixed interdocumentation linking feature

Location:

trunk/vendor/Sensei/Sensei/Doc

Files:

• Renderer/Xhtml.php (modified) (2 diffs)
• Section.php (modified) (3 diffs)

trunk/vendor/Sensei/Sensei/Doc/Renderer/Xhtml.php

@@ -188 +188 @@
     }
     
-    public function makeUrl(Sensei_Doc_Section $section)
-    {
+    public function makeUrl($section)
+    {
+        if ($section instanceof Sensei_Doc_Section) {
+            $path = $section->getPath();
+        } else {
+            $path = $section;
+        }
+        
         $url = $this->_options['url_prefix'];
         
         if ($this->_options['section'] instanceof Sensei_Doc_Section) {
-            $path = $section->getPath();
             $level = $this->_options['section']->getLevel();
             $url .= implode(':', array_slice(explode(':', $path), 0, $level));
@@ -206 +211 @@
     }
     
-    public function makeAnchor(Sensei_Doc_Section $section)
-    {
-        $path = $section->getPath();
+    public function makeAnchor($section)
+    {
+        if ($section instanceof Sensei_Doc_Section) {
+            $path = $section->getPath();
+        } else {
+            $path = $section;
+        }
         
         if ($this->_options['section'] instanceof Sensei_Doc_Section) {

trunk/vendor/Sensei/Sensei/Doc/Section.php

@@ -115 +115 @@
     {
         if ($this->_parent->_name !== null) {
-            return $this->_parent->getIndex($separator) . ($this->_index + 1) . $separator;
-        } else {
-            return ($this->_index + 1) . $separator;
+            return $this->_parent->getIndex($separator) . $separator . ($this->_index + 1);
+        } else {
+            return ($this->_index + 1);
         }
     }
@@ -137 +137 @@
             $path = preg_replace($patterns, $replacements, strtolower($this->_name)); 
             
-            return $path;
+            return self::convertNameToPath($this->_name);
         }
     }
@@ -386 +386 @@
             }
     }
+
+    /**
+     * Converts section name to section path.
+     *
+     * Section path is generated from section name by making section name
+     * lowercase, replacing all whitespace with a dash and removing all
+     * characters that are not a letter, a number or a dash.
+     *
+     * @param $name string  section name
+     * @return section path
+     */
+    public static function convertNameToPath($name)
+    {
+        $patterns = array('/\s/', '/[^a-z0-9-]/');
+        $replacements = array('-', '');
+            
+        return preg_replace($patterns, $replacements, strtolower($name)); 
+    }
 }