Hello community,
here is the log from the commit of package suse-xsl-stylesheets for
openSUSE:Factory checked in at 2017-05-20 10:08:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/suse-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "suse-xsl-stylesheets"
Sat May 20 10:08:47 2017 rev:36 rq:494845 version:2.0.7.2
Changes:
--------
---
/work/SRC/openSUSE:Factory/suse-xsl-stylesheets/suse-xsl-stylesheets.changes
2017-02-14 00:36:33.614536147 +0100
+++
/work/SRC/openSUSE:Factory/.suse-xsl-stylesheets.new/suse-xsl-stylesheets.changes
2017-05-20 10:09:13.397523830 +0200
@@ -1,0 +2,21 @@
+Fri May 12 11:29:08 UTC 2017 - [email protected]
+
+Stable release of the SUSE XSL stylesheets 2.0.7.2:
+
+Find issues in our GitHub tracker at
+https://github.com/openSUSE/suse-xsl/issues/NUMBER
+
+* Fixes bsc#1016953 (see also suse-xsl# 270)
+
+* SUSE Word List for aspell
+ - Removed duplicate and invalid words
+
+* Stylesheets (common)
+ - Add a compact style for admonitions, enabled by role="compact"
+attribute
+ (suse-xsl #211)
+
+* Stylesheets (HTML)
+ - Fix superscript/subscript styles
+
+-------------------------------------------------------------------
Old:
----
suse-xsl-stylesheets-2.0.7.1.tar.bz2
New:
----
suse-xsl-stylesheets-2.0.7.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ suse-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.o11VNH/_old 2017-05-20 10:09:13.925449236 +0200
+++ /var/tmp/diff_new_pack.o11VNH/_new 2017-05-20 10:09:13.929448671 +0200
@@ -17,7 +17,7 @@
Name: suse-xsl-stylesheets
-Version: 2.0.7.1
+Version: 2.0.7.2
Release: 0
###############################################################
++++++ suse-xsl-stylesheets-2.0.7.1.tar.bz2 ->
suse-xsl-stylesheets-2.0.7.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/ChangeLog
new/suse-xsl-stylesheets/ChangeLog
--- old/suse-xsl-stylesheets/ChangeLog 2017-02-09 14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/ChangeLog 2017-05-11 16:56:56.000000000 +0200
@@ -1,4 +1,22 @@
-------------------------------------------------------------------
+Thu May 11 17:00:00 UTC 2017 - [email protected]
+
+Stable release of the SUSE XSL stylesheets 2.0.7.2:
+
+Find issues in our GitHub tracker at
+https://github.com/openSUSE/suse-xsl/issues/NUMBER
+
+* SUSE Word List for aspell
+ - Removed duplicate and invalid words
+
+* Stylesheets (common)
+ - Add a compact style for admonitions, enabled by role="compact" attribute
+ (suse-xsl #211)
+
+* Stylesheets (HTML)
+ - Fix superscript/subscript styles
+
+-------------------------------------------------------------------
Thu Feb 08 19:00:00 UTC 2017 - [email protected]
Stable release of the SUSE XSL stylesheets 2.0.7.1:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/Makefile
new/suse-xsl-stylesheets/Makefile
--- old/suse-xsl-stylesheets/Makefile 2017-02-09 14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/Makefile 2017-05-11 16:56:56.000000000 +0200
@@ -12,7 +12,7 @@
SHELL := /bin/bash
PACKAGE := suse-xsl-stylesheets
# HINT: Also raise version number in packaging/suse-xsl-stylesheets.spec
-VERSION := 2.0.7.1
+VERSION := 2.0.7.2
CDIR := $(shell pwd)
DIST_EXCLUDES := packaging/exclude-files_for_susexsl_package.txt
SUSE_XML_PATH := $(PREFIX)/xml/suse
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/README.adoc
new/suse-xsl-stylesheets/README.adoc
--- old/suse-xsl-stylesheets/README.adoc 2017-02-09 14:04:31.000000000
+0100
+++ new/suse-xsl-stylesheets/README.adoc 2017-05-11 16:56:56.000000000
+0200
@@ -1,4 +1,4 @@
-SUSE XSL Stylesheets 2.0.7.1
+SUSE XSL Stylesheets 2.0.7.2
============================
Thomas Schraitle <[email protected]>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/aspell/suse_wordlist.txt
new/suse-xsl-stylesheets/aspell/suse_wordlist.txt
--- old/suse-xsl-stylesheets/aspell/suse_wordlist.txt 2017-02-09
14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/aspell/suse_wordlist.txt 2017-05-11
16:56:56.000000000 +0200
@@ -53,7 +53,6 @@
AppBrowser
AppNote
AppSocket
-Archiver
archiver
ARG
arg
@@ -65,7 +64,6 @@
arp
ARPs
aRts
-Ascii
asound
ASpeed
aspell
@@ -385,7 +383,6 @@
CTC
CTCP
Ctrl
-cucme
cumulate
cumulated
cumulates
@@ -476,7 +473,6 @@
desaturating
desktop's
dest
-Deutsches
dev
devel
developerWorks
@@ -536,7 +532,6 @@
domainname
DOMIRROR
DomU
-domU
DomUs
DoS
DPDK
@@ -581,7 +576,6 @@
eDir
eDirectory
EFI
-Eg
egrep
EiB
Ekiga
@@ -725,7 +719,6 @@
framerate
freedesktop
FreeMind
-FritzCard
frontpage
fs
FSC
@@ -739,9 +732,7 @@
FTPD
FTPd
ftpd
-Fullscreen
fullscreen
-Fullstop
func
functionalities
Funprinter
@@ -805,7 +796,6 @@
GLX
GmbH
Gnokii
-gnokii
GNOMEMeeting
Gnomovision
GNU's
@@ -817,13 +807,11 @@
GOCR
GOK
Google
-google
GPG
gpg
gpgcheck
gpgkey
gPhoto
-gphoto
gpicview
gpilotd
GPL
@@ -831,7 +819,6 @@
GPS
GPT
GQ
-Grayscale
grayscale
GRE
gre
@@ -849,12 +836,9 @@
gte
gThumb
GTK
-Gtk
-gtk
gtkacpiw
gui
GUID
-guid
GUIDs
GUIs
gunzip
@@ -897,9 +881,8 @@
helpdesk
Helvetica
Heuser
-Hipersocket
+HiperSocket
HiperSockets
-Hipersockets
HKP
HLE
HMAC
@@ -907,24 +890,17 @@
HNAS
hoc
HOMEDIRS
-Homehost
homehost
HOSTALIASES
hostap
-Hostname
hostname
-Hostnames
hostnames
-Hotkey
-Hotkeys
-Hotplug
+hotkey
+hotkeys
hotplug
-Hotpluggable
hotpluggable
-Hotplugging
hotplugging
HotSync
-hotsync
Howes
HOWTO
Howto
@@ -957,7 +933,6 @@
HWTYPE
HWtype
hwtype
-Hyper-V
hypercall
hypercalls
hyperthreaded
@@ -1006,7 +981,6 @@
iLO
IM
IMA
-ImageClass
imageclass
imageclasses
imagecomment
@@ -1125,12 +1099,10 @@
iscsid
iscsitarget
ISDN
-isdn
iSeries
iSNS
iso
ISOBoot
-isoboot
ISOs
ISP
ISpell
@@ -1159,7 +1131,6 @@
Joliet
journaled
journaler
-Journaling
journaling
jpeg
JPG
@@ -1198,10 +1169,8 @@
kdump
keepaliveMaxRequest
keepaliveTimeout
-Kerberized
kerberized
Kerberos
-kerberos
Kerberos's
kerberosclient
Kexec
@@ -1229,7 +1198,6 @@
kinit
Kino
KInternet
-KIOSK's
kiosktool
KitchenSync
Kivio
@@ -1291,7 +1259,7 @@
kwin
KWord
LabPlot
-laggy?
+laggy
landline
lang
LANs
@@ -1308,7 +1276,6 @@
leechftp
lefthand
leightweight
-LENGHT
Lenovo
Letna
Level
@@ -1360,19 +1327,16 @@
localtime
locatedb
Locator
-Lockdown
lockdown
LOCPATH
-Login
login
-Logins
logins
-Logoff
-Logout
+logoff
+logoffs
logout
+logouts
logprof
logrotate
-Lookup
lookup
lookups
loopback
@@ -1413,19 +1377,16 @@
LXC
Lycos
LZMA
-MacOS
+macOS
macvlan
macvtap
maddress
MagicPoint
Magnatune
-magnatune
-Maildir
maildir
mailfrom
mailfromaddr
mailinglist
-MailTo
mailto
mailtoaddr
MainActor
@@ -1443,7 +1404,6 @@
Matrox
Maxfeldstr
Mbit
-Mbox
mbox
Mbps
MBR
@@ -1491,9 +1451,8 @@
mindmapping
minicard
minicom
-Minidisk
-minidisk
-minidisks
+MiniDisk
+MiniDisks
Minix
mirrorability
misconfigured
@@ -1516,7 +1475,6 @@
MochaSoft
MODALIAS
modeline
-Modelines
modelines
modprobe
Modul
@@ -1555,10 +1513,10 @@
MTU
Multi
multi
-Multiboot
+multiboot
multibus
multicast
-Multicasting
+multicasting
multicasts
MultiDirector
multidisk
@@ -1623,15 +1581,12 @@
NetBEUI
NetBIOS
netboot
-Netconfig
netconfig
netfilter
netfront
netgroups
netlink
-Netmask
netmask
-Netmasks
netmasks
NetMeeting
netqueue
@@ -1643,8 +1598,7 @@
NFS
nfs
NFSroot
-Nfsserver
-nfsserver
+NFSserver
NFSv
NG
ng
@@ -1681,7 +1635,6 @@
nonposted
nonthreaded
noop
-Normung
nospoof
Noteedit
NotePad
@@ -1847,7 +1800,6 @@
passphrase
passphrases
passwd
-password-less
PASV
PATA
patchrpm
@@ -1935,9 +1887,7 @@
PnP
PoC
PocketPC
-Podcast
podcast
-Podcasts
podcasts
portblock
Portege
@@ -1977,25 +1927,21 @@
PowerNow
poweroff
PowerPC
-Powerpoint
+PowerPoint
PowerQuest
-Powersave
powersave
powersaved
Powertweak
PowerVCR
PPC
-ppc
PPD
PPDs
PPP
-ppp
pppd
PPPoATM
PPPoE
ppt
PPTP
-Pre
pre
preallocates
preallocation
@@ -2004,7 +1950,6 @@
preconfigure
preconfigured
predesigned
-Prefork
prefork
preforked
preforking
@@ -2220,7 +2165,7 @@
respawned
respawning
respawns
-REST-ful?
+REST
resync
resynced
resynchronization
@@ -2382,7 +2327,6 @@
setfacl
setgid
setindex
-Setuid
setuid
setuser
Sev
@@ -2499,9 +2443,8 @@
SSHD
sshd
SSHFS
-sshfs
SSI
-ssl
+SSL
SSL/TLS
sslCertificateFilePath
sslClientCertificate
@@ -2545,46 +2488,38 @@
subcommand
subcommands
subdialog
-Subdirectories
subdirectories
subdirectory
subdocument
-Subdocuments
subdocuments
-SubDomain
subdomain
+subdomains
subelement
subelements
subentries
subentry
subfolder
-Subfolders
subfolders
subitem
subitems
Subkey
subkey
-Subkeys
subkeys
sublicense
submenu
submenus
-Subnet
subnet
subnet's
subnetmask
-Subnets
subnets
subnetwork
subnetworks
subobject
suboption
-Subpixel
subpixel
subprocess
subprocesses
subprofile
-Subprofiles
subprofiles
subqueries
subrealms
@@ -2605,20 +2540,16 @@
SUMF
Summ
SunOS
-Superblock
superblock
superblocks
superclasses
supportability
-Supportconfig
supportconfig
supporturl
SUSE
SUSE's
SuSEconfig
-suseconfig
SUSEConnect
-SUSEDoc
susedoc
SuSEfirewall
SUSEgreeter
@@ -2626,7 +2557,6 @@
sv
svcgssd
SVG
-svg
SVN
sw
swappable
@@ -2650,7 +2580,6 @@
sysfs
SysInfo
SYSLINUX
-Syslog
syslog
syslogd
syslogged
@@ -2660,7 +2589,7 @@
SysRq
sysstat
systables
-system-wide
+systemwide
systemd
SYSV
tablatures
@@ -2720,16 +2649,14 @@
tnsping
ToDo
todo
-ToDos
todos
toolbar
toolbars
toolchain
toolchains
-Toolkits
+toolkit
toolkits
TotalStorage
-Touchpad
touchpad
touchpads
Toughbook
@@ -2756,9 +2683,9 @@
TSIGs
TSL
TTL
-ttl
TTLS
-ttyS
+tty
+ttys
tunables
tunefs
Tung
@@ -2787,7 +2714,6 @@
UIDs
ulimit
ulimits
-Umask
umask
UML
umount
@@ -2796,7 +2722,6 @@
unaccelerated
unaccessible
uname
-Unary
unary
unbold
Uncheck
@@ -2856,10 +2781,10 @@
Upgradability
uplink
uptime
+URI
URIs
-URl
-Url
-url
+URL
+URLs
USB
usbboot
USC
@@ -2882,7 +2807,6 @@
UUID
uuid
UUIDs
-Ux
ux
Valgrind
validator
@@ -2936,7 +2860,6 @@
VLANs
VLANX
VM
-vm
VM's
VM/ESA
VMAX
@@ -2983,9 +2906,8 @@
Wacom
Wagle
WAIS
-Wakeup
+wakeup
wakeups
-Wallclock
wallclock
Waltham
WANs
@@ -3016,15 +2938,12 @@
whitelists
whitespace
whois
-Wi-Fi
-Widescreen
-Wiki
+widescreen
wiki
Wikipedia
WikiWords
Winamp
Winbind
-winbind
winbindd
wincvs
WinPopup
@@ -3040,16 +2959,15 @@
WOL
WordPad
WordPerfect
-Workflow
workflow
workflows
-Workgroup
workgroup
-Workgroups
workgroups
workset
Workspaces
workspaces
+workstation
+workstations
workstation's
WPA
wpg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/suse2013/fo/admon.xsl
new/suse-xsl-stylesheets/suse2013/fo/admon.xsl
--- old/suse-xsl-stylesheets/suse2013/fo/admon.xsl 2017-02-09
14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/suse2013/fo/admon.xsl 2017-05-11
16:56:56.000000000 +0200
@@ -103,7 +103,24 @@
<xsl:variable name="color">
<xsl:call-template name="admon.symbol.color"/>
</xsl:variable>
- <xsl:variable name="graphic.width" select="8"/>
+ <xsl:variable name="graphic.width">
+ <xsl:choose>
+ <xsl:when test="@role='compact'">5</xsl:when>
+ <xsl:otherwise>8</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="additional.title.properties">
+ <xsl:choose>
+ <xsl:when
test="@role='compact'">admonition.compact.title.properties</xsl:when>
+ <xsl:otherwise>admonition.normal.title.properties</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
+ <xsl:variable name="padding">
+ <xsl:choose>
+ <xsl:when test="@role='compact'">0.7mm</xsl:when>
+ <xsl:otherwise>3mm</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<fo:block id="{$id}"
xsl:use-attribute-sets="graphical.admonition.properties">
<fo:list-block
@@ -121,10 +138,18 @@
</fo:list-item-label>
<fo:list-item-body start-indent="body-start()">
<fo:block padding-start="{(&gutter; - 0.75) div 2}mm"
- padding-before="3mm" padding-after="3mm">
- <xsl:if test="$admon.textlabel != 0 or title or info/title">
- <fo:block xsl:use-attribute-sets="admonition.title.properties"
- color="{$color}">
+ padding-before="{$padding}" padding-after="{$padding}">
+ <xsl:if test="((title or info/title) or ($admon.textlabel != 0
and not(@role='compact')))">
+ <fo:block xsl:use-attribute-sets="admonition.title.properties
{$additional.title.properties}">
+ <xsl:attribute name="color">
+ <xsl:choose>
+ <xsl:when test="not(@role='compact')">
+ <xsl:value-of select="$color"/>
+ </xsl:when>
+ <xsl:otherwise>&darker-gray;</xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <xsl:value-of select="@role"/>
<xsl:apply-templates select="." mode="object.title.markup">
<xsl:with-param name="allow-anchors" select="1"/>
</xsl:apply-templates>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/suse2013/fo/attributesets.xsl
new/suse-xsl-stylesheets/suse2013/fo/attributesets.xsl
--- old/suse-xsl-stylesheets/suse2013/fo/attributesets.xsl 2017-02-09
14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/suse2013/fo/attributesets.xsl 2017-05-11
16:56:56.000000000 +0200
@@ -32,12 +32,20 @@
<xsl:attribute-set name="admonition.title.properties">
<xsl:attribute name="font-family"><xsl:value-of
select="$title.font.family"/></xsl:attribute>
<xsl:attribute name="font-weight">normal</xsl:attribute>
- <xsl:attribute name="font-size"><xsl:value-of select="&x-large; *
$sans-fontsize-adjust"/>pt</xsl:attribute>
<xsl:attribute name="hyphenate">false</xsl:attribute>
<xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
<xsl:attribute name="text-align">start</xsl:attribute>
</xsl:attribute-set>
+<!-- FIXME: The font sizes here are a nice idea in theory. In practice, they
+are overridden somewhere. Probably because of the original stylesheets. -->
+<xsl:attribute-set name="admonition.normal.title.properties">
+ <xsl:attribute name="font-size"><xsl:value-of select="&xxx-large; *
$sans-fontsize-adjust"/>pt</xsl:attribute>
+</xsl:attribute-set>
+<xsl:attribute-set name="admonition.compact.title.properties">
+ <xsl:attribute name="font-size"><xsl:value-of select="&normal; *
$sans-fontsize-adjust"/>pt</xsl:attribute>
+</xsl:attribute-set>
+
<xsl:attribute-set name="graphical.admonition.properties">
<xsl:attribute name="space-before.optimum">1.5em</xsl:attribute>
<xsl:attribute name="space-before.minimum">1.2em</xsl:attribute>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/suse2013/static/css/style.css
new/suse-xsl-stylesheets/suse2013/static/css/style.css
--- old/suse-xsl-stylesheets/suse2013/static/css/style.css 2017-02-09
14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/suse2013/static/css/style.css 2017-05-11
16:56:56.000000000 +0200
@@ -1493,77 +1493,98 @@
/* Thou shalt not ... */
.admonition {
+ margin: 17px 0 24px;
+}
+
+.admonition.normal {
border-width: 1px;
border-radius: 3px;
border-style: solid;
padding: 10px;
- margin: 17px 0 24px;
}
-.tip {
+.tip.admonition.normal {
border-color: #439239;
background: #FFF url(../images/dots-green.png) repeat-x scroll top;
}
-.note {
+.note.admonition.normal {
border-color: #666;
background: #FFF url(../images/dots-darkgray.png) repeat-x scroll top;
}
-.note ul, .note .orderedlist, .warning ul, .warning .orderedlist {
+.note.admonition.normal ul, .note.admonition.normal .orderedlist,
+.warning.admonition.normal ul, .warning.admonition.normal .orderedlist {
color: #666;
}
-.important {
+.important.admonition.normal {
border-color: #BB7B03;
background: #FFF url(../images/dots-orange.png) repeat-x scroll top;
}
-.important ul, .important .orderedlist {
+.important.admonition.normal ul, .important .orderedlist {
color: #BB7B03;
}
-.warning, .caution {
+.warning.admonition.normal, .caution.admonition.normal {
border-color: #8C0000;
background: #FFF url(../images/dots-red.png) repeat-x scroll top;
}
.admonition > h6 {
font-weight: 600;
+}
+
+.admonition.normal > h6 {
vertical-align: middle;
display: table-cell;
height: 36px;
}
-.tip > h6 {
+/* FIXME: does not look correct with multi-line items. */
+.admonition.compact > h6 {
+ color: #666;
+ height: 24px;
+}
+
+.tip.admonition.normal > h6 {
color: #439239;
}
-.note > h6 {
+.note.admonition.normal > h6 {
color: #333;
}
-.important > h6 {
+.important.admonition.normal > h6 {
color: #BB7B03;
}
-.warning > h6, .caution > h6 {
+.warning.admonition.normal > h6, .caution.admonition.normal > h6 {
color: #8C0000;
}
-.symbol {
+.admonition > .symbol {
width: 36px;
height: 36px;
margin: 0 10px 0 0;
- background-repeat: no-repeat;
float: left;
- overflow: hidden;
+}
+
+.admonition.compact > .symbol {
+ width: 24px;
+ height: 24px;
+ margin-left: 0;
}
.admonition p {
margin: 10px 0 0 !important;
}
+.admonition.compact > p:nth-child(1) {
+ margin-top: 0 !important;
+}
+
/* Text styles */
.documentation span, .documentation a, .documentation p, .documentation em,
@@ -1580,6 +1601,18 @@
font-style: normal; /* Don't use italics within italics... */
}
+sub, sup {
+ line-height: 0;
+ font-size: 66.6%;
+}
+
+sub {
+ vertical-align: sub;
+}
+sup {
+ vertical-align: super;
+}
+
strong, b, .imprint-label, .version-info .productname,
.version-info .productnumber, .toc-title, .formalpara-title {
font-weight: 600;
@@ -3025,7 +3058,7 @@
padding-left: 10px;
}
- .admonition > .symbol {
+ .admonition.normal > .symbol {
float: none;
/* Remove proprietary attributes later on */
padding-left: -webkit-calc(50% - 18px);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/suse-xsl-stylesheets/suse2013/xhtml/admon.xsl
new/suse-xsl-stylesheets/suse2013/xhtml/admon.xsl
--- old/suse-xsl-stylesheets/suse2013/xhtml/admon.xsl 2017-02-09
14:04:31.000000000 +0100
+++ new/suse-xsl-stylesheets/suse2013/xhtml/admon.xsl 2017-05-11
16:56:56.000000000 +0200
@@ -30,6 +30,15 @@
<xsl:with-param name="key" select="$admon.type"/>
</xsl:call-template>
</xsl:variable>
+ <xsl:variable name="class">
+ <xsl:text>admonition </xsl:text>
+ <xsl:value-of select="local-name(.)"/>
+ <xsl:text> </xsl:text>
+ <xsl:choose>
+ <xsl:when test="@role='compact'">compact</xsl:when>
+ <xsl:otherwise>normal</xsl:otherwise>
+ </xsl:choose>
+ </xsl:variable>
<div>
<xsl:call-template name="id.attribute">
@@ -37,16 +46,20 @@
<xsl:with-param name="force" select="1"/>
</xsl:call-template>
<xsl:call-template name="generate.class.attribute">
- <xsl:with-param name="class">admonition <xsl:value-of
select="local-name()"/></xsl:with-param>
+ <xsl:with-param name="class" select="$class"/>
</xsl:call-template>
<img class="symbol" alt="{$alt}" title="{$admon.type}">
<xsl:attribute name="src">
<xsl:call-template name="admon.graphic"/>
</xsl:attribute>
</img>
- <h6>
- <xsl:apply-templates select="." mode="object.title.markup"/>
- </h6>
+ <!-- compact admons can have no title unless explicitly set, otherwise,
+ we always generate at least the text Note/Tip/... -->
+ <xsl:if test="((title or info/title) or ($admon.textlabel != 0 and
not(@role='compact')))">
+ <h6>
+ <xsl:apply-templates select="." mode="object.title.markup"/>
+ </h6>
+ </xsl:if>
<xsl:apply-templates/>
</div>
</xsl:template>
