[debian-edu-commits] [Git][debian-edu/debian-edu-doc][master] 4 commits: Set the default LaTeX paragraph setting style for all languages to \sloppy so...

Frans Spiesschaert (@frans) gitlab at salsa.debian.org
Sat Sep 26 22:57:03 BST 2026



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


Commits:
e021280f by Frans Spiesschaert at 2026-09-26T23:07:00+02:00
Set the default LaTeX paragraph setting style for all languages to \sloppy so text doesn't run off the right edge of the page in pdf documents.

- - - - -
8fbcd1dd by Frans Spiesschaert at 2026-09-26T23:10:18+02:00
Building a PDF with Russian text requires configuring a font with Cyrillic glyph support to prevent missing text or compilation errors.

- - - - -
327ac707 by Frans Spiesschaert at 2026-09-26T23:47:22+02:00
Use the right LaTeX package for russian.

- - - - -
3708b1cf by Frans Spiesschaert at 2026-09-26T23:56:33+02:00
Add <literallayout> workaround for ja, zh-=cn, uk and ru.

- - - - -


2 changed files:

- documentation/common/Makefile.common
- documentation/common/dblatex.xsl


Changes:

=====================================
documentation/common/Makefile.common
=====================================
@@ -35,7 +35,7 @@ SED_101= "s%id='[0-9]\+%id='%g"
 SED_102= "s% id=''%%g"
 # Tamil script lacks support for Italic in FreeSerif font
 SED_200= 's%<emphasis>%<emphasis role="bold">%g'
-# Workaround because <litterallayout> cannot handle Tamil script
+# Workaround for languages that cannot handle <litterallayout>
 SED_201= '/<literallayout>/,/<\/literallayout>/{/<literallayout>/n;/<\/literallayout>/!{s/$$/<\/para><para>/g}}'
 SED_202= "s%literallayout>%para>%g"
 
@@ -90,11 +90,17 @@ build-xml:
 		if [ -e $(name).$$f.xml ] ; then \
 			echo "Creating XML for $$f"; \
 			case "$$f" in \
-				cs|de|da|nb-no|pl|ro|ru|uk) sed -i $(SED_01) $(name).$$f.xml \
+				cs|de|da|nb-no|pl|ro) sed -i $(SED_01) $(name).$$f.xml \
 				;; \
 				fr|nl) sed -i $(SED_02) $(name).$$f.xml \
 				;; \
-				ja|zh-cn) sed -i $(SED_03) $(name).$$f.xml \
+				ja|zh-cn) sed -i $(SED_03) $(name).$$f.xml ; \
+                                     sed -i $(SED_201) $(name).$(LINGUA).xml ; \
+                                     sed -i $(SED_202) $(name).$(LINGUA).xml \
+				;; \
+				ru|uk) sed -i $(SED_01) $(name).$$f.xml ; \
+                                     sed -i $(SED_201) $(name).$(LINGUA).xml ; \
+                                     sed -i $(SED_202) $(name).$(LINGUA).xml \
 				;; \
 				es|it|pt-br|pt-pt|pt) sed -i $(SED_04) $(name).$$f.xml \
 				;; \
@@ -130,11 +136,17 @@ build-xml:
 	# modify localized XML file
 	if [ -e $(name).$(LINGUA).xml ] ; then \
 		case "$(LINGUA)" in \
-			cs|de|da|nb-no|pl|ro|ru|uk) sed -i $(SED_01) $(name).$(LINGUA).xml \
+			cs|de|da|nb-no|pl|ro) sed -i $(SED_01) $(name).$(LINGUA).xml \
 			;; \
 			fr|nl) sed -i $(SED_02) $(name).$(LINGUA).xml \
 			;; \
-			ja|zh-cn) sed -i $(SED_03) $(name).$(LINGUA).xml \
+			ja|zh-cn) sed -i $(SED_03) $(name).$(LINGUA).xml ; \
+                            sed -i $(SED_201) $(name).$(LINGUA).xml ; \
+                            sed -i $(SED_202) $(name).$(LINGUA).xml \
+			;; \
+			ru|uk) sed -i $(SED_01) $(name).$(LINGUA).xml ; \
+                            sed -i $(SED_201) $(name).$(LINGUA).xml ; \
+                            sed -i $(SED_202) $(name).$(LINGUA).xml \
 			;; \
 			es|it|pt-br|pt-pt|pt) sed -i $(SED_04) $(name).$(LINGUA).xml \
 			;; \


