Skip to content

Commit db533bb

Browse files
hauke96hauke96
committed
Merge branch 'dev'
2 parents 8fab92a + f7b242b commit db533bb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1894
-956
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ Steps to reproduce the behavior:
3838

3939
## Additional information
4040

41-
**The used wiki2book version (or commit-hash)**
41+
### The used wiki2book version (or commit-hash)
4242

43-
**Used output driver (when using `pandoc` output driver: The used pandoc version)**
43+
### Used output driver (when using `pandoc` output driver: The used pandoc version)
4444

45-
**Any other useful and/or related information**
45+
### Any other useful and/or related information

‎configs/de.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"quellen",
5757
"rechtshinweis",
5858
"redundanztext",
59+
"schwesterprojekte",
5960
"siehe auch",
6061
"sortierung",
6162
"staatslastig",
@@ -106,5 +107,7 @@
106107
"upright",
107108
"verweis",
108109
"zentriert"
109-
]
110+
],
111+
"math-converter": "rsvg",
112+
"convert-pdfs-to-images": true
110113
}

‎configs/rsvg-math.css‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
* {
2+
font-size: 18pt;
3+
}

‎generate-server-graph.sh‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
#!/bin/bash
2+
3+
#PKGS_TO_IGNORE="github.com/alecthomas/kong,github.com/hauke96/sigolo,github.com/go-shiori/go-epub,github.com/pkg/errors,golang.org/x/net,os,filepath,strings,runtime"
4+
5+
(
6+
echo "Go into src"
7+
cd src
8+
9+
# go install github.com/kisielk/godepgraph@latest
10+
#echo "Generate dot file with godepgraph"
11+
#OUT=$(godepgraph -s -p $PKGS_TO_IGNORE . | sed 's/wiki2book\///g')
12+
#echo "$OUT" > graph.dot
13+
#echo "Turn dot file into PNG"
14+
#echo "$OUT" | dot -Tpng -o graph.png
15+
16+
# go install github.com/ofabry/go-callvis@latest
17+
#echo "Generate dot file with go-callvis"
18+
#OUT=$(go-callvis -algo static -format dot -file graph2 -group type -ignore $PKGS_TO_IGNORE -minlen 5 .)
19+
#echo "Turn dot file into PNG"
20+
#cat graph2.dot | dot -Tpng -o graph2.png
21+
22+
# go install golang.org/x/tools/cmd/callgraph@latest
23+
echo "Generate dot file with callgraph"
24+
# Filter by call within wiki2book and exclude some very basic functions/packages that are simply called too often
25+
OUT=$(
26+
callgraph -algo static -format graphviz . | \
27+
grep -P "^( ? ?\".?.?wiki2book.* -> \".?.?wiki2book|digraph.*|})" | \
28+
grep -v -P "wiki2book/(util)" | \
29+
grep -v -P "\.init" | \
30+
grep -v -P "parser\.Tokenizer\)\.(getToken|setRawToken)\"" | \
31+
sed 's/wiki2book\///g' | \
32+
uniq
33+
)
34+
35+
echo "Generate full graph"
36+
echo "$OUT" > graph3.dot
37+
ls -alh graph3.dot
38+
echo "Turn dot file into PNG"
39+
cat graph3.dot | dot -Tpng -o graph3.png
40+
41+
echo "Generate high-level graph"
42+
echo "$OUT" | grep -v -P "\".?.?(generator|parser|api)" > graph-high-level.dot
43+
ls -alh graph-high-level.dot
44+
echo "Turn dot file into PNG"
45+
cat graph-high-level.dot | dot -Tpng -o graph-high-level.png
46+
47+
echo "Generate graph with api package"
48+
echo "$OUT" | grep -v -P "\".?.?(generator|parser)" > graph-api.dot
49+
ls -alh graph-api.dot
50+
echo "Turn dot file into PNG"
51+
cat graph-api.dot | dot -Tpng -o graph-api.png
52+
53+
echo "Generate graph with parser package"
54+
echo "$OUT" | grep -v -P "\".?.?(generator|api)" > graph-parser.dot
55+
ls -alh graph-parser.dot
56+
echo "Turn dot file into PNG"
57+
cat graph-parser.dot | dot -Tpng -o graph-parser.png
58+
59+
echo "Generate graph with generator package"
60+
echo "$OUT" | grep -v -P "\".?.?(parser|api)" > graph-generator.dot
61+
ls -alh graph-generator.dot
62+
echo "Turn dot file into PNG"
63+
cat graph-generator.dot | dot -Tpng -o graph-generator.png
64+
)
65+
66+
echo "Done"
67+
#| sed 's/github.com\/hauke96\/wiki2book\/server\///g' \
68+
#| sed 's/github.com\/hauke96\/wiki2book\/server/main/g' \

‎integration-tests/run.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ function run()
5656
echo "$1: Start test"
5757

5858
# TODO create own style and cover files for these integration tests
59-
./wiki2book -c ../configs/de.json -l debug standalone -r --cache-dir "$OUT" -o "$OUT" -s ./style.css -c ./cover.png "test-$1.mediawiki" > "$LOGS/$1.log" 2>&1
59+
./wiki2book -c ../configs/de.json -l debug standalone -r --cache-dir "$OUT" -o "$OUT" --style-file ./style.css -c ./cover.png "test-$1.mediawiki" > "$LOGS/$1.log" 2>&1
6060

6161
EXIT_CODE=$?
6262
if [ $EXIT_CODE -ne 0 ]

