From 2f25ade43e218faa9cb437eceb6f52b70ed6c1ca Mon Sep 17 00:00:00 2001 From: AVAtarMod Date: Sat, 19 Aug 2023 19:32:57 +0300 Subject: [PATCH 1/5] Update workspace files --- 6SST_NM.code-workspace | 49 ++++++++++++++++++++++++++++-------------- 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/6SST_NM.code-workspace b/6SST_NM.code-workspace index abd7c2d..15fd625 100644 --- a/6SST_NM.code-workspace +++ b/6SST_NM.code-workspace @@ -34,12 +34,6 @@ "pdflatex" ] }, - { - "name": "tectonic", - "tools": [ - "tectonic" - ] - } ], "latex-workshop.latex.tools": [ { @@ -81,6 +75,7 @@ "command": "pdflatex", "args": [ "-synctex=1", + // "-recorder", "-shell-escape", "-interaction=nonstopmode", "-file-line-error", @@ -97,17 +92,39 @@ ], "env": {} }, - { - "name": "tectonic", - "command": "tectonic", - "args": [ - "--synctex", - "--keep-logs", - "%DOC%.tex" - ], - "env": {} - } ], "latex-workshop.latex.rootFile.indicator": "\\begin{document}", + "latex-workshop.latex.watch.files.ignore": [ + "**/*.bbx", + "**/*.bbl", + "**/*.cbx", + "**/*.cfg", + "**/*.clo", + "**/*.cnf", + "**/*.def", + "**/*.dfu", + "**/*.enc", + "**/*.fd", + "**/*.fmt", + "**/*.lbx", + "**/*.map", + "**/*.mkii", + "**/*.pfb", + "**/*.tfm", + "**/*.vf", + "**/*.code.tex", + "**/*.sty", + "**/texmf-{dist,var}/**", + "**/Local/MiKTeX/**", + "**/Local/Programs/MiKTeX/**", + "**/Roaming/MiKTeX/**", + "**/Program*/MiKTeX*/**", + "**/.miktex/texmfs/**", + "/var/cache/miktex-texmf/**", + "/usr/local/share/miktex-texmf/**", + "**/Library/Application Support/MiKTeX/texmfs/**", + "/dev/null", + "**/*.fls" + ], } } From 1285da87e5b184e06daf2b80875843732c89333f Mon Sep 17 00:00:00 2001 From: AVAtarMod Date: Tue, 22 Aug 2023 14:23:36 +0300 Subject: [PATCH 2/5] config: Update math symbos, style - Replace quotation marks symbols to <<, >> - Fix TOC, itemize list style --- config.tex | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/config.tex b/config.tex index ec4f7b4..9c90371 100644 --- a/config.tex +++ b/config.tex @@ -20,6 +20,7 @@ \usepackage{xstring} \usepackage{tabularx} \usepackage{enumitem} +\usepackage[strict=true]{csquotes} \usepackage[abspath]{currfile} \usepackage[hidelinks,linktoc=all]{hyperref} @@ -57,6 +58,12 @@ {\hspace*{-2.3em}} {\titlerule*[2mm]{.}\contentspage} +\titlecontents{subsection} +[3.5em] % 1.5em (chapter) + 2.3em +{} +{\thecontentslabel. } +{\hspace*{-2.3em}} +{\titlerule*[2mm]{.}\contentspage} % ОФОРМЛЕНИЕ ЗАГОЛОВКОВ ----------------- % В т.ч. и содержания @@ -79,6 +86,7 @@ % ОФОРМЛЕНИЕ СПИСКОВ -------------------- \setlist{noitemsep,align=left,left=\parindent,topsep=0pt} +\setlist[itemize]{label=--} % ОФОРМЛЕНИЕ ЛИСТИНГОВ КОДА ----------------- \definecolor{dkgreen}{rgb}{0,0.6,0} @@ -171,4 +179,61 @@ \urlstyle{same} % ОФОРМЛЕНИЕ ТЕКСТА -\renewcommand{\baselinestretch}{1.5} +\renewcommand{\baselinestretch}{1.5} +\MakeOuterQuote{"} + +\makeatletter +\DeclareRobustCommand\vdots{% + \mathpalette\@vdots{}% +} +\newcommand*{\@vdots}[2]{% + % #1: math style + % #2: unused + \sbox0{$#1\cdotp\cdotp\cdotp\m@th$}% + \sbox2{$#1.\m@th$}% + \vbox{% + \dimen@=\wd0 % + \advance\dimen@ -3\ht2 % + \kern.5\dimen@ + % remove side bearings + \dimen@=\wd2 % + \advance\dimen@ -\ht2 % + \dimen2=\wd0 % + \advance\dimen2 -\dimen@ + \vbox to \dimen2{% + \offinterlineskip + \copy2 \vfill\copy2 \vfill\copy2 % + }% + }% +} +\DeclareRobustCommand\ddots{% + \mathinner{% + \mathpalette\@ddots{}% + \mkern\thinmuskip + }% +} +\newcommand*{\@ddots}[2]{% + % #1: math style + % #2: unused + \sbox0{$#1\cdotp\cdotp\cdotp\m@th$}% + \sbox2{$#1.\m@th$}% + \vbox{% + \dimen@=\wd0 % + \advance\dimen@ -3\ht2 % + \kern.5\dimen@ + % remove side bearings + \dimen@=\wd2 % + \advance\dimen@ -\ht2 % + \dimen2=\wd0 % + \advance\dimen2 -\dimen@ + \vbox to \dimen2{% + \offinterlineskip + \hbox{$#1\mathpunct{.}\m@th$}% + \vfill + \hbox{$#1\mathpunct{\kern\wd2}\mathpunct{.}\m@th$}% + \vfill + \hbox{$#1\mathpunct{\kern\wd2}\mathpunct{\kern\wd2}\mathpunct{.}\m@th$}% + }% + }% +} +\makeatother From 6dce1980d7375db20b2c520ea3755b2aebe5f2d0 Mon Sep 17 00:00:00 2001 From: AVAtarMod Date: Tue, 22 Aug 2023 14:39:42 +0300 Subject: [PATCH 3/5] Fix merge conflict (pre-PR merge) --- config.tex | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/config.tex b/config.tex index 9c90371..002e313 100644 --- a/config.tex +++ b/config.tex @@ -20,6 +20,7 @@ \usepackage{xstring} \usepackage{tabularx} \usepackage{enumitem} +\usepackage{mathtools} \usepackage[strict=true]{csquotes} \usepackage[abspath]{currfile} \usepackage[hidelinks,linktoc=all]{hyperref} @@ -179,9 +180,6 @@ \urlstyle{same} % ОФОРМЛЕНИЕ ТЕКСТА -\renewcommand{\baselinestretch}{1.5} -\MakeOuterQuote{"} - \makeatletter \DeclareRobustCommand\vdots{% \mathpalette\@vdots{}% @@ -237,3 +235,6 @@ }% } \makeatother + +\renewcommand{\baselinestretch}{1.5} +\MakeOuterQuote{"} From 3fad2bd5dd1f97fed484b285a26565306c926b34 Mon Sep 17 00:00:00 2001 From: AVAtarMod Date: Fri, 27 Oct 2023 11:20:59 +0300 Subject: [PATCH 4/5] Merge config.tex from dev --- config.tex | 129 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 56 deletions(-) diff --git a/config.tex b/config.tex index 002e313..cf0a135 100644 --- a/config.tex +++ b/config.tex @@ -5,6 +5,7 @@ \usepackage{threeparttable} \usepackage[labelsep=endash,tableposition=top,labelfont=md,textfont=md]{caption} \usepackage{indentfirst} +\usepackage{float} \usepackage{rotating} \usepackage{setspace} \usepackage{array} @@ -111,6 +112,73 @@ tabsize=3, escapechar={|}, emptylines=0, + extendedchars=true, + literate={а}{{\cyra}}1 + {б}{{\cyrb}}1 + {в}{{\cyrv}}1 + {г}{{\cyrg}}1 + {д}{{\cyrd}}1 + {е}{{\cyre}}1 + {ё}{\"{\cyre}}1 + {ж}{{\cyrzh}}1 + {з}{{\cyrz}}1 + {и}{{\cyri}}1 + {й}{{\cyrishrt}}1 + {к}{{\cyrk}}1 + {л}{{\cyrl}}1 + {м}{{\cyrm}}1 + {н}{{\cyrn}}1 + {о}{{\cyro}}1 + {п}{{\cyrp}}1 + {р}{{\cyrr}}1 + {с}{{\cyrs}}1 + {т}{{\cyrt}}1 + {у}{{\cyru}}1 + {ф}{{\cyrf}}1 + {х}{{\cyrh}}1 + {ц}{{\cyrc}}1 + {ч}{{\cyrch}}1 + {ш}{{\cyrsh}}1 + {щ}{{\cyrshch}}1 + {ъ}{{\cyrhrdsn}}1 + {ы}{{\cyrery}}1 + {ь}{{\cyrsftsn}}1 + {э}{{\cyrerev}}1 + {ю}{{\cyryu}}1 + {я}{{\cyrya}}1 + {А}{{\CYRA}}1 + {Б}{{\CYRB}}1 + {В}{{\CYRV}}1 + {Г}{{\CYRG}}1 + {Д}{{\CYR96}}1 + {Е}{{\CYRE}}1 + {Ё}{{\"{\CYRE}}}1 + {Ж}{{\CYRZH}}1 + {З}{{\CYRZ}}1 + {И}{{\CYRI}}1 + {Й}{{\CYRISHRT}}1 + {К}{{\CYRK}}1 + {Л}{{\CYRL}}1 + {М}{{\CYRM}}1 + {Н}{{\CYRN}}1 + {О}{{\CYRO}}1 + {П}{{\CYRP}}1 + {Р}{{\CYRR}}1 + {С}{{\CYRS}}1 + {Т}{{\CYRT}}1 + {У}{{\CYRU}}1 + {Ф}{{\CYRF}}1 + {Х}{{\CYRH}}1 + {Ц}{{\CYRC}}1 + {Ч}{{\CYRCH}}1 + {Ш}{{\CYRSH}}1 + {Щ}{{\CYRSHCH}}1 + {Ъ}{{\CYRHRDSN}}1 + {Ы}{{\CYRERY}}1 + {Ь}{{\CYRSFTSN}}1 + {Э}{{\CYREREV}}1 + {Ю}{{\CYRYU}}1 + {Я}{{\CYRYA}}1 } \newcommand\inputcode[3][]{ {\bfseries #1\filename{#2}}: @@ -180,61 +248,10 @@ \urlstyle{same} % ОФОРМЛЕНИЕ ТЕКСТА -\makeatletter -\DeclareRobustCommand\vdots{% - \mathpalette\@vdots{}% -} -\newcommand*{\@vdots}[2]{% - % #1: math style - % #2: unused - \sbox0{$#1\cdotp\cdotp\cdotp\m@th$}% - \sbox2{$#1.\m@th$}% - \vbox{% - \dimen@=\wd0 % - \advance\dimen@ -3\ht2 % - \kern.5\dimen@ - % remove side bearings - \dimen@=\wd2 % - \advance\dimen@ -\ht2 % - \dimen2=\wd0 % - \advance\dimen2 -\dimen@ - \vbox to \dimen2{% - \offinterlineskip - \copy2 \vfill\copy2 \vfill\copy2 % - }% - }% -} -\DeclareRobustCommand\ddots{% - \mathinner{% - \mathpalette\@ddots{}% - \mkern\thinmuskip - }% -} -\newcommand*{\@ddots}[2]{% - % #1: math style - % #2: unused - \sbox0{$#1\cdotp\cdotp\cdotp\m@th$}% - \sbox2{$#1.\m@th$}% - \vbox{% - \dimen@=\wd0 % - \advance\dimen@ -3\ht2 % - \kern.5\dimen@ - % remove side bearings - \dimen@=\wd2 % - \advance\dimen@ -\ht2 % - \dimen2=\wd0 % - \advance\dimen2 -\dimen@ - \vbox to \dimen2{% - \offinterlineskip - \hbox{$#1\mathpunct{.}\m@th$}% - \vfill - \hbox{$#1\mathpunct{\kern\wd2}\mathpunct{.}\m@th$}% - \vfill - \hbox{$#1\mathpunct{\kern\wd2}\mathpunct{\kern\wd2}\mathpunct{.}\m@th$}% - }% - }% -} -\makeatother - \renewcommand{\baselinestretch}{1.5} \MakeOuterQuote{"} + +\newenvironment{nospaceflalign*} + {\setlength{\abovedisplayskip}{0pt}\setlength{\belowdisplayskip}{0pt}% + \csname flalign*\endcsname} + {\csname endflalign*\endcsname\ignorespacesafterend} From 52cdcfbadebebb2c1dbdba54e756a9f63b643fd1 Mon Sep 17 00:00:00 2001 From: AVAtarMod Date: Fri, 27 Oct 2023 11:23:10 +0300 Subject: [PATCH 5/5] Merge workspace from dev --- 6SST_NM.code-workspace | 50 +++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 32 deletions(-) diff --git a/6SST_NM.code-workspace b/6SST_NM.code-workspace index 15fd625..f24448c 100644 --- a/6SST_NM.code-workspace +++ b/6SST_NM.code-workspace @@ -13,6 +13,12 @@ "pdflatex" ] }, + { + "name": "latexmk (xelatex)", + "tools": [ + "xelatexmk" + ] + }, { "name": "latexmk", "tools": [ @@ -44,6 +50,7 @@ "-interaction=nonstopmode", "-file-line-error", "-pdf", + "-shell-escape", "-outdir=%OUTDIR%", "%DOC%" ], @@ -92,39 +99,18 @@ ], "env": {} }, + { + "name": "tectonic", + "command": "tectonic", + "args": [ + "--synctex", + "--keep-logs", + "%DOC%.tex" + ], + "env": {} + } ], "latex-workshop.latex.rootFile.indicator": "\\begin{document}", - "latex-workshop.latex.watch.files.ignore": [ - "**/*.bbx", - "**/*.bbl", - "**/*.cbx", - "**/*.cfg", - "**/*.clo", - "**/*.cnf", - "**/*.def", - "**/*.dfu", - "**/*.enc", - "**/*.fd", - "**/*.fmt", - "**/*.lbx", - "**/*.map", - "**/*.mkii", - "**/*.pfb", - "**/*.tfm", - "**/*.vf", - "**/*.code.tex", - "**/*.sty", - "**/texmf-{dist,var}/**", - "**/Local/MiKTeX/**", - "**/Local/Programs/MiKTeX/**", - "**/Roaming/MiKTeX/**", - "**/Program*/MiKTeX*/**", - "**/.miktex/texmfs/**", - "/var/cache/miktex-texmf/**", - "/usr/local/share/miktex-texmf/**", - "**/Library/Application Support/MiKTeX/texmfs/**", - "/dev/null", - "**/*.fls" - ], + "latex-workshop.latex.recipe.default": "lastUsed", } }