Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion debian/control.docs.in
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Description: motion controller for CNC machines and robots (German documentation
.
This package contains the documentation in German.

Package: linuxcnc-doc-ua
Package: linuxcnc-doc-uk
Provides: linuxcnc-doc
Architecture: all
Multi-Arch: foreign
Expand Down
10 changes: 0 additions & 10 deletions debian/linuxcnc-doc-ua.doc-base

This file was deleted.

5 changes: 0 additions & 5 deletions debian/linuxcnc-doc-ua.docs

This file was deleted.

4 changes: 0 additions & 4 deletions debian/linuxcnc-doc-ua.install

This file was deleted.

10 changes: 10 additions & 0 deletions debian/linuxcnc-doc-uk.doc-base
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Document: linuxcnc-doc-uk
Title: LinuxCNC Documentation Ukrainian
Section: Science/Engineering

Format: PDF
Files:
/usr/share/doc/linuxcnc/LinuxCNC_Developer_uk.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Documentation_uk.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_uk.pdf
/usr/share/doc/linuxcnc/LinuxCNC_Integrator_uk.pdf
5 changes: 5 additions & 0 deletions debian/linuxcnc-doc-uk.docs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
usr/share/doc/linuxcnc/LinuxCNC_Developer_uk.pdf
usr/share/doc/linuxcnc/LinuxCNC_Documentation_uk.pdf
usr/share/doc/linuxcnc/LinuxCNC_Getting_Started_uk.pdf
usr/share/doc/linuxcnc/LinuxCNC_Integrator_uk.pdf
docs/html/uk/gcode.html
4 changes: 4 additions & 0 deletions debian/linuxcnc-doc-uk.install
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#debian/extras/usr/share/applications/linuxcnc-documentation_uk.desktop usr/share/applications
#debian/extras/usr/share/applications/linuxcnc-gcoderef_uk.desktop usr/share/applications
#debian/extras/usr/share/applications/linuxcnc-gettingstarted_uk.desktop usr/share/applications
#debian/extras/usr/share/applications/linuxcnc-integratorinfo_uk.desktop usr/share/applications
6 changes: 3 additions & 3 deletions debian/rules.in
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ ifeq (,$(filter nodocs,$(DEB_BUILD_OPTIONS)))
mv debian/linuxcnc-doc-en/usr/share/doc/@MAIN_PACKAGE_NAME@ debian/linuxcnc-doc-en/usr/share/doc/linuxcnc

# Remove files for translations created where we do not want Debian packages.
for l in ar es fr ru zh_CN; do \
$(RM) debian/tmp/usr/share/doc/linuxcnc/LinuxCNC_*_$$l.pdf; \
for l in ar es fr ru uk zh_CN; do \
$(RM) -f debian/tmp/usr/share/doc/linuxcnc/LinuxCNC_*_$$l.pdf; \
done
$(RM) debian/tmp/usr/share/doc/linuxcnc/*_es.adoc
$(RM) -f debian/tmp/usr/share/doc/linuxcnc/*_es.adoc
else
# Avoiding error message because of examples
$(RM) -fr debian/tmp/usr/share/doc/
Expand Down
1 change: 0 additions & 1 deletion docs/help/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ sai/*
sk/*
sv/*
tr/*
ua/*
uk/*
vi/*
zh_CN/*
1 change: 0 additions & 1 deletion docs/html/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ sai/*
sk/*
sv/*
tr/*
ua/*
uk/*
vi/*
zh_CN/*
1 change: 0 additions & 1 deletion docs/man/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,6 @@ sai/*
sk/*
sv/*
tr/*
ua/*
uk/*
vi/*
zh_CN/*
6 changes: 3 additions & 3 deletions docs/po4a.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
# constrain this list. For adding a new language, also edit docs/src/Submakefile.

# Original list
#[po4a_langs] ar bg ckb cs da de es fr hu it ka nb pl pt_BR pt ro ru sai sk sv ta tr uk ua vi zh_CN
#[po4a_langs] ar bg ckb cs da de es fr hu it ka nb pl pt_BR pt ro ru sai sk sv ta tr uk vi zh_CN
# Actual in makefile(s)
#[po4a_langs] ar de es fr nb ru sv ta tr ua zh_CN
#[po4a_langs] ar de es fr nb ru sv ta tr uk zh_CN
# Languages with any real translations
[po4a_langs] de es fr nb ru ua zh_CN
[po4a_langs] de es fr nb ru zh_CN

[po4a_paths] po/documentation.pot $lang:po/$lang.po

Expand Down
1 change: 0 additions & 1 deletion docs/src/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ sai/*
sk/*
sv/*
tr/*
ua/*
uk/*
vi/*
zh_CN/*
Expand Down
35 changes: 17 additions & 18 deletions docs/src/Submakefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.PHONY: docs docclean checkref checkref_en checkref_ar checkref_de checkref_es checkref_fr checkref_nb checkref_ru checkref_sv checkref_ta checkref_tr checkref_ua checkref_zh_CN
.PHONY: docs docclean checkref checkref_en checkref_ar checkref_de checkref_es checkref_fr checkref_nb checkref_ru checkref_sv checkref_ta checkref_tr checkref_uk checkref_zh_CN
.PHONY: pdfdocs htmldocs install-doc install-doc-pdf install-doc-html

SHELL=/bin/bash
Expand Down Expand Up @@ -33,7 +33,6 @@ LOC_LANG_MAP=$(LOC_HL_DIR)/local/lang.map
LANGUAGES := $(strip $(shell sed -e's/#.*//' < $(DOC_DIR)/po4a.cfg | grep '^\[po4a_langs\]' | cut -d" " -f2-))
LANGUAGES_MATCH := $(shell echo $(LANGUAGES) | tr " " "|")


GENERATED_MANPAGES += ../docs/man/man1/linuxcnc.1
GENERATED_MANPAGES += $(patsubst ../docs/src/man/%.adoc, ../docs/man/%, $(wildcard ../docs/src/man/*/*.adoc))

Expand All @@ -50,7 +49,7 @@ $(DOC_SRCDIR)/man/man1/linuxcnc.1.adoc: $(DOC_SRCDIR)/man/man1/linuxcnc.1.adoc.i

info::
@echo "I: Expecting the following languages: $(LANGUAGES)"
echo $(DOC_SRCS_UA)
echo $(DOC_SRCS_UK)

ifneq ($(MANDB),)
docs: $(DOC_DIR)/man/index.db
Expand Down Expand Up @@ -210,7 +209,7 @@ $(if $(filter $1,ru),russian,\
$(if $(filter $1,sv),swedish,\
$(if $(filter $1,ta),tamil,\
$(if $(filter $1,tr),turkish,\
$(if $(filter $1,ua),ukranian,\
$(if $(filter $1,uk),ukranian,\
$(if $(filter $1,zh_CN),chinese,\
unknown))))))))))))
endef
Expand Down Expand Up @@ -282,10 +281,10 @@ DOC_TARGETS_XML_RU = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /ru/, $(
DOC_TARGETS_XML_SV = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /sv/, $(p)), $p))
DOC_TARGETS_XML_TA = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /ta/, $(p)), $p))
DOC_TARGETS_XML_TR = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /tr/, $(p)), $p))
DOC_TARGETS_XML_UA = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /ua/, $(p)), $p))
DOC_TARGETS_XML_UK = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /uk/, $(p)), $p))
DOC_TARGETS_XML_ZH_CN = $(foreach p, $(DOC_TARGETS_XML), $(if $(findstring /zh_CN/, $(p)), $p))

DOC_TARGETS_XML_EN = $(filter-out $(DOC_TARGETS_XML_AR), $(filter-out $(DOC_TARGETS_XML_DE), $(filter-out $(DOC_TARGETS_XML_ES), $(filter-out $(DOC_TARGETS_XML_FR), $(filter-out $(DOC_TARGETS_XML_NB), $(filter-out $(DOC_TARGETS_XML_RU), $(filter-out $(DOC_TARGETS_XML_SV), $(filter-out $(DOC_TARGETS_XML_TR), $(filter-out $(DOC_TARGETS_XML_UA), $(filter-out $(DOC_TARGETS_XML_ZH_CN), $(DOC_TARGETS_XML)))))))))))
DOC_TARGETS_XML_EN = $(filter-out $(DOC_TARGETS_XML_AR), $(filter-out $(DOC_TARGETS_XML_DE), $(filter-out $(DOC_TARGETS_XML_ES), $(filter-out $(DOC_TARGETS_XML_FR), $(filter-out $(DOC_TARGETS_XML_NB), $(filter-out $(DOC_TARGETS_XML_RU), $(filter-out $(DOC_TARGETS_XML_SV), $(filter-out $(DOC_TARGETS_XML_TR), $(filter-out $(DOC_TARGETS_XML_UK), $(filter-out $(DOC_TARGETS_XML_ZH_CN), $(DOC_TARGETS_XML)))))))))))

DOC_TARGETS_HTML_AR = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /ar/, $(p)), $p))
DOC_TARGETS_HTML_DE = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /de/, $(p)), $p))
Expand All @@ -296,9 +295,9 @@ DOC_TARGETS_HTML_RU = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /ru/,
DOC_TARGETS_HTML_SV = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /sv/, $(p)), $p))
DOC_TARGETS_HTML_TA = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /ta/, $(p)), $p))
DOC_TARGETS_HTML_TR = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /tr/, $(p)), $p))
DOC_TARGETS_HTML_UA = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /ua/, $(p)), $p))
DOC_TARGETS_HTML_UK = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /uk/, $(p)), $p))
DOC_TARGETS_HTML_ZH_CN = $(foreach p, $(DOC_TARGETS_HTML), $(if $(findstring /zh_CN/, $(p)), $p))
DOC_TARGETS_HTML_EN = $(filter-out $(DOC_TARGETS_HTML_AR), $(filter-out $(DOC_TARGETS_HTML_DE), $(filter-out $(DOC_TARGETS_HTML_ES), $(filter-out $(DOC_TARGETS_HTML_FR), $(filter-out $(DOC_TARGETS_HTML_NB), $(filter-out $(DOC_TARGETS_HTML_RU), $(filter-out $(DOC_TARGETS_HTML_SV), $(filter-out $(DOC_TARGETS_HTML_TA), $(filter-out $(DOC_TARGETS_HTML_TR), $(filter-out $(DOC_TARGETS_HTML_UA), $(filter-out $(DOC_TARGETS_HTML_ZH_CN), $(DOC_TARGETS_HTML))))))))))))
DOC_TARGETS_HTML_EN = $(filter-out $(DOC_TARGETS_HTML_AR), $(filter-out $(DOC_TARGETS_HTML_DE), $(filter-out $(DOC_TARGETS_HTML_ES), $(filter-out $(DOC_TARGETS_HTML_FR), $(filter-out $(DOC_TARGETS_HTML_NB), $(filter-out $(DOC_TARGETS_HTML_RU), $(filter-out $(DOC_TARGETS_HTML_SV), $(filter-out $(DOC_TARGETS_HTML_TA), $(filter-out $(DOC_TARGETS_HTML_TR), $(filter-out $(DOC_TARGETS_HTML_UK), $(filter-out $(DOC_TARGETS_HTML_ZH_CN), $(DOC_TARGETS_HTML))))))))))))

MAN_HTML_TARGETS = $(patsubst $(DOC_DIR)/man/%, $(DOC_DIR)/html/man/%.html, $(MAN_SRCS))

Expand Down Expand Up @@ -343,15 +342,15 @@ PDF_TARGETS_TR = $(addprefix $(DOC_DIR)/, $(subst tr/,, \
$(patsubst %.adoc,%_tr.pdf, \
$(subst Master_,LinuxCNC_, $(filter tr/Master_%,$(DOC_SRCS_TR))))))

PDF_TARGETS_UA = $(addprefix $(DOC_DIR)/, $(subst ua/,, \
$(patsubst %.adoc,%_ua.pdf, \
$(subst Master_,LinuxCNC_, $(filter ua/Master_%,$(DOC_SRCS_UA))))))
PDF_TARGETS_UK = $(addprefix $(DOC_DIR)/, $(subst uk/,, \
$(patsubst %.adoc,%_uk.pdf, \
$(subst Master_,LinuxCNC_, $(filter uk/Master_%,$(DOC_SRCS_UK))))))

PDF_TARGETS_ZH_CN = $(addprefix $(DOC_DIR)/, $(subst zh_CN/,, \
$(patsubst %.adoc,%_zh_CN.pdf, \
$(subst Master_,LinuxCNC_, $(filter zh_CN/Master_%,$(DOC_SRCS_ZH_CN))))))

PDF_TARGETS = $(PDF_TARGETS_EN) $(PDF_TARGETS_AR) $(PDF_TARGETS_DE) $(PDF_TARGETS_ES) $(PDF_TARGETS_FR) $(PDF_TARGETS_NB) $(PDF_TARGETS_RU) $(PDF_TARGETS_SV) $(PDF_TARGETS_TA) $(PDF_TARGETS_TR) $(PDF_TARGETS_UA)
PDF_TARGETS = $(PDF_TARGETS_EN) $(PDF_TARGETS_AR) $(PDF_TARGETS_DE) $(PDF_TARGETS_ES) $(PDF_TARGETS_FR) $(PDF_TARGETS_NB) $(PDF_TARGETS_RU) $(PDF_TARGETS_SV) $(PDF_TARGETS_TA) $(PDF_TARGETS_TR) $(PDF_TARGETS_UK)
# Do not add $(PDF_TARGETS_ZH_CN) to the line above, it is added below - only if xetex is available

# Chinese PDFs only build with xetex - optional build-dependency on texlive-xetex
Expand All @@ -361,7 +360,7 @@ DBLATEX_OPTS=--backend xetex
endif

info::
@$(ECHO) PDF_TARGETS_UA: $(PDF_TARGETS_UA)
@$(ECHO) PDF_TARGETS_UK: $(PDF_TARGETS_UK)
@$(ECHO) PDF_TARGETS: $(PDF_TARGETS)


Expand Down Expand Up @@ -435,7 +434,7 @@ gen_complist: $(DOC_SRCDIR)/gen_complist.py $(DOC_SRCDIR)/hal/components.adoc $(

CHECKREF_TARGETS := checkref_en $(foreach L,$(LANGUAGES),checkref_$(L))

#checkref: checkref_en checkref_ar checkref_de checkref_es checkref_fr checkref_nb checkref_ru checkref_sv checkref_ta checkref_tr checkref_ua checkref_zh_CN
#checkref: checkref_en checkref_ar checkref_de checkref_es checkref_fr checkref_nb checkref_ru checkref_sv checkref_ta checkref_tr checkref_uk checkref_zh_CN
checkref: $(CHECKREF_TARGETS)

checkref_en: $(DOC_TARGETS_HTML_EN) $(DOC_DIR)/html/index.html $(DOC_DIR)/html/gcode.html .htmldoc-stamp
Expand Down Expand Up @@ -655,7 +654,7 @@ objects/xref_ta.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_TA_SMALL))
objects/xref_tr.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_TR_SMALL))
$(PYTHON) $(DOC_SRCDIR)/links_db_gen.py objects/ $^ > $@

objects/xref_ua.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_UA_SMALL))
objects/xref_uk.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_UK_SMALL))
$(PYTHON) $(DOC_SRCDIR)/links_db_gen.py objects/ $^ > $@

objects/xref_zh_CN.links: $(patsubst %.adoc,objects/%.links,$(DOC_SRCS_ZH_CN_SMALL))
Expand Down Expand Up @@ -876,8 +875,8 @@ $(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_TR_SMALL)): $(DOC_SRCDIR)/%.ht
-a stylesheet=linuxcnc.css \
-d book -a toc -a numbered -b xhtml11 $< || (X=$$?; rm -f $@; exit $$X)

$(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_UA_SMALL)): $(DOC_SRCDIR)/%.html: $(DOC_SRCDIR)/%.adoc objects/xref_ua.links $(LOC_LANG_MAP)
$(ECHO) "Building 'ua' adoc to html: " $<
$(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_UK_SMALL)): $(DOC_SRCDIR)/%.html: $(DOC_SRCDIR)/%.adoc objects/xref_uk.links $(LOC_LANG_MAP)
$(ECHO) "Building 'uk' adoc to html: " $<
$(Q)asciidoc -f $(DOC_SRCDIR)/xhtml11.conf \
-f $(DOC_SRCDIR)/asciidoc-dont-replace-arrows.conf \
-f $(LOC_HL_DIR)/emc-langs-source-highlight.conf \
Expand All @@ -886,7 +885,7 @@ $(patsubst %.adoc,$(DOC_SRCDIR)/%.html,$(DOC_SRCS_UA_SMALL)): $(DOC_SRCDIR)/%.ht
$(STYLES_SCRIPTS) \
-a "scriptdir=$(DOC_SRCDIR)/" \
-a "relindir=$(shell dirname $*)" \
-a "linksfile=objects/xref_ua.links" \
-a "linksfile=objects/xref_uk.links" \
-a stylesheet=linuxcnc.css \
-d book -a toc -a numbered -b xhtml11 $< || (X=$$?; rm -f $@; exit $$X)

Expand Down
2 changes: 1 addition & 1 deletion docs/src/index.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ function setup_page(){
<a href="ru/">Russian</a>
<a href="sv/">Svensk</a>
<!-- <a href="ta/">Tamil</a> -->
<a href="ua/">Ukranian</a>
<a href="uk/">Ukranian</a>
<a href="zh_CN/">中文</a>
</p>
@ENDTRANSLATIONS@
Expand Down
Loading