=====================================
documentation/common/dblatex.xsl
=====================================
@@ -11,6 +11,7 @@
 	<xsl:text>\setCJKsansfont{IPAPGothic}
</xsl:text>
 	<xsl:text>\setCJKmonofont{IPAexGothic}
</xsl:text>
         <xsl:text>\setmainfont{Latin Modern Sans}
</xsl:text>
+        <xsl:text>\sloppy
</xsl:text>
     </xsl:when>
     <xsl:when test="contains(/article/@lang,'zh-cn')">
 	<xsl:text>\usepackage{xeCJK}
</xsl:text>
@@ -18,6 +19,7 @@
 	<xsl:text>\setCJKsansfont{WenQuanYi Micro Hei}
</xsl:text>
 	<xsl:text>\setCJKmonofont{WenQuanYi Micro Hei Mono}
</xsl:text>
         <xsl:text>\setmainfont{Latin Modern Sans}
</xsl:text>
+        <xsl:text>\sloppy
</xsl:text>
     </xsl:when>
     <xsl:when test="contains(/article/@lang,'zh-tw')">
 	<xsl:text>\usepackage{xeCJK}
</xsl:text>
@@ -25,24 +27,34 @@
 	<xsl:text>\setCJKsansfont{WenQuanYi Micro Hei}
</xsl:text>
 	<xsl:text>\setCJKmonofont{WenQuanYi Micro Hei Mono}
</xsl:text>
         <xsl:text>\setmainfont{Latin Modern Sans}
</xsl:text>
+        <xsl:text>\sloppy
</xsl:text>
+    </xsl:when>
+    <xsl:when test="contains(/article/@lang,'ru')">
+	<xsl:text>\usepackage[russian]{babel}
</xsl:text>
+        <xsl:text>\setmainfont{DejaVuSans}
</xsl:text>
+        <xsl:text>\setsansfont{DejaVuSans}
</xsl:text>
+        <xsl:text>\setmonofont{DejaVuSansMono}
</xsl:text>
+        <xsl:text>\sloppy
</xsl:text>
     </xsl:when>
     <xsl:when test="contains(/article/@lang,'uk')">
 	<xsl:text>\usepackage[ukrainian]{babel}
</xsl:text>
         <xsl:text>\setmainfont{DejaVuSans}
</xsl:text>
         <xsl:text>\setsansfont{DejaVuSans}
</xsl:text>
         <xsl:text>\setmonofont{DejaVuSansMono}
</xsl:text>
+        <xsl:text>\sloppy
</xsl:text>
     </xsl:when>
     <xsl:when test="contains(/article/@lang,'ta')">
         <xsl:text>\usepackage[english, tamil, provide*=*]{babel}
</xsl:text>
         <xsl:text>\babelfont{rm}[Extension=.otf,BoldFont=*Bold,ItalicFont=*Italic,BoldItalicFont=*BoldItalic]{FreeSerif}
</xsl:text> % better alignment using those options
         <xsl:text>\babelfont{sf}[Extension=.otf,BoldFont=*Bold,ItalicFont=*Italic,BoldItalicFont=*BoldItalic]{FreeSerif}
</xsl:text> % better alignment using those options
         <xsl:text>\babelfont{tt}{FreeSerif}
</xsl:text>
-        <xsl:text>\sloppy
</xsl:text> % prevent some text from getting dropped from the right paper edge
+        <xsl:text>\sloppy
</xsl:text>
     </xsl:when>
     <xsl:otherwise>
         <xsl:text>\setmainfont{Latin Modern Sans}
</xsl:text>
         <xsl:text>\setsansfont{Latin Modern Sans}
</xsl:text>
         <xsl:text>\setmonofont{Latin Modern Mono Light}
</xsl:text>
+        <xsl:text>\sloppy
</xsl:text>
     </xsl:otherwise>
    </xsl:choose>
   </xsl:param>



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/f32c7cbe1523011371242d8e22cba9813f8baf00...3708b1cf02a83755a1440388e5252ad2ff642b20

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-doc/-/compare/f32c7cbe1523011371242d8e22cba9813f8baf00...3708b1cf02a83755a1440388e5252ad2ff642b20
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20260926/f8961a64/attachment-0001.htm>


More information about the debian-edu-commits mailing list