Skip to content

Commit 2164718

Browse files
committed
Migrate it to suse2022-ns
1 parent b7b3c7c commit 2164718

3 files changed

Lines changed: 71 additions & 6 deletions

File tree

source-assets/styles2022/sass/custom/content-formal-informal.sass

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ div.variablelist
6363

6464

6565
.glossary,
66-
.variablelist
66+
.variablelist,
67+
.glosslist
6768
dt
6869
color: $c_pine
6970
font-weight: 600
@@ -103,15 +104,17 @@ div.variablelist
103104
.list-of-examples,
104105
.list-of-figures,
105106
.list-of-procedures,
106-
.list-of-tables
107+
.list-of-tables,
108+
.glosslist
107109
dl
108110
margin: 5px 0 17px 0
109111
padding: 0 0 0 30px
110112

111113

112114
.glossary,
113115
.toc,
114-
.variablelist
116+
.variablelist,
117+
.glosslist
115118
dd > p
116119
margin: 0
117120

@@ -188,6 +191,7 @@ div.figure
188191

189192
.example-title,
190193
.figure-title,
194+
.glosslist-title,
191195
.itemizedlist-title,
192196
.orderedlist-title,
193197
.procedure-title,
@@ -204,6 +208,7 @@ div.figure
204208
.example-title,
205209
.itemizedlist-title,
206210
.procedure-title,
211+
.glosslist-title,
207212
.table-title,
208213
.variablelist-title
209214
padding-top: 0
@@ -241,6 +246,7 @@ div.figure
241246

242247
.example-title,
243248
.figure-title,
249+
.glosslist-title,
244250
.itemizedlist-title,
245251
.orderedlist-title,
246252
.procedure-title,

suse2022-ns/static/css/style.css

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2752,7 +2752,8 @@ div.variablelist {
27522752
margin: 24px 0; }
27532753

27542754
.glossary dt,
2755-
.variablelist dt {
2755+
.variablelist dt,
2756+
.glosslist dt {
27562757
color: #0c322c;
27572758
font-weight: 600;
27582759
margin: 0;
@@ -2784,13 +2785,15 @@ div.variablelist {
27842785
.list-of-examples dl,
27852786
.list-of-figures dl,
27862787
.list-of-procedures dl,
2787-
.list-of-tables dl {
2788+
.list-of-tables dl,
2789+
.glosslist dl {
27882790
margin: 5px 0 17px 0;
27892791
padding: 0 0 0 30px; }
27902792

27912793
.glossary dd > p,
27922794
.toc dd > p,
2793-
.variablelist dd > p {
2795+
.variablelist dd > p,
2796+
.glosslist dd > p {
27942797
margin: 0; }
27952798

27962799
div.figure {
@@ -2855,6 +2858,7 @@ div.figure {
28552858

28562859
.example-title,
28572860
.figure-title,
2861+
.glosslist-title,
28582862
.itemizedlist-title,
28592863
.orderedlist-title,
28602864
.procedure-title,
@@ -2870,6 +2874,7 @@ div.figure {
28702874
.example-title,
28712875
.itemizedlist-title,
28722876
.procedure-title,
2877+
.glosslist-title,
28732878
.table-title,
28742879
.variablelist-title {
28752880
padding-top: 0;
@@ -2908,6 +2913,11 @@ div.figure {
29082913
.figure-title .package,
29092914
.figure-title .replaceable,
29102915
.figure-title code,
2916+
.glosslist-title .keycap,
2917+
.glosslist-title .literal,
2918+
.glosslist-title .package,
2919+
.glosslist-title .replaceable,
2920+
.glosslist-title code,
29112921
.itemizedlist-title .keycap,
29122922
.itemizedlist-title .literal,
29132923
.itemizedlist-title .package,

suse2022-ns/xhtml/glossary.xsl

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,53 @@
144144
<xsl:apply-templates select="d:indexterm|d:revhistory|d:glosssee|d:glossdef"/>
145145
</xsl:template>
146146

147+
148+
<xsl:template match="d:glossseealso">
149+
<xsl:variable name="otherterm" select="(@otherterm|@linkend)[1]"/><!-- SUSE -->
150+
<xsl:variable name="targets" select="key('id', $otherterm)"/>
151+
<xsl:variable name="target" select="$targets[1]"/>
152+
<xsl:variable name="xlink" select="@xlink:href"/>
153+
154+
<xsl:choose>
155+
<xsl:when test="$target">
156+
<a>
157+
<xsl:apply-templates select="." mode="common.html.attributes"/>
158+
<xsl:call-template name="id.attribute"/>
159+
<xsl:attribute name="href">
160+
<xsl:call-template name="href.target">
161+
<xsl:with-param name="object" select="$target"/>
162+
</xsl:call-template>
163+
</xsl:attribute>
164+
<xsl:apply-templates select="$target" mode="xref-to"/>
165+
</a>
166+
</xsl:when>
167+
<xsl:when test="$xlink">
168+
<xsl:call-template name="simple.xlink">
169+
<xsl:with-param name="content">
170+
<xsl:apply-templates/>
171+
</xsl:with-param>
172+
</xsl:call-template>
173+
</xsl:when>
174+
<xsl:when test="$otherterm != '' and not($target)">
175+
<xsl:message>
176+
<xsl:text>Warning: glossseealso @otherterm reference not found: </xsl:text>
177+
<xsl:value-of select="$otherterm"/>
178+
</xsl:message>
179+
<xsl:apply-templates/>
180+
</xsl:when>
181+
<xsl:otherwise>
182+
<xsl:apply-templates/>
183+
</xsl:otherwise>
184+
</xsl:choose>
185+
186+
<xsl:choose>
187+
<xsl:when test="position() = last()"/>
188+
<xsl:otherwise>
189+
<xsl:call-template name="gentext.template">
190+
<xsl:with-param name="context" select="'glossary'"/>
191+
<xsl:with-param name="name" select="'seealso-separator'"/>
192+
</xsl:call-template>
193+
</xsl:otherwise>
194+
</xsl:choose>
195+
</xsl:template>
147196
</xsl:stylesheet>

0 commit comments

Comments
 (0)