From 8ec2f2ce0f760783611ebf5578ccd81cf2591efe Mon Sep 17 00:00:00 2001 From: Daniel Markstedt Date: Fri, 31 May 2024 12:35:23 +0900 Subject: [PATCH] docs: Restructure some sources, and localize Japanese header navbar --- configure.ac | 4 ++-- doc/{manual => }/generate_compile_docs.py | 6 +++--- doc/html.xsl.in | 2 +- doc/ja/html.xsl.in | 2 +- doc/ja/manual/.gitignore | 1 + doc/ja/manual/Makefile.am | 4 ++-- doc/ja/manual/meson.build | 6 +++--- doc/ja/manual/netatalk.html.in | 1 - doc/ja/manual/pageheader.txt.in | 15 +++++++++++++++ doc/manual/.gitignore | 2 +- doc/manual/Makefile.am | 4 ++-- doc/manual/meson.build | 6 +++--- .../{netatalk.html.in => pageheader.txt.in} | 0 13 files changed, 34 insertions(+), 19 deletions(-) rename doc/{manual => }/generate_compile_docs.py (96%) delete mode 120000 doc/ja/manual/netatalk.html.in create mode 100644 doc/ja/manual/pageheader.txt.in rename doc/manual/{netatalk.html.in => pageheader.txt.in} (100%) diff --git a/configure.ac b/configure.ac index 2e2b2f1b70..c4c1751e2e 100644 --- a/configure.ac +++ b/configure.ac @@ -261,14 +261,14 @@ AC_CONFIG_FILES([ doc/ja/Makefile doc/ja/manual/Makefile doc/ja/manual/manual.xml - doc/ja/manual/netatalk.html + doc/ja/manual/pageheader.txt doc/ja/manpages/Makefile doc/ja/manpages/man1/Makefile doc/ja/manpages/man5/Makefile doc/ja/manpages/man8/Makefile doc/manual/Makefile doc/manual/manual.xml - doc/manual/netatalk.html + doc/manual/pageheader.txt doc/manpages/Makefile doc/manpages/man1/Makefile doc/manpages/man5/Makefile diff --git a/doc/manual/generate_compile_docs.py b/doc/generate_compile_docs.py similarity index 96% rename from doc/manual/generate_compile_docs.py rename to doc/generate_compile_docs.py index c5333227cd..3a67ceb85a 100755 --- a/doc/manual/generate_compile_docs.py +++ b/doc/generate_compile_docs.py @@ -27,10 +27,10 @@ "para_3": "ビルド システムとして Autotools と Meson から選択する。 テスト手順は任意である。", } -output_en = "compile.xml" -output_jp = "../ja/manual/compile.xml" +output_en = "./manual/compile.xml" +output_jp = "./ja/manual/compile.xml" -with open('../../.github/workflows/build.yml', 'r') as file: +with open('../.github/workflows/build.yml', 'r') as file: workflow = yaml.safe_load(file) apt_packages_pattern = r'\$\{\{\senv\.APT_PACKAGES\s\}\}' diff --git a/doc/html.xsl.in b/doc/html.xsl.in index 61e6789fde..15c8b70bd0 100644 --- a/doc/html.xsl.in +++ b/doc/html.xsl.in @@ -9,7 +9,7 @@ - + diff --git a/doc/ja/html.xsl.in b/doc/ja/html.xsl.in index 3b2c75c6c0..bee4962530 100644 --- a/doc/ja/html.xsl.in +++ b/doc/ja/html.xsl.in @@ -10,7 +10,7 @@ - + diff --git a/doc/ja/manual/.gitignore b/doc/ja/manual/.gitignore index ab1918eb62..468fee26d9 100644 --- a/doc/ja/manual/.gitignore +++ b/doc/ja/manual/.gitignore @@ -1,2 +1,3 @@ manual.xml +pageheader.txt *.html diff --git a/doc/ja/manual/Makefile.am b/doc/ja/manual/Makefile.am index ccaf6ba20b..141bd4b9b3 100644 --- a/doc/ja/manual/Makefile.am +++ b/doc/ja/manual/Makefile.am @@ -17,7 +17,7 @@ EXTRA_DIST = \ install.xml \ intro.xml \ manual.xml.in \ - netatalk.html.in \ + pageheader.txt.in \ upgrade.xml HTML_PAGES = \ @@ -49,7 +49,7 @@ HTML_PAGES = \ table-toc.html \ upgrade.html -DISTCLEANFILES = manual.xml natatalk.html +DISTCLEANFILES = pageheader.txt manual.xml if HAVE_XSLTPROC CLEANFILES += $(HTML_PAGES) diff --git a/doc/ja/manual/meson.build b/doc/ja/manual/meson.build index f92f849725..1c47b17e43 100644 --- a/doc/ja/manual/meson.build +++ b/doc/ja/manual/meson.build @@ -4,9 +4,9 @@ manual_xml = configure_file( configuration: cdata, ) -netatalk_html = configure_file( - input: 'netatalk.html.in', - output: 'netatalk.html', +pageheader = configure_file( + input: 'pageheader.txt.in', + output: 'pageheader.txt', configuration: cdata, ) diff --git a/doc/ja/manual/netatalk.html.in b/doc/ja/manual/netatalk.html.in deleted file mode 120000 index d9cabde24f..0000000000 --- a/doc/ja/manual/netatalk.html.in +++ /dev/null @@ -1 +0,0 @@ -../../manual/netatalk.html.in \ No newline at end of file diff --git a/doc/ja/manual/pageheader.txt.in b/doc/ja/manual/pageheader.txt.in new file mode 100644 index 0000000000..ae2e297682 --- /dev/null +++ b/doc/ja/manual/pageheader.txt.in @@ -0,0 +1,15 @@ + + +
Netatalk @NETATALK_VERSION@
+ diff --git a/doc/manual/.gitignore b/doc/manual/.gitignore index 0244a351e7..468fee26d9 100644 --- a/doc/manual/.gitignore +++ b/doc/manual/.gitignore @@ -1,3 +1,3 @@ manual.xml +pageheader.txt *.html -venv diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 4aa11945d5..5bfdf940ac 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -19,7 +19,7 @@ EXTRA_DIST = \ install.xml \ intro.xml \ manual.xml.in \ - netatalk.html.in \ + pageheader.txt.in \ upgrade.xml HTML_PAGES = \ @@ -52,7 +52,7 @@ HTML_PAGES = \ table-toc.html \ upgrade.html -DISTCLEANFILES = manual.xml natatalk.html +DISTCLEANFILES = pageheader.txt manual.xml if HAVE_XSLTPROC CLEANFILES += $(HTML_PAGES) diff --git a/doc/manual/meson.build b/doc/manual/meson.build index 97a1366638..4410f2fe44 100644 --- a/doc/manual/meson.build +++ b/doc/manual/meson.build @@ -4,9 +4,9 @@ manual_xml = configure_file( configuration: cdata, ) -netatalk_html = configure_file( - input: 'netatalk.html.in', - output: 'netatalk.html', +pageheader = configure_file( + input: 'pageheader.txt.in', + output: 'pageheader.txt', configuration: cdata, ) diff --git a/doc/manual/netatalk.html.in b/doc/manual/pageheader.txt.in similarity index 100% rename from doc/manual/netatalk.html.in rename to doc/manual/pageheader.txt.in