Fix hyperlinks on web-big-page (issue 1917).

diff --git a/Documentation/common-macros.itexi b/Documentation/common-macros.itexi
index ab45cbaf32cbd4fdd1af09c603977dd5b8ede136..9873604a5042399693114958782d33d875a1c875 100644 (file)
--- a/Documentation/common-macros.itexi
+++ b/Documentation/common-macros.itexi
@@ -163,6 +163,24 @@ UNTRANSLATED NODE: IGNORE ME
 @end html
 @end macro
 
+@ifclear 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
+@end ifclear
+@ifset web_version
+  @macro docLink{name,target,webLink}
+    \webLink\
+  @end macro
+@end ifset
+
 @macro spanClass {CLASS}
 @html
 <span class="\CLASS\">

diff --git a/Documentation/cs/web.texi b/Documentation/cs/web.texi
index d43cb374cecf709364562347db49b10ede13de72..daf421657d19fdfc57fc8e3ef85260f843e39ae9 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (rozdělené HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (rozdělené HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (velké HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (velké HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/de/web.texi b/Documentation/de/web.texi
index fc4608f052dc5d3157e727f9151a320e7a6b15f0..e6203a878c85b7dc33b5d1a72fa0ce2166aed01e 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (aufgeteilt HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (aufgeteilt HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (großes HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (großes HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/es/web.texi b/Documentation/es/web.texi
index 6759fdb1ad68ece198a94b0e9ce8440635cf2e62..b1a6aa5dc5cb75169ca9912917a050fcd9786585 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (HTML seccionado)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML seccionado),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (HTML monolítico)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML monolítico),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.es.pdf, \base\.es.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.es.pdf,\base\.es.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/fr/web.texi b/Documentation/fr/web.texi
index 92701f936ab09bdbbd25e8420a098481cc9d93ca..b6ddf7654af4403ce912640f9fc02bbfd80afe00 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (HTML multipages)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML multipages),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (HTML page unique)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML page unique),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.fr.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.fr.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/hu/web.texi b/Documentation/hu/web.texi
index 857678b4a7d6750bf05671be1b2cbdc4b60c6138..d5c98057f45660f00186a09d7b5e676c8bc5b24d 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (HTML oldalak)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML oldalak),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (egy nagy HTML oldal)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (egy nagy HTML oldal),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/it/web.texi b/Documentation/it/web.texi
index 73b0187be82bb297f6be47430daf811bc36f29d3..3315ca87966965d514f74382af5e5671b77e65ff 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (HTML multipagina)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML multipagina),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (HTML pagina unica)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (HTML pagina unica),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/ja/web.texi b/Documentation/ja/web.texi
index 98959136d9f596bc68a33e9be69a09b74a0f0bde..9ee39320368f5938d91f9a119547309c23604074 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (ページ毎に分割された HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (ページ毎に分割された HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (1 つの大きな HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (1 つの大きな HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end 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 da78bc54aae0bd48827b15ee31c420fe1c933bf4..c1787fe6023d972e40229147f0a642548975a9d6 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (split HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (split HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (big HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (big HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/web.texi b/Documentation/web.texi
index 90d9f79251a326c12c8dba68bdb9cc829ca48e5a..f8e572b6847fcd6931634b04163937e3c9713af3 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (split HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (split HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (big HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (big HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro
 
 

diff --git a/Documentation/zh/web.texi b/Documentation/zh/web.texi
index 50505b30e8a5f50fcafe20d3c8bebf803eed1591..05faab4f8d8f6e6e50252477899721f89413d41e 100644 (file)
--- 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}
-@ifclear web_version
-  @uref{../\base\/index.html, \name\ (分开的 HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (分开的 HTML),\base\/index.html,\webLink\}
 @end macro
 
 @macro docLinkBig{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\-big-page.html, \name\ (大的 HTML)}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\name\ (大的 HTML),\base\-big-page.html,\webLink\}
 @end macro
 
 @macro docLinkPdf{name,base,webLink}
-@ifclear web_version
-  @uref{../\base\.pdf, \base\.pdf}
-@end ifclear
-@ifset web_version
-  \webLink\
-@end ifset
+  @docLink{\base\.pdf,\base\.pdf,\webLink\}
 @end macro