>From 975512e32244b94e92031983f6f3b522f7e0a001 Mon Sep 17 00:00:00 2001
From: Julien Rioux <address@hidden>
Date: Mon, 17 Oct 2011 19:14:16 -0400
Subject: [PATCH 2/2] Fix hyperlinks on web-big-page (issue 1917).

---
 Documentation/common-macros.itexi |   18 ++++++++++++++++++
 Documentation/cs/web.texi         |   21 +++------------------
 Documentation/de/web.texi         |   21 +++------------------
 Documentation/es/web.texi         |   21 +++------------------
 Documentation/fr/web.texi         |   21 +++------------------
 Documentation/hu/web.texi         |   21 +++------------------
 Documentation/it/web.texi         |   21 +++------------------
 Documentation/ja/web.texi         |   21 +++------------------
 Documentation/nl/web.texi         |   21 +++------------------
 Documentation/web.texi            |   21 +++------------------
 Documentation/zh/web.texi         |   21 +++------------------
 11 files changed, 48 insertions(+), 180 deletions(-)

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index ab45cba..9873604 100644
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -163,6 +163,24 @@ UNTRANSLATED NODE: IGNORE ME
 @end html
 @end macro
 
address@hidden web_version
+  @ifclear bigpage
+    @macro docLink{name,target,webLink}
+      @uref{../\target\, \name\}
+    @end macro
+  @end ifclear
+  @ifset bigpage
+    @macro docLink{name,target,webLink}
+      @uref{\target\, \name\}
+    @end macro
+  @end ifset
address@hidden ifclear
address@hidden web_version
+  @macro docLink{name,target,webLink}
+    \webLink\
+  @end macro
address@hidden ifset
+
 @macro spanClass {CLASS}
 @html
 <span class="\CLASS\">
diff --git a/Documentation/cs/web.texi b/Documentation/cs/web.texi
index d43cb37..daf4216 100644
--- a/Documentation/cs/web.texi
+++ b/Documentation/cs/web.texi
@@ -217,30 +217,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @end macro
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (rozdělené HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (rozdělené HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (velké HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (velké HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/de/web.texi b/Documentation/de/web.texi
index fc4608f..e6203a8 100644
--- a/Documentation/de/web.texi
+++ b/Documentation/de/web.texi
@@ -219,30 +219,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 @end macro
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (aufgeteilt HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (aufgeteilt HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (großes HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (großes HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/es/web.texi b/Documentation/es/web.texi
index 6759fdb..b1a6aa5 100644
--- a/Documentation/es/web.texi
+++ b/Documentation/es/web.texi
@@ -222,30 +222,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (HTML seccionado)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML seccionado),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (HTML monolítico)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML monolítico),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.es.pdf, \base\.es.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.es.pdf,\base\.es.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/fr/web.texi b/Documentation/fr/web.texi
index 92701f9..b6ddf76 100644
--- a/Documentation/fr/web.texi
+++ b/Documentation/fr/web.texi
@@ -219,30 +219,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (HTML multipages)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML multipages),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (HTML page unique)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML page unique),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.fr.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.fr.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/hu/web.texi b/Documentation/hu/web.texi
index 857678b..d5c9805 100644
--- a/Documentation/hu/web.texi
+++ b/Documentation/hu/web.texi
@@ -217,30 +217,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (HTML oldalak)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML oldalak),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (egy nagy HTML oldal)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (egy nagy HTML oldal),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/it/web.texi b/Documentation/it/web.texi
index 73b0187..3315ca8 100644
--- a/Documentation/it/web.texi
+++ b/Documentation/it/web.texi
@@ -215,30 +215,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (HTML multipagina)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML multipagina),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (HTML pagina unica)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (HTML pagina unica),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/ja/web.texi b/Documentation/ja/web.texi
index 9895913..9ee3932 100644
--- a/Documentation/ja/web.texi
+++ b/Documentation/ja/web.texi
@@ -220,30 +220,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (ページ毎に分割された HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (ページ毎に分割された HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (1 つの大きな HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (1 つの大きな HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 @macro docLinksBare{name,base,refLink,split,big,bigsize,pdf,pdfsize}
diff --git a/Documentation/nl/web.texi b/Documentation/nl/web.texi
index da78bc5..c1787fe 100644
--- a/Documentation/nl/web.texi
+++ b/Documentation/nl/web.texi
@@ -216,30 +216,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (split HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (split HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (big HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (big HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/web.texi b/Documentation/web.texi
index 90d9f79..f8e572b 100644
--- a/Documentation/web.texi
+++ b/Documentation/web.texi
@@ -215,30 +215,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (split HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (split HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (big HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (big HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
diff --git a/Documentation/zh/web.texi b/Documentation/zh/web.texi
index 50505b3..05faab4 100644
--- a/Documentation/zh/web.texi
+++ b/Documentation/zh/web.texi
@@ -215,30 +215,15 @@ Distributions will want to install lilypond.info in postinstall, doing:
 
 
 @macro docLinkSplit{name,base,webLink}
address@hidden web_version
-  @uref{../\base\/index.html, \name\ (分开的 HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (分开的 HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
address@hidden web_version
-  @uref{../\base\-big-page.html, \name\ (大的 HTML)}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\name\ (大的 HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
address@hidden web_version
-  @uref{../\base\.pdf, \base\.pdf}
address@hidden ifclear
address@hidden web_version
-  \webLink\
address@hidden ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 
-- 
1.7.4.1