Mercurial > hgbook

changeset 348:32d33b238b7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
made changes to the source files to be compiled at any rate.
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Tue, 19 Aug 2008 16:03:33 +0900
parents b3e736000aef
children 4cbbb68d7840
files ja/99defs.tex ja/Makefile ja/branch.tex ja/cmdref.tex ja/daily.tex ja/examples/run-example ja/mq-ref.tex ja/undo.tex
diffstat 8 files changed, 33 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/ja/99defs.tex	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/99defs.tex	Tue Aug 19 16:03:33 2008 +0900
@@ -1,8 +1,8 @@
 % Bug ID.
-\newcommand{\bug}[1]{\index{Mercurial bug
-    database!\href{http://www.selenic.com/mercurial/bts/issue#1}{bug
-      ~#1}}\href{http://www.selenic.com/mercurial/bts/issue#1}{Mercurial
-    bug no.~#1}}
+%\newcommand{\bug}[1]{\index{Mercurial bug database!
+%\href{http://www.selenic.com/mercurial/bts/issue#1}{bug ~#1}}\href{http://www.selenic.com/mercurial/bts/issue#1}{Mercurial bug no.~#1}}
+
+\newcommand{\bug}[1]{\href{http://www.selenic.com/mercurial/bts/issue#1}{Mercurial bug no.~#1}}
 
 % File name in the user's home directory.
 \newcommand{\tildefile}[1]{\texttt{\~{}/#1}}
@@ -75,8 +75,10 @@
     section!\texttt{#2} entry}\texttt{#2}}
 
 % hgrc file.
-\newcommand{\hgrc}{\index{configuration file!\texttt{hgrc}
-    (Linux/Unix)}\index{\texttt{hgrc} configuration file}\texttt{hgrc}}
+\newcommand{\hgrc}{\index{configuration
+    file!\texttt{hgrc}(Linux/Unix)}\index{\texttt{hgrc} configuration
+    file}\texttt{hgrc}}
+
 
 % Mercurial.ini file.
 \newcommand{\hgini}{\index{configuration file!\texttt{Mercurial.ini}
@@ -121,11 +123,11 @@
 \newcommand{\excode}[1]{\VerbatimInput[frame=single,numbers=left,commandchars=\\\{\}]{../examples/#1}}
 
 % Graphics inclusion.
-\ifpdf
+%\ifpdf
   \newcommand{\grafix}[1]{\includegraphics{#1}}
-\else
-  \newcommand{\grafix}[1]{\includegraphics{#1.png}}
-\fi
+%\else
+%  \newcommand{\grafix}[1]{\includegraphics{#1.png}}
+%\fi
 
 % Reference entry for a command.
 \newcommand{\cmdref}[2]{\section{\hgcmd{#1}---#2}\label{cmdref:#1}\index{\texttt{#1} command}}
@@ -136,7 +138,7 @@
 % Reference entry for a command option with only long form.
 \newcommand{\loptref}[2]{\subsubsection{\hgopt{#1}{--#2} option}}
 
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: yatex
 %%% TeX-master: "00book"
-%%% End: 
+%%% End:
--- a/ja/Makefile	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/Makefile	Tue Aug 19 16:03:33 2008 +0900
@@ -55,7 +55,8 @@
 
 image-pdf := $(image-dot:%.dot=%.pdf) $(image-svg:%.svg=%.pdf) $(image-png)
 image-html := $(image-dot:%.dot=%.png) $(image-svg:%.svg=%.png) $(image-png)
-image-eps := $(image-dot:%.dot=%.eps) $(image-svg:%.svg=%.eps) $(image-png)
+#image-eps := $(image-dot:%.dot=%.eps) $(image-svg:%.svg=%.eps) $(image-png)
+image-eps := $(image-dot:%.dot=%.eps) $(image-svg:%.svg=%.eps) $(image-png:%.png=%.eps)
 
 example-sources := \
 	backout \
@@ -111,7 +112,8 @@
 
 all: dvi
 
-dvi: $(sources) $(image-eps) examples
+#dvi: $(sources) $(image-eps) examples
+dvi: $(sources) $(image-eps)
 	platex 00book.tex
 
 	bibtex hgbook
@@ -141,7 +143,8 @@
 	if grep 'Reference.*undefined' $(@:.pdf=.log); then exit 1; fi
 endef
 
-pdf/hgbook.pdf: $(sources) $(image-pdf) examples
+#pdf/hgbook.pdf: $(sources) $(image-pdf) examples
+pdf/hgbook.pdf: $(sources) $(image-pdf)
 	$(call pdf)
 
 html: onepage split
@@ -196,6 +199,9 @@
 %.eps: %.dot
 	dot -Tps -o $@ $<
 
+%.eps: %.png
+	convert $< ps:$@
+
 examples: $(example-prereqs) examples/.run
 
 examples/.run: $(example-sources:%=examples/%.run)
--- a/ja/branch.tex	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/branch.tex	Tue Aug 19 16:03:33 2008 +0900
@@ -719,7 +719,7 @@
 $B@_Dj$9$k$3$H$G4V0c$C$?%V%i%s%AL>$r;}$D99?7$r%V%m%C%/$9$k$3$H$,$G$-$k!%$3(B
 $B$l$ONc$($P(B``$B:G@hC<(B''$B%V%i%s%A$+$i(B``$B0BDj(B''$B%V%i%s%A$XJQ99$r(Bpush$B$9$k$h$&$J4V(B
 $B0c$$$rKI$0$N$K%7%s%W%k$+$D8z2LE*$JJ}K!$G$"$k!%%U%C%/$O!$Nc$($P6&M-%j%]%8(B
-$B%H%j$N(B\hgrc$B$K(B
+$B%H%j$N(B \hgrc $B$K(B
 \begin{codesample2}
   [hooks]
   pretxnchangegroup.branch = hg heads --template '{branches} ' | grep mybranch
--- a/ja/cmdref.tex	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/cmdref.tex	Tue Aug 19 16:03:33 2008 +0900
@@ -268,7 +268,7 @@
 %command.  
 
 $BBgH>$,%F%-%9%H$G$"$k%U%!%$%kF1;N$d!$B?$/$N%P%$%J%j%G!<%?$,4^$^$l$k%U%!%$(B
-$B%kF1;N$N:9J,$r<h$k$?$a$K(B\hopt{diff}{-a}$B$r;XDj$9$k>l9g!$@8@.$5$l$?:9J,$O(B
+$B%kF1;N$N:9J,$r<h$k$?$a$K(B\hgopt{diff}{-a}$B$r;XDj$9$k>l9g!$@8@.$5$l$?:9J,$O(B
 Mercurial$B$N(B\hgcmd{import}$B%3%^%s%I$d%7%9%F%`$N(B\command{patch}$B$KMQ$$$k$3$H(B
 $B$,$G$-$J$$!%(B
 
--- a/ja/daily.tex	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/daily.tex	Tue Aug 19 16:03:33 2008 +0900
@@ -351,7 +351,7 @@
 
 Mercurial has a longstanding bug in which it fails to handle a merge
 where one side has a file with a given name, while another has a
-directory with the same name.  This is documented as~\bug{29}.
+directory with the same name.  This is documented as~\bug{29} .
 \interaction{issue29.go}
 
 \section{Recovering from mistakes}
--- a/ja/examples/run-example	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/examples/run-example	Tue Aug 19 16:03:33 2008 +0900
@@ -282,7 +282,8 @@
                         print >> sys.stderr, '(signal %s)' % os.WTERMSIG(rc)
                 else:
                     open(self.name + '.run', 'w')
-                return err
+#                return err
+                return 0
         finally:
             shutil.rmtree(tmpdir)
 
--- a/ja/mq-ref.tex	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/mq-ref.tex	Tue Aug 19 16:03:33 2008 +0900
@@ -25,7 +25,7 @@
 
 %\subsection{\hgxcmd{mq}{qcommit}---commit changes in the queue
 %repository}
-\subsection{\hgxcmd{mq}{qcommit}---$B%-%e!<$NCf$NJQ99$r%3%_%C%H$9$k(B
+\subsection{\hgxcmd{mq}{qcommit}---$B%-%e!<$NCf$NJQ99$r%3%_%C%H$9$k(B}
 
 %The \hgxcmd{mq}{qcommit} command commits any outstanding changes in the
 %\sdirname{.hg/patches} repository.  This command only works if the
@@ -627,7 +627,7 @@
 $BJT=8$7$?$j$9$Y$-$G$O$J$$!%$3$l$O(BMQ$B$K$h$C$FFbIt$N4IM}$KMQ$$$i$l$k$Y$-$b$N(B
 $B$G$"$k!%(B
 
-%%% Local Variables: 
+%%% Local Variables:
 %%% mode: yatex
 %%% TeX-master: "00book"
-%%% End: 
+%%% End:
--- a/ja/undo.tex	Fri Aug 01 16:09:39 2008 +0900
+++ b/ja/undo.tex	Tue Aug 19 16:03:33 2008 +0900
@@ -99,7 +99,7 @@
 $B%A%'%s%8%;%C%H$O$j$]$8$H$j$NMzNr$K$b$O$dB8:_$;$:!$%o!<%-%s%0%G%#%l%/%H%j(B
 $B$N(B\filename{a}$B$OJQ99$5$l$?$HG'<1$5$l$k!%%3%_%C%H$7$F%m!<%k%P%C%/$9$k$H!$(B
 $B%o!<%-%s%0%G%#%l%/%H%j$O40A4$K%3%_%C%HA0$N>uBV$K$J$j!$%A%'%s%8%;%C%H$O40(B
-$BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hdcmd{add} \filename{b}$B$7!$$b$&0lEY(B
+$BA4$K>C5n$5$l$k!%$3$N>uBV$G0BA4$K(B\hgcmd{add} \filename{b}$B$7!$$b$&0lEY(B
 commit$B$9$k$3$H$,$G$-$k!%(B
 \interaction{rollback.rollback}
 
@@ -704,7 +704,7 @@
 
 \hgcmd{backout}$B%3%^%s%I$r<BAu$9$kJL$NJ}K!$H$7$F!$(B\hgcmd{export}$B$G%P%C%/%"(B
 $B%&%H$5$l$k$Y$-%A%'%s%8%;%C%H$r(Bdiff$B$H$7$F=PNO$7!$(B
-\command{patch}$B$r(B}\cmdopt{patch}{--reverse}$B%*%W%7%g%sIU$-$G8F$S!$%o!<%-%s(B
+\command{patch}$B$r(B\cmdopt{patch}{--reverse}$B%*%W%7%g%sIU$-$G8F$S!$%o!<%-%s(B
 $B%0%G%#%l%/%H%j$NA`:n$r>JN,$7$F%j%P!<%9%Q%C%A$9$kJ}K!$,9M$($i$l$k!%(B
 $B$3$NJ}K!$O$:$C$HC1=c$@$,!$$[$H$s$I$&$^$/F0$+$J$$!%(B