*** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index d9e3d32..83bb0d5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ if MAINTAINER_MODE
 SRCFILES = $(shell echo @M17NLIB@/src/*.[ch])
 
 STYLEPATH = @abs_srcdir@/styles
-UTILPATH = @abs_srcdir@/utils
 
 LATEX_JA = ${STYLEPATH}/doxygen-m17n.sty \
        @abs_srcdir@/data-ja/header.tex \
@@ -19,9 +18,7 @@ LATEX_JA = ${STYLEPATH}/doxygen-m17n.sty \
        @abs_srcdir@/data-ja/m17n-database.tex \
        @abs_srcdir@/data-ja/conclusion.tex
 
-LATEX_USR = ${STYLEPATH}/doxygen-m17n.sty \
-       @abs_srcdir@/data-usr/header.tex \
-       @abs_srcdir@/data-usr/conclusion.tex
+LATEX_USR = data-usr/m17n-lib.sty
 
 LATEX_DEV = ${STYLEPATH}/doxygen-m17n.sty \
        @abs_srcdir@/data-dev/header.tex \
@@ -45,9 +42,9 @@ usr-html html-usr: usr/html/index.html
 ja-html html-ja: ja/html/index.html
 dev-html html-dev: dev/html/index.html
 
-usr-latex latex-usr: usr/latex/m17nlib.ps
-ja-latex latex-ja: ja/latex/m17nlib.ps
-dev-latex latex-dev: dev/latex/m17nlib.ps
+usr-latex latex-usr: usr/latex/m17n-lib.ps
+ja-latex latex-ja: ja/latex/m17n-lib.ps
+dev-latex latex-dev: dev/latex/m17n-lib.ps
 
 usr-man man-usr: man/man3m/m17nIntro.3m
 
@@ -125,7 +122,7 @@ doxyfile-man.usr: doxyfile Makefile
            -e 's|%GENERATE_MAN%|YES|' \
          < $< >$@
 
-%/html/index.html: doxyfile-html.% ${SRCFILES} data-%/mainpage.c m17nlib.css
+%/html/index.html: doxyfile-html.% ${SRCFILES} data-%/mainpage.c m17n-lib.css
        rm -rf `dirname $@`
        ${DOXYGEN} $<
 
@@ -133,28 +130,23 @@ doxyfile-man.usr: doxyfile Makefile
        rm -rf `dirname $@`
        ${DOXYGEN} $<
 
-%/latex/m17nlib.tex: %/latex/refman.tex ${UTILPATH}/refman-filter.sed
-       sed -f ${UTILPATH}/refman-filter.sed < $< > $@
+%/latex/m17n-lib.tex: %/latex/refman.tex utils/refman-filter.sed
+       sed -f utils/refman-filter.sed < $< > $@
 
-ja/latex/m17nlib.ps: ja/latex/m17nlib.tex ${UTILPATH}/run-latex.sh ${LATEX_JA}
-       ${UTILPATH}/run-latex.sh @abs_srcdir@ ja
-       emacs -batch -q -l ${UTILPATH}/mokuji.el -f write-mokuji ja
+%/latex/m17n-lib.ps: %/latex/m17n-lib.tex data-%/m17n-lib.sty utils/latex.sh
+       utils/latex.sh `dirname $@` platex
+       emacs -batch -q -l utils/mokuji.el -f write-mokuji $@
 
-usr/latex/m17nlib.ps: usr/latex/m17nlib.tex ${UTILPATH}/run-latex.sh ${LATEX_USR}
-       ${UTILPATH}/run-latex.sh @abs_srcdir@ usr
-       emacs -batch -q -l ${UTILPATH}/mokuji.el -f write-mokuji usr
+%/latex/m17n-lib.pdf: %/latex/m17n-lib.tex data-%/m17n-lib.sty utils/latex.sh
+       utils/latex.sh `dirname $@ `pdflatex
 
-dev/latex/m17nlib.ps: dev/latex/m17nlib.tex ${UTILPATH}/run-latex.sh ${LATEX_DEV}
-       ${UTILPATH}/run-latex.sh @abs_srcdir@ dev
-       emacs -batch -q -l ${UTILPATH}/mokuji.el -f write-mokuji dev
-
-doxyhead.txt: sample.c ${UTILPATH}/mkheaderlist.rb
+doxyhead.txt: sample.c utils/mkheaderlist.rb
 
 %/man/man3/m17nIntro.3m: doxyfile-man.% ${SRCFILES}
        rm -rf `dirname $@`
        ${DOXYGEN} $<
 
-man/man3m/%.3m: usr/man/man3/%.3m sample.c ${UTILPATH}/mkman.rb 
+man/man3m/%.3m: usr/man/man3/%.3m sample.c utils/mkman.rb 
        -${DOXYGEN} -g doxytemp
        echo "INPUT = sample.c" >> doxytemp
        echo "GENERATE_LATEX = NO" >> doxytemp
@@ -164,10 +156,10 @@ man/man3m/%.3m: usr/man/man3/%.3m sample.c ${UTILPATH}/mkman.rb
        echo "OPTIMIZE_OUTPUT_FOR_C  = yes" >> doxytemp
        ${DOXYGEN} doxytemp
        [ -d "man/man3m" ] || mkdir -p man/man3m
-       ruby ${UTILPATH}/mkman.rb usr
+       ruby utils/mkman.rb usr
        rm -rf doxytemp sample
 
-man/ja/man3m/%.3m: ja/man/man3/%.3m sample-ja.c ${UTILPATH}/mkman.rb 
+man/ja/man3m/%.3m: ja/man/man3/%.3m sample-ja.c utils/mkman.rb 
        -${DOXYGEN} -g doxytemp
        echo "INPUT = sample.c" >> doxytemp
        echo "GENERATE_LATEX = NO" >> doxytemp
@@ -177,7 +169,7 @@ man/ja/man3m/%.3m: ja/man/man3/%.3m sample-ja.c ${UTILPATH}/mkman.rb
        echo "OPTIMIZE_OUTPUT_FOR_C  = yes" >> doxytemp
        ${DOXYGEN} doxytemp
        [ -d "man/ja/man3m" ] || mkdir -p man/ja/man3m
-       ruby ${UTILPATH}/mkman.rb ja
+       ruby utils/mkman.rb ja
        rm -rf doxytemp sample
 
 CLEANFILES = doxyfile doxyfile-*.* m17n.tag warning \
@@ -185,5 +177,16 @@ CLEANFILES = doxyfile doxyfile-*.* m17n.tag warning \
 
 DISTCLEANFILES = doxyfile *~
 
+html/index.html: usr/html/index.html
+       [ -d html ] || mkdir html
+       cp usr/html/* html
+
+latex/m17n-lib.ps: usr/latex/m17n-lib.ps
+       [ -d latex ] || mkdir latex
+       cp usr/latex/m17n-lib.dvi latex
+       cp usr/latex/m17n-lib.ps latex
+
+pack: latex/m17n-lib.ps html/index.html man/man3m/m17nIntro.3m dist
+
 endif
-DISTFILES = man
+DISTFILES = latex html man 

diff --git a/data-usr/conclusion.tex b/data-usr/conclusion.tex
deleted file mode 100644 (file)
index 46bb045..0000000
--- a/data-usr/conclusion.tex
+++ /dev/null
@@ -1,5 +0,0 @@
-%% -*- coding: euc-jp; -*-
-
-\section{conclusion}
-
-This is a test conclusion text.

diff --git a/data-usr/header.tex b/data-usr/header.tex
deleted file mode 100644 (file)
index ca5f250..0000000
--- a/data-usr/header.tex
+++ /dev/null
@@ -1,36 +0,0 @@
-\documentclass[12pt,twoside]{article}
-\setlength\headheight{14.5pt}
-\usepackage{makeidx}
-\usepackage{fancyhdr}
-\usepackage{graphicx}
-\usepackage{float}
-\usepackage{alltt}
-\usepackage[english]{babel}
-\usepackage{times}
-%%%\usepackage[dvips, a4paper, bookmarks, bookmarksnumbered, pdftitle={Unix/LinuxÈÆÍÑ¡£¡£¡£}]{hyperref} 
-\usepackage{doxygen}
-\usepackage{doxygen-m17n}
-\makeindex
-\setcounter{tocdepth}{2}
-\setlength{\footrulewidth}{0pt}
-\begin{document}
-\begin{titlepage}
-\vspace*{2cm}
-\begin{center}
-{\Huge M17N-LIB -- Multilingual Library}\\
-\vspace*{2cm}
-{\Huge Ver. 0.9}\\
-\vspace*{7cm}
-{\Huge 2003.7.1}\\
-\vspace*{1.5cm}
-{\Huge AIST}
-\end{center}
-\end{titlepage}
-\cleardoublepage
-\pagenumbering{roman}
-\tableofcontents
-\newpage
-\pagenumbering{arabic}
-\input{introduction.tex}
-\newpage
-\sectionOnNewpage

diff --git a/data-usr/introduction.tex b/data-usr/introduction.tex
deleted file mode 100644 (file)
index dcd9fb0..0000000
--- a/data-usr/introduction.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\section{Introduction of the m17n library}
-
-\subsection{Motivation}
-\subsubsection{Background}
-
-What is the multilingual text processing?
-
-What is the multilingual library?
-
-\subsubsection{Position of the library}
-
-\subsubsection{Characteristics of the library}
-
-\subsubsection{Strategy}
-

diff --git a/data-usr/m17n-lib.sty b/data-usr/m17n-lib.sty
new file mode 100644 (file)
index 0000000..7438636
--- /dev/null
+++ b/data-usr/m17n-lib.sty
@@ -0,0 +1,93 @@
+%      -*- coding: euc-jp; -*-
+\ProvidesPackage{m17n-lib}
+
+%\usepackage{times}
+
+%% Don't leave the space for marginal notes.
+\setlength{\textwidth}{\paperwidth}
+\addtolength{\textwidth}{-2in}
+\setlength{\textheight}{\paperheight}
+\addtolength{\textheight}{-2in}
+\addtolength{\textheight}{-\headheight}
+\addtolength{\textheight}{-\headsep}
+\setlength{\headwidth}{\textwidth}
+\setlength{\topmargin}{0in}
+\setlength{\oddsidemargin}{0in}
+\setlength{\evensidemargin}{0in}
+\setlength{\marginparsep}{0pt}
+\setlength{\marginparwidth}{0pt}
+\setlength{\footskip}{0pt}
+
+%\def\sectionmark#1{\markboth
+%{\MakeUppercase{\ifnum \c@secnumdepth>\z@
+% \thesection\hskip 1em\relax \fi #1}}{}}
+%\def\sectionmark#1{\markboth{\MakeUppercase{#1}}{}}
+
+%% Don't write footers.
+\rfoot[]{}
+\lfoot[]{}
+\cfoot[]{}
+
+%% Fixing incorrest indentation of the original `CompactItemize'
+%% environment.
+%% \renewenvironment{CompactItemize}
+%% {
+%%   \bgroup
+%%   \def\@listi{\leftmargin\leftmargini
+%%             \parsep 0\p@  \@plus2.5\p@ \@minus\p@
+%%             \topsep 10\p@ \@plus4\p@   \@minus6\p@
+%%             \itemsep0\p@  \@plus2.5\p@ \@minus\p@}
+%%   \def\@listii {\leftmargin\leftmarginii
+%%               \labelwidth\leftmarginii
+%%               \advance\labelwidth-\labelsep
+%%               \topsep    5\p@   \@plus2.5\p@ \@minus\p@
+%%               \parsep    0\p@ \@plus\p@    \@minus\p@
+%%               \itemsep   \parsep}
+%%   \begin{itemize}
+%%   \setlength{\leftskip}{-1.5em}
+%% }
+%% {\end{itemize}\egroup}
+
+%% \renewenvironment{Desc}
+%% {\begin{list}{}
+%%   {
+%%     \settowidth{\labelwidth}{40pt}
+%%     \setlength{\leftmargin}{\labelwidth}
+%% %    \setlength{\parsep}{0pt}
+%%     \setlength{\itemsep}{-4pt}
+%%     \renewcommand{\makelabel}{\entrylabel}
+%%   }
+%% }
+%% {\end{list}}
+
+
+%% Use arabic numbers in the second level `enumerate' environment.
+\renewcommand\theenumii{\@arabic\c@enumii}
+
+%% Treat `_' as a normal letter.
+%% \catcode`\_11\relax
+
+%% Make each section start with a new page.
+\let\origsection\section
+\def\newsection{\cleardoublepage\origsection}
+\def\sectionOnNewpage{\let\section\newsection}
+\sectionOnNewpage
+
+%% Cross reference for IPA document.
+\def\IPAlabel#1{\label{IPA:#1}}
+\def\IPAref#1{\texttt{#1} (P.\pageref{IPA:#1})}
+\def\IPApage#1{(P.\pageref{IPA:#1})}
+
+%% \let\origtt\tt
+%% \let\origbf\bf
+%% \newif\iftt
+%% \def\tt{\tttrue\origtt}
+%% \def\bf{\iftt\else\origbf\fi}
+%% \def\em{\ttfamily\bfseries}
+%{\catcode`"=\active\gdef"{{\catcode`"=12\verb+"+}}}
+%\catcode`"=\active
+%\def\includegraphics[#1]#2{}
+
+\let\origtableofcontents\tableofcontents
+\def\tableofcontents{\setcounter{tocdepth}{2}\origtableofcontents\clearpage}
+\def\footrule{}

diff --git a/doxyfile.in b/doxyfile.in
index 072548d..fa523c7 100644 (file)
--- a/doxyfile.in
+++ b/doxyfile.in
@@ -425,7 +425,7 @@ HTML_FOOTER            = @abs_srcdir@/footer.html
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
 # will generate a default style sheet
 
-HTML_STYLESHEET        = @abs_srcdir@/m17nlib.css
+HTML_STYLESHEET        = @abs_srcdir@/m17n-lib.css
 # HTML_STYLESHEET        = 
 
 # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
@@ -513,7 +513,7 @@ PAPER_TYPE             = a4
 # The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
 # packages that should be included in the LaTeX output.
 
-EXTRA_PACKAGES         = doxygen-m17n
+EXTRA_PACKAGES         = m17n-lib
 
 # The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
 # the generated latex document. The header should contain everything until 

diff --git a/header.html b/header.html
index d506308..63d45b6 100644 (file)
--- a/header.html
+++ b/header.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset="usascii">
 <title>Multilingual Library for Unix/Linux </title>
-<link href="m17nlib.css" rel="stylesheet" type="text/css">
+<link href="m17n-lib.css" rel="stylesheet" type="text/css">
 </head>
 
 <body bgcolor="#ffffff">

diff --git a/header.html.ja b/header.html.ja
index f1b43df..438ee71 100644 (file)
--- a/header.html.ja
+++ b/header.html.ja
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html><head><meta http-equiv="Content-Type" content="text/html;charset="EUC-JP">
 <title>Unix/Linux ¸þ¤±Â¿¸À¸ì¥é¥¤¥Ö¥é¥ê</title>
-<link href="m17nlib.css" rel="stylesheet" type="text/css">
+<link href="m17n-lib.css" rel="stylesheet" type="text/css">
 </head>
 
 <body bgcolor="#ffffff">

diff --git a/m17n-lib.css b/m17n-lib.css
new file mode 100644 (file)
index 0000000..59c4e02
--- /dev/null
+++ b/m17n-lib.css
@@ -0,0 +1,23 @@
+H1 { text-align: center}
+A.qindex {}
+A.qindexRef {color: fuchsia}
+A.el { text-decoration: none; font-weight: bold }
+A.elRef { font-weight: bold }
+A.code { text-decoration: none; font-weight: normal; color: #4444ee }
+A.codeRef { font-weight: normal; color: #4444ee }
+A:hover { text-decoration: none; background-color: #f2f2ff }
+A:active {text-decoration: none; color: white; background-color: navy }
+DL.el { margin-left: -1cm }
+DIV.fragment { width: 100%; border: none; background-color: #eeeeee }
+DIV.ah { background-color: navy; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px }
+TD.md { background-color: #f2f2ff; font-weight: bold; }
+TD.mdname { background-color: #f2f2ff; font-weight: bold; font-style: italic }
+DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold }
+DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller }
+FONT.keyword       { color: #008000 }
+FONT.keywordtype   { color: #604020 }
+FONT.keywordflow   { color: #e08000 }
+FONT.comment       { color: #800000 }
+FONT.preprocessor  { color: #806020 }
+FONT.stringliteral { color: #002080 }
+FONT.charliteral   { color: #008080 }

diff --git a/styles/doxygen-m17n.sty b/styles/doxygen-m17n.sty
deleted file mode 100644 (file)
index bbf74b9..0000000
--- a/styles/doxygen-m17n.sty
+++ /dev/null
@@ -1,93 +0,0 @@
-%      -*- coding: euc-jp; -*-
-\ProvidesPackage{doxygen-m17n}
-
-%\usepackage{times}
-
-%% Don't leave the space for marginal notes.
-\setlength{\textwidth}{\paperwidth}
-\addtolength{\textwidth}{-2in}
-\setlength{\textheight}{\paperheight}
-\addtolength{\textheight}{-2in}
-\addtolength{\textheight}{-\headheight}
-\addtolength{\textheight}{-\headsep}
-\setlength{\headwidth}{\textwidth}
-\setlength{\topmargin}{0in}
-\setlength{\oddsidemargin}{0in}
-\setlength{\evensidemargin}{0in}
-\setlength{\marginparsep}{0pt}
-\setlength{\marginparwidth}{0pt}
-\setlength{\footskip}{0pt}
-
-%\def\sectionmark#1{\markboth
-%{\MakeUppercase{\ifnum \c@secnumdepth>\z@
-% \thesection\hskip 1em\relax \fi #1}}{}}
-%\def\sectionmark#1{\markboth{\MakeUppercase{#1}}{}}
-
-%% Don't write footers.
-\rfoot[]{}
-\lfoot[]{}
-\cfoot[]{}
-
-%% Fixing incorrest indentation of the original `CompactItemize'
-%% environment.
-%% \renewenvironment{CompactItemize}
-%% {
-%%   \bgroup
-%%   \def\@listi{\leftmargin\leftmargini
-%%             \parsep 0\p@  \@plus2.5\p@ \@minus\p@
-%%             \topsep 10\p@ \@plus4\p@   \@minus6\p@
-%%             \itemsep0\p@  \@plus2.5\p@ \@minus\p@}
-%%   \def\@listii {\leftmargin\leftmarginii
-%%               \labelwidth\leftmarginii
-%%               \advance\labelwidth-\labelsep
-%%               \topsep    5\p@   \@plus2.5\p@ \@minus\p@
-%%               \parsep    0\p@ \@plus\p@    \@minus\p@
-%%               \itemsep   \parsep}
-%%   \begin{itemize}
-%%   \setlength{\leftskip}{-1.5em}
-%% }
-%% {\end{itemize}\egroup}
-
-%% \renewenvironment{Desc}
-%% {\begin{list}{}
-%%   {
-%%     \settowidth{\labelwidth}{40pt}
-%%     \setlength{\leftmargin}{\labelwidth}
-%% %    \setlength{\parsep}{0pt}
-%%     \setlength{\itemsep}{-4pt}
-%%     \renewcommand{\makelabel}{\entrylabel}
-%%   }
-%% }
-%% {\end{list}}
-
-
-%% Use arabic numbers in the second level `enumerate' environment.
-\renewcommand\theenumii{\@arabic\c@enumii}
-
-%% Treat `_' as a normal letter.
-%% \catcode`\_11\relax
-
-%% Make each section start with a new page.
-\let\origsection\section
-\def\newsection{\cleardoublepage\origsection}
-\def\sectionOnNewpage{\let\section\newsection}
-\sectionOnNewpage
-
-%% Cross reference for IPA document.
-\def\IPAlabel#1{\label{IPA:#1}}
-\def\IPAref#1{\texttt{#1} (P.\pageref{IPA:#1})}
-\def\IPApage#1{(P.\pageref{IPA:#1})}
-
-%% \let\origtt\tt
-%% \let\origbf\bf
-%% \newif\iftt
-%% \def\tt{\tttrue\origtt}
-%% \def\bf{\iftt\else\origbf\fi}
-%% \def\em{\ttfamily\bfseries}
-%{\catcode`"=\active\gdef"{{\catcode`"=12\verb+"+}}}
-%\catcode`"=\active
-%\def\includegraphics[#1]#2{}
-
-\let\origtableofcontents\tableofcontents
-\def\tableofcontents{\setcounter{tocdepth}{2}\origtableofcontents\clearpage}
-\def\footrule{}

diff --git a/utils/mokuji.el b/utils/mokuji.el
index 767c4db..ab21c7b 100644 (file)
--- a/utils/mokuji.el
+++ b/utils/mokuji.el
@@ -1,14 +1,13 @@
 (require 'un-define)
 
-(defconst latex-dir
-  (format "%s/latex" (nth 2 command-line-args-left)))
+(defconst latex-dir (file-name-directory (nth 2 command-line-args-left)))
 
 (defun parse-toc ()
   (let ((sections nil)
        section-type
        title pos current-section current-subsection)
     (save-excursion
-      (find-file (expand-file-name "m17nlib.toc" latex-dir))
+      (find-file (expand-file-name "m17n-lib.toc" latex-dir))
       (while (re-search-forward "{\\(sub\\)*section}" nil t)
        (goto-char (1+ (match-beginning 0)))
        (setq section-type (intern (buffer-substring

diff --git a/utils/run-latex.sh b/utils/run-latex.sh
deleted file mode 100755 (executable)
index 485963d..0000000
--- a/utils/run-latex.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# $1: source directory
-# $2: ja or usr or dev
-
-umask 002
-TEXINPUTS=$1/styles:$1/data-$2:.:
-export TEXINPUTS
-echo ${TEXINPUTS}
-cd $2/latex
-if [ "$2" = "ja" ] ; then
-  LATEX=platex
-  PAPER='-t a4'
-else
-  LATEX=platex
-fi
-${LATEX} m17nlib.tex
-if [ "$2" = "ja" ] ; then
-  nkf -e < m17nlib.idx > temp.idx; mv temp.idx refman.idx
-fi
-makeindex m17nlib.idx
-${LATEX} m17nlib.tex
-dvips ${PAPER} -o m17nlib.ps m17nlib.dvi