From: Hironori Kitagawa <h_kitagawa2001@yahoo.co.jp>
Date: Thu, 13 Oct 2011 01:54:08 +0000 (+0900)
Subject: Merge branch 'kmaeda-ltjclasses' into kitagawa_test
X-Git-Tag: 20120419.0~52
X-Git-Url: http://git.osdn.jp/view?a=commitdiff_plain;h=07c1ca1e8b9c308b04176afefbcee547186f656b;p=luatex-ja%2Fluatexja.git

Merge branch 'kmaeda-ltjclasses' into kitagawa_test

Resolved conflicts:
	doc/man-en.pdf
	doc/manual.dtx
---

07c1ca1e8b9c308b04176afefbcee547186f656b
diff --cc doc/man-en.pdf
index 7a597f0,a474f9a..80cffa3
Binary files differ
diff --cc doc/man-ja.pdf
index 9c221ec,0000000..b7fdaf3
mode 100644,000000..100644
Binary files differ
diff --cc doc/manual.dtx
index ddaf6fd,c1de47b..da23ecd
--- a/doc/manual.dtx
+++ b/doc/manual.dtx
@@@ -6,15 -6,15 +6,16 @@@
  %</en>
  %<*ja>
  \documentclass[a4paper,titlepage]{bxjsarticle}
 -\setpagelayout*{margin=20mm}
 +\setpagelayout*{margin=20mm,footskip=5mm}
  \def\headfont{\normalfont\bfseries}
  % \def\headfont{\sffamily\gtfamily} is needed in ordinal documents
++% This document cannot typeset in ltjsclasses (conflict with showexpl?)
  %</ja>
  
 -\usepackage{amsmath,amssymb,xcolor,pict2e}
 +\usepackage{amsmath,amssymb,xcolor,pict2e,multienum,amsthm,float}
  \usepackage{booktabs,listings,lltjlisting,showexpl,multicol}
  \usepackage{luatexja-otf}
 -\usepackage[unicode=true]{hyperref}
 +\usepackage[unicode=false]{hyperref}
  \usepackage[all]{xy}
  \SelectTips{cm}{}
  
@@@ -586,31 -522,30 +587,30 @@@ This range consist of the following Uni
  \end{multicols}
  \item[Range~3${}^{\text{J}}$] Punctuations and Miscellaneous symbols. The block list is
  	   indicated in Table~\ref{table-rng3}.
 -\begin{table}[p]
 +\begin{table}[!tb]
  \caption{Unicode blocks in predefined character range~3.}\label{table-rng3}
  \catcode`\"=13\def"#1#2#3#4{{\tt U+#1#2#3#4}}%"
 -\begin{center}
 -\begin{tabular}{ll}
 -"2000--"206F&General Punctuation\\
 +\begin{center}\small
 +\begin{tabular}{llll}
 +"2000--"206F&General Punctuation&
  "2070--"209F&Superscripts and Subscripts\\
 -"20A0--"20CF&Currency Symbols\\
 -"20D0--"20FF&Combining Diacritical Marks for Symbols\\
 -"2100--"214F&Letterlike Symbols\\
 +"20A0--"20CF&Currency Symbols&
 +"20D0--"20FF&Comb.\ Diacritical Marks for Symbols\\
 +"2100--"214F&Letterlike Symbols&
  "2150--"218F&Number Forms\\
 -"2190--"21FF&Arrows\\
 +"2190--"21FF&Arrows&
  "2200--"22FF&Mathematical Operators\\
 -"2300--"23FF&Miscellaneous Technical\\
 +"2300--"23FF&Miscellaneous Technical&
  "2400--"243F&Control Pictures\\
 -"2500--"257F&Box Drawing\\
 +"2500--"257F&Box Drawing&
  "2580--"259F&Block Elements\\
 -"25A0--"25FF&Geometric Shapes\\
 +"25A0--"25FF&Geometric Shapes&
  "2600--"26FF&Miscellaneous Symbols\\
 -"2700--"27BF&Dingbats\\
 +"2700--"27BF&Dingbats&
  "2900--"297F&Supplemental Arrows-B\\
 -"2980--"29FF&Miscellaneous Mathematical Symbols-B\\
 +"2980--"29FF&Misc.\ Mathematical Symbols-B&
  "2B00--"2BFF&Miscellaneous Symbols and Arrows\\
 -"E000--"F8FF&Private Use Area\\
 +"E000--"F8FF&Private Use Area&
- "FB00--"FB4F&Alphabetic Presentation Forms
  \end{tabular}
  \end{center}
  \end{table}