Skip to content

Commit

Permalink
docs: Restructure some sources, and localize Japanese header navbar
Browse files Browse the repository at this point in the history
  • Loading branch information
rdmark committed May 31, 2024
1 parent 36babdc commit 8ec2f2c
Show file tree
Hide file tree
Showing 13 changed files with 34 additions and 19 deletions.
4 changes: 2 additions & 2 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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\}\}'
Expand Down
2 changes: 1 addition & 1 deletion doc/html.xsl.in
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<xsl:param name="toc.max.depth" select="2"/>

<xsl:template name="user.header.navigation">
<xsl:variable name="codefile" select="document('netatalk.html',/)"/>
<xsl:variable name="codefile" select="document('pageheader.txt',/)"/>
<xsl:copy-of select="$codefile/*/node()"/>
</xsl:template>
</xsl:stylesheet>
2 changes: 1 addition & 1 deletion doc/ja/html.xsl.in
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<xsl:param name="toc.max.depth" select="2"/>

<xsl:template name="user.header.navigation">
<xsl:variable name="codefile" select="document('netatalk.html',/)"/>
<xsl:variable name="codefile" select="document('pageheader.txt',/)"/>
<xsl:copy-of select="$codefile/*/node()"/>
</xsl:template>
</xsl:stylesheet>
1 change: 1 addition & 0 deletions doc/ja/manual/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
manual.xml
pageheader.txt
*.html
4 changes: 2 additions & 2 deletions doc/ja/manual/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ EXTRA_DIST = \
install.xml \
intro.xml \
manual.xml.in \
netatalk.html.in \
pageheader.txt.in \
upgrade.xml

HTML_PAGES = \
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions doc/ja/manual/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down
1 change: 0 additions & 1 deletion doc/ja/manual/netatalk.html.in

This file was deleted.

15 changes: 15 additions & 0 deletions doc/ja/manual/pageheader.txt.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<html>
<div id="header">
<div id="logo"></div>
<div id="menlinks">
<a href="/" title="Netatalk ホームに戻る">[main]</a>
<a href="/docs" title="Netatalk Wiki">[wiki]</a>
<a href="/documentation.html" title="Netatalk マニュアル">[documentation]</a>
<a href="/download.html" title="Netatalk をダウンロード">[downloads]</a>
<a href="/support.html" title="お問い合わせ">[support]</a>
<a href="/links.html" title="Netatalk 関連リンク">[links]</a>
<img src="/gfx/end.gif" alt="" width="125" height="7" />
</div>
</div>
<div class="navheader" align="center">Netatalk @NETATALK_VERSION@</div>
</html>
2 changes: 1 addition & 1 deletion doc/manual/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
manual.xml
pageheader.txt
*.html
venv
4 changes: 2 additions & 2 deletions doc/manual/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ EXTRA_DIST = \
install.xml \
intro.xml \
manual.xml.in \
netatalk.html.in \
pageheader.txt.in \
upgrade.xml

HTML_PAGES = \
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions doc/manual/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)

Expand Down
File renamed without changes.

0 comments on commit 8ec2f2c

Please sign in to comment.