You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ct...@apache.org on 2017/04/04 20:30:12 UTC
lucene-solr:jira/solr-10290: SOLR-10298: replace Noto Serif with Noto
Sans, to reduce font size and line height and keep readability
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10290 d14977553 -> c6d29e33e
SOLR-10298: replace Noto Serif with Noto Sans, to reduce font size and line height and keep readability
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c6d29e33
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c6d29e33
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c6d29e33
Branch: refs/heads/jira/solr-10290
Commit: c6d29e33e41435824e217acf66a02ea3b14be7de
Parents: d149775
Author: Cassandra Targett <ct...@apache.org>
Authored: Tue Apr 4 15:29:07 2017 -0500
Committer: Cassandra Targett <ct...@apache.org>
Committed: Tue Apr 4 15:29:07 2017 -0500
----------------------------------------------------------------------
.../fonts/NotoSerif/notoserif-bold-subset.ttf | Bin 228548 -> 0 bytes
.../NotoSerif/notoserif-bold_italic-subset.ttf | Bin 241388 -> 0 bytes
.../fonts/NotoSerif/notoserif-italic-subset.ttf | Bin 214940 -> 0 bytes
.../NotoSerif/notoserif-regular-subset.ttf | Bin 227776 -> 0 bytes
.../src/pdf/fonts/Noto_Sans/LICENSE.txt | 202 +++++++++++++++++++
.../src/pdf/fonts/Noto_Sans/NotoSans-Bold.ttf | Bin 0 -> 415132 bytes
.../pdf/fonts/Noto_Sans/NotoSans-BoldItalic.ttf | Bin 0 -> 290436 bytes
.../src/pdf/fonts/Noto_Sans/NotoSans-Italic.ttf | Bin 0 -> 279268 bytes
.../pdf/fonts/Noto_Sans/NotoSans-Regular.ttf | Bin 0 -> 414820 bytes
.../src/pdf/themes/refguide-theme.yml | 61 +++---
10 files changed, 234 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold-subset.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold-subset.ttf b/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold-subset.ttf
deleted file mode 100644
index aecf9d0..0000000
Binary files a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold-subset.ttf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold_italic-subset.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold_italic-subset.ttf b/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold_italic-subset.ttf
deleted file mode 100644
index c39cd6c..0000000
Binary files a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-bold_italic-subset.ttf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-italic-subset.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-italic-subset.ttf b/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-italic-subset.ttf
deleted file mode 100644
index db6991d..0000000
Binary files a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-italic-subset.ttf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-regular-subset.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-regular-subset.ttf b/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-regular-subset.ttf
deleted file mode 100644
index ef6f925..0000000
Binary files a/solr/solr-ref-guide/src/pdf/fonts/NotoSerif/notoserif-regular-subset.ttf and /dev/null differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/LICENSE.txt
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/LICENSE.txt b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/LICENSE.txt
new file mode 100755
index 0000000..75b5248
--- /dev/null
+++ b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Bold.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Bold.ttf b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Bold.ttf
new file mode 100755
index 0000000..6e00cdc
Binary files /dev/null and b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Bold.ttf differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-BoldItalic.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-BoldItalic.ttf b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-BoldItalic.ttf
new file mode 100755
index 0000000..51b7b29
Binary files /dev/null and b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-BoldItalic.ttf differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Italic.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Italic.ttf b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Italic.ttf
new file mode 100755
index 0000000..dc93fea
Binary files /dev/null and b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Italic.ttf differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Regular.ttf
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Regular.ttf b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Regular.ttf
new file mode 100755
index 0000000..9dd1019
Binary files /dev/null and b/solr/solr-ref-guide/src/pdf/fonts/Noto_Sans/NotoSans-Regular.ttf differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6d29e33/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml b/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
index 01b999e..868e8ca 100644
--- a/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
+++ b/solr/solr-ref-guide/src/pdf/themes/refguide-theme.yml
@@ -1,24 +1,27 @@
font:
catalog:
- # Noto Serif supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols
- Noto Serif:
- normal: NotoSerif/notoserif-regular-subset.ttf
- bold: NotoSerif/notoserif-bold-subset.ttf
- italic: NotoSerif/notoserif-italic-subset.ttf
- bold_italic: NotoSerif/notoserif-bold_italic-subset.ttf
- # M+ 1mn supports ASCII and the circled numbers used for conums
+ # Noto Sans supports Latin, Latin-1 Supplement, Latin Extended-A, Greek, Cyrillic, Vietnamese & an assortment of symbols
+ # Noto Sans used for body text
+ Noto Sans:
+ normal: Noto_Sans/NotoSans-Regular.ttf
+ bold: Noto_Sans/NotoSans-Bold.ttf
+ italic: Noto_Sans/NotoSans-Italic.ttf
+ bold_italic: Noto_Sans/NotoSans-BoldItalic.ttf
+ # Raleway used for headings
Raleway:
normal: Raleway/Raleway-Medium.ttf
bold: Raleway/Raleway-Bold.ttf
italic: Raleway/Raleway-Medium.ttf
bold_italic: Raleway/Raleway-Bold.ttf
- # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
- # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
+ # Ubuntu Mono used for monospaced text & code blocks
Ubuntu Mono:
normal: UbuntuMono/UbuntuMono-Regular.ttf
bold: UbuntuMono/UbuntuMono-Bold.ttf
italic: UbuntuMono/UbuntuMono-Italic.ttf
bold_italic: UbuntuMono/UbuntuMono-BoldItalic.ttf
+ # M+ 1p supports Latin, Latin-1 Supplement, Latin Extended, Greek, Cyrillic, Vietnamese, Japanese & an assortment of symbols
+ # It also provides arrows for ->, <-, => and <= replacements in case these glyphs are missing from font
+ # This is a fallback font, and will only be used when it can fill in missing glyphs from other fonts
M+ 1p Fallback:
normal: mplus1p-regular-fallback.ttf
bold: mplus1p-regular-fallback.ttf
@@ -26,18 +29,20 @@ font:
bold_italic: mplus1p-regular-fallback.ttf
fallbacks:
- M+ 1p Fallback
+# page-level settings apply to the entire page
page:
background_color: '#ffffff'
layout: portrait
margin: [0.5in, 0.75in, 0.75in, 0.67in]
size: LETTER
+# base-level settings are defaults for other elements
base:
align: left
# color as hex string (leading # is optional)
font_color: '#333333'
- font_family: Noto Serif
- font_size: 10.5
- line_height_length: 12
+ font_family: Noto Sans
+ font_size: 10
+ line_height_length: 11
line_height: $base_line_height_length / $base_font_size
font_size_large: round($base_font_size * 1.25)
font_size_small: round($base_font_size * 0.85)
@@ -51,11 +56,23 @@ horizontal_rhythm: $base_line_height_length
vertical_spacing: $vertical_rhythm
link:
font_color: '#428bca'
-# literal is currently used for inline monospaced in prose and table cells
+# literal is used for inline monospaced strings in prose and in table cells
literal:
font_color: '#333333'
font_family: Ubuntu Mono
background_color: '#f5f5f5'
+# code is used for source code blocks
+code:
+ font_color: $base_font_color
+ font_family: $literal_font_family
+ font_size: ceil($base_font_size)
+ padding: $code_font_size
+ line_height: 1.25
+ background_color: '#f5f5f5'
+ border_color: '#cccccc'
+ border_radius: $base_border_radius
+ border_width: 0.75
+# headings
heading:
font_color: '#d9411e'
font_family: Raleway
@@ -76,6 +93,7 @@ heading:
margin_top: $vertical_rhythm * 0.2
margin_bottom: $vertical_rhythm * 0.8
padding: [0, 0, 5, 0]
+# Applies only to the title page
title_page:
align: right
logo:
@@ -143,17 +161,6 @@ blockquote:
padding: [$vertical_rhythm / 2, $horizontal_rhythm, $vertical_rhythm / -2, $horizontal_rhythm + $blockquote_border_width / 2]
cite_font_size: $base_font_size_small
cite_font_color: '#999999'
-# code is used for source blocks (perhaps change to source or listing?)
-code:
- font_color: $base_font_color
- font_family: $literal_font_family
- font_size: ceil($base_font_size)
- padding: $code_font_size
- line_height: 1.25
- background_color: '#f5f5f5'
- border_color: '#cccccc'
- border_radius: $base_border_radius
- border_width: 0.75
conum:
font_family: M+ 1mn
font_color: $literal_font_color
@@ -246,16 +253,12 @@ footer:
# * {chapter-title}
# * {section-title}
# * {section-or-chapter-title}
+ # We have added some custom variables from the build, see _config.yml.template
recto_content:
- #right: '{section-or-chapter-title} | {page-number}'
- #right: '{document-title} | {page-number}'
right: 'Published: {build-date}'
left: '(C) {build-year}, Apache Software Foundation'
- #center: '{page-number}'
verso_content:
- #left: '{page-number} | {chapter-title}'
left: 'Published: {build-date}'
right: '(C) {build-year}, Apache Software Foundation'
- #center: '{page-number}'
colophon:
font_size: $base_font_size_small