Skip to content

Commit

Permalink
Merge branch 'release/2.0.6'
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Knorr committed Aug 1, 2016
2 parents ea17def + 4cfd2ab commit 3eacb05
Show file tree
Hide file tree
Showing 78 changed files with 3,198 additions and 30,506 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
build/
tmp/
.env/
.tmp/
\#*#
.#*
Expand Down
46 changes: 45 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,47 @@
-------------------------------------------------------------------
Fr Aug 01 16:00:00 UTC 2015 - [email protected]

Stable release DAPS 2.0.6:

Find issues in our GitHub tracker at
https://github.com/openSUSE/suse-xsl/issues/NUMBER

* Schema
- Completely removed schemas from SUSE XSL Stylesheets: Schemas
can now be found at https://github.com/openSUSE/geekodoc

* SUSE Word List for aspell
- Added more words, many of which were found in SUSE release
notes

* Stylesheets (PDF)
- Allow disabling secondary branding (Geeko Tail) via parameter:
enable.secondary.branding=0

* Stylesheets (XHTML)
- Added syntax highlighting for screens
- To enable, add language="..." to your screen
- Recognized languages are: bash, c++, css, diff, html, xml,
http, ini, json, java, javascript, makefile, nginx, php,
perl, python, ruby, sql, crmsh, dockerfile, lisp, yaml
- Report Bug Links: Fixed ampersands in Bugzilla URLs
- Report Bug Links: Fixed JavaScript responsible for GitHub labels

