From 74862858fa5ad86e23591107e39af0db5c704803 Mon Sep 17 00:00:00 2001
From: Michael Olson <mwolson@gnu.org>
Date: Tue, 15 May 2007 00:19:09 +0000
Subject: [PATCH] muse-latex: Use better markup for link-and-anchor

2007-05-14  Michael Olson  <mwolson@gnu.org>

	* lisp/muse-latex.el (muse-latex-markup-strings): Use better
	link-and-anchor markup.  Thanks to Jean Magnan de Bornier for the
	suggestion.

	* lisp/muse-publish.el (muse-publish-url): Pass the url without a
	file extension as the fourth argument.
git-archimport-id: mwolson@gnu.org--2006/muse--main--1.0--patch-310
---
 AUTHORS              | 3 +++
 ChangeLog            | 7 +++++++
 lisp/muse-latex.el   | 6 +++++-
 lisp/muse-publish.el | 3 ++-
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index 196b1e0..663ead0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,6 +8,9 @@ John Wiegley: Original author
 
 Michael Olson: Current maintainer
 
+Jean Magnan de Bornier: Contributor:
+                         - muse-latex.el: 2 lines changed
+
 Trent Buck: Contributor:
              - muse-latex.el: 4 lines changed
 
diff --git a/ChangeLog b/ChangeLog
index 2c2bc97..10091fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-14  Michael Olson  <mwolson@gnu.org>
 
+	* lisp/muse-latex.el (muse-latex-markup-strings): Use better
+	link-and-anchor markup.  Thanks to Jean Magnan de Bornier for the
+	suggestion.
+
+	* lisp/muse-publish.el (muse-publish-url): Pass the url without a
+	file extension as the fourth argument.
+
 	* README, texi/muse.texi (Getting Help and Reporting Bugs):
 	Mention the new muse-el-logs mailing list.
 
diff --git a/lisp/muse-latex.el b/lisp/muse-latex.el
index ef87b18..4efa635 100644
--- a/lisp/muse-latex.el
+++ b/lisp/muse-latex.el
@@ -31,6 +31,9 @@
 ;; Matthias Kegelmann (mathias DOT kegelmann AT sdm DOT de) provided a
 ;; scenario where we would need to respect the <contents> tag.
 
+;; Jean Magnan de Bornier (jean AT bornier DOT net) provided the
+;; markup string for link-and-anchor.
+
 ;;; Code:
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -156,7 +159,8 @@ For more on the structure of this list, see
     (url             . "\\url{%s}")
     (url-and-desc    . "\\href{%s}{%s}\\footnote{%1%}")
     (link            . "\\href{%s}{%s}\\footnote{%1%}")
-    (link-and-anchor . "\\href{%1%}{%3%}\\footnote{%1%}")
+    (link-and-anchor . "\\useexternaldocument[%4%][%4%][]
+\\at{%3%, page}{}[%1%::%2%]")
     (email-addr      . "\\verb|%s|")
     (anchor          . "\\label{%s}")
     (emdash          . "---")
diff --git a/lisp/muse-publish.el b/lisp/muse-publish.el
index 76893f1..1c1cd54 100644
--- a/lisp/muse-publish.el
+++ b/lisp/muse-publish.el
@@ -1461,7 +1461,8 @@ the cadr is the page name, and the cddr is the anchor."
                (muse-markup-text 'image url ext))))
           ((eq type 'link-and-anchor)
            (muse-markup-text 'link-and-anchor url anchor
-                             (or desc orig-url)))
+                             (or desc orig-url)
+                             (muse-path-sans-extension url)))
           ((and desc (string-match muse-image-regexp desc))
            (let ((ext (or (file-name-extension desc) "")))
              (setq desc (muse-path-sans-extension desc))
-- 
2.11.4.GIT