Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/ja/docbook.ja.xsl @ 5221:8860f29447c1
imerge: fix ancestor calculation
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.
This patch also handles the ParseError move from cmdutil to dispatch.
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 23 Aug 2007 19:51:59 -0700 |
parents | cadde8ebf167 |
children |
rev | line source |
---|---|
1500
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
1 <?xml version='1.0' encoding="UTF-8"?> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
2 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version='1.0'> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
3 <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl"/> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
4 <xsl:output encoding="UTF-8"/> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
5 |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
6 <xsl:template match="refnamediv"> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
7 <xsl:text>.SH 名前 </xsl:text> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
8 <xsl:for-each select="refname"> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
9 <xsl:if test="position()>1"> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
10 <xsl:text>, </xsl:text> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
11 </xsl:if> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
12 <xsl:value-of select="."/> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
13 </xsl:for-each> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
14 <xsl:text> \- </xsl:text> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
15 <xsl:value-of select="normalize-space (refpurpose)"/> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
16 </xsl:template> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
17 |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
18 <xsl:template match="refsynopsisdiv"> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
19 <xsl:text> .SH "書式" </xsl:text> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
20 <xsl:apply-templates/> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
21 </xsl:template> |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
22 |
cadde8ebf167
Fixed to convert to man properly.
Hidetaka Iwai <tyuyu@debian.or.jp>
parents:
diff
changeset
|
23 </xsl:stylesheet> |