* Common Stylesheet Changes
- Fixed a number of L10N issues in CJK and European languages
(suse-xsl #218, suse-xsl #51, suse-xsl #200, suse-xsl #82,
suse-xsl #87, suse-xsl #79)
- Reverted back to VERSION.xsl as used by upstream for
compatibility
- Improved screen trimming behavior to fix screens that contain
whitespace at beginning and end

* Packaging
- Added more fonts to requires to avoid broken foreign-language
PDF builds in the build service
- Removed mentions of schemas from spec file (see top)


-------------------------------------------------------------------
Fr Apr 22 09:00:00 UTC 2015 - [email protected]

Expand Down Expand Up @@ -143,7 +187,7 @@ Thu Jun 11 12:50:28 UTC 2015 - [email protected]
Hotfix for version 2.0-rc6:
* Reverted the move of the stylesheets to
/usr/share/xml/suse/stylesheet
because of serious compatibilioty issues.
because of serious compatibility issues.
The stylesheets remain in
/usr/share/xml/suse/docbook.

Expand Down
107 changes: 5 additions & 102 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,17 @@ endif
SHELL := /bin/bash
PACKAGE := suse-xsl-stylesheets
# HINT: Also raise version number in packaging/suse-xsl-stylesheets.spec
VERSION := 2.0.5
VERSION := 2.0.6
CDIR := $(shell pwd)
DIST_EXCLUDES := packaging/exclude-files_for_susexsl_package.txt
SUSE_XML_PATH := $(PREFIX)/xml/suse
DB_XML_PATH := $(PREFIX)/xml/docbook
SUSE_SCHEMA_PATH := $(SUSE_XML_PATH)/schema
SUSE_STYLES_PATH := $(DB_XML_PATH)/stylesheet

#--------------------------------------------------------------
# NOVDOC

NOVDOC_NAME := novdoc
NOVDOC_VERSION := 1.0
NOVDOC_DTD_PATH := $(SUSE_SCHEMA_PATH)/dtd/$(NOVDOC_VERSION)

#--------------------------------------------------------------
# SUSEDOC

#SUSEDOC_NAME := susedoc
#SUSEDOC_VERSION := 0.9
#SUSEDOC_RNG_PATH := $(SUSE_SCHEMA_PATH)/rng/$(SUSEDOC_VERSION)

#--------------------------------------------------------------
# stylsheet directory names
# stylesheet directory names

DIR2005 := suse
DIR2013_SUSE := suse2013
Expand All @@ -50,9 +37,6 @@ ALL_STYLEDIRS := $(DIR2005) $(DIR2013_SUSE) $(DIR2013_OPENSUSE) $(DIR2013_DAPS)
BUILD_DIR := build
DEV_ASPELL_DIR := $(BUILD_DIR)/aspell
DEV_CATALOG_DIR := $(BUILD_DIR)/catalogs
DEV_SCHEMA_DIR := $(BUILD_DIR)/schema
DEV_NOVDOC_DIR := $(DEV_SCHEMA_DIR)/novdoc
DEV_SUSEDOC_DIR := $(DEV_SCHEMA_DIR)/susedoc
DEV_STYLE_DIR := $(BUILD_DIR)/stylesheet
DEV_HTML_DIR := $(BUILD_DIR)/$(DIR2005)/html

Expand All @@ -62,7 +46,6 @@ SUSE_DICT := $(BUILD_DIR)/aspell/en_US-suse-addendum.rws
# Catalog stuff
#
SUSEXSL_CATALOG := $(DEV_CATALOG_DIR)/catalog-for-$(PACKAGE).xml
SUSESCHEMA_CATALOG := $(DEV_CATALOG_DIR)/catalog-for-suse_schemas.xml


# html4 stylesheets for STYLEDIR2005 are autogenerated from the xhtml
Expand All @@ -80,7 +63,7 @@ DEV_DIR2013_OPENSUSE := $(DEV_STYLE_DIR)/$(DIR2013_OPENSUSE)-ns
DEV_DIR2013_SUSE := $(DEV_STYLE_DIR)/$(DIR2013_SUSE)-ns

DEV_DIRECTORIES := $(DEV_ASPELL_DIR) $(DEV_CATALOG_DIR) $(DEV_HTML_DIR) \
$(DEV_NOVDOC_DIR) $(DEV_SUSEDOC_DIR) $(DEV_DIR2005) $(DEV_DIR2013_DAPS) \
$(DEV_DIR2005) $(DEV_DIR2013_DAPS) \
$(DEV_DIR2013_OPENSUSE) $(DEV_DIR2013_SUSE)

LOCAL_STYLEDIRS := $(DIR2005) $(DEV_DIR2005) \
Expand All @@ -104,9 +87,6 @@ OPENSUSESTYLEDIR2013-NS := $(INST_STYLE_ROOT)/$(DIR2013_OPENSUSE)-ns

ASPELLDIR := $(DESTDIR)$(PREFIX)/suse-xsl-stylesheets/aspell
DOCDIR := $(DESTDIR)$(PREFIX)/doc/packages/suse-xsl-stylesheets
DTDDIR_10 := $(DESTDIR)$(PREFIX)/xml/suse/schema/dtd/1.0
RNGDIR_09 := $(DESTDIR)$(PREFIX)/xml/suse/schema/rng/0.9
RNGDIR_10 := $(DESTDIR)$(PREFIX)/xml/suse/schema/rng/1.0
TTF_FONT_DIR := $(DESTDIR)$(PREFIX)/fonts/truetype
CATALOG_DIR := $(DESTDIR)/etc/xml
SGML_DIR := $(DESTDIR)$(PREFIX)/sgml
Expand All @@ -122,22 +102,13 @@ INST_DIRECTORIES := $(ASPELLDIR) $(INST_STYLEDIRS) $(DOCDIR) $(DTDDIR_10) \

#############################################################

all: $(DEV_NOVDOC_DIR)/novdocx.rng $(DEV_NOVDOC_DIR)/novdocxi.rng
all: $(DEV_NOVDOC_DIR)/novdocx-core.rng
all: $(SUSESCHEMA_CATALOG) $(SUSEXSL_CATALOG)
all: $(DEV_CATALOG_DIR)/CATALOG.$(NOVDOC_NAME)-$(NOVDOC_VERSION)
all: $(SUSEXSL_CATALOG)
all: $(HTMLSTYLESHEETS) $(SUSE_DICT) generate_xslns
@echo "Ready to install..."

#-----------------------------
install: | $(INST_DIRECTORIES)
install -m644 $(SUSE_DICT) $(ASPELLDIR)
install -m644 schema/rng/0.9/*.rnc $(RNGDIR_09)
install -m644 schema/rng/1.0/*.{rnc,ent} $(RNGDIR_10)
install -m644 $(DEV_NOVDOC_DIR)/*.{rnc,rng} $(RNGDIR_10)
install -m644 schema/dtd/1.0/{*.dtd,*.ent,catalog.xml,CATALOG} $(DTDDIR_10)
install -m644 $(DEV_CATALOG_DIR)/CATALOG.$(NOVDOC_NAME)-$(NOVDOC_VERSION) $(VAR_SGML_DIR)
ln -s /var/lib/sgml/CATALOG.$(NOVDOC_NAME)-$(NOVDOC_VERSION) $(SGML_DIR)
install -m644 $(DEV_CATALOG_DIR)/*.xml $(CATALOG_DIR)
install -m644 COPYING* $(DOCDIR)
install -m644 fonts/*.ttf $(TTF_FONT_DIR)
Expand All @@ -150,7 +121,7 @@ install: | $(INST_DIRECTORIES)
tar c --mode=u+w,go+r-w,a-s -C $(DIR2013_SUSE) . | (cd $(SUSESTYLEDIR2013); tar xp)
tar c --mode=u+w,go+r-w,a-s -C $(DEV_DIR2013_SUSE) . | (cd $(SUSESTYLEDIR2013-NS); tar xp)
for SDIR in $(INST_STYLEDIRS); do \
sed -i "s/@@#version@@/$(VERSION)/" $$SDIR/version.xsl; \
sed -i "s/@@#version@@/$(VERSION)/" $$SDIR/VERSION.xsl; \
done

#-----------------------------
Expand Down Expand Up @@ -186,74 +157,6 @@ $(DEV_HTML_DIR)/%.xsl: $(DIR2005)/xhtml/%.xsl | $(DEV_HTML_DIR)
xsltproc --output $@ ${XHTML2HTML} $<


#-----------------------------
# Generate SGML catalog for novdoc
#
$(DEV_CATALOG_DIR)/CATALOG.$(NOVDOC_NAME)-$(NOVDOC_VERSION): | $(DEV_CATALOG_DIR)
$(DEV_CATALOG_DIR)/CATALOG.$(NOVDOC_NAME)-$(NOVDOC_VERSION):
echo \
"CATALOG \"$(NOVDOC_DTD_PATH)/CATALOG\"" \
> $@

#-----------------------------
# Generate RELAX NG schemes for novdoc
#
# schemas cannot be build under build/schema, because the *-core files
# are included

#schema/rng/1.0/novdocx-core.rnc: schema/dtd/1.0/novdocx.dtd.tmp
$(DEV_NOVDOC_DIR)/novdocx-core.rnc: $(DEV_NOVDOC_DIR)/novdocx.dtd.tmp
trang -I dtd -i no-generate-start $< $@

#schema/rng/1.0/novdocx-core.rng: schema/dtd/1.0/novdocx.dtd.tmp
$(DEV_NOVDOC_DIR)/novdocx-core.rng: $(DEV_NOVDOC_DIR)/novdocx.dtd.tmp
trang -I dtd -i no-generate-start $< $@

#schema/rng/1.0/novdocx.rng: schema/rng/1.0/novdocx.rnc schema/rng/1.0/novdocx-core.rnc
$(DEV_NOVDOC_DIR)/novdocx.rng: schema/rng/1.0/novdocx.rnc $(DEV_NOVDOC_DIR)/novdocx-core.rnc
trang -I rnc $< $@

#schema/rng/1.0/novdocxi.rng: schema/rng/1.0/novdocxi.rnc schema/rng/1.0/novdocx-core.rnc
$(DEV_NOVDOC_DIR)/novdocxi.rng: $(DEV_NOVDOC_DIR)/novdocxi.rnc $(DEV_NOVDOC_DIR)/novdocx-core.rnc
trang -I rnc $< $@

#schema/rng/0.9/susedoc5.rng: schema/rng/0.9/susedoc5.rnc
# trang -I rnc $< $@


# To avoid unknown host errors with trang, we have to switch off the external
# entities from DocBook by creating a temporary file novdocx.dtd.tmp.
# As the entities are not used in RELAX NG anyway, this is uncritical.
#
.INTERMEDIATE: $(DEV_NOVDOC_DIR)/novdocx.dtd.tmp
$(DEV_NOVDOC_DIR)/novdocx.dtd.tmp: schema/dtd/1.0/novdocx.dtd | $(DEV_NOVDOC_DIR)
sed 's:\(%[ \t]*ISO[^\.]*\.module[ \t]*\)"INCLUDE":\1"IGNORE":g' \
< $< > $@

.INTERMEDIATE: $(DEV_NOVDOC_DIR)/novdocxi.rnc
$(DEV_NOVDOC_DIR)/novdocxi.rnc: schema/rng/1.0/novdocxi.rnc | $(DEV_NOVDOC_DIR)
(cd $(DEV_NOVDOC_DIR) && ln -s $(CDIR)/$<)

#-----------------------------
# Generate SUSE schema catalog
#

# since xmlcatalog cannot create groups (<group>) we need to use sed
# to fix this; while we are at it, we also remove the DOCTYPE line since
# it may cause problems with some XML parsers (hen/egg problem)
#
$(SUSESCHEMA_CATALOG): | $(DEV_CATALOG_DIR)
xmlcatalog --noout --create $@
xmlcatalog --noout --add "delegatePublic" "-//Novell//DTD NovDoc XML" \
"file://$(NOVDOC_DTD_PATH)/catalog.xml" $@
xmlcatalog --noout --add "delegateSystem" "novdocx.dtd" \
"file://$(NOVDOC_DTD_PATH)/catalog.xml" $@
xmlcatalog --noout --add "rewriteSystem" "http://raw.githubusercontent.com/openSUSE/suse-xsl/master/schema/" "file://$(SUSE_SCHEMA_PATH)/" $@
xmlcatalog --noout --add "rewriteURI" "http://raw.githubusercontent.com/openSUSE/suse-xsl/master/schema/" "file://$(SUSE_SCHEMA_PATH)/" $@
sed -i '/^<!DOCTYPE .*>$$/d' $@
sed -i '/<catalog/a\ <group id="suse_schemas">' $@
sed -i '/<\/catalog/i\ </group>' $@

# FIXME: None of the below URLs exist. Would be good if they would at least
# redirect into the SVN instead of 404ing.
$(SUSEXSL_CATALOG): | $(DEV_CATALOG_DIR)
Expand Down
4 changes: 2 additions & 2 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SUSE XSL Stylesheets v2.0.5
===========================
SUSE XSL Stylesheets 2.0.6
==========================
Thomas Schraitle <toms@opensuse.org>

:numbered:
Expand Down
Loading

0 comments on commit 3eacb05

Please sign in to comment.