Merge pull request #9 from cityEHR/custom-font

JennnRamirez · web-flow · commit 1b5a8d58a590 · 2025-03-19T12:19:56.000-06:00
Format the documentation using a custom font
diff --git a/cityehr-documentation-common/pom.xml b/cityehr-documentation-common/pom.xml
@@ -21,7 +21,27 @@
     </scm>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/fop-config</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>resources</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xml-maven-plugin</artifactId>
diff --git a/cityehr-documentation-common/src/main/fonts/AvertaDemoPE-ExtraBold.otf b/cityehr-documentation-common/src/main/fonts/AvertaDemoPE-ExtraBold.otf
diff --git a/cityehr-documentation-common/src/main/fonts/AvertaDemoPECuttedDemo-Regular.otf b/cityehr-documentation-common/src/main/fonts/AvertaDemoPECuttedDemo-Regular.otf
diff --git a/cityehr-documentation-common/src/main/fop-config/fop.xconf b/cityehr-documentation-common/src/main/fop-config/fop.xconf
diff --git a/cityehr-documentation-common/src/main/xslt/common-html.xslt b/cityehr-documentation-common/src/main/xslt/common-html.xslt
@@ -40,6 +40,29 @@
     </xsl:for-each>
   </xsl:template>
 
+  <xsl:template name="hcom:style">
+    <style>
+      @font-face {
+        font-family: avertaRegular;
+        src: url(fonts/AvertaDemoPECuttedDemo-Regular.otf);
+      }
+
+      @font-face {
+        font-family: avertaExtraBold;
+        src: url(fonts/AvertaDemoPE-ExtraBold.otf);
+        font-weight: bold;
+      }
+
+      body {
+        font-family: avertaRegular;
+      }
+
+      h1, h2, h3 {
+        font-family: avertaExtraBold;
+      }
+    </style>
+  </xsl:template>
+
   <!-- TOC (Table of Contents) -->
   <xsl:template name="hcom:toc">
     <xsl:param name="sections" as="element()+"/>
@@ -66,11 +89,11 @@
     <xsl:variable name="section-id" select="generate-id($section)"/>
 
     <!-- section -->
-    <li><xsl:value-of select="string-join($numbers, '.')"/><xsl:text>. </xsl:text><a name="{$section-id}" href="{$page-url}"><xsl:value-of select="$section/title"/></a></li>
+    <li class="toc-entry-level-{$level}"><xsl:value-of select="string-join($numbers, '.')"/><xsl:text>. </xsl:text><a name="{$section-id}" href="{$page-url}"><xsl:value-of select="$section/title"/></a></li>
 
     <!-- then process sub sections recursively (no more than 4 levels deep!) -->
-    <xsl:if test="$level le 4">
-      <ol style="list-style-type: none;">
+    <xsl:if test="$level le 4 and exists($section/body/section|$section/section)">
+      <ol class="toc-level-{$level + 1}" style="list-style-type: none;">
         <xsl:for-each select="$section/body/section|$section/section">
           <xsl:call-template name="hcom:toc-entry">
             <xsl:with-param name="section"  select="."/>
diff --git a/cityehr-documentation-common/src/main/xslt/common-pdf.xslt b/cityehr-documentation-common/src/main/xslt/common-pdf.xslt
@@ -21,7 +21,7 @@
   <xsl:import href="common.xslt"/>
   
   <xsl:template name="pcom:fo-root">
-    <fo:root xml:lang="en" font-family="Arial,Helvetica,sans-serif" font-size="11pt">
+    <fo:root xml:lang="en" font-family="Averta,Arial,Helvetica,sans-serif" font-size="11pt">
       <xsl:call-template name="pcom:fo-layout-master-set"/>
 
       <xsl:apply-templates mode="declarations"/>
diff --git a/cityehr-documentation-common/src/main/xslt/create-map-html.xslt b/cityehr-documentation-common/src/main/xslt/create-map-html.xslt
@@ -44,6 +44,12 @@
           <xsl:with-param name="created-dateTime" select="$revision"/>
           <xsl:with-param name="modified-dateTime" select="$revision"/>
         </xsl:call-template>
+        <xsl:call-template name="hcom:style"/>
+        <style>
+          .toc-entry-level-1 {
+            margin-top: 1em;
+          }
+        </style>
       </head>
       <body about="">
         <div id="cover-page">
@@ -101,13 +107,13 @@
   
   <!-- TOC (Table of Contents) -->
   <xsl:template match="map" mode="toc">
-    <secton>
+    <section>
       <h2>Table of Contents</h2>
       <xsl:apply-templates select="topicref" mode="create-topic-html"/>
       <xsl:call-template name="hcom:toc">
         <xsl:with-param name="sections" select="topicref"/>
       </xsl:call-template>
-    </secton>
+    </section>
   </xsl:template>
 
   <!-- OVERRIDE this template from create-topic-html.xsd so that we can add previous and following links -->
diff --git a/cityehr-documentation-common/src/main/xslt/create-topic-html.xslt b/cityehr-documentation-common/src/main/xslt/create-topic-html.xslt
@@ -41,6 +41,7 @@
           <xsl:with-param name="created-dateTime" select="$revision"/>
           <xsl:with-param name="modified-dateTime" select="$revision"/>
         </xsl:call-template>
