[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 2 commits: documentation/common/edu.css.xml Add style for subtitle to improve the publish

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-doc


Commits:
774b60cd by Wolfgang Schweer at 2020-02-25T17:23:27+01:00
documentation/common/edu.css.xml Add style for subtitle to improve the publish
date rendering (in HTML).

Whitespace fixes.

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -
b56f84ce by Wolfgang Schweer at 2020-02-25T17:26:02+01:00
Makefile.common: Include images for all languages in all manuals. (Closes: #951909)

  Rework the section for languages other than (en) after the temporary image
  file location has changed.

  Adjust DESTPATH value.

  Whitespace fixes

Signed-off-by: Wolfgang Schweer <wschweer at arcor.de>

- - - - -


3 changed files:

- debian/changelog
- documentation/common/Makefile.common
- documentation/common/edu.css.xml


Changes:

=====================================
debian/changelog
=====================================
@@ -10,12 +10,16 @@ debian-edu-doc (2.11.2) UNRELEASED; urgency=medium
   * documentation/common/Makefile.common:
     - Fix condition and add (en) related code to integrate the publish date also
       for the 'install' target and the default language. (Closes: #951908).
+    - Rework the section for languages other than (en) after the temporary image
+      file location has changed.
     - Add code to remove the alpha channel from PNG files to make the img2pdf
-      command actually work for already existing image files. This makes sure
-      that the (en) PDF files contain images (partly addresses #951909).
-      For all other languages the PDF files are still missing images in case the
-     'install' target is used (they do contain (en) images like expected if
-      the command 'LINGUA=<lang> make pdf' is used).
+      command work for already existing image files. This makes sure that the
+      PDF files contain images. (Closes: #951909).
+    - Remove superfluous leading slash in DESTPATH value.
+    - Whitespace fixes.
+  * documentation/common/edu.css.xml:
+    - Add style for subtitle to improve the publish date rendering (in HTML).
+    - Whitespace fixes.
   * Fix lang=pt-pt and lang=pt-br related xelatex compilation errors:
     - Add texlive-lang-portuguese to Build-Depends-Indep.
     - audacity/audacity-manual.pt_{BR,PT}.po: Adjust lang attribute values.


=====================================
documentation/common/Makefile.common
=====================================
@@ -2,7 +2,7 @@
 # language specific date formatting config below (default is yyyy-mm-dd).
 #
 DESTDIR=
-DESTPATH = /usr/share/doc
+DESTPATH = usr/share/doc
 # Use Make internal functions 'subst' and 'wildcard'; (from right to left):
 # get list of all PO files in dir, first substitute the extension with nothing,
 # then do so for the manual name to get the list of languages.
@@ -197,6 +197,7 @@ install: build
 			  $(DBLATEX) -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; \
 			else \
 				mkdir -p $$LANGPATH/$(name)-images ; \
+				mkdir -p $$LANGPATH/$(name)-images-tmp ; \
 				cd images ; \
 				if [ -d $$f ] ; then \
 					for i in $$f/*.png ; do \
@@ -206,15 +207,19 @@ install: build
 				fi ; \
 				for i in *.* ; do \
 					if [ -e $$f/$$i ] ; then \
-						cp -v $$f/$$i $$LANGPATH/$(name)-images/ ; \
+						cp $$f/$$i $$LANGPATH/$(name)-images-tmp/ ; \
 					else \
 						ln -sf ../../debian-edu-doc-en/$(name)-images/$$i $$LANGPATH/$(name)-images/$$i ; \
+						cp $$i $$LANGPATH/$(name)-images-tmp/ ; \
 					fi ; done ; \
 				cd .. ; \
 				sed -i s/\.png"/.pdf"/g $(name).$$f.xml ; \
 				sed -i "s#./images#./$(name)-images#g" $(name).$$f.xml ; \
-			  mv images images_tmp_away ; $(DBLATEX) -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; mv images_tmp_away images ; \
-			  rm $$LANGPATH/$(name)-images/*.pdf ; \
+				$(DBLATEX) -I $$LANGPATH/ -I $(DESTDIR)/debian-edu-doc-en/$(DESTPATH)/debian-edu-doc-en/ -o $$LANGPATH/$(name).pdf $(name).$$f.xml --param=lingua=$$f ; \
+				rm $$LANGPATH/$(name)-images/*.pdf ; \
+				rm $$LANGPATH/$(name)-images-tmp/*.pdf ; \
+				cp $$LANGPATH/$(name)-images-tmp/*.* $$LANGPATH/$(name)-images 2> /dev/null ; \
+				rm -rf $$LANGPATH/$(name)-images-tmp ; \
 			fi ; \
 		fi ; \
 		if [ -e $(name).epub ] && [ "$$f" = "en" ]  ; then \


=====================================
documentation/common/edu.css.xml
=====================================
@@ -36,11 +36,16 @@ h1.title, h2.title, h3.title, h4.title, h5.title, h6.title {
 	line-height: 1.3;
 	margin-top: 1em;
 	margin-left: 0;
-        border: solid 3px #d2d3d7;
-        background-color: #f5f6f7;
-        color: #262626dd;
-        width: 100%;
+	border: solid 3px #d2d3d7;
+	background-color: #f5f6f7;
+	color: #262626dd;
+	width: 100%;
 }
+
+h3.subtitle {
+	font: normal 100% sans-serif;
+}
+
 /* Suggestion: hoxp18: to avoid too small h4~h6 renderings */
 h1.title { font-size: 150%; }
 h2.title { font-size: 140%; }
@@ -85,8 +90,8 @@ pre.screen {
 	white-space: pre;
 	overflow: auto;
 	font-family: monospace;
-        border: solid 1px #d2d3d7;
-        background-color: #f5f6f7;
+	border: solid 1px #d2d3d7;
+	background-color: #f5f6f7;
 	padding: 4px;
 	margin: 1em;
 	margin-left: 2em;



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/7deecc147ea735d98a3e3e1974c2891e527ccd6b...b56f84cef01205dfeba065b39035cb78bd72c8ab

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/7deecc147ea735d98a3e3e1974c2891e527ccd6b...b56f84cef01205dfeba065b39035cb78bd72c8ab
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20200225/9694c86d/attachment-0001.html>