branch: externals/auctex commit ee42d3711a382357bb50e41468cde6bab3ab495f Author: Ikumi Keita <ik...@ikumi.que.jp> Commit: Ikumi Keita <ik...@ikumi.que.jp>
Enhance Japanese class files support * style/tarticle.el: * style/tbooks.el: * style/treport.el: * style/jsreport.el: Add new style files. * Makefile.in (STYLESRC): Add them and tweak order not to break the format of file name alignment. * style/j-book.el ("j-book"): Correct the largest section level to "part" following book.el. * style/jarticle.el: * style/jbook.el: * style/jreport.el: * style/jsarticle.el: * style/jsbook.el: Add defvar for class options, counters and pagestyles following {article,book,report}.el. Correct the largest section level in jbook.el, too. Deal with "report" option in jsbook.el. --- Makefile.in | 7 ++++--- style/j-book.el | 2 +- style/jarticle.el | 16 ++++++++++++++-- style/jbook.el | 15 +++++++++++++-- style/jreport.el | 17 ++++++++++++++--- style/jsarticle.el | 20 ++++++++++++++++++-- style/jsbook.el | 26 +++++++++++++++++++++++--- style/jsreport.el | 28 ++++++++++++++++++++++++++++ style/tarticle.el | 15 +++++++++++++++ style/tbook.el | 15 +++++++++++++++ style/treport.el | 15 +++++++++++++++ 11 files changed, 160 insertions(+), 16 deletions(-) diff --git a/Makefile.in b/Makefile.in index 19c8e83..a454950 100644 --- a/Makefile.in +++ b/Makefile.in @@ -97,6 +97,8 @@ STYLESRC = style/prosper.el \ style/dutch.el style/german.el style/dk.el \ style/j-article.el style/j-book.el style/j-report.el \ style/jarticle.el style/jbook.el style/jreport.el \ + style/tarticle.el style/tbook.el style/treport.el \ + style/jsarticle.el style/jsbook.el style/jsreport.el \ style/dinbrief.el style/virtex.el style/plfonts.el \ style/plhb.el style/harvard.el style/swedish.el \ style/danish.el style/slovak.el style/czech.el \ @@ -113,8 +115,6 @@ STYLESRC = style/prosper.el \ style/alltt.el style/italian.el style/doc.el \ style/ltxdoc.el style/ltx-base.el style/units.el \ style/nicefrac.el style/url.el style/listings.el \ - style/jurabib.el style/csquotes.el style/jsarticle.el \ - style/jsbook.el style/babel.el style/dk-bib.el \ style/inputenc.el style/frenchb.el style/francais.el \ style/MinionPro.el style/pdfsync.el style/polish.el \ style/polski.el style/icelandic.el style/comment.el \ @@ -164,7 +164,8 @@ STYLESRC = style/prosper.el \ style/dcolumn.el style/mdframed.el style/tcolorboxlib-raster.el \ style/titleps.el style/titlesec.el style/titletoc.el \ style/exam.el style/breqn.el style/sourcecodepro.el \ - style/preview.el style/fvextra.el + style/preview.el style/fvextra.el style/jurabib.el \ + style/csquotes.el style/babel.el style/dk-bib.el STYLEELC = $(STYLESRC:.el=.elc) diff --git a/style/j-book.el b/style/j-book.el index 932fe45..1df4bb0 100644 --- a/style/j-book.el +++ b/style/j-book.el @@ -5,7 +5,7 @@ (TeX-add-style-hook "j-book" (lambda () - (LaTeX-largest-level-set "chapter")) + (LaTeX-largest-level-set "part")) LaTeX-dialect) ;;; j-book.el ends here diff --git a/style/jarticle.el b/style/jarticle.el index 5d38668..f62bc02 100644 --- a/style/jarticle.el +++ b/style/jarticle.el @@ -1,11 +1,23 @@ -;;; jarticle.el - Special code for jarticle style. +;;; jarticle.el - Special code for jarticle class. ;;; Code: +(defvar LaTeX-jarticle-class-options + '("a4paper" "a5paper" "b4paper" "b5paper" "a4j" "a5j" "b4j" "b5j" + "a4p" "b4p" "b5p" "10pt" "11pt" "12pt" "landscape" "tombow" "tombo" + "mentuke" "oneside" "twoside" "onecolumn" "twocolumn" + "titlepage" "notitlepage" "leqno" "fleqn" + "openbib" "disablejfam" "mathrmmc" "draft" "final") + "Class options for the jarticle class.") + (TeX-add-style-hook "jarticle" (lambda () - (LaTeX-largest-level-set "section")) + (LaTeX-largest-level-set "section") + (LaTeX-add-counters "part" "section" "subsection" "subsubsection" "paragraph" + "subparagraph" "figure" "table") + (LaTeX-add-pagestyles "headings" "myheadings") + (LaTeX-add-environments "abstract")) LaTeX-dialect) ;;; jarticle.el ends here diff --git a/style/jbook.el b/style/jbook.el index beb8748..bdb3dad 100644 --- a/style/jbook.el +++ b/style/jbook.el @@ -1,11 +1,22 @@ -;;; jbook.el - Special code for jbook style. +;;; jbook.el - Special code for jbook class. ;;; Code: +(defvar LaTeX-jbook-class-options + '("a4paper" "a5paper" "b4paper" "b5paper" "a4j" "a5j" "b4j" "b5j" + "a4p" "b4p" "b5p" "10pt" "11pt" "12pt" "landscape" "tombow" "tombo" + "mentuke" "oneside" "twoside" "onecolumn" "twocolumn" + "titlepage" "notitlepage" "openright" "openany" "leqno" "fleqn" + "openbib" "disablejfam" "mathrmmc" "draft" "final") + "Class options for the jbook class.") + (TeX-add-style-hook "jbook" (lambda () - (LaTeX-largest-level-set "chapter")) + (LaTeX-largest-level-set "part") + (LaTeX-add-counters "part" "chapter" "section" "subsection" "subsubsection" + "paragraph" "subparagraph" "figure" "table") + (LaTeX-add-pagestyles "headings" "myheadings")) LaTeX-dialect) ;;; jbook.el ends here diff --git a/style/jreport.el b/style/jreport.el index 751ecc1..77aac32 100644 --- a/style/jreport.el +++ b/style/jreport.el @@ -1,12 +1,23 @@ -;;; jreport.el - Special code for jreport style. +;;; jreport.el - Special code for jreport class. ;;; Code: +(defvar LaTeX-jreport-class-options + '("a4paper" "a5paper" "b4paper" "b5paper" "a4j" "a5j" "b4j" "b5j" + "a4p" "b4p" "b5p" "10pt" "11pt" "12pt" "landscape" "tombow" "tombo" + "mentuke" "oneside" "twoside" "onecolumn" "twocolumn" + "titlepage" "notitlepage" "openright" "openany" "leqno" "fleqn" + "openbib" "disablejfam" "mathrmmc" "draft" "final") + "Class options for the jreport class.") + (TeX-add-style-hook "jreport" (lambda () - (LaTeX-largest-level-set "chapter")) + (LaTeX-largest-level-set "chapter") + (LaTeX-add-counters "part" "chapter" "section" "subsection" "subsubsection" + "paragraph" "subparagraph" "figure" "table") + (LaTeX-add-pagestyles "headings" "myheadings") + (LaTeX-add-environments "abstract")) LaTeX-dialect) - ;;; jreport.el ends here diff --git a/style/jsarticle.el b/style/jsarticle.el index 9e50fbb..d951cef 100644 --- a/style/jsarticle.el +++ b/style/jsarticle.el @@ -1,11 +1,27 @@ -;;; jsarticle.el - Special code for jsarticle style. +;;; jsarticle.el - Special code for jsarticle class. ;;; Code: +(defvar LaTeX-jsarticle-class-options + '("a3paper" "a4paper" "a5paper" "a6paper" "b4paper" "b5paper" "b6paper" + "a4j" "a5j" "b4j" "b5j" "a4var" "b5var" "letterpaper" "legalpaper" + "executivepaper" "landscape" "slide" + "8pt" "9pt" "10pt" "11pt" "12pt" "14pt" "17pt" "20pt" "21pt" "25pt" + "30pt" "36pt" "43pt" "12Q" "14Q" "usemag" "nomag" "nomag*" + "tombow" "tombo" "mentuke" "oneside" "twoside" "vartwoside" + "onecolumn" "twocolumn" "titlepage" "notitlepage" "leqno" "fleqn" + "disablejfam" "draft" "final" "mingoth" "wingoth" "jis" + "uplatex" "autodetect-engine" "papersize" "english" "jslogo" "nojslogo") + "Class options for the jsarticle class.") + (TeX-add-style-hook "jsarticle" (lambda () - (LaTeX-largest-level-set "section")) + (LaTeX-largest-level-set "section") + (LaTeX-add-counters "part" "section" "subsection" "subsubsection" "paragraph" + "subparagraph" "figure" "table") + (LaTeX-add-pagestyles "headings" "myheadings") + (LaTeX-add-environments "abstract")) LaTeX-dialect) ;;; jsarticle.el ends here diff --git a/style/jsbook.el b/style/jsbook.el index fae2713..350e8af 100644 --- a/style/jsbook.el +++ b/style/jsbook.el @@ -1,11 +1,31 @@ -;;; jsbook.el - Special code for jsbook style. +;;; jsbook.el - Special code for jsbook class. ;;; Code: +(defvar LaTeX-jsbook-class-options + '("a3paper" "a4paper" "a5paper" "a6paper" "b4paper" "b5paper" "b6paper" + "a4j" "a5j" "b4j" "b5j" "a4var" "b5var" "letterpaper" "legalpaper" + "executivepaper" "landscape" "report" + "8pt" "9pt" "10pt" "11pt" "12pt" "14pt" "17pt" "20pt" "21pt" "25pt" + "30pt" "36pt" "43pt" "12Q" "14Q" "usemag" "nomag" "nomag*" + "tombow" "tombo" "mentuke" "oneside" "twoside" "vartwoside" + "onecolumn" "twocolumn" "titlepage" "notitlepage" + "openright" "openleft" "openany" "leqno" "fleqn" + "disablejfam" "draft" "final" "mingoth" "wingoth" "jis" + "uplatex" "autodetect-engine" "papersize" "english" "jslogo" "nojslogo") + "Class options for the jsbook class.") + (TeX-add-style-hook "jsbook" - (lambda () - (LaTeX-largest-level-set "chapter")) + (lambda () + (if (LaTeX-provided-class-options-member "jsbook" "report") + (progn + (LaTeX-largest-level-set "chapter") + (LaTeX-add-environments "abstract")) + (LaTeX-largest-level-set "part")) + (LaTeX-add-counters "part" "chapter" "section" "subsection" "subsubsection" + "paragraph" "subparagraph" "figure" "table") + (LaTeX-add-pagestyles "headings" "myheadings")) LaTeX-dialect) ;;; jsbook.el ends here diff --git a/style/jsreport.el b/style/jsreport.el new file mode 100644 index 0000000..009a00b --- /dev/null +++ b/style/jsreport.el @@ -0,0 +1,28 @@ +;;; jsreport.el - Special code for jsreport class. + +;;; Code: + +(defvar LaTeX-jsreport-class-options + '("a3paper" "a4paper" "a5paper" "a6paper" "b4paper" "b5paper" "b6paper" + "a4j" "a5j" "b4j" "b5j" "a4var" "b5var" "letterpaper" "legalpaper" + "executivepaper" "landscape" + "8pt" "9pt" "10pt" "11pt" "12pt" "14pt" "17pt" "20pt" "21pt" "25pt" + "30pt" "36pt" "43pt" "12Q" "14Q" "usemag" "nomag" "nomag*" + "tombow" "tombo" "mentuke" "oneside" "twoside" "vartwoside" + "onecolumn" "twocolumn" "titlepage" "notitlepage" + "openright" "openleft" "openany" "leqno" "fleqn" + "disablejfam" "draft" "final" "mingoth" "wingoth" "jis" + "uplatex" "autodetect-engine" "papersize" "english" "jslogo" "nojslogo") + "Class options for the jsreport class.") + +(TeX-add-style-hook + "jsreport" + (lambda () + (LaTeX-largest-level-set "chapter") + (LaTeX-add-counters "part" "chapter" "section" "subsection" "subsubsection" + "paragraph" "subparagraph" "figure" "table") + (LaTeX-add-pagestyles "headings" "myheadings") + (LaTeX-add-environments "abstract")) + LaTeX-dialect) + +;;; jsreport.el ends here diff --git a/style/tarticle.el b/style/tarticle.el new file mode 100644 index 0000000..c617fa3 --- /dev/null +++ b/style/tarticle.el @@ -0,0 +1,15 @@ +;;; tarticle.el - Special code for tarticle class. + +;;; Code: + +(TeX-load-style "jarticle") +(defvar LaTeX-tarticle-class-options LaTeX-jarticle-class-options + "Class options for the tarticle class.") + +(TeX-add-style-hook + "tarticle" + (lambda () + (TeX-run-style-hooks "jarticle" "plext")) + LaTeX-dialect) + +;;; tarticle.el ends here diff --git a/style/tbook.el b/style/tbook.el new file mode 100644 index 0000000..530633e --- /dev/null +++ b/style/tbook.el @@ -0,0 +1,15 @@ +;;; tbook.el - Special code for tbook class. + +;;; Code: + +(TeX-load-style "jbook") +(defvar LaTeX-tbook-class-options LaTeX-jbook-class-options + "Class options for the tbook class.") + +(TeX-add-style-hook + "tbook" + (lambda () + (TeX-run-style-hooks "jbook" "plext")) + LaTeX-dialect) + +;;; tbook.el ends here diff --git a/style/treport.el b/style/treport.el new file mode 100644 index 0000000..e16f423 --- /dev/null +++ b/style/treport.el @@ -0,0 +1,15 @@ +;;; treport.el - Special code for treport class. + +;;; Code: + +(TeX-load-style "jreport") +(defvar LaTeX-treport-class-options LaTeX-jreport-class-options + "Class options for the treport class.") + +(TeX-add-style-hook + "treport" + (lambda () + (TeX-run-style-hooks "jreport" "plext")) + LaTeX-dialect) + +;;; treport.el ends here