xecjk (19jun13)

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

4 files changed, 100 insertions, 3 deletions

diff --git a/Master/texmf-dist/doc/xelatex/xecjk/README b/Master/texmf-dist/doc/xelatex/xecjk/README
index 8748970f35a..cb0e3f1e255 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/README
+++ b/Master/texmf-dist/doc/xelatex/xecjk/README
@@ -15,6 +15,7 @@ This package consists of the file  xeCJK.dtx
                                    xeCJK.cfg,
                                    xeCJK.ins,
                                    xeCJKfntef.sty,
+                                   xeCJK-listings.sty,
                                    xeCJK-example-autofake.tex,
                                    xeCJK-example-fallback.tex,
                                    xeCJK-example-subCJKblock.tex,
@@ -22,7 +23,9 @@ This package consists of the file  xeCJK.dtx
                                    xeCJK-example-checksingle.tex,
                                    xeCJK-example-CJKfntef.tex,
                                    xeCJK-example-punctstyle.tex,
-                                   xeCJK-example-verbatim.tex, and
+                                   xeCJK-example-verbatim.tex,
+                                   xeCJK-example-IVS.tex,
+                                   xeCJK-example-listings.tex, and
                                    README.txt. (this file).
 
 If you are interested in the process of development you may observe
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 0e0e39b5033..228a4db7428 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
@@ -6,8 +6,7 @@
 %%
 %% xeCJK.dtx  (with options: `ex-fntef')
 %% 
-\documentclass{article}
-\usepackage{xeCJK}
+\documentclass{ctexart}
 \usepackage{xcolor}
 \usepackage{xeCJKfntef}
 \xeCJKDeclareSubCJKBlock{test}{ `殆 , `已 }
@@ -26,6 +25,8 @@
 
 \begin{document}
 
+\section{\textsf{xeCJKfntef} 的简单测试文件}
+
 \CJKunderline{汉 字}\CJKunderline{加下划线}
 \varCJKunderline{汉字}\varCJKunderline{加下划线}
 \CJKunderanyline{0.5em}{\sixly \kern-.021em\char58 \kern-.021em}{自定义下划线}
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
new file mode 100644
index 00000000000..59962600fe2
--- /dev/null
+++ b/Master/texmf-dist/doc/xelatex/xecjk/example/xeCJK-example-listings.tex
@@ -0,0 +1,93 @@
+%%
+%% This is file `xeCJK-example-listings.tex',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% xeCJK.dtx  (with options: `ex-listings')
+%% 
+\documentclass{article}
+\usepackage[margin=1in]{geometry}
+\usepackage{listings,xcolor}
+\usepackage{showexpl}
+
+\usepackage{xeCJK}
+\setCJKmainfont{HanaMinA}
+\setCJKmonofont{SimSun}
+\xeCJKDeclareSubCJKBlock{Kana}  { "3040 -> "309F, "30A0 -> "30FF, "31F0 -> "31FF }
+\setCJKmonofont[Kana]{Meiryo}
+\setmonofont{Latin Modern Mono Light}
+
+\lstset{%
+  basicstyle=\small\ttfamily,
+  numbers=left,numberstyle=\tiny\color{gray},
+  commentstyle=\color{green!50!black},keywordstyle=\color{blue}\bfseries,
+  identifierstyle=\color{violet},stringstyle=\color{brown},
+  escapebegin=\normalfont}
+\lstnewenvironment{cppcode}[1][]
+  {\lstset{language=C++,#1}}
+  {}
+
+\begin{document}
+
+\section{\lstinline{\\lstinline} 测试}
+
+\section{\lstinline|甲*乙| 测试}
+
+\lstinline|abc汉字abc|
+
+\lstinline|甲*乙|
+
+\lstinline[mathescape]|数学公式$x^2+y^2$|
+
+\section{\lstinline{lstlisting} 环境测试}
+
+\begin{lstlisting}[basicstyle=\rmfamily]
+纯文字text测试
+    纯文字text测试
+文字+文字
+文字（符号）文字
+辻󠄂辻󠄃辻󠄄辻󠄅
+かがか゚
+\end{lstlisting}
+
+\begin{lstlisting}
+text纯文字测试
+\end{lstlisting}
+
+\begin{lstlisting}
+text 纯文字测试
+\end{lstlisting}
+
+\begin{lstlisting}
+text,纯文字测试
+\end{lstlisting}
+
+\section{自定义环境测试}
+
+\begin{LTXexample}[pos=t,varwidth,numbersep=5pt,columns=fixed]
+\begin{cppcode}[escapechar=`,morekeywords=返回]
+#define 返回 return
+#include <iostream>
+/*
+ * 块注释
+ * `逃逸字符，测试$f(x)$`
+ */
+int main()
+{
+    // 行注释
+    const char *欢迎 = "hello 世界（ワールド）";
+    std::cout << 欢迎 << std::endl;
+    返回 0;
+}
+\end{cppcode}
+\end{LTXexample}
+
+\section{\lstinline|\\lstinputlisting| 测试}
+
+\lstinputlisting[language={[AlLaTeX]TeX}]{\jobname}
+
+\end{document}
+%% 
+%%
+%% End of file `xeCJK-example-listings.tex'.
diff --git a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
index 026d39ae62a..727f2b817c3 100644
--- a/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf
+++ b/Master/texmf-dist/doc/xelatex/xecjk/xeCJK.pdf