Skip to content

Commit a187f35

Browse files
committed
Remove DocOnce dependencies and legacy files
- Delete all .do.txt files and conversion scripts - Remove doconce, mako, and related dependencies from pyproject.toml and requirements.txt - Replace doconce combine_images with ImageMagick montage in source files - Clean up .gitignore, config files, and documentation references - Remove legacy doc/ build directory
1 parent af194bb commit a187f35

22 files changed

Lines changed: 43 additions & 1333 deletions

.gitignore

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -46,28 +46,9 @@ temp*
4646
.idea
4747
__pycache__
4848
_minted-*
49-
# doconce:
50-
.*_html_file_collection
51-
.*.exerinfo
52-
.*.copyright
53-
sphinx-rootdir
54-
Trash
5549
# Generated/published content (regenerated by build scripts):
5650
doc/pub/
5751

58-
# Generated LaTeX files (in doc/.src/book/):
59-
book.tex
60-
book.pdf
61-
book.dlog
62-
latex_figs/
63-
svmonodo.cls
64-
t4do.sty
65-
newcommands_keep.tex
66-
tmp_mako__*.do.txt
67-
tmp_preprocess__*.do.txt
68-
# Test files:
69-
title_test.*
70-
7152
/.quarto/
7253
/_book/
7354
**/*.quarto_ipynb

.markdownlint.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ MD018: false
5959
# MD036 - Emphasis as heading (false positive from a) b) c) exercise labels)
6060
MD036: false
6161

62-
# MD004 - Unordered list style (allow both dash and plus - converted from DocOnce)
62+
# MD004 - Unordered list style (allow both dash and plus)
6363
MD004: false
6464

6565
# MD031 - Blanks around fences (false positives in nested documentation examples)

README.do.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.

README.sh

Lines changed: 0 additions & 2 deletions
This file was deleted.

_quarto.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ format:
153153
\newcommand{\Integerp}{\mathbb{N}}
154154
\newcommand{\Integer}{\mathbb{Z}}
155155
156-
# Quarto variables (replacement for Mako variables)
156+
# Quarto variables
157157
# These can be referenced as {{< var name >}} in documents
158158
src: "https://github.com/hplgit/fdm-book/tree/master/src"
159159
src_vib: "https://github.com/hplgit/fdm-book/tree/master/src/vib"

chapters/diffu/diffu_exer.qmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -993,9 +993,10 @@ def investigate():
993993
for gamma in gamma_values:
994994
for ext in "pdf", "png":
995995
cmd = (
996-
"doconce combine_images -2 "
996+
"montage "
997997
"tmp1_gamma{gamma:g}_s1.{ext} "
998998
"tmp1_gamma{gamma:g}_s2.{ext} "
999+
"-tile 2x1 -geometry +0+0 "
9991000
"welding_gamma{gamma:g}.{ext}".format(**vars())
10001001
)
10011002
os.system(cmd)

chapters/diffu/diffu_rw.qmd

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1155,12 +1155,12 @@ def demo_fig_random_walks1D():
11551155
files = [
11561156
os.path.join("tmp_%d" % n, "tmp%d.%s" % (j + 1, ext)) for n in num_walks
11571157
]
1158-
cmd = "doconce combine_images -%d %s rw1D_%s_%s.%s" % (
1159-
3 if len(num_walks) == 3 else 2,
1158+
ncols = 3 if len(num_walks) == 3 else 2
1159+
output = "rw1D_%s_%s.%s" % (plot, "_".join([str(n) for n in num_walks]), ext)
1160+
cmd = "montage %s -tile %dx1 -geometry +0+0 %s" % (
11601161
" ".join(files),
1161-
plot,
1162-
"_".join([str(n) for n in num_walks]),
1163-
ext,
1162+
ncols,
1163+
output,
11641164
)
11651165
print(cmd)
11661166
os.system(cmd)
@@ -1826,12 +1826,12 @@ def demo_fig_random_walks1D():
18261826
files = [
18271827
os.path.join("tmp_%d" % n, "tmp%d.%s" % (j + 1, ext)) for n in num_walks
18281828
]
1829-
cmd = "doconce combine_images -%d %s rw1D_%s_%s.%s" % (
1830-
3 if len(num_walks) == 3 else 2,
1829+
ncols = 3 if len(num_walks) == 3 else 2
1830+
output = "rw1D_%s_%s.%s" % (plot, "_".join([str(n) for n in num_walks]), ext)
1831+
cmd = "montage %s -tile %dx1 -geometry +0+0 %s" % (
18311832
" ".join(files),
1832-
plot,
1833-
"_".join([str(n) for n in num_walks]),
1834-
ext,
1833+
ncols,
1834+
output,
18351835
)
18361836
print(cmd)
18371837
os.system(cmd)
@@ -2196,12 +2196,12 @@ def demo_fig_random_walks1D():
21962196
files = [
21972197
os.path.join("tmp_%d" % n, "tmp%d.%s" % (j + 1, ext)) for n in num_walks
21982198
]
2199-
cmd = "doconce combine_images -%d %s rw1D_%s_%s.%s" % (
2200-
3 if len(num_walks) == 3 else 2,
2199+
ncols = 3 if len(num_walks) == 3 else 2
2200+
output = "rw1D_%s_%s.%s" % (plot, "_".join([str(n) for n in num_walks]), ext)
2201+
cmd = "montage %s -tile %dx1 -geometry +0+0 %s" % (
22012202
" ".join(files),
2202-
plot,
2203-
"_".join([str(n) for n in num_walks]),
2204-
ext,
2203+
ncols,
2204+
output,
22052205
)
22062206
print(cmd)
22072207
os.system(cmd)

chapters/diffu/exer-diffu/welding.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,10 @@ def investigate():
9898
for gamma in gamma_values:
9999
for ext in "pdf", "png":
100100
cmd = (
101-
"doconce combine_images -2 "
101+
"montage "
102102
"tmp1_gamma{gamma:g}_s1.{ext} "
103103
"tmp1_gamma{gamma:g}_s2.{ext} "
104+
"-tile 2x1 -geometry +0+0 "
104105
"welding_gamma{gamma:g}.{ext}".format(**vars())
105106
)
106107
os.system(cmd)

chapters/vib/exer-vib/resonance.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
visualize(u, t, title=f"gamma={gamma:g}", filename=f"tmp_{gamma}")
2828
print(gamma, "max u amplitude:", np.abs(u).max())
2929
for ext in "png", "pdf":
30-
cmd = "doconce combine_images "
31-
cmd += " ".join([f"tmp_{gamma}." + ext for gamma in gamma_values])
32-
cmd += " resonance%d." % (i + 1) + ext
30+
files = " ".join([f"tmp_{gamma}." + ext for gamma in gamma_values])
31+
output = "resonance%d.%s" % (i + 1, ext)
32+
cmd = "montage %s -tile 2x2 -geometry +0+0 %s" % (files, output)
3333
os.system(cmd)
3434
raw_input()

chapters/vib/exer-vib/vib_phase_error.do.txt

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)