--- loncom/homework/structuretags.pm 2011/12/14 11:56:08 1.497.2.4
+++ loncom/homework/structuretags.pm 2013/09/05 12:07:29 1.515
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.497.2.4 2011/12/14 11:56:08 foxr Exp $
+# $Id: structuretags.pm,v 1.515 2013/09/05 12:07:29 goltermann Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -61,6 +61,7 @@ use Apache::lonlocal;
use Apache::lonxml;
use Apache::londefdef;
use Apache::lonenc();
+use Apache::loncommon();
use Time::HiRes qw( gettimeofday tv_interval );
use lib '/home/httpd/lib/perl/';
use LONCAPA;
@@ -96,13 +97,13 @@ my %languages_required;
sub select_hyphenation {
my $language = shift;
- $language = &Apache::loncommon::latex_language($language); # Translate -> latex language.
+ $language = &Apache::loncommon::latexlanguage($language); # Translate -> latex language.
# If there is no latex language there's not much we can do:
if ($language) {
&require_language($language);
- my $babel_hyphenation = "\\select_language{$language}";
+ my $babel_hyphenation = "\\selectlanguage{$language}";
return $babel_hyphenation;
} else {
@@ -110,6 +111,28 @@ sub select_hyphenation {
}
}
##
+# Selects hyphenation based on the current problem metadata.
+# This requires that
+# - There is a language metadata item set for the problem.
+# - The language has a latex/babel hyphenation.
+#
+# @note: Uses &Apache::lonxml::request to locate the Uri associated with
+# this problem.
+# @return string (possibly empty).
+# @retval If not empty an appropriate \selectlanguage{} directive.
+#
+sub select_metadata_hyphenation {
+ my $uri = $Apache::lonxml::request->uri;
+ my $language = &Apache::lonnet::metadata($uri, 'language');
+ my $latex_language = &Apache::loncommon::latexhyphenation($language);
+ if ($latex_language) {
+ return '\selectlanguage{'.$latex_language."}\n";
+ }
+ return ''; # no latex hyphenation or no lang metadata.
+}
+
+
+##
# Clears the set of languages required by the document being rendered.
#
sub clear_required_languages {
@@ -122,7 +145,6 @@ sub clear_required_languages {
#
sub require_language {
my $language = shift;
-
$languages_required{$language} = 1;
}
@@ -133,9 +155,8 @@ sub require_language {
# @retval \usepackage[lang1,lang2...]{babel}
# @retval '' if there are no languages_required.
sub languages_header {
-
my $header ='';
- my @languages = keys(%languages_required);
+ my @languages = (keys(%languages_required));
# Only generate the header if there are languages:
@@ -143,7 +164,6 @@ sub languages_header {
my $language_list = join(',', (@languages));
$header = '\usepackage['.$language_list."]{babel}\n";
}
-
return $header;
}
@@ -359,10 +379,10 @@ sub page_start {
} elsif (!defined($found{'body'})
&& $env{'request.state'} eq 'construct') {
if ($target eq 'web' || $target eq 'edit') {
- # Breadcrumbs for Construction Space
+ # Breadcrumbs for Authoring Space
&Apache::lonhtmlcommon::clear_breadcrumbs();
&Apache::lonhtmlcommon::add_breadcrumb({
- 'text' => 'Construction Space',
+ 'text' => 'Authoring Space',
'href' => &Apache::loncommon::authorspace($env{'request.uri'}),
});
# breadcrumbs (and tools) will be created
@@ -433,7 +453,6 @@ sub page_start {
}
$form_tag_start.='>'."\n";
- my $symb=&Apache::lonnet::symbread();
if ($symb =~ /\S/) {
$symb=
&HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
@@ -618,7 +637,7 @@ sub problem_edit_header {
'.&Apache::lonxml::message_location().'
'.
- '
';
+ '
';
}
sub problem_edit_footer {
@@ -691,7 +710,7 @@ sub problem_web_to_edit_header {
".&mt("Problem Type:")."