review updates

- update md mime type text to official one `text/markdown`
- font config is associated to `text/x-markdown-nb-preview`
- decrease body padding
- include font family and font size customization

Author: haidubogdan

ide/markdown/src/org/netbeans/modules/markdown/MarkdownDataObject.java

@@ -105,7 +105,7 @@
 @GrammarRegistration(mimeType=MarkdownDataObject.MIME_TYPE, grammar="markdown.tmLanguage.json")
 public class MarkdownDataObject extends MultiDataObject {
 
-    public static final String MIME_TYPE = "text/x-markdown";
+    public static final String MIME_TYPE = "text/markdown";
 
     public MarkdownDataObject(FileObject pf, MultiFileLoader loader) throws DataObjectExistsException, IOException {
         super(pf, loader);
@@ -120,7 +120,7 @@ protected int associateLookup() {
     @MultiViewElement.Registration(
             displayName = "#LBL_Markdown_EDITOR",
             iconBase = "org/netbeans/modules/markdown/markdown.png",
-            mimeType = "text/x-markdown",
+            mimeType = "text/markdown",
             persistenceType = TopComponent.PERSISTENCE_ONLY_OPENED,
             preferredID = "Markdown",
             position = 1000

ide/markdown/src/org/netbeans/modules/markdown/MarkdownViewerElement.java

@@ -74,6 +74,7 @@
  *
  * @author lkishalmi
  */
+
 @MultiViewElement.Registration(
         displayName = "#LBL_MarkdownViewer",
         iconBase = "org/netbeans/modules/markdown/markdown.png",
@@ -85,6 +86,7 @@
 @Messages("LBL_MarkdownViewer=Preview")
 public class MarkdownViewerElement implements MultiViewElement {
 
+    public static final String MIME_TYPE_PREVIEW = "text/x-markdown-nb-preview";
     private static final Logger LOG = Logger.getLogger(MarkdownViewerElement.class.getName());
     private static final RequestProcessor RP = new RequestProcessor(MarkdownViewerElement.class);
     private static final int UPDATE_DELAY = 500;
@@ -105,12 +107,12 @@ public class MarkdownViewerElement implements MultiViewElement {
             ))
             .set(HtmlRenderer.INDENT_SIZE, 2)
             .set(HtmlRenderer.RENDER_HEADER_ID, true)
-            .set(HtmlRenderer.FENCED_CODE_LANGUAGE_CLASS_PREFIX, "")
+            .set(HtmlRenderer.FENCED_CODE_LANGUAGE_CLASS_PREFIX, "") //NOI18N
             // JEditorPane search for the name attribute
             .set(AnchorLinkExtension.ANCHORLINKS_SET_NAME, true)
             .set(AnchorLinkExtension.ANCHORLINKS_SET_ID, false)
-            .set(AnchorLinkExtension.ANCHORLINKS_ANCHOR_CLASS, "")
-            .set(AnchorLinkExtension.ANCHORLINKS_TEXT_PREFIX, "")
+            .set(AnchorLinkExtension.ANCHORLINKS_ANCHOR_CLASS, "") //NOI18N
+            .set(AnchorLinkExtension.ANCHORLINKS_TEXT_PREFIX, "") //NOI18N
             // Make the table generation SWING Friendly
             .set(TablesExtension.COLUMN_SPANS, false)
             .set(TablesExtension.MIN_HEADER_ROWS, 1)

ide/markdown/src/org/netbeans/modules/markdown/resources/Bundle.properties

@@ -15,9 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-Editors/text/x-markdown=Markdown
+Editors/text/markdown=Markdown
 
-Editors/text/x-markdown-preview=Markdown Preview
+Editors/text/x-markdown-nb-preview=Markdown Preview
 
 body = Body
 heading1 = H1

ide/markdown/src/org/netbeans/modules/markdown/resources/Coloring.md

@@ -18,45 +18,3 @@ This is a **generic Markdown template** showcasing essential formatting features
 #### H4
 ##### H5
 ###### H6 (Smallest)
-
----
-
-## 2. Text Formatting
-- **Bold** (`**text**` or `__text__`)
-- *Italic* (`*text*` or `_text_`)
-- ~~Strikethrough~~ (`~~text~~`)
-- `Inline Code` (`` `code` ``)
-- > Blockquote (prefix with `>`)
-
----
-
-## 3. Lists
-### Unordered List
-- Item 1
-- Item 2
-  - Nested Item (indent with 2 spaces)
-
-### Ordered List
-1. First item
-2. Second item
-   1. Nested item (indent with 3 spaces)
-
-### Task List
-- [x] Completed task
-- [ ] Pending task (`[ ]`)
-
----
-
-## 4. Links
-- [Hyperlink](https://example.com) (`[text](url)`)
-
----
-
-## 5. Code Blocks
-```java
-# Syntax-highlighted block (java)
-class HelloWorld {
-    public static main(String... args) {
-        System.out.println("Hello markdown");
-    }
-}

ide/markdown/src/org/netbeans/modules/markdown/resources/layer.xml

@@ -23,8 +23,8 @@
 <filesystem>
     <folder name="Editors">
         <folder name="text">
-            <folder name="x-markdown">
-                <attr name="displayName" bundlevalue="org.netbeans.modules.markdown.resources.Bundle#Editors/text/x-markdown-preview"/>
+            <folder name="x-markdown-nb-preview">
+                <attr name="displayName" bundlevalue="org.netbeans.modules.markdown.resources.Bundle#Editors/text/x-markdown-nb-preview"/>
                 <folder name="FontsColors">
                     <folder name="NetBeans">
                         <folder name="Defaults">
@@ -67,15 +67,15 @@
     </folder>
     <folder name="Loaders">
         <folder name="text">
-            <folder name="x-markdown">
+            <folder name="x-markdown-nb-preview">
                 <attr name="iconBase" stringvalue="org/netbeans/modules/markdown/markdown.png"/>
             </folder>
         </folder>
     </folder>
     <folder name="OptionsDialog">
         <folder name="PreviewExamples">
             <folder name="text">
-                <file name="x-markdown" url="Coloring.md"/>
+                <file name="x-markdown-nb-preview" url="Coloring.md"/>
             </folder>
         </folder>
     </folder>

ide/markdown/src/org/netbeans/modules/markdown/utils/Bundle.properties

@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-CSS_DEFAULT=body {padding:40px;}\
+CSS_DEFAULT=body {padding:10px 25px;}\
 h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {font-size:inherit;}\
 ul, li ul {margin-left: 20px;}\
 li {margin-bottom: 3px;padding-left:5px;}\

ide/markdown/src/org/netbeans/modules/markdown/utils/StyleUtils.java

@@ -20,7 +20,6 @@
 
 import java.awt.Color;
 import java.util.Enumeration;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import javax.swing.text.AttributeSet;
@@ -31,7 +30,7 @@
 import org.netbeans.modules.editor.settings.storage.api.EditorSettings;
 import org.netbeans.api.editor.settings.FontColorSettings;
 import org.netbeans.modules.editor.settings.storage.api.FontColorSettingsFactory;
-import org.netbeans.modules.markdown.MarkdownDataObject;
+import static org.netbeans.modules.markdown.MarkdownViewerElement.MIME_TYPE_PREVIEW;
 import org.openide.util.NbBundle;
 
 /**
@@ -76,6 +75,8 @@ public static void addRule(StyleSheet ss, AttributeSet attributeSet, AttributeSe
         cssRule.append(" {");  // NOI18N
         cssRule.append(rgbStyling("color", getThemeColor(attributeSet, defaultAttributes, StyleConstants.ColorConstants.Foreground)));  // NOI18N
         cssRule.append(rgbStyling("background-color", getThemeColor(attributeSet, defaultAttributes, StyleConstants.ColorConstants.Background)));  // NOI18N
+        cssRule.append(fontSizeStyling(getFontSize(attributeSet)));
+        cssRule.append(fontStyling("font-family", getFontStyleConfig(attributeSet, StyleConstants.ColorConstants.FontFamily)));
         cssRule.append("}");  // NOI18N
         ss.addRule(cssRule.toString());
     }
@@ -87,6 +88,15 @@ public static Color getThemeColor(AttributeSet attributeSet, AttributeSet defaul
         }
         return color;
     }
+    
+    public static int getFontSize(AttributeSet attributeSet) {
+        Object fontSizeConfig = attributeSet.getAttribute(StyleConstants.ColorConstants.FontSize);
+        if (fontSizeConfig == null) {
+            return 0;
+        }
+        int fontSize = (int) fontSizeConfig;
+        return fontSize;
+    }
 
     public static String rgbStyling(String property, Color color) {
         if (color == null) {
@@ -105,19 +115,48 @@ public static String rgbStyling(String property, Color color) {
         return cssRule.toString();
     }
 
+    public static String fontSizeStyling(int size) {
+        if (size == 0 ) {
+            return "";
+        }
+
+        StringBuilder cssRule = new StringBuilder();
+        cssRule.append("font-size:"); // NOI18N
+        cssRule.append(Integer.toString(size));
+        cssRule.append(";");  // NOI18N
+        return cssRule.toString();
+    }
+
+    public static String fontStyling(String property, String value) {
+        if (value == null) {
+            return ""; // NOI18N
+        }
+        
+        StringBuilder cssRule = new StringBuilder();
+        cssRule.append(property);
+        cssRule.append(":"); // NOI18N
+        cssRule.append(value);
+        cssRule.append(";");  // NOI18N
+        return cssRule.toString();
+    }
+
+    public static String getFontStyleConfig(AttributeSet attributeSet, Object option) {
+        return (String) attributeSet.getAttribute(option);
+    }
+    
     private static void appendDefaultMarkdownCssRules(StyleSheet ss) {
         String defaultRules = NbBundle.getMessage(StyleUtils.class, "CSS_DEFAULT");  // NOI18N
         ss.addRule(defaultRules);
     }
 
     private static Iterator<AttributeSet> loadCustomizedMarkdownFontAttributes() {
         String profile = EditorSettings.getDefault().getCurrentFontColorProfile();
-        FontColorSettingsFactory fcsf = EditorSettings.getDefault().getFontColorSettings(new String[]{MarkdownDataObject.MIME_TYPE});
+        FontColorSettingsFactory fcsf = EditorSettings.getDefault().getFontColorSettings(new String[]{MIME_TYPE_PREVIEW});
         return fcsf.getAllFontColors(profile).iterator();
     }
 
     private static AttributeSet loadDefaultNbMarkdownFontAttributes() {
-        FontColorSettings fcs = (MimeLookup.getLookup(MimePath.get(MarkdownDataObject.MIME_TYPE)).lookup(FontColorSettings.class));
+        FontColorSettings fcs = (MimeLookup.getLookup(MimePath.get(MIME_TYPE_PREVIEW)).lookup(FontColorSettings.class));
         return fcs.getFontColors("default"); // NOI18N
     }