‎integration-tests/test-generic.filelist‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
results/test-generic/articles/File:Wikimedia_Servers-0051_19.jpg.json
22
results/test-generic/articles/File:Wikipedia-logo-v2.svg.json
33
results/test-generic/html/test-generic.html
4-
results/test-generic/images/241e89bf30991bd082129555304cb82d10322b44.png
5-
results/test-generic/images/241e89bf30991bd082129555304cb82d10322b44.svg
6-
results/test-generic/images/25d952c483765aeea66e570a93fb6387c85698f9.png
7-
results/test-generic/images/25d952c483765aeea66e570a93fb6387c85698f9.svg
4+
results/test-generic/images/5648ad8d9095518f5a9aa95d2d606123d796f312.png
5+
results/test-generic/images/5648ad8d9095518f5a9aa95d2d606123d796f312.svg
86
results/test-generic/images/Wikimedia_Servers-0051_19.jpg
97
results/test-generic/images/Wikipedia-logo-v2.svg
10-
results/test-generic/math/07e73ce0c2718f84db47911ef11f856ecb28d594
11-
results/test-generic/math/f84e22cde14f643628f522ea3819505ba636cade
8+
results/test-generic/images/af45bbf21bbd7c5efe9d88f49daee8f26c496777.png
9+
results/test-generic/images/af45bbf21bbd7c5efe9d88f49daee8f26c496777.svg
10+
results/test-generic/math/298f9ae56e2df2a505218d2dc326f8faa60b7fc5
11+
results/test-generic/math/ab85d9d3ab664ce0fb875e78e57ddc710ede984b
1212
results/test-generic/standalone.epub
1313
results/test-generic/templates/d0d5319b11de0e1b5d3de3a213b7e3dd9efd9267
1414
results/test-generic/test-generic.filelist

‎integration-tests/test-generic.html‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ <h2>Links</h2>
2626
<h3>Interwiki links</h3>
2727
Some links lead to other instances.
2828
<h2>Math</h2>
29-
Let us do some <img alt="image" src="./images/241e89bf30991bd082129555304cb82d10322b44.png" style="width: 13.278ex; height: 2.343ex; vertical-align: -0.505ex;"> stuff:
29+
Let us do some <img alt="image" src="./images/af45bbf21bbd7c5efe9d88f49daee8f26c496777.png" style="width: 13.278ex; height: 2.343ex; vertical-align: -0.505ex;"> stuff:
3030
<div class="description-list">
3131
<div class="dd">
32-
<img alt="image" src="./images/25d952c483765aeea66e570a93fb6387c85698f9.png" style="width: 16.156ex; height: 9.176ex; vertical-align: -4.005ex;">
32+
<img alt="image" src="./images/5648ad8d9095518f5a9aa95d2d606123d796f312.png" style="width: 16.156ex; height: 9.176ex; vertical-align: -4.005ex;">
3333
</div>
3434
</div>
3535
<h2>Lists</h2>
@@ -210,11 +210,26 @@ <h2>Tables</h2>
210210
</div>
211211
</div>
212212
<h2>References</h2>
213-
They will be collected and are visible at the end of the document:<br>
213+
They will be collected[5] and are visible[6] at the end of the document:[5]<br>
214+
<br><br>
215+
There are also grouped references possible.[1]<br>
216+
Even named[2] grouped references work![2]<br>
217+
<br><br>
218+
Normal refs:<br>
214219
[1] Reference to a source<br>
215220
[2] That's true!<br>
216221
[3] That's cool!<br>
217222
[4] No name, no problem.<br>
223+
[5] This is true<br>
224+
[6] Some reference<br>
225+
Here comes[7] additional content.[8]
226+
<br><br>
227+
Additional refs:<br>
228+
[7] Aaaaaaand another boring reference no one ever reads.<br>
229+
[8] bar<br>
230+
Grouped refs:<br>
231+
[1] Some grouped ref<br>
232+
[2] Some named grouped ref<br>
218233
<h2>Mixing stuff</h2>
219234
1. Mixing stuff also works:
220235
2. Planemo = <i><b>plane</b>tary <a href="https://object.de"><b>m</b>ass</a> <b>o</b>bject</i>

‎integration-tests/test-generic.mediawiki‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,10 +130,24 @@ A bit tricky but they work as well:
130130
131131
== References ==
132132
133-
They will be collected and are visible at the end of the document:<br>
133+
They will be collected<ref name="another-ref">This is true</ref> and are visible<ref>Some reference</ref> at the end of the document:<ref name="another-ref" /><br>
134134
135+
There are also grouped references possible.<ref group="some-group">Some grouped ref</ref><br>
136+
Even named<ref group="some-group" name="grouped-ref-name"/> grouped references work!<ref group="some-group" name="grouped-ref-name">Some named grouped ref</ref><br>
137+
138+
Normal refs:<br>
135139
<references />
136140
141+
Here comes<ref name="yet-another-named-ref" /> additional content.<ref>bar</ref>
142+
143+
Additional refs:<br>
144+
<references>
145+
<ref name="yet-another-named-ref">Aaaaaaand another boring reference no one ever reads.</ref>
146+
</references>
147+
148+
Grouped refs:<br>
149+
<references group="some-group" />
150+
137151
== Mixing stuff ==
138152
139153
1. Mixing stuff also works:

‎integration-tests/test-real-article-Erde.filelist‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,5 +62,4 @@ results/test-real-article-Erde/images/World-Scientists’-Warning,-Temperaturans
6262
results/test-real-article-Erde/images/World-Scientists’-Warning,-Totzonen.png
6363
results/test-real-article-Erde/images/World-Scientists’-Warning,-Wirbeltier-Bestandsveränderungen.png
6464
results/test-real-article-Erde/standalone.epub
65-
results/test-real-article-Erde/templates/31db7c4aa8c8fd78e5451726d4de659084281d8a
6665
results/test-real-article-Erde/test-real-article-Erde.filelist

0 commit comments

Comments
 (0)