diff --git a/md2gost/handlers/image.py b/md2gost/handlers/image.py index d845e80..44b8c16 100644 --- a/md2gost/handlers/image.py +++ b/md2gost/handlers/image.py @@ -96,7 +96,7 @@ def figure(tokens: list[Token]) -> str: caption = escape_latex(m.group(1)) lines = [ - "\\begin{figure}[ht]", + "\\begin{figure}[htb]", " \\centering", rf" \includegraphics[width={width}]{{\detokenize{{{path}}}}}", ] diff --git a/md2gost/handlers/table.py b/md2gost/handlers/table.py index 1a0f5ca..703f6f5 100644 --- a/md2gost/handlers/table.py +++ b/md2gost/handlers/table.py @@ -191,7 +191,7 @@ def captioned_table(tokens: list[Token]) -> str: return "\n".join( [ - "\\begin{table}[ht]", + "\\begin{table}[htb]", f" \\caption{{{caption}}}", " \\centering", _tabular(rows, aligns), diff --git a/md2gost/latex/preamble.py b/md2gost/latex/preamble.py index f07bb5d..33cd936 100644 --- a/md2gost/latex/preamble.py +++ b/md2gost/latex/preamble.py @@ -15,6 +15,16 @@ PREAMBLE = r"""\documentclass[a4paper, 14pt]{extarticle} \graphicspath{ {./} {./images/} } \usepackage{float} \usepackage[section]{placeins} +% Значения по умолчанию требуют, чтобы текст занимал не меньше 80 % страницы, +% а иллюстрация внизу — не больше 30 %. Из-за этого крупный рисунок не +% помещался на своей странице и уезжал, оставляя её наполовину пустой. +\renewcommand{\textfraction}{0.05} +\renewcommand{\topfraction}{0.95} +\renewcommand{\bottomfraction}{0.95} +\renewcommand{\floatpagefraction}{0.75} +\setcounter{topnumber}{3} +\setcounter{bottomnumber}{2} +\setcounter{totalnumber}{5} \usepackage{wrapfig} \sloppy \setlength{\emergencystretch}{2em} diff --git a/tests/test_render.py b/tests/test_render.py index d6107a0..ec527c1 100644 --- a/tests/test_render.py +++ b/tests/test_render.py @@ -48,7 +48,7 @@ def test_figure_with_caption(tmp_path) -> None: "![[images/antenna.png]]\n\nРисунок 1 — Антенна\n\n" "Данная антенна используется для ...\n" ) - assert "\\begin{figure}[ht]" in tex + assert "\\begin{figure}[htb]" in tex assert "\\centering" in tex assert ( "\\includegraphics[width=0.8\\textwidth]{\\detokenize{images/antenna.png}}" @@ -60,7 +60,7 @@ def test_figure_with_caption(tmp_path) -> None: def test_figure_without_caption() -> None: tex = render("![[images/photo.png]]\n\nОбычный абзац после картинки.\n") - assert "\\begin{figure}[ht]" in tex + assert "\\begin{figure}[htb]" in tex assert "\\caption{" not in tex assert "Обычный абзац после картинки." in tex @@ -127,7 +127,7 @@ TABLE_MD = ( def test_table_with_caption() -> None: tex = render(TABLE_MD) - assert "\\begin{table}[ht]" in tex + assert "\\begin{table}[htb]" in tex assert "\\caption{Сравнение скорости}" in tex assert "\\begin{tabularx}{\\textwidth}" in tex assert "\\textbf{1} & 0.027852 & 0.000285 \\\\" in tex