Fix some link resolving bugs

2006-10-29  Michael Olson  <mwolson@gnu.org>

	* lisp/muse-publish.el (muse-publish-url): Allow the original link
	to serve as a description for a URL, as long as it differs from
	the destination URL.  This fixes the description of WikPage links
	in PDF output.

	* lisp/muse-wiki.el (muse-wiki-resolve-project-page): Use the path
	of the current page as the local path, instead of duplicating the
	remote file's path.  This probably fixes at least one reported
	bug. since it's quite major.
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-229

ChangeLog

@@ -1,3 +1,15 @@
+2006-10-29  Michael Olson  <mwolson@gnu.org>
+
+	* lisp/muse-publish.el (muse-publish-url): Allow the original link
+	to serve as a description for a URL, as long as it differs from
+	the destination URL.  This fixes the description of WikPage links
+	in PDF output.
+
+	* lisp/muse-wiki.el (muse-wiki-resolve-project-page): Use the path
+	of the current page as the local path, instead of duplicating the
+	remote file's path.  This probably fixes at least one reported
+	bug. since it's quite major.
+
 2006-10-28  Michael Olson  <mwolson@gnu.org>
 
 	* lisp/muse-project.el (muse-project-choose-style-by-link-suffix)

lisp/muse-publish.el

@@ -1390,8 +1390,10 @@ the cadr is the page name, and the cddr is the anchor."
           ((eq type 'link)
            (muse-markup-text 'link url (or desc orig-url)))
           (t
-           (or (and desc
-                    (let ((text (muse-markup-text 'url-and-desc url desc)))
+           (or (and (or desc
+                        (not (string= url orig-url)))
+                    (let ((text (muse-markup-text 'url-and-desc url
+                                                  (or desc orig-url))))
                       (and (not (string= text ""))
                            text)))
                (muse-markup-text 'url url (or desc orig-url)))))))

lisp/muse-wiki.el

@@ -240,7 +240,7 @@ use the first style we find."
   (let* ((page-path (muse-project-page-file page project))
          (remote-styles (when page-path (muse-project-applicable-styles
                                          page-path (cddr project))))
-         (local-style (muse-project-current-output-style page-path project)))
+         (local-style (muse-project-current-output-style)))
     (cond ((and remote-styles local-style muse-publishing-p)
            (muse-project-resolve-link page local-style remote-styles))
           ((not muse-publishing-p)