+        <xsl:call-template name="hcom:style"/>
       </head>
       <body>
         <nav id="top-nav">
diff --git a/cityehr-documentation-parent/pom.xml b/cityehr-documentation-parent/pom.xml
@@ -68,13 +68,16 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <saxon.version>12.5</saxon.version>
 
+        <fop.config.path>${project.basedir}/../cityehr-documentation-common/target/classes/fop.xconf</fop.config.path>
+
         <common.catalog.path>${project.basedir}/../cityehr-documentation-common/src/main/catalog/catalog.xml</common.catalog.path>
 
         <common.xslt.path>${project.basedir}/../cityehr-documentation-common/src/main/xslt</common.xslt.path>
         <common.create-map-pdf.xslt.path>${common.xslt.path}/create-map-pdf.xslt</common.create-map-pdf.xslt.path>
         <common.create-map-html.xslt.path>${common.xslt.path}/create-map-html.xslt</common.create-map-html.xslt.path>
 
         <common.images.path>${project.basedir}/../cityehr-documentation-common/src/main/images</common.images.path>
+        <common.fonts.path>${project.basedir}/../cityehr-documentation-common/src/main/fonts</common.fonts.path>
     </properties>
 
     <build>
diff --git a/cityehr-documentation-website/pom.xml b/cityehr-documentation-website/pom.xml
@@ -83,17 +83,23 @@
                     </execution>
 
                     <execution>
-                        <id>copy-common-images</id>
+                        <id>copy-common-resources</id>
                         <phase>package</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${website.output.folder}/images</outputDirectory>
+                            <outputDirectory>${website.output.folder}</outputDirectory>
                             <resources>
                                 <resource>
                                     <directory>${common.images.path}</directory>
                                     <filtering>false</filtering>
+                                    <targetPath>images</targetPath>
+                                </resource>
+                                <resource>
+                                    <directory>${common.fonts.path}</directory>
+                                    <filtering>false</filtering>
+                                    <targetPath>fonts</targetPath>
                                 </resource>
                             </resources>
                         </configuration>
diff --git a/cityehr-documentation-website/src/main/website/index.html b/cityehr-documentation-website/src/main/website/index.html
@@ -11,6 +11,26 @@
       <meta xmlns:com="http://cityehr/common" name="DCTERMS.creator" content="https://seveninformatics.com">
       <meta xmlns:com="http://cityehr/common" name="DCTERMS.created" content="${maven.build.timestamp}">
       <meta xmlns:com="http://cityehr/common" name="DCTERMS.modified" content="${maven.build.timestamp}">
+      <style>
+         @font-face {
+            font-family: avertaRegular;
+            src: url(fonts/AvertaDemoPECuttedDemo-Regular.otf);
+         }
+
+         @font-face {
+            font-family: avertaExtraBold;
+            src: url(fonts/AvertaDemoPE-ExtraBold.otf);
+            font-weight: bold;
+         }
+
+         body {
+            font-family: avertaRegular;
+         }
+
+         h1, h2, h3 {
+            font-family: avertaExtraBold;
+         }
+      </style>
    </head>
    <body about="">
       <div id="cover-page">
diff --git a/cityehr-modelling-guide/pom.xml b/cityehr-modelling-guide/pom.xml
@@ -65,7 +65,7 @@
 
                     <execution>
                         <id>copy-resources</id>
-                        <phase>validate</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
@@ -306,6 +306,11 @@
                                             <filtering>false</filtering>
                                             <targetPath>images</targetPath>
                                         </resource>
+                                        <resource>
+                                            <directory>${common.fonts.path}</directory>
+                                            <filtering>false</filtering>
+                                            <targetPath>fonts</targetPath>
+                                        </resource>
                                         <resource>
                                             <directory>${project.build.directory}</directory>
                                             <filtering>false</filtering>
diff --git a/cityehr-quick-start-guide/pom.xml b/cityehr-quick-start-guide/pom.xml
@@ -65,7 +65,7 @@
 
                     <execution>
                         <id>copy-resources</id>
-                        <phase>validate</phase>
+                        <phase>process-resources</phase>
                         <goals>
                             <goal>copy-resources</goal>
                         </goals>
@@ -168,6 +168,8 @@
                                 <classpath/>
                                 <argument>-Djavax.xml.transform.TransformerFactory=net.sf.saxon.TransformerFactoryImpl</argument>
                                 <argument>org.apache.fop.cli.Main</argument>
+                                <argument>-c</argument>
+                                <argument>${fop.config.path}</argument>
                                 <argument>-fo</argument>
                                 <argument>${fo.generated-resources}/quick-start-guide.fo</argument>
                                 <argument>-pdf</argument>
@@ -306,6 +308,11 @@
                                             <filtering>false</filtering>
                                             <targetPath>images</targetPath>
                                         </resource>
+                                        <resource>
+                                            <directory>${common.fonts.path}</directory>
+                                            <filtering>false</filtering>
+                                            <targetPath>fonts</targetPath>
+                                        </resource>
                                         <resource>
                                             <directory>${project.build.directory}</directory>
                                             <filtering>false</filtering>
