xecjk (8jul13)

git-svn-id: svn://tug.org/texlive/trunk@31138 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 15 insertions, 2 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
index 228a4db7428..e3826104b7c 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-CJKfntef.tex
@@ -33,12 +33,14 @@
 \CJKunderanyline{0.2em}{\kern-.03em\vtop{\kern.2ex\hrule width.2em\kern 0.11em
   \hrule height 0.1em}\kern-.03em}{自定义下划线}
 
-\CJKunderanyline{0.5em}{-}{\showtext}
+\indent\CJKunderanyline{0.5em}{-}{\showtext}
 
 \CJKunderanysymbol{0.2em}{-}{\showtext}
 
 \CJKunderdot{\showtext}
 
+\hrule depth \dp\strutbox width 0 pt \relax
+
 \begin{CJKfilltwosides}{40mm}
 两端分散对齐\\
 分散对齐\\
@@ -46,6 +48,8 @@
 \CJKunderline{汉字可加下划线}
 \end{CJKfilltwosides}
 
+\hrule depth \dp\strutbox width 0 pt \relax
+
 \CJKfntef{CJKunderline}
 \CJKfntef{CJKunderwave}
 \CJKfntef{CJKunderdblline}
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-listings.tex b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-listings.tex
index 59962600fe2..266ce45653c 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-listings.tex
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-listings.tex
@@ -18,8 +18,9 @@
 \setCJKmonofont[Kana]{Meiryo}
 \setmonofont{Latin Modern Mono Light}
 
+\makeatletter
 \lstset{%
-  basicstyle=\small\ttfamily,
+  basicstyle=\small\ttfamily,breakindent=4\lst@width,
   numbers=left,numberstyle=\tiny\color{gray},
   commentstyle=\color{green!50!black},keywordstyle=\color{blue}\bfseries,
   identifierstyle=\color{violet},stringstyle=\color{brown},
@@ -27,6 +28,7 @@
 \lstnewenvironment{cppcode}[1][]
   {\lstset{language=C++,#1}}
   {}
+\makeatother
 
 \begin{document}
 
@@ -83,6 +85,13 @@ int main()
 \end{cppcode}
 \end{LTXexample}
 
+\section{\texttt{breaklines} 测试}
+
+\begin{lstlisting}[linewidth=10em,frame=single,rulecolor=\color{black},breaklines]
+断行文字text测试，断行文字text测试，断行文字text测试，断行文字text测试
+断行文字text测试，断行文字text测试，断行文字text测试，断行文字text测试
+\end{lstlisting}
+
 \section{\lstinline|\\lstinputlisting| 测试}
 
 \lstinputlisting[language={[AlLaTeX]TeX}]{\jobname}
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index 727f2b817c3..f72b2b7bc90 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf