diff --git a/flake.nix b/flake.nix index da52268..419d751 100644 --- a/flake.nix +++ b/flake.nix @@ -22,19 +22,25 @@ vimWithTex = import ./nix/vim.nix { inherit pkgs; lib = pkgs.lib; }; texEnv = import ./nix/latex.nix { inherit pkgs; }; + + basePackages = [ + texEnv + pkgs.qpdf + pkgs.qpdfview + ]; in { - devShells.default = pkgs.stdenv.mkDerivation { + templates = { + latex = {}; + }; + devShells.default = self.devShells.${system}.latex; + devShells.latex = pkgs.stdenv.mkDerivation { inherit name; shellHook = '' export PS1="${name} \w \$ " ''; - buildInputs = [ - texEnv + buildInputs = basePackages ++ [ vimWithTex - pkgs._0xproto - pkgs.qpdf - pkgs.kdePackages.okular ]; }; devShells.pandoc = pkgs.stdenv.mkDerivation { @@ -42,12 +48,8 @@ shellHook = '' export PS1="${name} pandoc \w \$ " ''; - buildInputs = [ - texEnv + buildInputs = basePackages ++ [ pkgs.pandoc - pkgs._0xproto - pkgs.qpdf - pkgs.qpdfview ]; }; } diff --git a/nix/latex.nix b/nix/latex.nix index c635e41..cce85b8 100644 --- a/nix/latex.nix +++ b/nix/latex.nix @@ -2,60 +2,61 @@ pkgs.texliveSmall.withPackages (ps: with ps; [ # Bibliography biber - bibtex biblatex + bibtex # Japanese Support + ascmac babel babel-japanese - luatexja - ascmac bxjscls - zxjatype collection-langjapanese + luatexja + zxjatype # Fonts - noto - zxjafont + fontspec haranoaji - libertine + inconsolata latex-fonts + libertine + luainputenc mathfont newtx - luainputenc - fontspec + noto type1cm + zxjafont # Math - amsmath amsfonts - unicode-math - mathtools + amsmath lualatex-math + mathtools + unicode-math # Graphics - graphics - wrapfig caption + circuitikz + graphics here pgf - circuitikz + wrapfig # Tools - latexmk - subfiles - enumitem - hyperref - cleveref - float - framed - tabularray - footmisc - listings - xcolor - xstring - xpatch blindtext - multirow + cleveref + enumitem etoolbox + float + footmisc + framed + hyperref + latexmk + listings + multirow + subfiles + tabularray + xcolor + xpatch + xstring ] ++ [ ps.import pkgs.my-latex-pkgs ]) diff --git a/nix/vim.nix b/nix/vim.nix index 6217f28..2007994 100644 --- a/nix/vim.nix +++ b/nix/vim.nix @@ -41,8 +41,8 @@ pkgs.vim-full.customize { syntax enable let g:vimtex_view_method = 'general' - let g:vimtex_view_general_viewer = 'okular' - let g:vimtex_view_general_options = '--unique file:@pdf\#src:@line@tex' + let g:vimtex_view_general_viewer = 'qpdfview' + let g:vimtex_view_general_options = '--unique @pdf\#src:@tex:@line:@col' let g:vimtex_compiler_method = 'latexmk' let maplocalleader = "," diff --git a/out/test.pdf b/out/test.pdf deleted file mode 100644 index cb1e696..0000000 Binary files a/out/test.pdf and /dev/null differ diff --git a/out/test.synctex.gz b/out/test.synctex.gz deleted file mode 100644 index a9f0717..0000000 Binary files a/out/test.synctex.gz and /dev/null differ diff --git a/templates/latex/.gitignore b/templates/latex/.gitignore new file mode 100644 index 0000000..613cd88 --- /dev/null +++ b/templates/latex/.gitignore @@ -0,0 +1 @@ +.intermediates/ diff --git a/.latexmkrc b/templates/latex/.latexmkrc similarity index 100% rename from .latexmkrc rename to templates/latex/.latexmkrc diff --git a/templates/latex/README.md b/templates/latex/README.md new file mode 100644 index 0000000..676fe17 --- /dev/null +++ b/templates/latex/README.md @@ -0,0 +1,3 @@ +# LaTeX Template + +Use `vim` for edit/compile TeX files with vimtex plugin or `latexmk` command to compile. diff --git a/templates/latex/bibliography.bib b/templates/latex/bibliography.bib new file mode 100644 index 0000000..e69de29 diff --git a/templates/latex/detailed.tex b/templates/latex/detailed.tex new file mode 100644 index 0000000..55fd98d --- /dev/null +++ b/templates/latex/detailed.tex @@ -0,0 +1,34 @@ +\documentclass[xelatex,a4paper,11pt,ja=standard]{bxjsarticle} + +\usepackage{preamble} +\usepackage{detailed-title} + +\reportauthor{高専太郎} +\reporttitle{テストレポート} +\reportdate{AAAA年}{BB月}{CC日} +\turnindate{AAAA年}{BB月}{DD日} +\schoolname{abc工業高等専門学校} +\department{hogefuga科} +\subject{foobazz} +\professor{高専先生} +\studentid{0000} +\seatingnum{0} + +\begin{document} + \detailedtitle + + \section{Test} + + Hello world program implemented in C is listed in listing \ref{lst1}. + + \begin{lstlisting}[language=C,caption={Code Listing},label={lst1}] +#include + +int main(int argc, char** argv) { + printf("Hello World!"); + + return 0; +} + \end{lstlisting} +\end{document} + diff --git a/templates/latex/experiment.tex b/templates/latex/experiment.tex new file mode 100644 index 0000000..68a743d --- /dev/null +++ b/templates/latex/experiment.tex @@ -0,0 +1,44 @@ +\documentclass[japanese,xelatex,a4paper,10.5pt,ja=standard]{bxjsarticle} + +\usepackage{depD-experiment} +\usepackage{pgf} + +\reportauthor{高専太郎} +\reporttitle{テストレポート} +\reportdate{AAAA年}{BB月}{CC日} +\turnindate{AAAA年}{CC月}{DD日} +\schoolyear{AAAA} +\grade{N} +\department{電子xxxx科} +\subject{実験} +\reportid{0000} +\expgroup{fuga} +\seatingnum{0} +\addExperimentDate{aaaa年 bb月 cc日} +\addResearcher{高専花子} + +\addbibresource{./bibliography.bib} + +\begin{document} + \experimentTitle + + \section{実験目的} + \resetrefcounter + + \section{理論} + \resetrefcounter + + \section{実験条件} + \resetrefcounter + + \section{実験結果} + \resetrefcounter + + \section{考察} + \resetrefcounter + + \section{まとめ} + + \printbibliography[title={参考文献}]{} +\end{document} + diff --git a/templates/latex/flake.nix b/templates/latex/flake.nix new file mode 100644 index 0000000..f7a5fb0 --- /dev/null +++ b/templates/latex/flake.nix @@ -0,0 +1,23 @@ +{ + description = "Template for LaTeX"; + + inputs = { + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + report-temp.url = "github:kenryuS/report-temp"; + }; + + outputs = { self, nixpkgs, flake-utils, report-temp }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config = {}; + overlays = []; + }; + in + { + devShells.default = report-temp.devShells.${system}.latex; + } + ); +} diff --git a/templates/latex/simple.tex b/templates/latex/simple.tex new file mode 100644 index 0000000..245f452 --- /dev/null +++ b/templates/latex/simple.tex @@ -0,0 +1,29 @@ +\documentclass[xelatex,a4paper,11pt,ja=standard]{bxjsarticle} + +\usepackage{preamble} +\usepackage{simple-title} + +\reportauthor{高専太郎} +\reporttitle{テストレポート} +\reportdate{AAAA年}{BB月}{CC日} +\turnindate{AAAA年}{BB月}{DD日} + +\begin{document} + \simpletitle + + \section{Test} + + Hello \LaTeX{}! + + \begin{itemize} + \item{\textrm{Roman}} + \item{\textit{Italic}} + \item{\textbf{Bold}} + \item{\texttt{Typewriter}} + \end{itemize} + + \section{テスト} + + いろはにほへとちりぬるを +\end{document} + diff --git a/tex/depD-experiment.sty b/tex/depD-experiment.sty index 98a3e7c..7d31bb2 100644 --- a/tex/depD-experiment.sty +++ b/tex/depD-experiment.sty @@ -5,3 +5,4 @@ \usepackage{experiment-title} \usepackage{depD-bib} \usepackage{depD-format} +\usepackage{amssymb} diff --git a/tex/depD-format.sty b/tex/depD-format.sty index 961cd12..2327a6a 100644 --- a/tex/depD-format.sty +++ b/tex/depD-format.sty @@ -1,6 +1,7 @@ \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{depD-format} +\usepackage{amsmath} \usepackage{cleveref} \renewcommand\figurename{Fig. } diff --git a/tex/preamble.sty b/tex/preamble.sty index edd6468..58979f5 100644 --- a/tex/preamble.sty +++ b/tex/preamble.sty @@ -10,9 +10,10 @@ ]{biblatex} \usepackage{fontspec} +\usepackage{inconsolata} +\fontspec{inconsolata} \usepackage[mono=false]{libertine} \usepackage{noto} -\setmonofont{0xProto} \usepackage[european]{circuitikz} @@ -59,4 +60,3 @@ framexleftmargin=10mm } \lstset{style=mystyle} - diff --git a/tex/report-paper.sty b/tex/report-paper.sty deleted file mode 100644 index 76f79c2..0000000 --- a/tex/report-paper.sty +++ /dev/null @@ -1,16 +0,0 @@ -\NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{reportpaper} - -\geometry{ - a4paper, - total={166mm,270mm}, - left=22mm, - right=22mm, - top=30mm, - headheight=15mm, - headsep=5mm, - marginparwidth=25mm, - footnotesep=5mm, - footskip=15mm, - bottom=25mm -}