Skip to content

Commit

Permalink
Merge branch 'release/2.0.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomschr committed Apr 22, 2016
2 parents e070c0f + b2c7039 commit ea17def
Show file tree
Hide file tree
Showing 57 changed files with 36,945 additions and 10,991 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@ env/

# This directory should be generated by bin/xmlns-build:
suse2013-ns/

#
schema/rng/0.9/.env3/
schema/rng/*/susedoc5.rng
schema/rng/*/docbook*.rnc
schema/rng/*/docbook*.rng
6 changes: 3 additions & 3 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2003-2011, [email protected], [email protected], Novell, Inc.
Copyright (c) 2003-2016, SUSE LLC

All Rights Reserved.

Expand All @@ -13,7 +13,7 @@
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program; if not, contact Novell, Inc.
along with this program; if not, contact SUSE LLC

To contact Novell, Inc. about this file by physical or
To contact SUSE LLC about this file by physical or
electronic mail, you may find current contact information at www.suse.com
124 changes: 89 additions & 35 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,45 +1,99 @@
-------------------------------------------------------------------
Fr Apr 22 09:00:00 UTC 2015 - [email protected]

Stable release DAPS 2.0.5:

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

* Schema
- Add flat SUSEDoc schema for RNC and RNG
- Fix NovDoc/DB4 incompatibility: Phrase is only allowed in
productname, but not in productnumber

* Spelling
- Fix trailing whitespace

* Stylesheets (PDF)
- Added missing procedure, itemizedlist, and orderedlist for
intra.title.markup mode (suse-xsl #162, ec0cb3d6)
- Fix Ulink/Link template for DB 5
- Specifically check for @role='abbrev'
- Fix for vertical spaces on nested lists (#221)
- Question and answers
- Make an answer closer to a question
- Make consistent use of sans-stack for questions
- Use all paras in question consistently
- Italic for question label and first para (#200)
- Clean up web links
- Specifically check for @role='abbrev'
- Fix Ulink/Link template for DB 5

* Stylesheets (XHTML)
- Add GitHub URL in titlepage of book and article (suse-xsl #35)
- Fix functionality of "dm:version"
- xref handling
- Improve xref and is.xref.in.samebook template
- Fix xref resolution when $rootid is empty
- Implement vcs.url to fix, remove add.github.url and
bibliosource (suse-xsl #35)
- add actual book title to HTML pages again (suse-xsl #208)
- Fix formatting for intraxref (provides final fix suse-xsl #162)

* Stylesheets (EPUB)
- Build EPUBs by default without comments

* Common Stylesheet Changes
- allow intra xref linking for tables, figures, admons (suse-xsl #155)
- Added missing procedure, itemizedlist, and orderedlist for
intra.title.markup mode (suse-xsl #162)

* Packaging
- Update Requires/Recommends (also fixes suse-xsl #220)
- suse_beta => suse2013
- Improve package description in Spec file


-------------------------------------------------------------------
Tue Dec 02 13:41:00 UTC 2015 - [email protected]

Stable release DAPS 2.0.4:

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

* Schema:
- Allow constant and see (inside indexterm); make db.all.blocks zero
or more (*) for question (fbebfb6)
- Remove XLinks from DB5 elements (issue #99)
- Disallow db.all.blocks in lists (issue #100)
- Remove menuchoice from guiinlines (Novdoc) (a049b85)
- Allow menuchoice in titles (Novdoc) (975b8d6)

* Stylesheets (PDF):
- "unbolded" admonition titles (issue #46)
- Odd space in footer where productname used to beproductname not displayed
on book title page (issue #50)
- Style sect5 Titles (issue #52)
- FOP don't like empty <fo:table-cell>s (issue #97)
- Make remark handling a little more elegant
- Attribute sets: fix logic for replacing bold/italic in CJK languages

* Stylesheets (XHTML):
- Make Callouts "uncopyable" (issue #55)
- Don't link inline images (issue #65)
- Publication date is incorrectly capitalized (issue #70)
- debug.filename-id: Use xml:id for metadata
Find issues in our GitHub tracker at
https://github.com/openSUSE/suse-xsl/issues/NUMBER

* Schema
- Allow constant and see (inside `<indexterm>`); make db.all.blocks
zero or more (*) for question (fbebfb6)
- Remove XLinks from DB5 elements (suse-xsl #99)
- Disallow db.all.blocks in lists (suse-xsl #100)
- Remove `<menuchoice>` from guiinlines (Novdoc) (a049b85)
- Allow `<menuchoice>` in titles (Novdoc) (975b8d6)

* Stylesheets (PDF)
- "unbolded" admonition titles (suse-xsl #46)
- Odd space in footer where `<productname>` used to be,
`<productname>` not displayed on book title page (suse-xsl #50)
- Fix style of `<sect5>` titles (suse-xsl #52, bsc#955663)
- FOP don't like empty `<fo:table-cell>`s (suse-xsl #97)
- Make `<remark>` handling a little more elegant
- Attribute sets: fix logic for replacing bold/italic in CJK
languages

* Stylesheets (XHTML)
- Make Callouts "uncopyable" (suse-xsl #55)
- Don't link inline images (suse-xsl #65)
- Publication date is incorrectly capitalized (suse-xsl #70)
- Create better plain-text output via DAPS (suse-xsl #101)
- debug.filename-id: Use `xml:id` for metadata
- Various fixes for JS code for tracker

* Common Stylesheet Changes:
- Style for <package/> (issue #49)
- xrefs to variablelists in another book is broken (issue #73)
- Trim spaces/newlines at beginning/end of verbatim elements (eba1e8b)
- Feature/fix bugtracker for db4 (issue #102)

* Infrastructure:
- Fixed xslns-build script (issue #57)
- Wrong includes in daps2013-ns, opensuse2013-ns (issue #107)
- Defect URLs in Entities of the *-ns Stylesheets (issue #108)
- Consistent variable names and indendation
* Common Stylesheet Changes
- Style for `<package>` (issue #49)
- xrefs to variablelists in another book is broken (suse-xsl #73)
- Trim spaces/newlines at beginning/end of verbatim elements
(suse-xsl #53)
- Fix bugtracker for db4 (suse-xsl #102)

-------------------------------------------------------------------
Tue Aug 11 15:11:52 UTC 2015 - [email protected]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ endif
SHELL := /bin/bash
PACKAGE := suse-xsl-stylesheets
# HINT: Also raise version number in packaging/suse-xsl-stylesheets.spec
VERSION := 2.0.4
VERSION := 2.0.5
CDIR := $(shell pwd)
DIST_EXCLUDES := packaging/exclude-files_for_susexsl_package.txt
SUSE_XML_PATH := $(PREFIX)/xml/suse
Expand Down
2 changes: 1 addition & 1 deletion README.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SUSE XSL Stylesheets v2.0.4
SUSE XSL Stylesheets v2.0.5
===========================
Thomas Schraitle <toms@opensuse.org>

Expand Down
10 changes: 5 additions & 5 deletions aspell/add_context/one_line_context.pl
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
#
# 2009-08-12, jw, v0.3 - protected xml markup in html output better
#
# Usage:
#
# Usage:
#
# ./one_line_context.pl Jakub ../../../books/en/xml
# ./one_line_context.pl wordlist.txt ../../../books/en/xml
# call it either with a wordlist or with a word.
#
# TODO:
# TODO:
# - run grep in --color=always mode, parse the wdiff colors
# - add -a option to print all matches, not just the first one.

Expand All @@ -25,7 +25,7 @@
{
chomp $word;
find_context($word, $where, {as_html => 1, highlight => 1});
printf STDERR " %s %d\r", $word, $n++ unless -t STDOUT;
printf STDERR " %s %d\r", $word, $n++ unless -t STDOUT;
# last if $word eq 'adminc';
}
print "</table>\n";
Expand Down Expand Up @@ -64,7 +64,7 @@ sub find_context
while (defined(my $line = <IN>))
{
chomp $line;
# remove all clear EOL escapes
# remove all clear EOL escapes
$line =~ s{\033\[K}{}g;
die "\Q$line\E\n";
if ($line =~m{^(\S+\.xml)[-:]\s*(.*)$})
Expand Down
6 changes: 2 additions & 4 deletions aspell/faq.txt
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,13 @@ the file. If you do so, please note the following:
apaches
apache's

* Send a note to Rebecca - she has to proofread the new file before
* Ask your co-workers to proofread the new file before
building a new directory.

How can I generate a new dictionary?
-------------------------------------

Simply _don't do it_ if you are not Rebecca ;-).

Rebecca, once you have proofed a new wordlist you can generate a new
Once you have proofed a new wordlist, you can generate a new
directory with the following commands:

cd <PATH TO NOVDOC DIRECTORY>/aspell/
Expand Down
4 changes: 2 additions & 2 deletions aspell/oxygen/en.hints
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
%mistake i y
%mistake- i e
%mistake- a o
%mistake- a u
%mistake- o u
%mistake- a u
%mistake- o u


%mistake $ gh$ w$ r$ e$
Expand Down
Loading

0 comments on commit ea17def

Please sign in to comment.