style: change font to more classic Computer Modern (CMU) + change the anchor symbol
--- a/Makefile Mon Apr 27 10:55:46 2020 +0200
+++ b/Makefile Tue Jul 14 16:42:04 2020 +0200
@@ -20,12 +20,24 @@
validate:
xmllint --noout --schema schema/ssm.xsd text/ssm.en.xml
-xhtml:
+xhtml: templates/cmunrm.woff templates/cmunbx.woff
mkdir -p build
xsltproc $(VERSION_PARAMS) --output build/index.xhtml --nonet templates/ssm.xhtml.xsl text/ssm.en.xml
cp templates/*.css build
cp templates/*.woff build
+templates/cmunrm.ttf:
+ cd templates/; ln -s /usr/share/fonts/truetype/cmu/cmunrm.ttf
+
+templates/cmunbx.ttf:
+ cd templates/; ln -s /usr/share/fonts/truetype/cmu/cmunbx.ttf
+
+templates/cmunrm.woff: templates/cmunrm.ttf
+ cd templates/; sfnt2woff cmunrm.ttf
+
+templates/cmunbx.woff: templates/cmunbx.ttf
+ cd templates/; sfnt2woff cmunbx.ttf
+
pdf:
mkdir -p build
xsltproc $(VERSION_PARAMS) --output build/ssm.en.fodt --nonet templates/ssm.odt.xsl text/ssm.en.xml
--- a/logo/sane-software-logo-circle.svg Mon Apr 27 10:55:46 2020 +0200
+++ b/logo/sane-software-logo-circle.svg Tue Jul 14 16:42:04 2020 +0200
@@ -30,14 +30,14 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
- inkscape:cx="-74.489942"
+ inkscape:cx="-251.26664"
inkscape:cy="172.25179"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
- inkscape:window-width="2560"
- inkscape:window-height="1021"
+ inkscape:window-width="1920"
+ inkscape:window-height="1015"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
@@ -88,30 +88,28 @@
sodipodi:role="line"
x="26.445415"
y="266.67731"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;text-align:center;text-anchor:middle;stroke-width:0.26458332px"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';text-align:center;text-anchor:middle;stroke-width:0.26458332px"
id="tspan14-7">Sane</tspan><tspan
sodipodi:role="line"
x="26.445415"
y="280.00983"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;text-align:center;text-anchor:middle;stroke-width:0.26458332px"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';text-align:center;text-anchor:middle;stroke-width:0.26458332px"
id="tspan55">software</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.58345246px;line-height:125%;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26875892px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text199"><textPath
xlink:href="#path217"
- id="textPath222"><tspan
- style="stroke-width:0.26875892px"
- id="tspan197">we create software according to the</tspan></textPath></text>
+ id="textPath222"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';stroke-width:0.26875892px">we create software according to the</textPath></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
id="text203"
transform="translate(0,-2.244929)"><textPath
xlink:href="#path35"
- id="textPath231"><tspan
- style="font-size:3.52777767px;stroke-width:0.26458332px"
- id="tspan201">manifesto</tspan></textPath></text>
+ id="textPath231"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';stroke-width:0.26458332px">manifesto</textPath></text>
<circle
style="fill:none;stroke:none;stroke-width:0.24708341"
id="path217"
--- a/logo/sane-software-logo-rectangle.svg Mon Apr 27 10:55:46 2020 +0200
+++ b/logo/sane-software-logo-rectangle.svg Tue Jul 14 16:42:04 2020 +0200
@@ -25,18 +25,20 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="2.8"
- inkscape:cx="-0.17131873"
- inkscape:cy="99.285245"
+ inkscape:zoom="1"
+ inkscape:cx="-31.49558"
+ inkscape:cy="122.04573"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
- inkscape:window-width="2560"
- inkscape:window-height="1021"
+ inkscape:window-width="1920"
+ inkscape:window-height="1015"
inkscape:window-x="0"
inkscape:window-y="0"
- inkscape:window-maximized="1" />
+ inkscape:window-maximized="1"
+ showguides="true"
+ inkscape:guide-bbox="true" />
<metadata
id="metadata60">
<rdf:RDF>
@@ -55,51 +57,51 @@
id="layer1"
transform="translate(0,-275.83331)">
<g
- id="g93"
- transform="translate(0.56696422,-3.0238317)">
+ id="g937"
+ transform="translate(2.2892291)">
<text
id="text12"
- y="292.86588"
- x="2.9961281"
+ y="289.84204"
+ x="3.5630922"
style="font-style:normal;font-weight:normal;font-size:10.58333302px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
xml:space="preserve"><tspan
id="tspan14"
- style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;stroke-width:0.26458332px"
- y="292.86588"
- x="2.9961281"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';stroke-width:0.26458332px"
+ y="289.84204"
+ x="3.5630922"
sodipodi:role="line">Sane software</tspan></text>
<path
inkscape:connector-curvature="0"
id="path18"
- d="M 2.1306229,283.43732 H 70.818782"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="M 2.6975871,280.41349 H 66.807288"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25561327px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path18-3"
- d="M 2.1306239,295.44363 H 70.818782"
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+ d="M 2.6975881,292.4198 H 66.807288"
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.25561327px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- x="8.1399002"
+ x="9.8126793"
y="278.93277"
id="text136"><tspan
sodipodi:role="line"
id="tspan134"
- x="8.1399002"
+ x="9.8126793"
y="278.93277"
- style="font-size:3.52777767px;stroke-width:0.26458332px">we create software according to the</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';stroke-width:0.26458332px">we create software according to the</tspan></text>
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;line-height:125%;font-family:Sawasdee;-inkscape-font-specification:Sawasdee;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.26458332px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- x="29.626961"
+ x="29.632866"
y="295.92264"
id="text140"><tspan
sodipodi:role="line"
id="tspan138"
- x="29.626961"
+ x="29.632866"
y="295.92264"
- style="font-size:3.52777767px;stroke-width:0.26458332px">manifesto</tspan></text>
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:3.52777767px;font-family:'CMU Serif';-inkscape-font-specification:'CMU Serif';stroke-width:0.26458332px">manifesto</tspan></text>
</g>
</svg>
Binary file templates/Sawasdee.woff has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/cmunbx.ttf Tue Jul 14 16:42:04 2020 +0200
@@ -0,0 +1,1 @@
+/usr/share/fonts/truetype/cmu/cmunbx.ttf
\ No newline at end of file
Binary file templates/cmunbx.woff has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/cmunrm.ttf Tue Jul 14 16:42:04 2020 +0200
@@ -0,0 +1,1 @@
+/usr/share/fonts/truetype/cmu/cmunrm.ttf
\ No newline at end of file
Binary file templates/cmunrm.woff has changed
--- a/templates/ssm.odt.xsl Mon Apr 27 10:55:46 2020 +0200
+++ b/templates/ssm.odt.xsl Tue Jul 14 16:42:04 2020 +0200
@@ -99,17 +99,16 @@
<xsl:template name="styles">
<office:font-face-decls>
+ <style:font-face style:name="CMU Serif" svg:font-family="'CMU Serif'" style:font-adornments="Roman" style:font-family-generic="roman" style:font-pitch="variable"/>
+ <style:font-face style:name="CMU Typewriter Text" svg:font-family="'CMU Typewriter Text'" style:font-adornments="Běžné" style:font-family-generic="modern" style:font-pitch="fixed"/>
+ <style:font-face style:name="FreeMono" svg:font-family="FreeMono" style:font-adornments="obyčejné" style:font-family-generic="modern" style:font-pitch="fixed"/>
<style:font-face style:name="OpenSymbol" svg:font-family="OpenSymbol" style:font-charset="x-symbol"/>
- <style:font-face style:name="Sawasdee" svg:font-family="Sawasdee" style:font-adornments="Tučné" style:font-pitch="variable"/>
- <style:font-face style:name="Liberation Sans" svg:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable"/>
- <style:font-face style:name="Lohit Devanagari" svg:font-family="'Lohit Devanagari'" style:font-family-generic="system" style:font-pitch="variable"/>
- <style:font-face style:name="Noto Sans CJK SC" svg:font-family="'Noto Sans CJK SC'" style:font-family-generic="system" style:font-pitch="variable"/>
</office:font-face-decls>
<office:styles>
<style:default-style style:family="paragraph">
<style:paragraph-properties fo:orphans="2" fo:widows="2" fo:hyphenation-ladder-count="no-limit" style:text-autospace="ideograph-alpha" style:punctuation-wrap="hanging" style:line-break="strict" style:tab-stop-distance="1.251cm" style:writing-mode="page"/>
- <style:text-properties style:use-window-font-color="true" style:font-name="Liberation Sans" fo:font-size="12pt" fo:language="cs" fo:country="CZ" style:letter-kerning="true" style:font-name-asian="Noto Sans CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lohit Devanagari" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>
+ <style:text-properties style:use-window-font-color="true" style:font-name="CMU Serif" fo:font-size="12pt" fo:language="cs" fo:country="CZ" style:letter-kerning="true" style:font-name-asian="Noto Sans CJK SC" style:font-size-asian="10.5pt" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="Lohit Devanagari" style:font-size-complex="12pt" style:language-complex="hi" style:country-complex="IN" fo:hyphenate="false" fo:hyphenation-remain-char-count="2" fo:hyphenation-push-char-count="2"/>
</style:default-style>
<style:style style:name="Standard" style:family="paragraph" style:class="text">
<style:paragraph-properties fo:text-align="justify" style:justify-single-word="false"/>
@@ -117,15 +116,15 @@
</style:style>
<style:style style:name="Heading" style:family="paragraph" style:parent-style-name="Standard" style:next-style-name="Paragraph" style:class="text">
<style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" loext:contextual-spacing="false" fo:keep-with-next="always"/>
- <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Noto Sans CJK SC" style:font-family-asian="'Noto Sans CJK SC'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
+ <style:text-properties style:font-name="CMU Serif" fo:font-family="'CMU Serif'" style:font-family-generic="swiss" style:font-pitch="variable" fo:font-size="14pt" style:font-name-asian="Noto Sans CJK SC" style:font-family-asian="'Noto Sans CJK SC'" style:font-family-generic-asian="system" style:font-pitch-asian="variable" style:font-size-asian="14pt" style:font-name-complex="Lohit Devanagari" style:font-family-complex="'Lohit Devanagari'" style:font-family-generic-complex="system" style:font-pitch-complex="variable" style:font-size-complex="14pt"/>
</style:style>
<style:style style:name="Paragraph" style:display-name="Text body" style:family="paragraph" style:parent-style-name="Standard" style:class="text">
<style:paragraph-properties fo:margin-top="0cm" fo:margin-bottom="0.247cm" loext:contextual-spacing="false" fo:line-height="115%"/>
- <style:text-properties style:font-name="Liberation Sans" fo:font-family="'Liberation Sans'" style:font-style-name="Běžné" style:font-family-generic="swiss" style:font-pitch="variable" style:font-size-asian="10.5pt"/>
+ <style:text-properties style:font-name="CMU Serif" fo:font-family="'CMU Serif'" style:font-style-name="Běžné" style:font-family-generic="swiss" style:font-pitch="variable" style:font-size-asian="10.5pt"/>
</style:style>
<style:style style:name="Title" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Paragraph" style:class="chapter">
<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
- <style:text-properties style:font-name="Sawasdee" fo:font-family="Sawasdee" style:font-style-name="Tučné" style:font-pitch="variable" fo:font-size="28pt" fo:font-weight="bold" style:font-size-asian="28pt" style:font-weight-asian="bold" style:font-size-complex="28pt" style:font-weight-complex="bold"/>
+ <style:text-properties style:font-name="CMU Serif" fo:font-family="CMU Serif" style:font-style-name="Tučné" style:font-pitch="variable" fo:font-size="28pt" fo:font-weight="bold" style:font-size-asian="28pt" style:font-weight-asian="bold" style:font-size-complex="28pt" style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="Subtitle" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Paragraph" style:class="chapter">
<style:paragraph-properties fo:margin-top="0.106cm" fo:margin-bottom="0.212cm" loext:contextual-spacing="false" fo:text-align="center" style:justify-single-word="false"/>
@@ -133,7 +132,7 @@
</style:style>
<style:style style:name="Heading_1" style:display-name="Heading 1" style:family="paragraph" style:parent-style-name="Heading" style:next-style-name="Paragraph" style:default-outline-level="1" style:class="text">
<style:paragraph-properties fo:margin-top="0.423cm" fo:margin-bottom="0.212cm" loext:contextual-spacing="false"/>
- <style:text-properties style:font-name="Sawasdee" fo:font-family="Sawasdee" style:font-style-name="Tučné" style:font-pitch="variable" fo:font-size="130%" fo:font-weight="bold" style:font-size-asian="130%" style:font-weight-asian="bold" style:font-size-complex="130%" style:font-weight-complex="bold"/>
+ <style:text-properties style:font-name="CMU Serif" fo:font-family="CMU Serif" style:font-style-name="Tučné" style:font-pitch="variable" fo:font-size="130%" fo:font-weight="bold" style:font-size-asian="130%" style:font-weight-asian="bold" style:font-size-complex="130%" style:font-weight-complex="bold"/>
</style:style>
<style:style style:name="Footer" style:family="paragraph" style:parent-style-name="Standard" style:class="extra">
<style:paragraph-properties text:number-lines="false" text:line-number="0">
--- a/templates/ssm.xhtml.xsl Mon Apr 27 10:55:46 2020 +0200
+++ b/templates/ssm.xhtml.xsl Tue Jul 14 16:42:04 2020 +0200
@@ -100,7 +100,7 @@
<h2>
<xsl:value-of select="m:name"/>
<xsl:text> </xsl:text>
- <a href="#{m:id}" class="anchor">🔗</a>
+ <a href="#{m:id}" class="anchor">§</a>
</h2>
<ul>
<xsl:apply-templates select="m:item"/>
@@ -113,7 +113,7 @@
<li id="{m:id}" class="{m:type}">
<xsl:apply-templates select="m:text"/>
<xsl:text> </xsl:text>
- <a href="#{m:id}" class="anchor">🔗</a>
+ <a href="#{m:id}" class="anchor">§</a>
<xsl:if test="m:item">
<ul>
<xsl:apply-templates select="m:item"/>
--- a/templates/style.css Mon Apr 27 10:55:46 2020 +0200
+++ b/templates/style.css Tue Jul 14 16:42:04 2020 +0200
@@ -1,10 +1,15 @@
@font-face {
- font-family: "Sawasdee";
- src: url("Sawasdee.woff");
+ font-family: "CMU Serif Roman";
+ src: url("cmunrm.woff");
+}
+
+@font-face {
+ font-family: "CMU Serif Bold";
+ src: url("cmunbx.woff");
}
body {
- font-family: sans-serif;
+ font-family: "CMU Serif Roman";
font-size: 18px;
background-color: white;
color: black;
@@ -18,8 +23,8 @@
}
h1,h2,h3 {
- font-family: Sawasdee;
- font-weight: bold;
+ font-family: "CMU Serif Bold";
+ font-weight: normal;
}
h1 {
@@ -27,19 +32,13 @@
}
a.anchor {
- color: transparent;
- text-shadow: 0 0 0 #eee;
+ color: #eee;
text-decoration: none;
- font-family: sans-serif;
- font-weight: normal;
- font-size: medium;
- width: 0px;
- height: 0px;
- display: inline-block;
+ font-size: 80%;
}
h2:hover > a.anchor, li:hover > a.anchor {
- text-shadow: 0 0 0 #999;
+ color: #999;
text-decoration: none;
}
