Mercurial > octave

changeset 25105:dd480b75e6e8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
octave.css: Provide fallback monospace fonts (bug #53006). * octave.css: add 'Courier New', Cousine, and Courier fallback fonts in case 'Fantasque Sans Mono' is not installed and the doc is being rendered offline. * doc/interpreter/module.mk: Add a dependency on HTMLDIR_CSS to OCTAVE_QTHELP_FILES so they are rebuilt when styles change.
author Pantxo Diribarne <pantxo.diribarne@gmail.com>
date Tue, 03 Apr 2018 12:15:41 +0200
parents 078b795c5219
children d7ad543255c5
files doc/interpreter/module.mk doc/interpreter/octave.css
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/doc/interpreter/module.mk	Tue Apr 03 13:52:07 2018 -0700
+++ b/doc/interpreter/module.mk	Tue Apr 03 12:15:41 2018 +0200
@@ -204,7 +204,7 @@
 octdoc_DATA += \
   $(OCTAVE_QTHELP_FILES)
 
-$(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) %reldir%/mk-qthelp.pl
+$(OCTAVE_QTHELP_FILES): $(OCTAVE_HTML_STAMP) $(HTMLDIR_CSS) %reldir%/mk-qthelp.pl
 	$(AM_V_GEN)rm -f $(OCTAVE_QTHELP_FILES) && \
 	$(PERL) $(srcdir)/%reldir%/mk-qthelp.pl octave.html %reldir%/octave_interpreter && \
 	$(QCOLLECTIONGENERATOR) $(QCOLLECTIONGENERATORFLAGS) %reldir%/octave_interpreter.qhcp -o %reldir%/octave_interpreter.qhc >/dev/null && \
--- a/doc/interpreter/octave.css	Tue Apr 03 13:52:07 2018 -0700
+++ b/doc/interpreter/octave.css	Tue Apr 03 12:15:41 2018 +0200
@@ -62,7 +62,7 @@
 /* Import web font Fantasque Sans Mono, Font Library Version 2016-04-05 */
 @font-face
 {
-  font-family: 'Fantasque Sans Mono';
+  font-family: 'Fantasque Sans Mono', 'Courier New', Cousine, Courier, monospace;
   src: local('Fantasque Sans Mono Bold'),
        local('FantasqueSansMono-Bold'),
        url('https://fontlibrary.org/assets/fonts/fantasque-sans-mono/b0cbb25e73a9f8354e96d89524f613e7/a46033d3a07d9385620dc83b7655203f/FantasqueSansMonoBold.ttf') format('truetype');
@@ -72,7 +72,7 @@
 
 @font-face
 {
-  font-family: 'Fantasque Sans Mono';
+  font-family: 'Fantasque Sans Mono', 'Courier New', Cousine, Courier,  'monospace';
   src: local('Fantasque Sans Mono Bold Italic'),
        local('FantasqueSansMono-BoldItalic'),
        url('https://fontlibrary.org/assets/fonts/fantasque-sans-mono/b0cbb25e73a9f8354e96d89524f613e7/b0683ef4c834908aa372ec78dea42349/FantasqueSansMonoBoldItalic.ttf') format('truetype');
@@ -82,7 +82,7 @@
 
 @font-face
 {
-  font-family: 'Fantasque Sans Mono';
+  font-family: 'Fantasque Sans Mono', 'Courier New', Cousine, Courier, monospace;
   src: local('Fantasque Sans Mono Italic'),
        local('FantasqueSansMono-Italic'),
        url('https://fontlibrary.org/assets/fonts/fantasque-sans-mono/b0cbb25e73a9f8354e96d89524f613e7/b78d0a48e4443f797e8d45dcf97594f7/FantasqueSansMonoItalic.ttf') format('truetype');
@@ -92,7 +92,7 @@
 
 @font-face
 {
-  font-family: 'Fantasque Sans Mono';
+  font-family: 'Fantasque Sans Mono', 'Courier New', Cousine, Courier, monospace;
   src: local('Fantasque Sans Mono Regular'),
        local('FantasqueSansMono-Regular'),
        url('https://fontlibrary.org/assets/fonts/fantasque-sans-mono/b0cbb25e73a9f8354e96d89524f613e7/f3fdc4f0f26e4431f54e8b552d55480c/FantasqueSansMonoRegular.ttf') format('truetype');
@@ -101,7 +101,7 @@
 }
 
 /* Use custom fonts */
-code, kbd, samp, tt, pre { font-family: 'Fantasque Sans Mono', monospace; }
+code, kbd, samp, tt, pre { font-family: 'Fantasque Sans Mono', 'Courier New', Cousine, Courier, monospace; }
 
 code, kbd, samp, tt {
   font-style: italic;