Changeset 9bb96e0b in tol

Timestamp:

Jan 19, 2012, 2:57:14 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

e88e327

Parents:

50adfcc

Message:

refs #1396, se utiliza la fuente normal configurada en tolbase, pendiente de sincronizar cambios y habilitar opciones de menu contextual

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4023 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib/toltk

Files:

• markuphelper.tcl (modified) (2 diffs)
• tolbase.tcl (modified) (2 diffs)

tolbase/lib/toltk/markuphelper.tcl

@@ -180 +180 @@
         if { $s eq "\[" && $e eq "\]" } {
           Text "[ string range $line 1 end-1 ]:" \
-              -tags {b i} -br 1
+              -tags {b} -br 1
         } elseif { $s eq "{" && $e eq "}" } {
-          Text "[ string range $line 1 end-1 ]: " -tags {b i}
+          Text "[ string range $line 1 end-1 ]: " -tags {b}
         } else {
           Text \
@@ -189 +189 @@
       }
     }
-    return "<m>[ GetText ]</m>"
+    return [ GetText ]
   }
 }

tolbase/lib/toltk/tolbase.tcl

@@ -226 +226 @@
     array set normalProps [ CGetFont [ $widgets(output) cget -font ] ]
   }
-  if { $normalProps(-size) == 9 } {
-    # { Times 9 } does not look good on Linux
-    set normalProps(-size) 10
-  }
-  prefs set bodytext "Times $normalProps(-size)"
+  prefs set bodytext "$normalProps(-family) $normalProps(-size)"
   prefs set monotext "Courier $normalProps(-size)"
   foreach {f ds p} {header1 4 bold header2 2 bold header3 0 bold title 8 {} small -4 {}} {
@@ -541 +537 @@
       }
       MarkupHelper::Init
-      $data(notebookdb) set "info" \
-          [ MarkupHelper::BuildTolbaseInfo \
+      set fmtInfo [ MarkupHelper::BuildTolbaseInfo \
                 $icon $grammar $name $content $path $desc -objref $objRef ]
+      $data(notebookdb) set "info" $fmtInfo
+          
       $widgets(info,markupviewer) showpage "info"
       ActivateInfoWidget "markup"