diff --git a/docs/htmlqa b/docs/htmlqa
index 0f46a9e..ce87fb1 100644
--- a/docs/htmlqa
+++ b/docs/htmlqa
@@ -126,7 +126,7 @@
�̋@�\������ auto-insert-tkld ���g���܂��傤�B��҂́A
ftp://ftp.ae.keio.ac.jp/pub/emacs-lisp/util/auto-inset-tkld.tar.Z
�œ���ł��܂��B
- http://www-nagao.kuee.kyoto-u.ac.jp/member/tsuchiya/elisp/yahtml-mode.html
+ http://namazu.org/~tsuchiya/elisp/yahtml-mode.html
�ɐݒ�Ⴊ�����Ă���܂��B
�����̑�
diff --git a/docs/htmlqa.eng b/docs/htmlqa.eng
index 71738fa..fb7a079 100644
--- a/docs/htmlqa.eng
+++ b/docs/htmlqa.eng
@@ -63,7 +63,7 @@
option is to use auto-insert-tkld. The latter can be found at
ftp://ftp.ae.keio.ac.jp/pub/emacs-lisp/util/auto-inset-tkld.tar.Z
Examples in Japanese are at
- http://www-nagao.kuee.kyoto-u.ac.jp/member/tsuchiya/elisp/yahtml-mode.html
+ http://namazu.org/~tsuchiya/elisp/yahtml-mode.html
[ETC]
============
diff --git a/docs/qanda b/docs/qanda
index d3b9a1a..bfa1d94 100644
--- a/docs/qanda
+++ b/docs/qanda
@@ -4,7 +4,9 @@
%% C-u C-x $ �Ƃ���Ǝ��⍀�ڂ����\������܂��BC-x $ �Ō��ɖ߂�܂��B
%%
-(�V����:�Efont-lock �͂ǂ�����Ďg��������ł���?
+(�V����:�ERefTeX�͎g���܂���?
+ �E�����Œ�`�����J�E���^��\ref�⊮�ł̃��x�����ΏۂƂ��ĔF����������
+ �Efont-lock �͂ǂ�����Ďg��������ł���?
�EXEmacs�ł��F�͒����܂���?
�E{\it }�����ł͎Α̂� {\bf }�ł͑����ɂȂ�Ƃ����\������ł����c)
@@ -277,6 +279,96 @@
�� .emacs �ɓ���Ă݂܂��傤�B
+�ERefTeX�͎g���܂���?
+
+ �g���Ă���l�͂���݂����ł�����g�����Ȃ��ł��傤���B�ł�
+ �ł��ˁA�쒹�� \ref �⊮������ARefTeX�Ȃv��Ȃ��Ǝv���܂�
+ ��B���ꂩ���\label{}�͂������������ł͍�炸�ɂ����Ȃ�[prefix]
+ s �� \ref ��ł����݂܂��傤�B����Ƀ��x����łĂ����ȂƂ����T
+ ���ď���Ƀ��x����ł��Ă��̖��O��\ref�ɓ���Ă���܂��B\ref�⊮
+ �� \label{} �� \ref{} ���������ɕ⊮���͂��܂��B
+
+ �łł��ˁA\ref�⊮�̕�������ڂ��Ǝv���Ȃ���ǂ��܂���B�uRefTeX
+ �̕����F�����Ă������傦���v�Ƃ������ȊO�Ȃ炷���Ɋ撣��܂��B
+
+�E�����Œ�`�����J�E���^��\ref�⊮�ł̃��x�����ΏۂƂ��ĔF����������
+
+ �����A����͍��x�Ȏ���ł������B���݂������ˁB���A����̈Ӗ���
+ �������? ����LaTeX�̂��ׂ�[����B
+
+ ���Ƃ��A�v���O�������X�g�Ȃɂ͐}�\�Ɠ����悤�ɔԍ���t����
+ ���B����Ƃ����������B���������Ƃ��ɂ͒藝�^���� newtheorem
+ �Œ�`����ł���B���Ƃ��A�Z�N�V�����ԍ��ɘA�����Ă��悤�ȃv
+ ���O�������X�g������肽���Ƃ��܂���|�B�������炱�����܂��B
+
+ \newtheorem{Program}{���X�g}[section]
+
+ ��������� \begin{Program} ... \end{Program} �Ƃ���ƃ^�C�v�Z�b
+ �g���ʂ�
+
+ ���X�g 2.4.1 ...
+
+ �Ȃ�ĂȂ�킯�ł��ȁB�������傦�[�B���āA���̂܂܂��Ƃ���2.4.1
+ �Ƃ����ԍ���\ref�ň������邽�߂ɂ�\label�����Ȃ��Ƃ�����킯��
+ ����B�ł��ǂ��������Ŋ����`����Ȃ�label�������I�ɒ�`������
+ ���悤�ȃ}�N�����`���������������֗��Ȃ킯�ł���B �����Ƃ�
+ ���ƓƎ��ɒ�`�����J�E���^�̂ǂ̈ʒu�� \label ��ł����邩��쒹
+ �ɔ��f�����邽�߂̃p�^�[���������̂͂��̂������ނ��������̂ŁA��
+ �x�����`���邽�߂̃}�N���̃p�^�[�����������������₷���킯��
+ ���B�Ƃ������ƂŁA�ÖقŃ��x�����ł�����悤�Ȋ����`����ƁA
+ ����Ȋ����B
+
+ \newenvironment{program}[1]{
+ \begin{table}[tbp]
+ \begin{Program}\filename{#1}\nopagebreak[4]\label{#1}\end{Program}
+ \nopagebreak[4]
+ \begin{breakbox}\small
+ }{
+ \end{breakbox}
+ \end{table}
+ }
+
+ ���̏����� program ����
+
+ \begin{program}{foo.c}
+ \begin{verbatim}
+ #include
+ \end{verbatim}
+ \end{program}
+
+ �݂����ɂ���ƃ^�C�v�Z�b�g���ʂ�
+
+ ���X�g 2.4.1 foo.c
+ ��������������������������������
+ ��#include ��
+ ��������������������������������
+
+ �Ăȋ�ɂȂ�킯�ł���B���������傦���B���āA������program��
+ ���̃}�N����`��ǂ�����Ɗ��ɓn���� foo.c �͂��̂܂�
+ \label{#1} �Ń��x���Ƃ��Ď����I�ɑł���邱�ƂɂȂ�B���ApLaTeX
+ �̃��x���͓��{���OK��B�ŁA���̈Öق̂����ɑł��ꂽ���x�������
+ ���ɋ�����Ƃ����̂��X�}�[�g�Ȃ����ł��B������`����̂��ϐ�
+ YaTeX::ref-labeling-regexp-alist-private �Ȃ�B����ɂ�
+
+ (���K�\�� . ���x�����̃O���[�v�ԍ�)
+
+ �Ƃ����g(cons�Z��)����������W�܂������X�g���`����B���Ƃ��A
+ ��L��program���̑�1�������E�킹��ɂ�
+
+ (setq YaTeX::ref-labeling-regexp-alist-private
+ '(("\\\\begin{program}{\\([^}]+\\)}" . 1)))
+
+ �Ƃ��܂��Bprogram���̑������̕����̐��K�\����
+
+ {\\([^}]+\\)}
+
+ �̕����ŁA\\( \\) �̃O���[�v�����ꂽ���K�\�� [^}]+ �܂�A��
+ �����ʈȊO�̕����������Ƃ���A�����x�����Ƃ��Ď��o����킯�ł��B
+ �Ƃ������ƂŁA��L�̂悤��LaTeX�}�N���̒�`��
+ YaTeX::ref-labeling-regexp-alist-private �̒�`�Ŗ����A�����Ȃ�
+ �̃J�E���^�Ƃ��̃��x������\ref�⊮�Ɏ�荞�߂�킯�ł��B�ŏ��͖�
+ �|�L�����ǁA��x��`�����Ⴆ�Έꐶ���m�ł���!
+
��Mule2 �֘A
�EMule2+hilit19���g���Ă��鎞�ɐ������Â��ėǂ��ǂ߂Ȃ��B
@@ -493,7 +585,7 @@
Emacs.Font: fontset-tt
����ɂ��A��͂�쒹�������I�ɘa�� italic, bold �t�H���g������
- ���A
+ ���A��ʕ\����̌��f����ς���悤�ɂ��Ă���܂��B
Windows�ł͂����ƃt�H���g�����[�����Ă���̂ł��ȒP�ɐݒ��
����̂ł͂Ȃ����Ǝv���܂����A���͂��̂�����m��܂���B�����m
@@ -556,8 +648,8 @@
n �� p �ł����Ⴒ������܂��B
����Ȋ����ł����ˁB
- ���Ƃ́A�C���[�W�⊮�A�������[�h��������Ȃ�Ă̂�AUC�ɂ͂����
- ����B
+ ���Ƃ́A�C���[�W�⊮�A�������[�h��������A����usepackage�Ȃ��
+ �̂�AUC�ɂ͂���܂���B
�E�Ȃ�ō\���t�@�C�������܂���SJIS�Ȃ�? �������[�B
@@ -572,13 +664,6 @@
�����Ă��܂��\�����l����ƁA��͂�쒹��SJIS�ł��葱����ׂ���
�Ǝv���܂��B
- Emacs20�̈ꕔ�̃o�[�W�����ŁA������Ɋ������܂�Emacs-Lisp�t�@�C
- �����o�C�g�R���p�C������Ɖ����Ă��܂����̂�����̂͒m���Ă��܂�
- ���A�����Emacs20�̔�ł��B����������͂����꒼�����ł��낤�o
- �O�ł���AEmacs20���g�����Ȃ��Ă��郔�F�e�����̂�����Ƃ������
- ���y�����邽�߂�JIS�R�[�h�ȂǂɕύX���āAEmacs���S�҂ɑ���v��
- ������������܂���B
-
���������킯�ŁA�쒹�ł̓_�T���Ă������ł��ASJIS���g���܂��B
�E���C�����O���X�g�͂Ȃ���ł���?
diff --git a/docs/yatex.ref b/docs/yatex.ref
index c6874a9..d7d859b 100644
--- a/docs/yatex.ref
+++ b/docs/yatex.ref
@@ -157,6 +157,7 @@
���C���N���[�h�\���u���E�Y [prefix] d
+ ��font-lock���������j���[ [prefix] u
�L���Y��
yuuji@yatex.org
diff --git a/docs/yatexe.tex b/docs/yatexe.tex
index f1da05a..3297409 100644
--- a/docs/yatexe.tex
+++ b/docs/yatexe.tex
@@ -5,7 +5,7 @@
@iftex
@c @syncodeindex fn cp
-@c Last modified Fri Sep 12 12:04:11 2003 on firestorm
+@c Last modified Wed Jul 20 21:27:50 2005 on firestorm
@syncodeindex vr cp
@end iftex
@@ -88,6 +88,10 @@
@item Online help for the popular La@TeX{} commands
(@kbd{C-c ?}, @kbd{C-c /})
@item Document files hierarchy browser (@kbd{C-c d})
+@item Adding automatically \usepackage corresponding to inputting LaTeX
+ macro with completion
+@item Allow you to forget creating \label{}s, \ref or \cite completion
+ automatically generate labels.
@end itemize
@node Installation, Typesetting, Main features, Top
@@ -268,6 +272,10 @@
@noindent
Note that YaTeX assumes the component before the last period of
the last word in this line as base name of the main La@TeX{} source.
+The @code{%f} notation in this line is replaced by main file name, and
+@code{%r} replaced by root name of main file name. If you specify
+@code{%f} or @code{%r}, YaTeX always ask you the name of main file at the
+first typesetting.
To make best use of the feature of inter-file jumping by
@kbd{[prefix] g} (see @ref{Cursor jump}), take described below into
@@ -1812,6 +1820,53 @@
Consult the value of @code{YaTeX-package-alist-default} as an example.
@end defvar
+@defvar YaTeX-tabular-indentation
+At indentation by @kbd{C-i} in tabular or array environment,
+YaTeX put the additional spaces to the normail indentation depth.
+The number of additional spaces is the product of YaTeX-tabular-indentation
+and the number of column position in tabular.
+@end defvar
+
+@defvar YaTeX-noindent-env-regexp
+Regexp of environment names that should begin with no indentation.
+All verbatime-like environment name should match with.
+@end defvar
+
+@defvar YaTeX-ref-default-label-string
+Default \\ref time string format.
+This format is like strftime(3) but allowed conversion char are as follows;
+%y -> Last 2 digit of year, %b -> Month name, %m -> Monthe number(1-12),
+%d -> Day, %H -> Hour, %M -> Minute, %S -> Second,
+%qx -> alphabetical-decimal conversion of yymmdd.
+%qX -> alphabetical-decimal conversion of HHMMSS.
+Beware defualt label-string should be always unique. So this format string
+should have both time part (%H+%M+%S or %qX) and date
+part (%y+(%b|%m)+%d or %qx).
+@end defvar
+
+@defvar YaTeX-ref-generate-label-function
+Function to generate default label string for unnamed \\label{}s.
+The function pointed to this value should take two arguments.
+First argument is LaTeX macro's name, second is macro's argument.
+Here is an example for using this value.
+@lisp
+ (setq YaTeX-ref-generate-label-function 'my-yatex-generate-label)
+ (defun my-yatex-generate-label (command value)
+ (and (string= command "caption")
+ (re-search-backward "\\\\begin{\\(figure\\|table\\)}" nil t)
+ (setq command (match-string 1)))
+ (let ((alist '(("chapter" . "chap")
+ ("section" . "sec")
+ ("subsection" . "subsec")
+ ("figure" . "fig")
+ ("table" . "tbl"))))
+ (if (setq command (cdr (assoc command alist)))
+ (concat command ":" value)
+ (YaTeX::ref-generate-label nil nil))))
+@end lisp
+@end defvar
+
+
@node Sample definitions, Hook variables, All customizable variables, Lisp variables
@comment node-name, next, previous, up
@subsection Sample definitions
@@ -2315,16 +2370,18 @@
@comment node-name, next, previous, up
@chapter Copying
- This program is distributed as a free software. You can
-redistribute this software freely but with NO warranty to anything
-as a result of using this software. However, any reports and
-suggestions are welcome as long as I feel interests in this
-software. My possible e-mail address is `yuuji@@yatex.org'.
-(up to Sep.2003 at least) And there is mailing list for YaTeX.
-Although the common language is Japanese, questions in English will be
-welcome. To join the ML, send the mail whose subject is `append' to
-the address `yatex@@yatex.org. If you have some
-question, please ask to `yatex-admin@@yatex.org'.
+ This program is distributed as a free software. You can
+use/copy/modify/redistribute this software freely but with NO warranty to
+anything as a result of using this software. Adopting code from this
+program is also free. But I would not do contract act.
+
+Any reports and suggestions are welcome as long as I feel interests in
+this software. My possible e-mail address is `yuuji@@yatex.org'. (as of
+Jan.2004) And there is mailing list for YaTeX. Although the common
+language is Japanese, questions in English will be welcome. To join the
+ML, send the mail whose subject is `append' to the address
+`yatex@@yatex.org. If you have some question, please ask to
+`yatex-admin@@yatex.org'.
The specification of this software will be surely modified
(depending on my feelings) without notice :-p.
diff --git a/docs/yatexj.tex b/docs/yatexj.tex
index 6013a66..9845914 100644
--- a/docs/yatexj.tex
+++ b/docs/yatexj.tex
@@ -10,7 +10,7 @@
@c �m�[�h���������� C-l C-u C-n �S���̃m�[�h�X�V C-l C-u C-e
@c ���j���[���₵���� C-l C-u C-m �S���̃��j���[�X�V C-l C-u C-a
@c �t�H�[�}�b�g����Ƃ��� C-l C-e C-b
-@c Last modified Fri Aug 29 01:55:00 2003 on firestorm
+@c Last modified Wed Jul 20 21:25:48 2005 on firestorm
@syncodeindex vr cp
@end iftex
@@ -20,7 +20,7 @@
@subtitle Yet Another tex-mode for emacs
@title �w�쒹�x
@subtitle // YaTeX //
-@author @copyright{} 1991-2003 by HIROSE, Yuuji [yuuji@@yatex.org]
+@author @copyright{} 1991-2004 by HIROSE, Yuuji [yuuji@@yatex.org]
@end titlepage
@node Top, Intro, (dir), (dir)
@@ -139,6 +139,9 @@
@item �W���I La@TeX{} �R�}���h�̃I�����C���w���v(@kbd{C-c ?}, @kbd{C-c /})
@item �h�L�������g�̃C���N���[�h�\���̎��o�I�\���ƃo�b�t�@��ւ�
(@kbd{C-c d})
+@item �⊮���͂����}�N���ɉ����ĕK�v�� \userpackage �����Ă�������
+userpackage
+@item \label��ł��Ƃ͂����Y��悤! ref��cite�⊮���͂Ŏ����������܂�
@end itemize
@node Installation, Invocation, Main features, Top
@@ -368,6 +371,10 @@
�Ȃ��A���̍s�̍Ō�̒P��̃s���I�h�ȑO���u���C���t�@�C���v�̃x�[�X
�l�[���ł���Ɖ��肵�܂�(���2�̏ꍇ�ǂ����@file{main})�B
+���̍s�ɋL�q�����A@code{%f}�̓��C���t�@�C�����ɁA
+@code{%r} �̓��C���t�@�C���̊g���q����菜���������ɒu������܂��B
+�������A@code{%f,%r}�𗘗p�����ꍇ�A����^�C�v�Z�b�g���ɕK�����C���t�@�C��
+���̓��͂𑣂���܂��B
@kbd{[prefix] g} (@ref{Cursor jump}�Q��) �ł�
�t�@�C���ԃW�����v��L���ɋ@�\�����邽�߁A���̓t�@�C���������ɂ͎��̂��Ƃ�
@@ -712,6 +719,7 @@
* Enclose section-type command:: ����⊮
* Recursive completion:: �ċA�⊮
* view-sectioning:: �Z�N�V�������̃A�E�g���C���\��
+* label-generation:: ���x����������
@end menu
@node 2�ȏ�̈������Ƃ� section�^�R�}���h, Enclose section-type command, section�^�⊮, section�^�⊮
@@ -765,7 +773,7 @@
�^�R�}���h�̈����ɍX�� La@TeX{} �R�}���h������ꍇ�ɂ̓~�j�o�b�t�@�Ŗ쒹��
�⊮�L�[���ċA�I�ɓ��͂��邱�Ƃň����̓��͂������I�ɍs�Ȃ��܂��B
-@node view-sectioning, , Recursive completion, section�^�⊮
+@node view-sectioning, label-generation, Recursive completion, section�^�⊮
@comment node-name, next, previous, up
@subsection �Z�N�V�������̃A�E�g���C���\��
@cindex �A�E�g���C��[�����Ƃ炢��]
@@ -817,6 +825,19 @@
@cindex �Z�N�V�������[�����������]
@cindex �W�����v[������]
+@node label-generation, , view-sectioning, section�^�⊮
+@comment node-name, next, previous, up
+@subsection ���x����������
+@cindex ���x����������[��ւ邵�Ƃ���������]
+
+ @code{\ref@{@}} �� @code{\cite{@@}} �}�N����section�^�⊮�œ��ꂽ�ꍇ
+�Q�Ɛ�ƂȂ蓾����̂�S�ĒT���ă��j���[�ɂ��đI���ł��܂��B�Q�Ɛ�ɂ�
+@code{\label@{@}}�����Ă����K�v�͂���܂���B��������A���̃��x����
+�g���A�Ȃ�����̏�ŎQ�Ɛ��@code{\label@{@}}����点�Ă���܂��B
+���x�������l����̂͋�ɂɊ�������̂ł��B�S�ẴJ�E���^�Ƀ��x����
+����̂������ւ�ł��B�������x�����ɉ������邩�A���x�������邩����
+�����A�ȂǂƂ������Ƃ͖Y��܂��傤!
+
@node large�^�⊮, maketitle�^�⊮, section�^�⊮, Completion
@comment node-name, next, previous, up
@section large�^�⊮
@@ -1554,6 +1575,7 @@
���ł��傤�B@file{yatexenv.el}���̊�
@code{YaTeX-intelligent-newline-itemize} �̒�`�Ȃǂ��Q�l�ɂ��Ă��������B
+
@node Usepackage cheker, Changing mode of YaTeX, Intelligent newline, Top
@comment node-name, next, previous, up
@chapter ����usepackage
@@ -2017,6 +2039,50 @@
�̒l�Q�ƁB
@end defvar
+@defvar YaTeX-tabular-indentation
+tabular/array ���Ō��ݍs�̐擪�ʒu���\�̑�N�J�����̂Ƃ���
+�W���C���f���g�ʒu���� N*YaTeX-tabular-indentation ��������
+�C���f���g�ɂ���B
+@end defvar
+
+@defvar YaTeX-noindent-env-regexp
+�ʂ̊����ɂ����Ă� \begin{} ���s������n�܂�ׂ������̐��K�\���B
+verbatim���Ȃǂ��w�肷��B
+@end defvar
+
+@defvar YaTeX-ref-default-label-string
+\ref{} �̃��x���⊮�Ń��x�����ݒ�̂��̂Ɏ����I�ɐ�������
+���x�����̏����Bstrftime(3)���Ɏ������t�x�[�X�Ŏw�肷��B
+���p�ł��鏑���͈ȉ��̂Ƃ���B
+%y -> �����, %b -> ���̉p��, %m -> ��(1�`12)
+%d -> ��, %H -> ��, %M -> ��, %S -> �b,
+%qx -> �A���t�@�x�b�g��26�i�������� yymmdd.
+%qX -> �A���t�@�x�b�g��26�i�������� HHMMSS.
+�f�t�H���g�� "%H%M%S_%d%b%y"
+@end defvar
+
+@defvar YaTeX-ref-generate-label-function
+\ref{}�̃��x�������������̂Ƃ��Ɏg�����̃V���{���B
+�f�t�H���g�͕W���� YaTeX::ref-generate-label �������蓖�ĂĂ���B
+������2�������`���āA���̕ϐ��ɃZ�b�g����Ƃ��̊����Ă�
+���ʂ��f�t�H���g�̃��x�������Ƃ���B�ݒ��:
+@lisp
+ (setq YaTeX-ref-generate-label-function 'my-yatex-generate-label)
+ (defun my-yatex-generate-label (command value)
+ (and (string= command "caption")
+ (re-search-backward "\\\\begin{\\(figure\\|table\\)}" nil t)
+ (setq command (match-string 1)))
+ (let ((alist '(("chapter" . "chap")
+ ("section" . "sec")
+ ("subsection" . "subsec")
+ ("figure" . "fig")
+ ("table" . "tbl"))))
+ (if (setq command (cdr (assoc command alist)))
+ (concat command ":" value)
+ (YaTeX::ref-generate-label nil nil))))
+@end lisp
+@end defvar
+
@node Sample definitions, Hook variables, All customizable variables, Lisp variables
@comment node-name, next, previous, up
@subsection �J�X�^�}�C�Y�ϐ��ݒ��
@@ -2104,11 +2170,15 @@
�{�v���O�����̓t���[�\�t�g�E�F�A�ł��B�{�v���O�������g�p���Đ�����������
�錋�ʂɑ��Ă���҂͐ӔC��Ȃ����ƂƂ��܂��B�]�ړ��Ɋւ��Ă͐�������
-���܂���B�펯�I�Ɉ����Ă��������B�܂��A�g�p���Ă���|�����C���ł��m�点��
-�������ƁA��҂͊��ŃT�|�[�g�ɗ�ނ��Ƃł��傤�B
+���܂���B�펯�I�Ɉ����Ă��������B�܂��A�{�v���O�����Ɋ܂܂��R�[�h�𗘗p
+���邱�ƁA�������邱�Ƃ����R�ɍs�Ȃ��č\���܂��A���p���邱�Ƃɂ��_��
+�����̕K�v��������ꍇ�A���͂����Ȃ�_����������܂���B��̓I�ɂ�GPL�ւ�
+�T�C���͂��܂���̂ŁAGNU�Ɋ�����̂�����Ă���ꍇ���̍�i�����荞
+�R�[�h�𗬗p����Ƌ�J���邩������܂���B�����Ȃ�R�[�h���p�����ۂ���
+���_������͎��ނ��܂��B
���A��]�A�o�O�A���z���͊��}�������܂��B
-�A���� yuuji@@yatex.org �܂�(2003�N9������)�B
+�A���� yuuji@@yatex.org �܂�(2004�N1������)�B
�p���I�Ɏg�p���Ă���������̓��C�����O���X�g�ufj�쒹�̉�v��
����������Ă��������B�������@�ɂ��Ă͖{�p�b�P�[�W�� @file{docs/qanda}
�t�@�C���́u���̑��v�̏͂��䗗���������B
diff --git a/help/YATEXHLP.eng b/help/YATEXHLP.eng
index a099cab..2b786da 100644
--- a/help/YATEXHLP.eng
+++ b/help/YATEXHLP.eng
@@ -2,7 +2,8 @@
%%% YaTeX-LaTeX Help File(c)HIROSE Yuuji [yuuji@yatex.org]
%%% You can translate this file for any device other than YaTeX via
%%% any filter program. But it is not allowed to remove copyright
-%%% notice and any existing dictionary entiries.
+%%% notice and any existing dictionary entiries which describes the
+%%% source of this file.
%%%
textfloatsep
@@ -374,16 +375,30 @@
\setcounter{FOO}{VAL}
Set counter FOO's value to VAL.
+
+
addtocounter
\addtocounter{FOO}{VAL}
Add value VAL to counter FOO.
+
+
newcounter
\newcounter{COUNTER}[OLDCTR]
Defines a new counter COUNTER.
If an optional argument OLDCTR is given, COUNTER's value will be reset
every time OLDCTR's value is changed by \stepcounter or \addtocounter.
+
+
+How to Introduce new counter
+You'll get `Question n.' increasing n with \mondai, by setting as below.
+
+\newcounter{toi}
+\renewcommand{\thetoi}{Question \arabic{toi}.~ }
+\setcounter{toi}{0}
+\newcommand{\mondai}{\refstepcounter{toi}\thetoi}
+
value
\value{COUNTER}
Returns value of COUNTER. Must not be preceded by \protect.
@@ -442,7 +457,7 @@
LABELs set in an item of the enumerate environment.
pageref
-pageref{LABEL}
+\pageref{LABEL}
Refer to the page number where \label{LABEL} exists.
(
@@ -669,11 +684,13 @@
makebox
\makebox[WID][POS]{OBJECT} \makebox(X,Y)[POS]{OBJECT}
First form will place OBJECT at position POS and width WID in a \box.
-For POS, object will be placed flush-left if l, flush-right if r, and
-centered if nothing is given
-In the second form, object will be placed in a \hbox sized (X,Y) (in
+For POS, object will be placed flush-left if `l', flush-right if `r',
+splattering words in the same space if `s', and centered if nothing is given
+in the second form, object will be placed in a \hbox sized (X,Y) (in
\unitlength) within a picture environment. POS is the same as the first form.
+
+
mbox
\mbox{OBJECT}
Same as \makebox{OBJECT}.
@@ -695,7 +712,7 @@
Same as \savebox. \sbox is robust, and \savebox is fragile.
framebox
-\framebox{OBJECT}
+\framebox[WID][POS]{OBJECT} \framebox(X,Y)[POS]{OBJECT}
Do the same thing as \makebox with a frame.
The frame's width and space between the object are decided by \framerule
and \framesep. If used as \framebox(X,Y){OBJECT} in a picture
@@ -708,6 +725,13 @@
Same as \framebox{OBJECT}.
\fbox is robust, \framebox fragile.
+Rule width of \fbox can be controled by setting \fboxrule
+
+ {
+ \fboxrule=2\fboxrule
+ \fbox{contents of double width of rule}
+ }
+
parbox
\parbox[POS]{WIDTH}{TEXT}
Make a box of width WIDTH using TEXT. The box's position by POS is;
@@ -1218,8 +1242,17 @@
documentstyle
\documentstyle[OPTION1,OPTION2, ... ,OPTIONn]{STYLE}
-The user starts his file with the command as above
-which saves the OPTION's and \input's the file STYLE.STY.
+The user starts one's file with the command as above
+which loads the OPTION's respectively and \input's the file STYLE.sty.
+
+documentclass
+\documentclass[OPTION1,OPTION2, ... ,OPTIONn]{STYLE}
+In LaTeX2e, user starts one's file with the command as above
+which loads the OPTION's respectively and \input's the file STYLE.cls.
+
+usepackage
+\usepackage[OPTIONS]{PACKAGE}
+Use additional package `PACKAGE' with option `OPTION'.
verb
\verb#CONTENTS#
@@ -1287,6 +1320,17 @@
\twocolumn[STRING]
Clear page and start two-column typesetting.
Optional argument [STRING] specifies the page-acrossing title.
+
+If you want to output one-column title page with two-column body,
+describe like this;
+\twocolumn[
+\begin{titlepage}
+{\LARGE YourTitle}
+\vspace*{1em}
+\begin{abstract} Your Abstract blah blah... \end{abstract}
+\end{titlepage}
+]
+
->onecolumn
onecolumn
@@ -1457,7 +1501,255 @@
[
+quote
+\begin{quote} ... \end{quote}
+quotation without paragraph
+quotation
+\begin{quotation} ... \end{quotation}
+quoted environment which might contains paragraphs
+
+textcircled
+\textcircled{CHAR}
+Enclose `char' with small circle. Because this circle is as large as one
+character, you had better encolose `CHAR' with {\small ...}, {\tiny ...},
+{\scriptsize ...}.
+
+hfill
+\hfill
+Insert a space as wide as possible. Same as \hspace{\fill}.
+
+foo\hfill bar
+produces;
+ foo bar
+
+foo\hfill bar\hfill baz
+produces;
+ foo bar baz
+
+\hfill can't produce space at the beginning of the line because \hfill
+is a kind of \hspace{}. If you make right-justified world in a line,
+write \hspace*{\fill}.
+
+hfil
+\hfil
+Same as \hfill, but little bit weak.
+
+vfill
+\vfill
+Make vertical space in utmost length , the same as \vspace{\fill}.
+cf. \hfill
+
+hrulefill
+\hrulefill
+Draw underline in utmost length.
+
+backslashbox
+\usepackage{slashbox} \backslashbox{A}{B}
+Draw a back-slash in a column of tabular.
+\begin{tabular}
+\hline
+\backslashbox{A}{B} & hoge \\ \hline
+\end{tabular}
+
+ +----+--------+
+ | \ B| |
+ | A\ | hoge |
+ +----+--------+
+
+
+slashbox
+\slashbox{A}{B}
+Draw long slash line in a column of tabular.
+See also backslashbox.
+
+ooalign
+{\ooalign{String1\crcr String2...}
+Set line spacing to zero and shift to double-strike mode.
+This can be used for generating circled character.
+Look this;
+
+\newcommand{\maru}[1]{{\ooalign {\hfill$\scriptstyle#1$\hfill\crcr$\bigcirc$}}}
+
+\crcr is the equivalent of \\ for tabulars.
+Note that \ooalign change the spacing parameters. So you should enclose
+\ooalign itself with { }.
+
+maru
+\maru{R}
+Circle one character.
+Declare the \newcommand as below;
+\newcommand{\maru}[1]{{\ooalign {\hfill$\scriptstyle#1$\hfill\crcr$\bigcirc$}}}
+
+today
+\date{\today}
+Use this as the argument of \date{}.
+Set the document's date in title to today.
+
+NamedColor
+\textcolor[named]{COLOR}{TEXT}, for example.
+With `\usepackage{color}', you can use colors listed below.
+
+GreenYellow Yellow Goldenrod Dandelion Apricot Peach Melon YellowOrange
+Orange BurntOrange Bittersweet RedOrange Mahogany Maroon BrickRed Red
+OrangeRed RubineRed WildStrawberry Salmon CarnationPink Magenta
+VioletRed Rhodamine Mulberry RedViolet Fuchsia Lavender Thistle
+OrchidDarkOrchid Purple Plum Violet RoyalPurple BlueViolet Periwinkle
+CadetBlue CornflowerBlue MidnightBlue NavyBlue RoyalBlue Blue Cerulean
+Cyan ProcessBlue SkyBlue Turquoise TealBlue Aquamarine BlueGreen Emerald
+JungleGreen SeaGreen Green ForestGreen PineGreen LimeGreen YellowGreen
+SpringGreen OliveGreen RawSienna Sepia Brown Tan Gray Black White)
+
+See also http://www.yatex.org/help/color.tex
+
+textcolor
+\textcolor{COLOR}{TEXT}
+Put the TEXT colored with COLOR.
+
+
+
+pagecolor
+\pagecolor{COLOR}
+Set background color of the page to COLOR.
+
+
+
+color
+\color{COLOR}
+Set text color of the page to COLOR.
+
+
+
+colorbox
+\colorbox{COLOR}{TEXT}
+Put TEXT in the box whose background color is COLRO.
+
+
+
+fcolorbox
+\fcolorbox{FCOLOR}{BGCOLOR}{TEXT}
+Put text int the box whose frame color is FCOLOR and background BGCOLOR.
+
+
+
+rotatebox
+\rotatebox{ANGLE}{TEXT}
+Put TEXT with rotated by ANGLE-degrees, unclockwise.
+Require `\usepackage{graphicx}'.
+
+resizebox
+\resizebox{WIDTH}{HEIGHT}{TEXT}
+Put TEXT enlarging/shrinking to WIDTH and HEIGHT.
+You can omit either of WIDHT or HEIGHT. In that case, specify `!'.
+\resizebox{!}{40mm}{TEXT} outputs TEXT with 40mm in height.
+Require `\usepackage{graphicx}'.
+
+scalebox
+\scalebox{MAG}[V-MAG]{TEXT}
+Put TEXT maginifiyng by MAG. V-MAG for vertical magnification factor is
+optional. Negative values for magnification factor flip the TEXT
+in that direction.
+
+Require `\usepackage{graphicx}'.
+
+reflectbox
+\reflectbox{TEXT}
+Flip TEXT horizontally.
+Equivalent to \scalebox{-1}[1]{TEXT}.
+Require `\usepackage{graphicx}'.
+
+ulem
+\usepackage{ulem}
+\usepackage{ulem}
+The `ulem' package provides macros listed below.
+\uline{Underlined Text}
+\uwave{Waved-Unlderlined Text}
+\uuline{Double Underlined Text}
+
+(Information by TSUCHIYA Masatoshi )
+uline
+\uline{TEXT}
+Put TEXT with underline.
+
+
+
+uwave
+\uwave{TEXT}
+Put TEXT with waved underline.
+
+
+
+uuline
+\uuline{TEXT}
+Put TEXT with double underline.
+
+
+showkeys.sty
+\usepackage[options]{showkeys}
+In margin area, output `(?)' marks for unlabeled math-expressions,
+`?label?' marks for unreferred labels.
+Optional arguments are one of;
+showrefs, norefs, showcites, nocites, msgs, nomsgs, chkunlbld,
+ignoreunlbld.
+msgs/nomsgs specifies whether output messages in *.log file or not.
+
+`\usepackage{showkeys}' should be located before the declaration
+for AMS-LaTeX or HyperRef, if any.
+
+Another style `refcheck.sty' can also output labeling information
+including `\ref{***}' macros themselves.
+
+(Information by Masaki Shigemori )
+
+table*
+\begin{table*} ... \end{table*}
+Put tabular in one column at the top of page even if in twocolumn mode.
+
+figure*
+\begin{figure*} ... \end{figure*}
+Put figure in one column at the top of page even if in twocolumn mode.
+If you put figure bottom of page instead of top, use nidanfloat.sty
+instead.
+\begin{figure*}[b]
+ \includegraphics{blahblahblah}
+ \caption{foo bar baz}
+\end{figure*}
+
+includegraphics
+\usepackage{graphicx} ... \includegraphics[Options]{graphicfile.eps}
+Include graphics$B!#(BRequires `graphicx' package.
+Possible [Options] are as follows.
+scale=X
+width=W
+height=H
+draft (Frame only)
+angle=R
+origin=RotationOrigin (One of `c', `tl', `tr', `bl' or `br')
+bb=llx lly urx ury (Specify BoundingBox)
+viewport=llx lly urx ury (Rerative to BoundingBox)
+trim=left bottom right top
+
+abstract
+\begin{abstract} ... \end{abstract}
+Output abstract
+
+\langle
+$\langle$
+
+`<' in math-modes.
+
+\langle
+$rlangle$
+
+`>' in math-modes.
+
+\slash
+\slash
+slash(/) itself.
+
+\textbackslash
+\textbackslash
+backslash(\) itself.
YaTeX
(setq auto-mode-alist (cons '("\\.tex$" . yatex-mode) auto-mode-alist))
diff --git a/help/YATEXHLP.jp b/help/YATEXHLP.jp
index 6aaf7de..ce02ac7 100644
--- a/help/YATEXHLP.jp
+++ b/help/YATEXHLP.jp
@@ -44,6 +44,9 @@
{}���̓��e��\\�ŋ��ꂽ�P�ʖ��ɐςݏd�˂ĕ\������B
[�ꏊ]�́Al(����)�Ac(�Z���^�����O)�Ar(�E��)�̂����ꂩ�B
+�\(tabular)�̒��ŏc�����ɍ��ڂ���ꂽ���Ƃ��ɂ��֗��B
+
+
newlength
\newlength{NAME}
NAME�Ƃ��������R�}���h��V���ɐ錾����B
@@ -390,10 +393,15 @@
\setcounter{FOO}{VAL}
�J�E���^FOO�̒l��VAL�ɐݒ肷��B
+
+
addtocounter
\addtocounter{FOO}{VAL}
�J�E���^FOO�̒l��VAL��������B
+
+
+
newcounter
\newcounter{COUNTER}[OLDCTR]
�V�����J�E���^COUNTER��ݒ肷��B
@@ -401,6 +409,18 @@
\stepcounter �������� \addtocounter �ŕύX����邽�т�COUNTER�̒l�����Z�b
�g�����B
+
+
+�V�����J�E���^�̍���
+�ȉ��̒�`�� \mondai �Ƃ���ƁA�����I��n���C���N�������g���āu��n��v��
+�o�͂���B
+
+\newcounter{toi}
+\renewcommand{\thetoi}{��\arabic{toi}��~ }
+\setcounter{toi}{0}
+\newcommand{\mondai}{\refstepcounter{toi}\thetoi}
+
+
value
\value{COUNTER}
COUNTER�̒l��Ԃ��B\protect ��O�u���Ă͂Ȃ�Ȃ��B
@@ -459,7 +479,7 @@
enumerate���ꂽitem�Őݒ肳�ꂽ���x���ɂ������ẮAitem�ԍ����Ԃ����B
pageref
-pageref{LABEL}
+\pageref{LABEL}
\label{LABEL}�̑��݂���y�[�W�ԍ����Q�Ƃ���B
(
@@ -692,6 +712,18 @@
��2�̏����ł́Apicuture���ő傫��(X,Y)��(\unitlength����Ƃ���)
\hbox �ɃI�u�W�F�N�g��z�u����B�z�u�ʒuPOS�͑�1�̏����Ɠ��l�B
+LaTeX2e�ȍ~�ł͑�1�̏�����POS��s���w��ł��A�{�b�N�X���ɕ������ϓ�����t��
+���Ă����B�{�b�N�X�̕��͑S�p1����\��zw��P�ʂɂ���ƕ֗����낤�B
+\makebox[7zw][s]{�R�c���Y}\\
+\makebox[7zw][s]{�ؑ���}\\
+\makebox[7zw][s]{�L�� �Y��}
+�Ƃ����
+ |�R �c �� �Y|
+ |�� �� ��|
+ |�L �� �Y ��|
+
+�Ƃ��������ɂȂ�B
+
mbox
\mbox{�I�u�W�F�N�g}
\makebox{�I�u�W�F�N�g}�Ɠ����B
@@ -718,17 +750,40 @@
\savebox��\CMD�ɕۑ����ꂽ�e�L�X�g��z�u����B
framebox
-\framebox{�I�u�W�F�N�g}
+\framebox[WID][POS]{�I�u�W�F�N�g} \framebox(X,Y)[POS]{�I�u�W�F�N�g}
�u�I�u�W�F�N�g�v�ɘg������\makebox�Ɠ��l�̏���������B
�g�̐��̑����� \framerule�A�I�u�W�F�N�g�Ƃ̊Ԋu�� \framesep �Ō��܂�B��
����picture���� \framebox(X,Y){�I�u�W�F�N�g}�Ƃ����ꍇ�́Apicture��
�p�̐��̑����ɏ]���A�O�g�ƃI�u�W�F�N�g�Ƃ̊Ԋu�͋��Ȃ��B
+LaTeX2e�ȍ~�ł͑�1�̏�����POS��s���w��ł��A�{�b�N�X���ɕ������ϓ����t
+���Ă����B�{�b�N�X�̕��͑S�p1����\��zw��P�ʂɂ���ƕ֗����낤�B
+\framebox[7zw][s]{�R�c���Y}\\
+\framebox[7zw][s]{�ؑ���}\\
+\framebox[7zw][s]{�L�� �Y��}
+�Ƃ����
+ +--------------+
+ |�R �c �� �Y|
+ +--------------+
+ |�� �� ��|
+ +--------------+
+ |�L �� �Y ��|
+ +--------------+
+
+�Ƃ��������ɂȂ�B
+
fbox
\fbox{�I�u�W�F�N�g}
\framebox{�I�u�W�F�N�g}�Ɠ����B
\fbox��robust, \framebox��fragile
+\fbox �̌r���̑�����ς���ɂ́C\fboxrule ��ύX���܂��D
+
+ {
+ \fboxrule=2\fboxrule
+ \fbox{2�{�̑����̌r���ň͂܂ꂽ�{�b�N�X}
+ }
+
parbox
\parbox[POS]{WIDTH}{TEXT}
TEXT��WIDTh�̕��őg��Ń{�b�N�X���쐬����B�{�b�N�X�̈ʒu��POS�ɂ����
@@ -895,6 +950,18 @@
tabular���́A�y�[�W���ׂ邱�Ƃ��ł��Ȃ��B������\�ɂ���X�^�C���t�@
�C���Ƃ��āAsupertab.sty������B
+l, c, r �w�肵��1�̃J������2�s�ȏ�̍��ڂ���ꂽ���Ƃ���parbox�𗘗p����
+(shortstack�𗘗p����Ə�ɂ����̂�raisebox�Œ������Ȃ���Ȃ�Ȃ�)�B
+\begin{tabular}{lp{0.5\columnwidth}}
+ \parbox[t]{7em}{��\\��} & ���Ԃ炩���Ԃ炠�Ԃ炩���Ԃ炠�Ԃ炩���Ԃ�
+\end{tabular}
+�́A�ȉ��̂悤�Ƀ��C�A�E�g�����B
+
+ �� ���Ԃ炩��
+ �� �Ԃ炠�Ԃ�
+ �����Ԃ�
+
+
tabular*
\begin{tabular*}{��}{�v���A���u��} ... \end{tabular*}
�����w�肵��tabular�����쐬�B
@@ -1166,6 +1233,17 @@
[OPTION...] ���w�肷��ƁASTYLE.sty ��ǂ�ɁA
OPTIONn.sty �������ǂݍ��܂��B
+documentclass
+\documentclass[OPTION1,OPTION2, ... ,OPTIONn]{STYLE}
+�����X�^�C�����w�肷��(LaTeX2e)�B
+[OPTION...] ���w�肷��ƁASTYLE.cls ��ǂ�ɁA
+OPTIONn.sty �������ǂݍ��܂��B
+
+usepackage
+\usepackage[�I�v�V����]{�p�b�P�[�W}
+LaTeX2e �̋L�@���g������u�p�b�P�[�W�v�����[�h����B
+
+
verb
\verb#���e#
\verb�̒���ɗ��镶���ƁA���ɂ�����铯�������Ƃ̂������ɋ��܂ꂽ����
@@ -1215,6 +1293,8 @@
mm �~�����[�g��
pc �p�C�J(=12pt)
pt �|�C���g(72.27pt=1�C���`)
+zw ���{��S�p1���̕�
+zh ���{��S�p1���̍���
\fill ���R����0�����A�C�ӂ̒����ɐL�т邱�Ƃ̂ł���L�k��
\stretch{X} \fill ��X�{
@@ -1226,6 +1306,17 @@
\twocolumn[STRING]
���ł������Ɠ�i�g�݂ł̑g�ł��J�n����B
[STRING]���w�肷��ƁASTRING���i�Ԃ������̃^�C�g���Ƃ��ďo�́B
+�{������i�g�݂Ń^�C�g���ƃA�u�X�g���N�g�݂̂�1�i�g�ɂ������ꍇ��
+\twocolumn[
+\begin{titlepage}
+{\LARGE �a���^�C�g����}
+\vspace*{1em}
+\begin{abstract} �a�����^ \end{abstract}
+\renewcommand{\abstractname}{\textbf{Abstract}}
+\begin{abstract} �p���A�u�X�g���N�g \end{abstract}
+\end{titlepage}
+]
+�̂悤�ɂ���Ɨǂ��B
��onecolumn
onecolumn
@@ -1396,10 +1487,288 @@
\doublebox{STRING}
��d�l�p�g�� STRING ���͂ށB
+quote
+\begin{quote} ... \end{quote}
+�i�����܂܂Ȃ����p
+
+quotation
+\begin{quotation} ... \end{quotation}
+�i�����܂ވ��p
+
+
�v `\usepackage{fancybox}`
][
+textcircled
+\textcircled{����}
+�u�����v���ۘg�ň͂ށB1�����Ɠ����傫���̊ۘg�Ȃ̂�
+{\small ...}, {\tiny ...}, {\scriptsize ...} �ȂǂŊ����������ǂ��B
+
+hfill
+\hfill
+�ł��邾���L���Ԋu���J����B\hspace{\fill} �Ɠ����B
+��\hfill ��
+�Ƃ����
+ �� ��
+
+��\hfill ��\hfill ��
+�Ƃ����
+ �� �� ��
+
+�̂悤�ɍő���ɊԊu�������Ă����B������ \hspace{} �����Ȃ̂�
+�s�����Ƃ��܂��s���Ȃ��B�E�������Ȃ� \hspace*{\fill} �Ƃ���B
+
+hfil
+\hfil
+\hfill ���ア�Ԋu�J���B
+\hfill ���Q�Ƃ̂��ƁB
+
+vfill
+\vfill
+�c�����ɍő���̋��J����B\vspace{\fill} �Ɠ����B
+\hfill ���Q�Ƃ̂��ƁB
+
+hrulefill
+\hrulefill
+�\�Ȍ��蒷�����t�r���������B
+����܂肢����������Ȃ��ȁB
+
+backslashbox
+\backslashbox{A}{B}
+tabular����(���)����̃J�����ŗp���ĉE������ΐ��ŋ����2���ڂ������B
+�v \usepackage{slashbox}
+\begin{tabular}
+\hline
+\backslashbox{A}{B} & hoge \\ \hline
+\end{tabular}
+
+ +------+--------+
+ | �_ B | |
+ | A �_ | hoge |
+ +------+--------+
+
+
+slashbox
+\slashbox{A}{B}
+tabular����(���)�E��̃J�����ŗp���ĉE�オ��ΐ��ŋ����2���ڂ������B
+backslashbox���Q�Ƃ���B
+
+ooalign
+{\ooalign{������1\crcr ������2�c�c}
+�s����[���̐ݒ�ɕύX���ĕ����̏d�ˑł����\�ɂ���B
+������������邽�߂̗L���ȃ}�N�� \maru{} �͕֗��B
+
+\newcommand{\maru}[1]{{\ooalign {\hfill$\scriptstyle#1$\hfill\crcr$\bigcirc$}}}
+
+\crcr ��\ooalign���ł̉��s���Ӗ�����B\hfill �́u�ő�ɉ��т�v�Ƃ�
+�����ƂŁA�����̍��E�ɔz�u���邱�ƂŃZ���^�����O�̌��ʂ�������B
+\ooalign �͉��s���Ȃǂ̒����p�����[�^���������Ă��܂��̂őS�̂� {} ��
+����K�v�����邱�Ƃɒ��ӁB
+
+maru
+\maru{��}
+����(1�����Ɍ���)�����ň͂ށB�v���A���u���ňȉ��� \newcommand ������B
+\newcommand{\maru}[1]{{\ooalign {\hfill$\scriptstyle#1$\hfill\crcr$\bigcirc$}}}
+
+today
+\date{\today}
+�쐬���̓��t���̏o�͂��w�肷��B�v���A���u���� \date �ƂƂ��Ɏg���B
+
+�a��
+\�a��
+\�a�� �͓��t���������ł̕\�L�ɂ���B
+\���� �͐���ł̕\�L�ɂ���B
+\maketitle ����Ɏw�肷��B
+
+����
+\����
+
+
+color�̖��O���J���[
+\textcolor[named]{�F��}{���e} �ȂǁA[named] ���w�肷��B
+
+\usepackage{color} �ɂ���Ďg�p�\�B
+�g����F�͈ȉ��̒ʂ�B
+GreenYellow Yellow Goldenrod Dandelion Apricot Peach Melon YellowOrange
+Orange BurntOrange Bittersweet RedOrange Mahogany Maroon BrickRed Red
+OrangeRed RubineRed WildStrawberry Salmon CarnationPink Magenta
+VioletRed Rhodamine Mulberry RedViolet Fuchsia Lavender Thistle
+OrchidDarkOrchid Purple Plum Violet RoyalPurple BlueViolet Periwinkle
+CadetBlue CornflowerBlue MidnightBlue NavyBlue RoyalBlue Blue Cerulean
+Cyan ProcessBlue SkyBlue Turquoise TealBlue Aquamarine BlueGreen Emerald
+JungleGreen SeaGreen Green ForestGreen PineGreen LimeGreen YellowGreen
+SpringGreen OliveGreen RawSienna Sepia Brown Tan Gray Black White)
+
+�F���{���o���\�[�X��
+http://www.yatex.org/help/color.tex �ɂ���̂ŁA�����Ɨǂ��B
+
+textcolor
+\textcolor{�F}{���e}
+�����̐F���u�F�v�ɐݒ肵�āu���e�v���o�́B
+
+
+
+pagecolor
+\pagecolor{�F}
+�y�[�W�̔w�i�F���u�F�v�ɐݒ肷��B
+
+
+
+color
+\color{�F}
+
+�y�[�W�̕����H���u�F�v�ɐݒ肷��B
+
+
+
+colorbox
+\colorbox{�F}{���e}
+�u�F�v���w�i�̃{�b�N�X����肻�̒��Ɂu���e�v���o�́B
+
+
+
+
+fcolorbox
+\fcolorbox{�g�̐F}{�w�i�F}{���e}
+�g�Ɣw�i�F���w�肵�āu���e�v���o�́B
+
+
+
+rotatebox
+\rotatebox{�p�x}{���e}
+�u���e�v���u�p�x�v��]���ďo�́B
+�v `\usepackage{graphicx}'
+
+resizebox
+\resizebox{���̒���}{�c�̒���}{���e}
+�c�������ȗ��������Ƃ��� ! ���w�肷��B
+\resizebox{!}{40mm}{���e} �Ƃ���Əc��40mm�ŏc�����ۑ����Ċg�傷��B
+�v `\usepackage{graphicx}'
+
+scalebox
+\scalebox{�{��}[�c�{��]{���e}
+�u���e�v���u�{���v�{���ďo�́B�c�{���͏ȗ��\�B
+�{���Ƃ��ĕ��̐����w�肷��Ɣ��]�B
+�v `\usepackage{graphicx}'
+
+reflectbox
+\reflectbox{���e}
+�u���e�v�����E���]���ďo�́B\scalebox{-1}[1]{���e} �Ɠ����B
+�v `\usepackage{graphicx}'
+
+ulem
+\usepackage{ulem}
+\usepackage{ulem} ����� �ȉ��̃}�N�����g����B
+\uline{�ʏ�̉���}
+\uwave{�g��}
+\uuline{��d�̉���}
+
+\underline��\uline�͑O��ɒP����}������邩�ǂ������قȂ��Ă���B
+
+�O\underline{��}��
+�O\uline{��}��
+
+�� typeset ���Ĕ�r���Ă݂�ƕ�����B
+
+(���� TSUCHIYA Masatoshi )
+
+uline
+\uline{���e}
+�u���e�v�ɃA���_�[���C��������B
+
+
+
+uwave
+\uwave{���e}
+�u���e�v�ɔg����������B
+
+
+
+uuline
+\uuline{���e}
+�u���e�v�ɓ�d�A���_�[���C��������B
+
+
+
+showkeys.sty
+\usepackage[options]{showkeys}
+���x���������iunlabeled�j�����ɂ� {?} ���}�[�W���Ɉ�������B
+���p����Ȃ��������x���� ?label? �̂悤�Ɉ�������B
+�I�v�V�����ɂ� showrefs, norefs, showcites, nocites, msgs, nomsgs,
+chkunlbld, ignoreunlbld ������Bmsgs/nomsgs �� .log �t�@�C����
+���b�Z�[�W���������ނ��ۂ��B���̑��̃I�v�V�����͎����B
+
+AMS-LaTeX �� HyperRef �Ɠ����Ɏg���邪�A�����������
+\usepackage ���Ȃ��Ă͂Ȃ�Ȃ��B
+
+�����悤�� package �� refcheck.sty �Ƃ����̂�����B
+���ꂾ�� \ref �܂Ō�����i�ł��������Ă��������������j�B
+(���� Masaki Shigemori )
+
+dots
+\dots
+�_�X
+\dots�ɂ͂�������ނ�����̂œK�Ɏg���킯�܂��傤�B
+
+\dotsc ... �R���}�ŋ��ꂽ�������Ƃ�\�킷�_�X�D $A_1, A_2, \dotsc$
+\dotsb ... ���Z�q(+�Ȃ�)���������Ƃ�\�킷�_�X�D$A_1+A_2+\dotsb$
+\dotsm ... �|���Z(���Z�q�ȗ�)���������Ƃ�\�킷�_�X�D$A_1 A_2 \dotsm$
+\dotsi ... �ϕ����������Ƃ�\�킷�_�X \[ \int_{A_1} int_{A_2} \dotsi \]
+
+(���� Ryohei SETO )
+
+table*
+\begin{table*} ... \end{table*}
+��i�g���ł��\����i�Ԃ������Ŕz�u
+
+figure*
+\begin{figure*} ... \end{figure*}
+��i�g���ł��}����i�Ԃ������Ŕz�u([t]�̂�)�B
+���i([b])�ɒu�������Ƃ��� nidanfloat.sty ���g���B
+\begin{figure*}[b]
+ �`�`\includegraphics�Ƃ��}�������}�N���`�`
+ \caption{�W��}
+\end{figure*}
+
+includegraphics
+\usepackage{graphicx} ... \includegraphics[�I�v�V����]{graphicfile.eps}
+�摜����荞�ށB�v graphicx �p�b�P�[�W�B
+�u�I�v�V�����v�͈ȉ��̂��̂��w��\�B
+scale=�g�嗦
+width=��
+height=����
+draft (���e���[�h; �g�����\��)
+angle=��]�p
+origin=��]�̒��S�ʒu (c, tl, tr, bl, br�̂ǂꂩ)
+bb=llx lly urx ury (BoundingBox�ƂȂ��`�Ίp���W���w��)
+viewport=llx lly urx ury (BoundingBox���̑��ΓI���W�Ő���)
+trim=left bottom right top (�w�肵���������)
+
+abstract
+\begin{abstract} ... \end{abstract}
+���^(�A�u�X�g���N�g)���o�͂���B
+�a�����^����p���ɐ�ւ������Ƃ��͘a����abstract�����I�������Ƃ�
+\renewcommand{\abstractname}{\textbf{Abstract}}
+�Ƃ��Ă���ēxabstract�����n�߂�Ɨǂ��B
+
+\langle
+$\langle$
+
+�������[�h�ł�`�q'
+
+\langle
+$rlangle$
+
+�������[�h�ł�`�r'
+
+\slash
+\slash
+�X���b�V�����̂���
+
+\textbackslash
+\textbackslash
+�o�b�N�X���b�V�����̂���
LaiTeX
a Little Assistant Interface for TeX on Vz
@@ -1633,6 +2002,16 @@
�R���M������(���k��)
Meadow���[�U�̂��߂̏ڍ׃C���X�g�[���h�L�������g�������ĉ������܂����B
+�d�X��������(������)
+ ������Ȃ��o�O���|�[�g�ƃR�����g���܂����B
+
+���˗�������(�����ّ�)
+ Carbon Emacs(MacOS X) �ł̎g�p�̂��߂̏������������܂����B
+ AMS-LaTeX�Ŏg���d�v�ȃ}�N���̏������������܂����B
+
+
+
+
yatex
(setq auto-mode-alist (cons '("\\.tex$" . yatex-mode) auto-mode-alist))
diff --git a/yahtml.el b/yahtml.el
index a72485e..c8176b9 100644
--- a/yahtml.el
+++ b/yahtml.el
@@ -1,9 +1,9 @@
;;; -*- Emacs-Lisp -*-
-;;; (c) 1994-2003 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Nov 17 18:28:50 2003 on firestorm
+;;; (c) 1994-2006 by HIROSE Yuuji [yuuji@yatex.org]
+;;; Last modified Sun Dec 24 15:12:35 2006 on firestorm
;;; $Id$
-(defconst yahtml-revision-number "1.70"
+(defconst yahtml-revision-number "1.72"
"Revision number of running yahtml.el")
;;;[Installation]
@@ -173,9 +173,8 @@
;;; --- customizable variable starts here ---
(defvar yahtml-prefix "\C-c"
"*Prefix key stroke of yahtml functions.")
-(defvar yahtml-image-viewer "xv" "*Image viewer program")
-(defvar yahtml-www-browser "netscape"
- "*WWW Browser command")
+(defvar yahtml-image-viewer "display" "*Image viewer program")
+(defvar yahtml-www-browser "firefox" "*WWW Browser command")
(defvar yahtml-kanji-code 2
"*Kanji coding system number of html file; 1=sjis, 2=jis, 3=euc")
;;(defvar yahtml-coding-system
@@ -208,13 +207,19 @@
(defvar yahtml-hate-too-deep-indentation nil
"*Non-nil for this variable suppress deep indentation in listing environments.")
-(defvar yahtml-always-/p nil
+(defvar yahtml-always-/p t
"*Those who always use ] with
set this to t.")
+(defvar yahtml-always-/li nil
+ "*Those who always use with set this to t.")
+(defvar yahtml-always-/dt nil
+ "*Those who always use with set this to t.")
+(defvar yahtml-always-/dd nil
+ "*Those who always use with set this to t.")
(defvar yahtml-p-prefered-env-regexp "^\\(body\\|dl\\|blockquote\\)"
"*Regexp of envs where paragraphed sentences are prefered.")
-(defvar yahtml-template-file "~/http/template.html"
+(defvar yahtml-template-file "~/public_html/template.html"
"*Template HTML file. It'll be inserted to empty file.")
(defvar yahtml-prefer-upcases nil
@@ -223,8 +228,7 @@
(defvar yahtml-prefer-upcase-attributes nil
"*Non-nil for preferring upcase attributes")
-(defvar yahtml-server-type 'apache
- "*WWW server program type")
+(defvar yahtml-server-type 'apache "*WWW server program type")
(defvar yahtml-apache-access-file ".htaccess"
"*Server access file name for apache")
@@ -265,6 +269,10 @@
(defvar yahtml-indentation-boundary "^\\s *"
"*Boundary regexp for indentation calculation.")
+(defvar yahtml-html4-strict t
+ "*Non-nil means editing HTML 4.01 Strict.
+Completing read for obsoleted attributes disabled.")
+
;;; --- customizable variable ends here ---
(defvar yahtml-prefix-map nil)
(defvar yahtml-mode-map nil "Keymap used in yahtml-mode.")
@@ -305,6 +313,7 @@
(define-key yahtml-mode-map "\M-\C-a" 'YaTeX-beginning-of-environment)
(define-key yahtml-mode-map "\M-\C-e" 'YaTeX-end-of-environment)
(define-key yahtml-mode-map "\M-\C-m" 'yahtml-intelligent-newline)
+ (define-key yahtml-mode-map "\M-\C-j" 'yahtml-intelligent-newline)
(define-key yahtml-mode-map "\C-i" 'yahtml-indent-line)
(define-key yahtml-mode-map "&" 'yahtml-insert-amps)
(let ((map yahtml-prefix-map))
@@ -337,6 +346,7 @@
(yahtml-define-begend-key "bc" "center" map)
(yahtml-define-begend-key "bd" "dl" map)
(yahtml-define-begend-key "bu" "ul" map)
+ (yahtml-define-begend-key "bo" "ol" map)
(yahtml-define-begend-key "b1" "h1" map)
(yahtml-define-begend-key "b2" "h2" map)
(yahtml-define-begend-key "b3" "h3" map)
@@ -344,7 +354,7 @@
(yahtml-define-begend-key "bf" "form" map)
(yahtml-define-begend-key "bs" "select" map)
(yahtml-define-begend-key "bv" "div" map)
- (yahtml-define-begend-key "bS" "div" map)
+ (yahtml-define-begend-key "bS" "span" map)
(yahtml-define-begend-key "bp" "pre" map)
(YaTeX-define-key "b " 'yahtml-insert-begend map)
(YaTeX-define-key "B " 'yahtml-insert-begend-region map)
@@ -409,13 +419,17 @@
("UnorderedList" . "ul")
("DefinitionList" . "dl")
("Preformatted" . "pre")
- ("table") ("thead") ("tbody") ("tfoot") ("caption") ("tr") ("th") ("td")
+ ("table") ("thead") ("tbody") ("tfoot") ("tr") ("th") ("td")
("address")
("h1") ("h2") ("h3") ("h4") ("h5") ("h6")
;; ("p") ;This makes indentation screwed up!
- ("style") ("div") ("object")
+ ("style") ("script") ("noscript") ("div") ("object") ("ins") ("del")
))
+(if yahtml-html4-strict
+ (setq yahtml-env-table
+ (delete (assoc "center" yahtml-env-table) yahtml-env-table)))
+
;(defvar yahtml-itemizing-regexp
; "\\(ul\\|ol\\|dl\\)"
; "Regexp of itemizing forms")
@@ -427,12 +441,23 @@
(and yahtml-always-/p
(or (assoc "p" yahtml-env-table)
(setq yahtml-env-table (cons '("p") yahtml-env-table))))
+(and yahtml-always-/li
+ (or (assoc "li" yahtml-env-table)
+ (setq yahtml-env-table (cons '("li") yahtml-env-table))))
+(and yahtml-always-/dt
+ (or (assoc "dt" yahtml-env-table)
+ (setq yahtml-env-table (cons '("dt") yahtml-env-table))))
+(and yahtml-always-/dd
+ (or (assoc "dd" yahtml-env-table)
+ (setq yahtml-env-table (cons '("dd") yahtml-env-table))))
(defvar yahtml-typeface-table
(append
- '(("dfn") ("em") ("cite") ("code") ("kbd") ("samp") ("strike") ("s")
- ("strong") ("var") ("b") ("i") ("tt") ("u") ("big") ("small") ("font")
- ("sup") ("sub") ("span"))
+ '(("dfn") ("em") ("cite") ("code") ("kbd") ("samp") ("caption")
+ ("strong") ("var") ("b") ("i") ("tt") ("big") ("small")
+ ("sup") ("sub") ("span") ("abbr"))
+ (if (not yahtml-html4-strict)
+ '(("strike") ("s") ("u") ("font")))
yahtml-env-table)
"Default completion table of typeface designator")
(defvar yahtml-user-typeface-table nil)
@@ -440,14 +465,17 @@
(defvar yahtml-last-typeface-cmd "a")
(defvar yahtml-single-cmd-table
- '(("hr") ("br") ("option") ("p")
- ("HorizontalLine" . "hr")
+ '(("hr") ("br") ("option")
+ ("HorizontalRule" . "hr")
("BreakLine" . "br")
- ("Paragraph" . "p")
- ("Item" . "li")
- ("DefineTerm" . "dt")
- ("Description" . "dd")
- ("dd") ("dt") ("li")
+ ("exec" . "!--#exec")
+ ("!--#exec")
+ ("include" . "!--#include")
+ ("!--#include")
+;; ("Item" . "li")
+;; ("DefineTerm" . "dt")
+;; ("Description" . "dd")
+;; ("dd") ("dt") ("li")
)
"Default completion table of HTML single command.")
(defvar yahtml-user-single-cmd-table nil)
@@ -537,6 +565,8 @@
(setq charset 3))
((string-match "shift_jis" charset)
(setq charset 1))
+ ((string-match "utf-8" charset)
+ (setq charset 4))
(t (setq charset nil)))
(setq dir "")))
(if (featurep 'mule)
@@ -576,7 +606,9 @@
((and YaTeX-emacs-20 (boundp 'buffer-file-coding-system))
(setq buffer-file-coding-system
(or (and (fboundp 'set-auto-coding) buffer-file-name
- (save-excursion (set-auto-coding buffer-file-name (buffer-size))))
+ (save-excursion
+ (goto-char (point-min))
+ (set-auto-coding buffer-file-name (buffer-size))))
coding)))
((featurep 'mule)
(set-file-coding-system coding))
@@ -599,7 +631,7 @@
(YaTeX-struct-begin . "<%1%2")
(YaTeX-struct-end . "%1>")
(YaTeX-struct-name-regexp . yahtml-closable-regexp)
- (YaTeX-comment-prefix . "
@@ -1807,12 +1940,12 @@
(defun yahtml-goto-corresponding-* (&optional other)
"Go to corresponding object."
- (interactive)
+ (interactive "P")
(cond
((yahtml-goto-corresponding-href other))
((yahtml-goto-corresponding-img))
- ((yahtml-goto-corresponding-begend))
((yahtml-goto-corresponding-source other))
+ ((yahtml-goto-corresponding-begend))
(t (message "I don't know where to go."))
))
@@ -1945,8 +2078,8 @@
((setq attr (yahtml-on-assignment-p)) ;if on the assignment to attr
(if (and (equal attr "class") ;treat "class" attribute specially
(setq css (yahtml-css-get-element-completion-alist tag)))
- (setq new (yahtml-read-parameter ;should be made generic?
- attr nil (list (cons "class" css))))
+
+ (setq new (yahtml-read-css css))
;;other than "class", read parameter normally
(setq new (yahtml-read-parameter attr)))
(goto-char (car (get 'yahtml-on-assignment-p 'region)))
@@ -2478,7 +2611,7 @@
(defun yahtml-intelligent-newline-ul ()
(interactive)
(yahtml-insert-single "li")
- (or yahtml-faithful-to-htmllint (insert " "))
+ (or yahtml-always-/li yahtml-faithful-to-htmllint (insert " "))
(yahtml-indent-line))
(fset 'yahtml-intelligent-newline-ol 'yahtml-intelligent-newline-ul)
@@ -2492,11 +2625,11 @@
(cond
((match-beginning 2)
(yahtml-insert-single "dd")
- (or yahtml-faithful-to-htmllint (insert " "))
+ (or yahtml-always-/dd yahtml-faithful-to-htmllint (insert " "))
(setq yahtml-last-single-cmd "dt"))
((match-beginning 3)
(yahtml-insert-single "dt")
- (or yahtml-faithful-to-htmllint (insert " "))
+ (or yahtml-always-/dt yahtml-faithful-to-htmllint (insert " "))
(setq yahtml-last-single-cmd "dd")))
(insert (if yahtml-prefer-upcases " " " "))
(setq yahtml-last-single-cmd "dd"))
@@ -2526,6 +2659,35 @@
(open-line 1)
(YaTeX-reindent c))))
+(defun yahtml-intelligent-newline-head ()
+ (let ((title (read-string "Document title: "))
+ (b "") (e "") p)
+ (yahtml-indent-line)
+ (insert (format "%s" (if yahtml-prefer-upcases (upcase b) b)))
+ (setq p (point))
+ (insert (format "%s%s" title (if yahtml-prefer-upcases (upcase e) e)))
+ (if (string= "" title) (goto-char p))
+ (setq yahtml-last-begend "body")))
+
+(defun yahtml-intelligent-newline-script ()
+ (let ((p (point)) b)
+ (if (save-excursion
+ (and
+ (setq b (re-search-backward "